diff --git a/configure b/configure
index d0ae403..a150c87 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for STK 4.4.
+# Generated by GNU Autoconf 2.63 for STK 4.4.
 #
 # Report bugs to <gary@music.mcgill.ca>.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -17,7 +17,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -39,17 +39,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -65,8 +93,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -89,7 +115,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -102,17 +128,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -134,7 +153,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -160,7 +179,7 @@ else
   as_have_required=no
 fi
 
-  if test $as_have_required = yes && 	 (eval ":
+  if test $as_have_required = yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -242,7 +261,7 @@ IFS=$as_save_IFS
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -263,7 +282,7 @@ _ASEOF
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -343,10 +362,10 @@ fi
 
       if test "x$CONFIG_SHELL" != x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
 
 
@@ -415,9 +434,10 @@ fi
 
 test \$exitcode = 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  echo Please tell bug-autoconf@gnu.org about your system,
+  echo including any error possibly output before this message.
+  echo This can help us improve future autoconf versions.
+  echo Configuration will now proceed without shell functions.
 }
 
 
@@ -453,7 +473,7 @@ test \$exitcode = 0") || {
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -481,7 +501,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -494,19 +513,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -531,10 +553,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -615,80 +637,95 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-GXX
-CXX
-CXXFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CXX
-EXEEXT
-OBJEXT
-RANLIB
-AR
-CC
-CFLAGS
-ac_ct_CC
-CPP
-GREP
-EGREP
-byte_order
-rawwaves
-include
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+objects
+api
+libflags
+sharedname
+sharedlib
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+debug
+object_path
+cxxflag
+cppflag
 realtime
 sound_api
-cppflag
-cxxflag
-object_path
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-api
-objects
-LIBOBJS
-LTLIBOBJS'
+include
+rawwaves
+byte_order
+EGREP
+GREP
+CPP
+ac_ct_CC
+CFLAGS
+CC
+AR
+RANLIB
+OBJEXT
+EXEEXT
+ac_ct_CXX
+CPPFLAGS
+LDFLAGS
+CXXFLAGS
+CXX
+GXX
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_realtime
+enable_debug
+with_jack
+with_alsa
+with_oss
+with_core
+with_asio
+with_ds
+'
       ac_precious_vars='build_alias
 host_alias
 target_alias
@@ -706,6 +743,8 @@ CPP'
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -804,13 +843,21 @@ do
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
@@ -823,13 +870,21 @@ do
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1020,22 +1075,38 @@ do
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
    { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -1055,7 +1126,7 @@ do
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1064,16 +1135,16 @@ Try \`$0 --help' for more information." >&2
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -1082,22 +1153,38 @@ done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
 
@@ -1112,7 +1199,7 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -1128,10 +1215,10 @@ test "$silent" = yes && exec 6>/dev/null
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
+  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
    { (exit 1); exit 1; }; }
 
 
@@ -1139,12 +1226,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1171,12 +1258,12 @@ else
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=.
@@ -1225,9 +1312,9 @@ Configuration:
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1237,25 +1324,25 @@ for instance \`--prefix=\$HOME'.
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/stk]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/stk]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1273,6 +1360,7 @@ if test -n "$ac_init_help"; then
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-realtime = only compile generic non-realtime classes
@@ -1312,15 +1400,17 @@ fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1356,7 +1446,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -1366,10 +1456,10 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 STK configure 4.4
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1380,7 +1470,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by STK $as_me 4.4, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
 
@@ -1416,7 +1506,7 @@ for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -1451,7 +1541,7 @@ do
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1503,11 +1593,12 @@ _ASBOX
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1537,9 +1628,9 @@ _ASBOX
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      echo "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
@@ -1554,9 +1645,9 @@ _ASBOX
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	echo "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1572,8 +1663,8 @@ _ASBOX
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1615,21 +1706,24 @@ _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=$CONFIG_SITE
 elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
+  test "x$ac_site_file" = xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
@@ -1639,16 +1733,16 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
@@ -1662,29 +1756,38 @@ for ac_var in $ac_precious_vars; do
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1694,10 +1797,12 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1749,8 +1854,8 @@ for ac_dir in config "$srcdir"/config; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1786,10 +1891,10 @@ if test -z "$CXX"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -1802,7 +1907,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1813,11 +1918,11 @@ fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1830,10 +1935,10 @@ if test -z "$CXX"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -1846,7 +1951,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1857,11 +1962,11 @@ fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -1873,12 +1978,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -1888,37 +1989,41 @@ fi
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
@@ -1937,27 +2042,22 @@ main ()
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
@@ -1968,10 +2068,11 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -1982,7 +2083,7 @@ for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
@@ -2009,25 +2110,27 @@ else
   ac_file=''
 fi
 
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C++ compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ compiler cannot create executables
+$as_echo "$as_me: error: C++ compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
@@ -2036,49 +2139,53 @@ if test "$cross_compiling" != yes; then
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
+	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C++ compiled programs.
+$as_echo "$as_me: error: cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
     fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { (ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2087,31 +2194,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2134,40 +2243,43 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2193,20 +2305,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2216,15 +2329,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
    ac_cxx_werror_flag=yes
@@ -2251,20 +2368,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CXXFLAGS=""
@@ -2289,20 +2407,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -2328,20 +2447,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -2356,8 +2476,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" = set; then
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
@@ -2382,10 +2502,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -2398,7 +2518,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2409,11 +2529,11 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2422,10 +2542,10 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -2438,7 +2558,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2449,11 +2569,11 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -2461,12 +2581,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -2477,10 +2593,10 @@ fi
 
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $AR in
   [\\/]* | ?:[\\/]*)
@@ -2495,7 +2611,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2508,17 +2624,17 @@ esac
 fi
 AR=$ac_cv_path_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 if [ $AR = "no" ] ; then
-    { { echo "$as_me:$LINENO: error: \"Could not find ar - needed to create a library\"" >&5
-echo "$as_me: error: \"Could not find ar - needed to create a library\"" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: \"Could not find ar - needed to create a library\"" >&5
+$as_echo "$as_me: error: \"Could not find ar - needed to create a library\"" >&2;}
    { (exit 1); exit 1; }; };
 fi
 
@@ -2531,10 +2647,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2547,7 +2663,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2558,11 +2674,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2571,10 +2687,10 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2587,7 +2703,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2598,11 +2714,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
@@ -2610,12 +2726,8 @@ fi
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2628,10 +2740,10 @@ if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2644,7 +2756,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2655,11 +2767,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2668,10 +2780,10 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2689,7 +2801,7 @@ do
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2712,11 +2824,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2727,10 +2839,10 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2743,7 +2855,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2754,11 +2866,11 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2771,10 +2883,10 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2787,7 +2899,7 @@ do
   for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2798,11 +2910,11 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -2814,12 +2926,8 @@ done
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -2829,50 +2937,56 @@ fi
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
 { (ac_try="$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 { (ac_try="$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
 
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2898,20 +3012,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_compiler_gnu=no
@@ -2921,15 +3036,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
@@ -2956,20 +3075,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	CFLAGS=""
@@ -2994,20 +3114,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_c_werror_flag=$ac_save_c_werror_flag
@@ -3033,20 +3154,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3061,8 +3183,8 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3078,10 +3200,10 @@ else
     CFLAGS=
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
@@ -3152,20 +3274,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -3181,15 +3304,15 @@ fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
 
@@ -3205,15 +3328,15 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3245,20 +3368,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3282,13 +3406,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3296,7 +3421,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3321,8 +3446,8 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3350,20 +3475,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Broken: fails on valid input.
@@ -3387,13 +3513,14 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3401,7 +3528,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   # Passes both tests.
@@ -3417,11 +3544,13 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
 
 ac_ext=c
@@ -3431,42 +3560,37 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3481,74 +3605,60 @@ case `"$ac_path_GREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_GREP_found && break 3
+      $ac_path_GREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_GREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
-
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=`expr $ac_count + 1`
@@ -3563,40 +3673,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
-
-    $ac_path_EGREP_found && break 3
+      $ac_path_EGREP_found && break 3
+    done
   done
 done
-
-done
 IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
    { (exit 1); exit 1; }; }
-fi
-
+  fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3623,20 +3724,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_stdc=no
@@ -3661,7 +3763,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -3682,7 +3784,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -3728,37 +3830,40 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -3780,11 +3885,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -3802,20 +3907,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_Header=no"
@@ -3823,12 +3929,15 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -3843,20 +3952,21 @@ done
 
 for ac_header in fcntl.h sys/ioctl.h sys/time.h termio.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3872,32 +3982,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3911,51 +4022,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
 ## Report this to gary@music.mcgill.ca ##
@@ -3964,21 +4076,24 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -3987,10 +4102,10 @@ done
 
 
 # Checks for typedefs, structures, and compiler characteristics.
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4062,20 +4177,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_const=no
@@ -4083,36 +4199,34 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 cat >>confdefs.h <<\_ACEOF
-#define const
+#define const /**/
 _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
 if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_type_size_t=no
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-typedef size_t ac__type_new_;
 int
 main ()
 {
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
+if (sizeof (size_t))
+       return 0;
   ;
   return 0;
 }
@@ -4123,30 +4237,73 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+if (sizeof ((size_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  :
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_cv_type_size_t=no
+	ac_cv_type_size_t=yes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" = x""yes; then
   :
 else
 
@@ -4156,10 +4313,10 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
 if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4186,20 +4343,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_header_time=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_header_time=no
@@ -4207,8 +4365,8 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
 if test $ac_cv_header_time = yes; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -4217,28 +4375,78 @@ _ACEOF
 
 fi
 
-{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are some -arch flags.  Note that *ppc* also matches
+	# ppc64.  This check is also rather less than ideal.
+	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+	esac
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+	     #include <sys/param.h>
 
 int
 main ()
 {
-#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
-#endif
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
 
   ;
   return 0;
@@ -4250,33 +4458,34 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
+	 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <sys/types.h>
-#include <sys/param.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+		 not big endian
+		#endif
 
   ;
   return 0;
@@ -4288,20 +4497,21 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_bigendian=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_c_bigendian=no
@@ -4309,29 +4519,31 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+#include <limits.h>
+
 int
 main ()
 {
- _ascii (); _ebcdic ();
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
   ;
   return 0;
 }
@@ -4342,30 +4554,139 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
   ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_c_bigendian=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then
+  # Try to guess by grepping values from an object file.
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
@@ -4384,14 +4705,14 @@ int
 main ()
 {
 
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long int l;
-    char c[sizeof (long int)];
-  } u;
-  u.l = 1;
-  return u.c[sizeof (long int) - 1] == 1;
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
 
   ;
   return 0;
@@ -4403,55 +4724,62 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 ( exit $ac_status )
 ac_cv_c_bigendian=yes
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+    fi
 fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
-case $ac_cv_c_bigendian in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     cat >>confdefs.h <<\_ACEOF
 #define WORDS_BIGENDIAN 1
 _ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+;; #(
+   no)
+      ;; #(
+   universal)
+
+cat >>confdefs.h <<\_ACEOF
+#define AC_APPLE_UNIVERSAL_BUILD 1
+_ACEOF
+
+     ;; #(
+   *)
+     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+$as_echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
    { (exit 1); exit 1; }; } ;;
-esac
+ esac
 
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4469,45 +4797,47 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   byte_order=-D__LITTLE_ENDIAN__
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
-{ echo "$as_me:$LINENO: checking for RAWWAVE_PATH argument" >&5
-echo $ECHO_N "checking for RAWWAVE_PATH argument... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for RAWWAVE_PATH argument" >&5
+$as_echo_n "checking for RAWWAVE_PATH argument... " >&6; }
 rawwaves=$RAWWAVE_PATH
 
-{ echo "$as_me:$LINENO: result: $RAWWAVE_PATH" >&5
-echo "${ECHO_T}$RAWWAVE_PATH" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $RAWWAVE_PATH" >&5
+$as_echo "$RAWWAVE_PATH" >&6; }
 
-{ echo "$as_me:$LINENO: checking for INCLUDE_PATH argument" >&5
-echo $ECHO_N "checking for INCLUDE_PATH argument... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for INCLUDE_PATH argument" >&5
+$as_echo_n "checking for INCLUDE_PATH argument... " >&6; }
 include=$INCLUDE_PATH
 
-{ echo "$as_me:$LINENO: result: $INCLUDE_PATH" >&5
-echo "${ECHO_T}$INCLUDE_PATH" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INCLUDE_PATH" >&5
+$as_echo "$INCLUDE_PATH" >&6; }
 
 # Check for realtime support disable
-{ echo "$as_me:$LINENO: checking whether to compile realtime support" >&5
-echo $ECHO_N "checking whether to compile realtime support... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to compile realtime support" >&5
+$as_echo_n "checking whether to compile realtime support... " >&6; }
 # Check whether --enable-realtime was given.
 if test "${enable_realtime+set}" = set; then
-  enableval=$enable_realtime; realtime=no
- sound_api=
-
-else
-  realtime=yes
-
+  enableval=$enable_realtime; realtime=$enableval
 fi
 
-{ echo "$as_me:$LINENO: result: $realtime" >&5
-echo "${ECHO_T}$realtime" >&6; }
+if test "$realtime" = "no"; then
+   sound_api=
+
+else
+   realtime=yes
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $realtime" >&5
+$as_echo "$realtime" >&6; }
 
 # Check for math library
 
-{ echo "$as_me:$LINENO: checking for cos in -lm" >&5
-echo $ECHO_N "checking for cos in -lm... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for cos in -lm" >&5
+$as_echo_n "checking for cos in -lm... " >&6; }
 if test "${ac_cv_lib_m_cos+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
@@ -4539,33 +4869,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_m_cos=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_m_cos=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
-echo "${ECHO_T}$ac_cv_lib_m_cos" >&6; }
-if test $ac_cv_lib_m_cos = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_cos" >&5
+$as_echo "$ac_cv_lib_m_cos" >&6; }
+if test "x$ac_cv_lib_m_cos" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -4573,30 +4907,39 @@ _ACEOF
   LIBS="-lm $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: math library is needed!" >&5
-echo "$as_me: error: math library is needed!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: math library is needed!" >&5
+$as_echo "$as_me: error: math library is needed!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
 # Check for debug
-{ echo "$as_me:$LINENO: checking whether to compile debug version" >&5
-echo $ECHO_N "checking whether to compile debug version... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to compile debug version" >&5
+$as_echo_n "checking whether to compile debug version... " >&6; }
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug; cppflag="-D_STK_DEBUG_ -D__RTAUDIO_DEBUG__ -D__RTMIDI_DEBUG__"
- cxxflag="-g"
- object_path=Debug
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  cppflag=
- cxxflag=-O3
- object_path=Release
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  enableval=$enable_debug; debug=$enableval
 fi
 
+if test "$debug" = "yes"; then
+   cppflag="-D_STK_DEBUG_ -D__RTAUDIO_DEBUG__ -D__RTMIDI_DEBUG__"
+
+   cxxflag="-g"
+
+   object_path=Debug
+
+else
+  debug=no
+
+  cppflag=
+
+  cxxflag=-O3
+
+  object_path=Release
+
+fi
+{ $as_echo "$as_me:$LINENO: result: $debug" >&5
+$as_echo "$debug" >&6; }
 
 # Checks for functions
 if test $realtime = yes; then
@@ -4604,11 +4947,11 @@ if test $realtime = yes; then
 
 for ac_func in select socket
 do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
 if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4661,44 +5004,51 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	eval "$as_ac_var=no"
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" = x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-  { echo "$as_me:$LINENO: checking for gettimeofday" >&5
-echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for gettimeofday" >&5
+$as_echo_n "checking for gettimeofday... " >&6; }
 if test "${ac_cv_func_gettimeofday+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4751,32 +5101,36 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_func_gettimeofday=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_func_gettimeofday=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_gettimeofday" >&5
-echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6; }
-if test $ac_cv_func_gettimeofday = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gettimeofday" >&5
+$as_echo "$ac_cv_func_gettimeofday" >&6; }
+if test "x$ac_cv_func_gettimeofday" = x""yes; then
   cppflag="$cppflag -DHAVE_GETTIMEOFDAY"
 fi
 
@@ -4786,6 +5140,7 @@ fi
 CPPFLAGS="$CPPFLAGS $cppflag"
 
 # For debugging and optimization ... overwrite default because it has both -g and -O2
+echo "$CXXFLAGS"
 CXXFLAGS="$cxxflag"
 
 # Check compiler and use -Wall if gnu.
@@ -4796,38 +5151,36 @@ fi
 
 CXXFLAGS="$CXXFLAGS $cxxflag"
 
-if test $realtime = yes; then
-  # Checks for package options and external software
-  # Make sure we can run config.sub.
+# Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
 if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 build=$ac_cv_build
@@ -4844,27 +5197,27 @@ IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
 if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
    { (exit 1); exit 1; }; };;
 esac
 host=$ac_cv_host
@@ -4881,8 +5234,27 @@ IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-  { echo "$as_me:$LINENO: checking for audio API" >&5
-echo $ECHO_N "checking for audio API... $ECHO_C" >&6; }
+
+sharedlib="libstk.so"
+
+sharedname="libstk.so.\$(RELEASE)"
+
+libflags="-shared -Wl,-soname,\$(SHAREDLIB).\$(MAJOR) -o \$(SHAREDLIB).\$(RELEASE)"
+
+case $host in
+  *-apple*)
+  sharedlib="libstk.dylib"
+
+  sharedname="libstk.\$(RELEASE).dylib"
+
+  libflags="-dynamiclib -o libstk.\$(RELEASE).dylib"
+
+esac
+
+if test $realtime = yes; then
+  # Checks for package options and external software
+  { $as_echo "$as_me:$LINENO: checking for audio API" >&5
+$as_echo_n "checking for audio API... " >&6; }
   case $host in
     *-*-linux*)
 
@@ -4890,13 +5262,13 @@ echo $ECHO_N "checking for audio API... $ECHO_C" >&6; }
 if test "${with_jack+set}" = set; then
   withval=$with_jack;
     api="$api -D__UNIX_JACK__"
-    { echo "$as_me:$LINENO: result: using JACK" >&5
-echo "${ECHO_T}using JACK" >&6; }
+    { $as_echo "$as_me:$LINENO: result: using JACK" >&5
+$as_echo "using JACK" >&6; }
 
-{ echo "$as_me:$LINENO: checking for jack_client_open in -ljack" >&5
-echo $ECHO_N "checking for jack_client_open in -ljack... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for jack_client_open in -ljack" >&5
+$as_echo_n "checking for jack_client_open in -ljack... " >&6; }
 if test "${ac_cv_lib_jack_jack_client_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljack  $LIBS"
@@ -4928,33 +5300,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_jack_jack_client_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_jack_jack_client_open=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_jack_jack_client_open" >&5
-echo "${ECHO_T}$ac_cv_lib_jack_jack_client_open" >&6; }
-if test $ac_cv_lib_jack_jack_client_open = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jack_jack_client_open" >&5
+$as_echo "$ac_cv_lib_jack_jack_client_open" >&6; }
+if test "x$ac_cv_lib_jack_jack_client_open" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBJACK 1
 _ACEOF
@@ -4962,16 +5338,16 @@ _ACEOF
   LIBS="-ljack $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: JACK support requires the jack library!" >&5
-echo "$as_me: error: JACK support requires the jack library!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: JACK support requires the jack library!" >&5
+$as_echo "$as_me: error: JACK support requires the jack library!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
-{ echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
-echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
+$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
 if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
@@ -5003,33 +5379,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_asound_snd_pcm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_asound_snd_pcm_open=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test $ac_cv_lib_asound_snd_pcm_open = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBASOUND 1
 _ACEOF
@@ -5037,8 +5417,8 @@ _ACEOF
   LIBS="-lasound $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: Jack support also requires the asound library!" >&5
-echo "$as_me: error: Jack support also requires the asound library!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: Jack support also requires the asound library!" >&5
+$as_echo "$as_me: error: Jack support also requires the asound library!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -5051,13 +5431,13 @@ fi
 if test "${with_alsa+set}" = set; then
   withval=$with_alsa;
     api="$api -D__LINUX_ALSA__"
-    { echo "$as_me:$LINENO: result: using ALSA" >&5
-echo "${ECHO_T}using ALSA" >&6; }
+    { $as_echo "$as_me:$LINENO: result: using ALSA" >&5
+$as_echo "using ALSA" >&6; }
 
-{ echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
-echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
+$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
 if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
@@ -5089,33 +5469,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_asound_snd_pcm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_asound_snd_pcm_open=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test $ac_cv_lib_asound_snd_pcm_open = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBASOUND 1
 _ACEOF
@@ -5123,8 +5507,8 @@ _ACEOF
   LIBS="-lasound $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: ALSA support requires the asound library!" >&5
-echo "$as_me: error: ALSA support requires the asound library!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: ALSA support requires the asound library!" >&5
+$as_echo "$as_me: error: ALSA support requires the asound library!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -5137,22 +5521,22 @@ fi
 if test "${with_oss+set}" = set; then
   withval=$with_oss;
     api="$api -D__LINUX_OSS__"
-    { echo "$as_me:$LINENO: result: using OSS" >&5
-echo "${ECHO_T}using OSS" >&6; }
+    { $as_echo "$as_me:$LINENO: result: using OSS" >&5
+$as_echo "using OSS" >&6; }
 fi
 
 
     # If no audio api flags specified, use ALSA
     if test "$api" == ""; then
-      { echo "$as_me:$LINENO: result: using ALSA" >&5
-echo "${ECHO_T}using ALSA" >&6; }
+      { $as_echo "$as_me:$LINENO: result: using ALSA" >&5
+$as_echo "using ALSA" >&6; }
       api=-D__LINUX_ALSA__
 
 
-{ echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
-echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
+$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
 if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
@@ -5184,33 +5568,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_asound_snd_pcm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_asound_snd_pcm_open=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test $ac_cv_lib_asound_snd_pcm_open = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBASOUND 1
 _ACEOF
@@ -5218,8 +5606,8 @@ _ACEOF
   LIBS="-lasound $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: ALSA support requires the asound library!" >&5
-echo "$as_me: error: ALSA support requires the asound library!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: ALSA support requires the asound library!" >&5
+$as_echo "$as_me: error: ALSA support requires the asound library!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -5227,10 +5615,10 @@ fi
 
     # Look for ALSA library because we need it for RtMidi
 
-{ echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
-echo $ECHO_N "checking for snd_pcm_open in -lasound... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for snd_pcm_open in -lasound" >&5
+$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; }
 if test "${ac_cv_lib_asound_snd_pcm_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lasound  $LIBS"
@@ -5262,33 +5650,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_asound_snd_pcm_open=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_asound_snd_pcm_open=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
-echo "${ECHO_T}$ac_cv_lib_asound_snd_pcm_open" >&6; }
-if test $ac_cv_lib_asound_snd_pcm_open = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_asound_snd_pcm_open" >&5
+$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; }
+if test "x$ac_cv_lib_asound_snd_pcm_open" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBASOUND 1
 _ACEOF
@@ -5296,18 +5688,18 @@ _ACEOF
   LIBS="-lasound $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: STK in Linux requires the ALSA asound library for RtMidi!" >&5
-echo "$as_me: error: STK in Linux requires the ALSA asound library for RtMidi!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: STK in Linux requires the ALSA asound library for RtMidi!" >&5
+$as_echo "$as_me: error: STK in Linux requires the ALSA asound library for RtMidi!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
     api="$api -D__LINUX_ALSASEQ__"
 
 
-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
@@ -5339,33 +5731,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pthread_pthread_create=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pthread_pthread_create=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
-if test $ac_cv_lib_pthread_pthread_create = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPTHREAD 1
 _ACEOF
@@ -5373,8 +5769,8 @@ _ACEOF
   LIBS="-lpthread $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: realtime support requires the pthread library!" >&5
-echo "$as_me: error: realtime support requires the pthread library!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: realtime support requires the pthread library!" >&5
+$as_echo "$as_me: error: realtime support requires the pthread library!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -5386,13 +5782,13 @@ fi
 if test "${with_jack+set}" = set; then
   withval=$with_jack;
     api="$api -D__UNIX_JACK__"
-    { echo "$as_me:$LINENO: result: using JACK" >&5
-echo "${ECHO_T}using JACK" >&6; }
+    { $as_echo "$as_me:$LINENO: result: using JACK" >&5
+$as_echo "using JACK" >&6; }
 
-{ echo "$as_me:$LINENO: checking for jack_client_new in -ljack" >&5
-echo $ECHO_N "checking for jack_client_new in -ljack... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for jack_client_new in -ljack" >&5
+$as_echo_n "checking for jack_client_new in -ljack... " >&6; }
 if test "${ac_cv_lib_jack_jack_client_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ljack  $LIBS"
@@ -5424,33 +5820,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_jack_jack_client_new=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_jack_jack_client_new=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_jack_jack_client_new" >&5
-echo "${ECHO_T}$ac_cv_lib_jack_jack_client_new" >&6; }
-if test $ac_cv_lib_jack_jack_client_new = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jack_jack_client_new" >&5
+$as_echo "$ac_cv_lib_jack_jack_client_new" >&6; }
+if test "x$ac_cv_lib_jack_jack_client_new" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBJACK 1
 _ACEOF
@@ -5458,8 +5858,8 @@ _ACEOF
   LIBS="-ljack $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: JACK support requires the jack library!" >&5
-echo "$as_me: error: JACK support requires the jack library!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: JACK support requires the jack library!" >&5
+$as_echo "$as_me: error: JACK support requires the jack library!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -5472,20 +5872,20 @@ fi
 if test "${with_core+set}" = set; then
   withval=$with_core;
     api="$api -D__MACOSX_CORE__"
-    { echo "$as_me:$LINENO: result: using CoreAudio" >&5
-echo "${ECHO_T}using CoreAudio" >&6; }
+    { $as_echo "$as_me:$LINENO: result: using CoreAudio" >&5
+$as_echo "using CoreAudio" >&6; }
     if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+$as_echo_n "checking CoreAudio/CoreAudio.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5501,32 +5901,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+$as_echo_n "checking CoreAudio/CoreAudio.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5540,51 +5941,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
 ## Report this to gary@music.mcgill.ca ##
@@ -5593,22 +5995,22 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
 
 fi
-if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+if test "x$ac_cv_header_CoreAudio_CoreAudio_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: CoreAudio header files not found!" >&5
-echo "$as_me: error: CoreAudio header files not found!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: CoreAudio header files not found!" >&5
+$as_echo "$as_me: error: CoreAudio header files not found!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -5621,20 +6023,20 @@ fi
     if test "$api" == "";  then
       api=-D__MACOSX_CORE__
 
-      { echo "$as_me:$LINENO: result: using CoreAudio" >&5
-echo "${ECHO_T}using CoreAudio" >&6; }
+      { $as_echo "$as_me:$LINENO: result: using CoreAudio" >&5
+$as_echo "using CoreAudio" >&6; }
       if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
+$as_echo_n "checking CoreAudio/CoreAudio.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5650,32 +6052,33 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_header_compiler=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h presence" >&5
+$as_echo_n "checking CoreAudio/CoreAudio.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -5689,51 +6092,52 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then
   ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
   ac_header_preproc=no
 fi
 
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the compiler's result" >&2;}
     ac_header_preproc=yes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## ----------------------------------- ##
 ## Report this to gary@music.mcgill.ca ##
@@ -5742,22 +6146,22 @@ _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
-{ echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
+$as_echo_n "checking for CoreAudio/CoreAudio.h... " >&6; }
 if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
+$as_echo "$ac_cv_header_CoreAudio_CoreAudio_h" >&6; }
 
 fi
-if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
+if test "x$ac_cv_header_CoreAudio_CoreAudio_h" = x""yes; then
   :
 else
-  { { echo "$as_me:$LINENO: error: CoreAudio header files not found!" >&5
-echo "$as_me: error: CoreAudio header files not found!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: CoreAudio header files not found!" >&5
+$as_echo "$as_me: error: CoreAudio header files not found!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -5767,10 +6171,10 @@ fi
     fi
 
 
-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpthread  $LIBS"
@@ -5802,33 +6206,37 @@ case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_lib_pthread_pthread_create=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_cv_lib_pthread_pthread_create=no
 fi
 
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
-if test $ac_cv_lib_pthread_pthread_create = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPTHREAD 1
 _ACEOF
@@ -5836,8 +6244,8 @@ _ACEOF
   LIBS="-lpthread $LIBS"
 
 else
-  { { echo "$as_me:$LINENO: error: RtAudio requires the pthread library!" >&5
-echo "$as_me: error: RtAudio requires the pthread library!" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: RtAudio requires the pthread library!" >&5
+$as_echo "$as_me: error: RtAudio requires the pthread library!" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -5849,8 +6257,8 @@ fi
 if test "${with_asio+set}" = set; then
   withval=$with_asio;
     api="$api -D__WINDOWS_ASIO__"
-    { echo "$as_me:$LINENO: result: using ASIO" >&5
-echo "${ECHO_T}using ASIO" >&6; }
+    { $as_echo "$as_me:$LINENO: result: using ASIO" >&5
+$as_echo "using ASIO" >&6; }
     objects="asio.o asiodrivers.o asiolist.o iasiothiscallresolver.o"
 
 fi
@@ -5862,8 +6270,8 @@ fi
 if test "${with_ds+set}" = set; then
   withval=$with_ds;
     api="$api -D__WINDOWS_DS__"
-    { echo "$as_me:$LINENO: result: using DirectSound" >&5
-echo "${ECHO_T}using DirectSound" >&6; }
+    { $as_echo "$as_me:$LINENO: result: using DirectSound" >&5
+$as_echo "using DirectSound" >&6; }
     LIBS="-ldsound -lwinmm $LIBS"
 fi
 
@@ -5872,8 +6280,8 @@ fi
     if test "$api" == ""; then
       api=-D__WINDOWS_DS__
 
-      { echo "$as_me:$LINENO: result: using DirectSound" >&5
-echo "${ECHO_T}using DirectSound" >&6; }
+      { $as_echo "$as_me:$LINENO: result: using DirectSound" >&5
+$as_echo "using DirectSound" >&6; }
       LIBS="-ldsound -lwinmm $LIBS"
     fi
 
@@ -5883,8 +6291,8 @@ echo "${ECHO_T}using DirectSound" >&6; }
 
     *)
     # Default case for unknown realtime systems.
-    { { echo "$as_me:$LINENO: error: Unknown system type for realtime support ... try --disable-realtime argument!" >&5
-echo "$as_me: error: Unknown system type for realtime support ... try --disable-realtime argument!" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: Unknown system type for realtime support ... try --disable-realtime argument!" >&5
+$as_echo "$as_me: error: Unknown system type for realtime support ... try --disable-realtime argument!" >&2;}
    { (exit 1); exit 1; }; }
     ;;
   esac
@@ -5919,11 +6327,12 @@ _ACEOF
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -5956,12 +6365,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -5978,6 +6387,12 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 # take arguments), then branch to the quote section.  Otherwise,
 # look for a macro that doesn't take arguments.
 ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
 t clear
 :clear
 s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
@@ -6007,7 +6422,7 @@ ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -6019,12 +6434,14 @@ LTLIBOBJS=$ac_ltlibobjs
 
 
 
+
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -6037,7 +6454,7 @@ ac_cs_silent=false
 SHELL=\${CONFIG_SHELL-$SHELL}
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -6047,7 +6464,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
@@ -6069,17 +6486,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 # Support unset when possible.
@@ -6095,8 +6540,6 @@ fi
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl='
-'
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -6119,7 +6562,7 @@ if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   { (exit 1); exit 1; }
 fi
 
@@ -6132,17 +6575,10 @@ PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
 
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -6164,7 +6600,7 @@ as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -6215,7 +6651,7 @@ $as_unset CDPATH
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -6243,7 +6679,6 @@ case `echo -n x` in
 *)
   ECHO_N='-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -6256,19 +6691,22 @@ if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
     as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
+  fi
 else
   as_ln_s='cp -p'
 fi
@@ -6293,10 +6731,10 @@ else
   as_test_x='
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -6319,7 +6757,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by STK $as_me 4.4, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -6332,26 +6770,33 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q`
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files from templates according to the
 current configuration.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
@@ -6359,23 +6804,23 @@ $config_files
 Report bugs to <bug-autoconf@gnu.org>."
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
 STK config.status 4.4
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
@@ -6397,21 +6842,24 @@ do
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h |  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
 
@@ -6430,30 +6878,32 @@ if $ac_cs_silent; then
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  exec "\$@"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -6467,8 +6917,8 @@ do
     "projects/examples/Makefile") CONFIG_FILES="$CONFIG_FILES projects/examples/Makefile" ;;
     "projects/examples/libMakefile") CONFIG_FILES="$CONFIG_FILES projects/examples/libMakefile" ;;
 
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -6507,137 +6957,143 @@ $debug ||
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
 
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
+
+ac_cr='
'
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 
 
-
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-GXX!$GXX$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-RANLIB!$RANLIB$ac_delim
-AR!$AR$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-byte_order!$byte_order$ac_delim
-rawwaves!$rawwaves$ac_delim
-include!$include$ac_delim
-realtime!$realtime$ac_delim
-sound_api!$sound_api$ac_delim
-cppflag!$cppflag$ac_delim
-cxxflag!$cxxflag$ac_delim
-object_path!$object_path$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-api!$api$ac_delim
-objects!$objects$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+  . ./conf$$subs.sh ||
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 73; then
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
    { (exit 1); exit 1; }; }
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
+rm -f conf$$subs.sh
 
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
 
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
@@ -6654,19 +7110,21 @@ s/^[^=]*=[	 ]*$//
 }'
 fi
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 
-for ac_tag in  :F $CONFIG_FILES
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
    { (exit 1); exit 1; }; };;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -6695,26 +7153,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
    { (exit 1); exit 1; }; };;
       esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      ac_file_inputs="$ac_file_inputs '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; } ;;
     esac
     ;;
   esac
@@ -6724,7 +7194,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6750,7 +7220,7 @@ echo X"$ac_file" |
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -6759,7 +7229,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -6780,17 +7250,17 @@ echo X"$as_dir" |
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -6826,12 +7296,13 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
   p
   q
 }
@@ -6840,13 +7311,14 @@ case `sed -n '/datarootdir/ {
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -6860,15 +7332,16 @@ _ACEOF
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -6877,21 +7350,28 @@ s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&2;}
 
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+   { (exit 1); exit 1; }; }
  ;;
 
 
@@ -6906,6 +7386,11 @@ _ACEOF
 chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -6927,4 +7412,8 @@ if test "$no_create" != yes; then
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
 
diff --git a/doc/doxygen/html/doxygen.css b/doc/doxygen/html/doxygen.css
deleted file mode 100644
index 3767dc9..0000000
--- a/doc/doxygen/html/doxygen.css
+++ /dev/null
@@ -1,441 +0,0 @@
-body, table, div, p, dl {
-	font-family: Lucida Grande, Verdana, Geneva, Arial, sans-serif;
-	font-size: 12px;
-}
-
-/* @group Heading Levels */
-
-h1 {
-	text-align: center;
-	font-size: 150%;
-}
-
-h2 {
-	font-size: 120%;
-}
-
-h3 {
-	font-size: 100%;
-}
-
-/* @end */
-
-caption {
-	font-weight: bold;
-}
-
-div.qindex, div.navtab{
-	background-color: #e8eef2;
-	border: 1px solid #84b0c7;
-	text-align: center;
-	margin: 2px;
-	padding: 2px;
-}
-
-div.qindex, div.navpath {
-	width: 100%;
-	line-height: 140%;
-}
-
-div.navtab {
-	margin-right: 15px;
-}
-
-/* @group Link Styling */
-
-a {
-	color: #153788;
-	font-weight: normal;
-	text-decoration: none;
-}
-
-.contents a:visited {
-	color: #1b77c5;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-a.qindex {
-	font-weight: bold;
-}
-
-a.qindexHL {
-	font-weight: bold;
-	background-color: #6666cc;
-	color: #ffffff;
-	border: 1px double #9295C2;
-}
-
-.contents a.qindexHL:visited {
-        color: #ffffff;
-}
-
-a.el {
-	font-weight: bold;
-}
-
-a.elRef {
-}
-
-a.code {
-}
-
-a.codeRef {
-}
-
-/* @end */
-
-dl.el {
-	margin-left: -1cm;
-}
-
-.fragment {
-	font-family: monospace, fixed;
-	font-size: 105%;
-}
-
-pre.fragment {
-	border: 1px solid #CCCCCC;
-	background-color: #f5f5f5;
-	padding: 4px 6px;
-	margin: 4px 8px 4px 2px;
-}
-
-div.ah {
-	background-color: black;
-	font-weight: bold;
-	color: #ffffff;
-	margin-bottom: 3px;
-	margin-top: 3px
-}
-
-div.groupHeader {
-	margin-left: 16px;
-	margin-top: 12px;
-	margin-bottom: 6px;
-	font-weight: bold;
-}
-
-div.groupText {
-	margin-left: 16px;
-	font-style: italic;
-}
-
-body {
-	background: white;
-	color: black;
-	margin-right: 20px;
-	margin-left: 20px;
-}
-
-td.indexkey {
-	background-color: #e8eef2;
-	font-weight: bold;
-	border: 1px solid #CCCCCC;
-	margin: 2px 0px 2px 0;
-	padding: 2px 10px;
-}
-
-td.indexvalue {
-	background-color: #e8eef2;
-	border: 1px solid #CCCCCC;
-	padding: 2px 10px;
-	margin: 2px 0px;
-}
-
-tr.memlist {
-	background-color: #f0f0f0;
-}
-
-p.formulaDsp {
-	text-align: center;
-}
-
-img.formulaDsp {
-	
-}
-
-img.formulaInl {
-	vertical-align: middle;
-}
-
-/* @group Code Colorization */
-
-span.keyword {
-	color: #008000
-}
-
-span.keywordtype {
-	color: #604020
-}
-
-span.keywordflow {
-	color: #e08000
-}
-
-span.comment {
-	color: #800000
-}
-
-span.preprocessor {
-	color: #806020
-}
-
-span.stringliteral {
-	color: #002080
-}
-
-span.charliteral {
-	color: #008080
-}
-
-span.vhdldigit { 
-	color: #ff00ff 
-}
-
-span.vhdlchar { 
-	color: #000000 
-}
-
-span.vhdlkeyword { 
-	color: #700070 
-}
-
-span.vhdllogic { 
-	color: #ff0000 
-}
-
-/* @end */
-
-.search {
-	color: #003399;
-	font-weight: bold;
-}
-
-form.search {
-	margin-bottom: 0px;
-	margin-top: 0px;
-}
-
-input.search {
-	font-size: 75%;
-	color: #000080;
-	font-weight: normal;
-	background-color: #e8eef2;
-}
-
-td.tiny {
-	font-size: 75%;
-}
-
-.dirtab {
-	padding: 4px;
-	border-collapse: collapse;
-	border: 1px solid #84b0c7;
-}
-
-th.dirtab {
-	background: #e8eef2;
-	font-weight: bold;
-}
-
-hr {
-	height: 0;
-	border: none;
-	border-top: 1px solid #666;
-}
-
-/* @group Member Descriptions */
-
-.mdescLeft, .mdescRight,
-.memItemLeft, .memItemRight,
-.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
-	background-color: #FAFAFA;
-	border: none;
-	margin: 4px;
-	padding: 1px 0 0 8px;
-}
-
-.mdescLeft, .mdescRight {
-	padding: 0px 8px 4px 8px;
-	color: #555;
-}
-
-.memItemLeft, .memItemRight, .memTemplParams {
-	border-top: 1px solid #ccc;
-}
-
-.memTemplParams {
-	color: #606060;
-}
-
-/* @end */
-
-/* @group Member Details */
-
-/* Styles for detailed member documentation */
-
-.memtemplate {
-	font-size: 80%;
-	color: #606060;
-	font-weight: normal;
-	margin-left: 3px;
-}
-
-.memnav {
-	background-color: #e8eef2;
-	border: 1px solid #84b0c7;
-	text-align: center;
-	margin: 2px;
-	margin-right: 15px;
-	padding: 2px;
-}
-
-.memitem {
-	padding: 0;
-}
-
-.memname {
-	white-space: nowrap;
-	font-weight: bold;
-}
-
-.memproto, .memdoc {
-	border: 1px solid #84b0c7;	
-}
-
-.memproto {
-	padding: 0;
-	background-color: #d5e1e8;
-	font-weight: bold;
-	-webkit-border-top-left-radius: 8px;
-	-webkit-border-top-right-radius: 8px;
-	-moz-border-radius-topleft: 8px;
-	-moz-border-radius-topright: 8px;
-}
-
-.memdoc {
-	padding: 2px 5px;
-	background-color: #eef3f5;
-	border-top-width: 0;
-	-webkit-border-bottom-left-radius: 8px;
-	-webkit-border-bottom-right-radius: 8px;
-	-moz-border-radius-bottomleft: 8px;
-	-moz-border-radius-bottomright: 8px;
-}
-
-.paramkey {
-	text-align: right;
-}
-
-.paramtype {
-	white-space: nowrap;
-}
-
-.paramname {
-	color: #602020;
-	white-space: nowrap;
-}
-.paramname em {
-	font-style: normal;
-}
-
-/* @end */
-
-/* @group Directory (tree) */
-
-/* for the tree view */
-
-.ftvtree {
-	font-family: sans-serif;
-	margin: 0.5em;
-}
-
-/* these are for tree view when used as main index */
-
-.directory {
-	font-size: 9pt;
-	font-weight: bold;
-}
-
-.directory h3 {
-	margin: 0px;
-	margin-top: 1em;
-	font-size: 11pt;
-}
-
-/*
-The following two styles can be used to replace the root node title
-with an image of your choice.  Simply uncomment the next two styles,
-specify the name of your image and be sure to set 'height' to the
-proper pixel height of your image.
-*/
-
-/*
-.directory h3.swap {
-	height: 61px;
-	background-repeat: no-repeat;
-	background-image: url("yourimage.gif");
-}
-.directory h3.swap span {
-	display: none;
-}
-*/
-
-.directory > h3 {
-	margin-top: 0;
-}
-
-.directory p {
-	margin: 0px;
-	white-space: nowrap;
-}
-
-.directory div {
-	display: none;
-	margin: 0px;
-}
-
-.directory img {
-	vertical-align: -30%;
-}
-
-/* these are for tree view when not used as main index */
-
-.directory-alt {
-	font-size: 100%;
-	font-weight: bold;
-}
-
-.directory-alt h3 {
-	margin: 0px;
-	margin-top: 1em;
-	font-size: 11pt;
-}
-
-.directory-alt > h3 {
-	margin-top: 0;
-}
-
-.directory-alt p {
-	margin: 0px;
-	white-space: nowrap;
-}
-
-.directory-alt div {
-	display: none;
-	margin: 0px;
-}
-
-.directory-alt img {
-	vertical-align: -30%;
-}
-
-/* @end */
-
-address {
-	font-style: normal;
-	color: #333;
-}
diff --git a/doc/doxygen/html/doxygen.png b/doc/doxygen/html/doxygen.png
deleted file mode 100644
index f0a274b..0000000
Binary files a/doc/doxygen/html/doxygen.png and /dev/null differ
diff --git a/doc/doxygen/html/index.html b/doc/doxygen/html/index.html
deleted file mode 100644
index b72753f..0000000
--- a/doc/doxygen/html/index.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>Main Page</title>
-<link href="tabs.css" rel="stylesheet" type="text/css">
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.5.8 -->
-<div class="navigation" id="top">
-  <div class="tabs">
-    <ul>
-      <li class="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
-    </ul>
-  </div>
-</div>
-<div class="contents">
-<h1></h1>
-<p>
-</div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Sun May 17 21:46:45 2009 by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
-</body>
-</html>
diff --git a/doc/doxygen/html/tab_b.gif b/doc/doxygen/html/tab_b.gif
deleted file mode 100644
index 0d62348..0000000
Binary files a/doc/doxygen/html/tab_b.gif and /dev/null differ
diff --git a/doc/doxygen/html/tab_l.gif b/doc/doxygen/html/tab_l.gif
deleted file mode 100644
index 9b1e633..0000000
Binary files a/doc/doxygen/html/tab_l.gif and /dev/null differ
diff --git a/doc/doxygen/html/tab_r.gif b/doc/doxygen/html/tab_r.gif
deleted file mode 100644
index ce9dd9f..0000000
Binary files a/doc/doxygen/html/tab_r.gif and /dev/null differ
diff --git a/doc/doxygen/html/tabs.css b/doc/doxygen/html/tabs.css
deleted file mode 100644
index ab02c62..0000000
--- a/doc/doxygen/html/tabs.css
+++ /dev/null
@@ -1,105 +0,0 @@
-/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
-
-DIV.tabs
-{
-   float            : left;
-   width            : 100%;
-   background       : url("tab_b.gif") repeat-x bottom;
-   margin-bottom    : 4px;
-}
-
-DIV.tabs UL
-{
-   margin           : 0px;
-   padding-left     : 10px;
-   list-style       : none;
-}
-
-DIV.tabs LI, DIV.tabs FORM
-{
-   display          : inline;
-   margin           : 0px;
-   padding          : 0px;
-}
-
-DIV.tabs FORM
-{
-   float            : right;
-}
-
-DIV.tabs A
-{
-   float            : left;
-   background       : url("tab_r.gif") no-repeat right top;
-   border-bottom    : 1px solid #84B0C7;
-   font-size        : 80%;
-   font-weight      : bold;
-   text-decoration  : none;
-}
-
-DIV.tabs A:hover
-{
-   background-position: 100% -150px;
-}
-
-DIV.tabs A:link, DIV.tabs A:visited,
-DIV.tabs A:active, DIV.tabs A:hover
-{
-       color: #1A419D;
-}
-
-DIV.tabs SPAN
-{
-   float            : left;
-   display          : block;
-   background       : url("tab_l.gif") no-repeat left top;
-   padding          : 5px 9px;
-   white-space      : nowrap;
-}
-
-DIV.tabs INPUT
-{
-   float            : right;
-   display          : inline;
-   font-size        : 1em;
-}
-
-DIV.tabs TD
-{
-   font-size        : 80%;
-   font-weight      : bold;
-   text-decoration  : none;
-}
-
-
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-DIV.tabs SPAN {float : none;}
-/* End IE5-Mac hack */
-
-DIV.tabs A:hover SPAN
-{
-   background-position: 0% -150px;
-}
-
-DIV.tabs LI.current A
-{
-   background-position: 100% -150px;
-   border-width     : 0px;
-}
-
-DIV.tabs LI.current SPAN
-{
-   background-position: 0% -150px;
-   padding-bottom   : 6px;
-}
-
-DIV.navpath
-{
-   background       : none;
-   border           : none;
-   border-bottom    : 1px solid #84B0C7;
-   text-align       : center;
-   margin           : 2px;
-   padding          : 2px;
-}
diff --git a/doc/doxygen/latex/FreeSans.ttf b/doc/doxygen/latex/FreeSans.ttf
deleted file mode 100644
index b550b90..0000000
Binary files a/doc/doxygen/latex/FreeSans.ttf and /dev/null differ
diff --git a/doc/doxygen/latex/doxygen.sty b/doc/doxygen/latex/doxygen.sty
deleted file mode 100644
index 413ad33..0000000
--- a/doc/doxygen/latex/doxygen.sty
+++ /dev/null
@@ -1,86 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{doxygen}
-\RequirePackage{calc}
-\RequirePackage{array}
-\pagestyle{fancyplain}
-\newcommand{\clearemptydoublepage}{\newpage{\pagestyle{empty}\cleardoublepage}}
-\renewcommand{\chaptermark}[1]{\markboth{#1}{}}
-\renewcommand{\sectionmark}[1]{\markright{\thesection\ #1}}
-\lhead[\fancyplain{}{\bfseries\thepage}]
-        {\fancyplain{}{\bfseries\rightmark}}
-\rhead[\fancyplain{}{\bfseries\leftmark}]
-        {\fancyplain{}{\bfseries\thepage}}
-\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Sun May 17 21:46:45 2009 by Doxygen }]{}
-\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Sun May 17 21:46:45 2009 by Doxygen }}
-\cfoot{}
-\newenvironment{Code}
-{\footnotesize}
-{\normalsize}
-\newcommand{\doxyref}[3]{\textbf{#1} (\textnormal{#2}\,\pageref{#3})}
-\newenvironment{DocInclude}
-{\footnotesize}
-{\normalsize}
-\newenvironment{VerbInclude}
-{\footnotesize}
-{\normalsize}
-\newenvironment{Image}
-{\begin{figure}[H]}
-{\end{figure}}
-\newenvironment{ImageNoCaption}{}{}
-\newenvironment{CompactList}
-{\begin{list}{}{
-  \setlength{\leftmargin}{0.5cm}
-  \setlength{\itemsep}{0pt}
-  \setlength{\parsep}{0pt}
-  \setlength{\topsep}{0pt}
-  \renewcommand{\makelabel}{\hfill}}}
-{\end{list}}
-\newenvironment{CompactItemize}
-{
-  \begin{itemize}
-  \setlength{\itemsep}{-3pt}
-  \setlength{\parsep}{0pt}
-  \setlength{\topsep}{0pt}
-  \setlength{\partopsep}{0pt}
-}
-{\end{itemize}}
-\newcommand{\PBS}[1]{\let\temp=\\#1\let\\=\temp}
-\newlength{\tmplength}
-\newenvironment{TabularC}[1]
-{
-\setlength{\tmplength}
-     {\linewidth/(#1)-\tabcolsep*2-\arrayrulewidth*(#1+1)/(#1)}
-      \par\begin{tabular*}{\linewidth}
-             {*{#1}{|>{\PBS\raggedright\hspace{0pt}}p{\the\tmplength}}|}
-}
-{\end{tabular*}\par}
-\newcommand{\entrylabel}[1]{
-   {\parbox[b]{\labelwidth-4pt}{\makebox[0pt][l]{\textbf{#1}}\vspace{1.5\baselineskip}}}}
-\newenvironment{Desc}
-{\begin{list}{}
-  {
-    \settowidth{\labelwidth}{40pt}
-    \setlength{\leftmargin}{\labelwidth}
-    \setlength{\parsep}{0pt}
-    \setlength{\itemsep}{-4pt}
-    \renewcommand{\makelabel}{\entrylabel}
-  }
-}
-{\end{list}}
-\newenvironment{Indent}
-  {\begin{list}{}{\setlength{\leftmargin}{0.5cm}}
-      \item[]\ignorespaces}
-  {\unskip\end{list}}
-\setlength{\parindent}{0cm}
-\setlength{\parskip}{0.2cm}
-\addtocounter{secnumdepth}{1}
-\sloppy
-\usepackage[T1]{fontenc}
-\makeatletter
-\renewcommand{\paragraph}{\@startsection{paragraph}{4}{0ex}%
-   {-3.25ex plus -1ex minus -0.2ex}%
-   {1.5ex plus 0.2ex}%
-   {\normalfont\normalsize\bfseries}}
-\makeatother
-\stepcounter{secnumdepth}
-\stepcounter{tocdepth}
diff --git a/doc/doxygen/latex/refman.tex b/doc/doxygen/latex/refman.tex
deleted file mode 100644
index bb08b24..0000000
--- a/doc/doxygen/latex/refman.tex
+++ /dev/null
@@ -1,50 +0,0 @@
-\documentclass[a4paper]{book}
-\usepackage{a4wide}
-\usepackage{makeidx}
-\usepackage{fancyhdr}
-\usepackage{graphicx}
-\usepackage{multicol}
-\usepackage{float}
-\usepackage{textcomp}
-\usepackage{alltt}
-\usepackage{times}
-\usepackage{ifpdf}
-\ifpdf
-\usepackage[pdftex,
-            pagebackref=true,
-            colorlinks=true,
-            linkcolor=blue,
-            unicode
-           ]{hyperref}
-\else
-\usepackage[ps2pdf,
-            pagebackref=true,
-            colorlinks=true,
-            linkcolor=blue,
-            unicode
-           ]{hyperref}
-\usepackage{pspicture}
-\fi
-\usepackage[utf8]{inputenc}
-\usepackage{doxygen}
-\makeindex
-\setcounter{tocdepth}{3}
-\renewcommand{\footrulewidth}{0.4pt}
-\begin{document}
-\begin{titlepage}
-\vspace*{7cm}
-\begin{center}
-{\Large Reference Manual}\\
-\vspace*{1cm}
-{\large Generated by Doxygen 1.5.8}\\
-\vspace*{0.5cm}
-{\small Sun May 17 21:46:45 2009}\\
-\end{center}
-\end{titlepage}
-\clearemptydoublepage
-\pagenumbering{roman}
-\tableofcontents
-\clearemptydoublepage
-\pagenumbering{arabic}
-\printindex
-\end{document}
diff --git a/doc/html/ADSR_8h-source.html b/doc/html/ADSR_8h-source.html
deleted file mode 100644
index 1c5ef37..0000000
--- a/doc/html/ADSR_8h-source.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>ADSR.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ADSR_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_ADSR_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Generator.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a><a class="code" href="namespacestk.html">00006</a> <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 <span class="comment">/***************************************************/</span>
-<a name="l00020"></a>00020 
-<a name="l00021"></a><a class="code" href="classstk_1_1ADSR.html">00021</a> <span class="keyword">class </span><a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00022"></a>00022 {
-<a name="l00023"></a>00023  <span class="keyword">public</span>:
-<a name="l00024"></a>00024 
-<a name="l00026"></a>00026   <span class="keyword">enum</span> {
-<a name="l00027"></a><a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba9518c737b76795fa49f997c09e074c8e">00027</a>     <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba9518c737b76795fa49f997c09e074c8e">ATTACK</a>,   
-<a name="l00028"></a><a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba75e1deeb861fe2989250b1977018cacf">00028</a>     <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba75e1deeb861fe2989250b1977018cacf">DECAY</a>,    
-<a name="l00029"></a><a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba139dc35648a28ddc99a7a606e185f6ad">00029</a>     <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba139dc35648a28ddc99a7a606e185f6ad">SUSTAIN</a>,  
-<a name="l00030"></a><a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba7efc189b0b53e581201fd64f357a1756">00030</a>     <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba7efc189b0b53e581201fd64f357a1756">RELEASE</a>,  
-<a name="l00031"></a><a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154bac9fd188b8e5ad469e002f7ba3498028b">00031</a>     <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154bac9fd188b8e5ad469e002f7ba3498028b">DONE</a>      
-<a name="l00032"></a>00032   };
-<a name="l00033"></a>00033 
-<a name="l00035"></a>00035   <a class="code" href="classstk_1_1ADSR.html#c7473272021307b0dcf1ef602143e144" title="Default constructor.">ADSR</a>( <span class="keywordtype">void</span> );
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038   <a class="code" href="classstk_1_1ADSR.html#714f0b9deb325050eba819bc1fe22127" title="Class destructor.">~ADSR</a>( <span class="keywordtype">void</span> );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#ad03e82010a20cfb49c1f04bae791631" title="Set target = 1, state = ADSR::ATTACK.">keyOn</a>( <span class="keywordtype">void</span> );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#9400e04b313ab8900a3ba9b693f448e6" title="Set target = 0, state = ADSR::RELEASE.">keyOff</a>( <span class="keywordtype">void</span> );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#ff18347235fd52ce307c4b5de18a9c62" title="Set the attack rate.">setAttackRate</a>( StkFloat rate );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#285f500b1e149aed48dba2a155b95cdd" title="Set the decay rate.">setDecayRate</a>( StkFloat rate );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#85138fb6bbcc7b7cd85ec8449d68f7d8" title="Set the sustain level.">setSustainLevel</a>( StkFloat level );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#29da04231df73c2968c0e9387b43be6e" title="Set the release rate.">setReleaseRate</a>( StkFloat rate );
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#48885319b8175cd4d6312fdf7980f116" title="Set the attack rate based on a time duration.">setAttackTime</a>( StkFloat time );
-<a name="l00060"></a>00060 
-<a name="l00062"></a>00062   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#450703c45384ae27eb766551843ce82d" title="Set the decay rate based on a time duration.">setDecayTime</a>( StkFloat time );
-<a name="l00063"></a>00063 
-<a name="l00065"></a>00065   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#91c14442557cb65286a327f8b297237a" title="Set the release rate based on a time duration.">setReleaseTime</a>( StkFloat time );
-<a name="l00066"></a>00066 
-<a name="l00068"></a>00068   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#3567b02a0e8ab82d18eb949d362f9708" title="Set sustain level and attack, decay, and release time durations.">setAllTimes</a>( StkFloat aTime, StkFloat dTime, StkFloat sLevel, StkFloat rTime );
-<a name="l00069"></a>00069 
-<a name="l00071"></a>00071   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#428eebd510e464ccd7bb4e5728f80d63" title="Set the target value.">setTarget</a>( StkFloat target );
-<a name="l00072"></a>00072 
-<a name="l00074"></a><a class="code" href="classstk_1_1ADSR.html#87f9918cfa4104a841dc5b44f26f8904">00074</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1ADSR.html#87f9918cfa4104a841dc5b44f26f8904" title="Return the current envelope state (ATTACK, DECAY, SUSTAIN, RELEASE, DONE).">getState</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> state_; };
-<a name="l00075"></a>00075 
-<a name="l00077"></a>00077   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a99bf5fca3885bf8d99a3edc4072a4b5" title="Set to state = ADSR::SUSTAIN with current and target values of value.">setValue</a>( StkFloat value );
-<a name="l00078"></a>00078 
-<a name="l00080"></a><a class="code" href="classstk_1_1ADSR.html#edbcb85346c354139f139b3232f36f39">00080</a>   StkFloat <a class="code" href="classstk_1_1ADSR.html#edbcb85346c354139f139b3232f36f39" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00081"></a>00081 
-<a name="l00083"></a>00083   StkFloat <a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00084"></a>00084 
-<a name="l00086"></a>00086 
-<a name="l00093"></a>00093   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00094"></a>00094 
-<a name="l00095"></a>00095  <span class="keyword">protected</span>:  
-<a name="l00096"></a>00096 
-<a name="l00097"></a>00097   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00098"></a>00098 
-<a name="l00099"></a>00099   <span class="keywordtype">int</span> state_;
-<a name="l00100"></a>00100   StkFloat value_;
-<a name="l00101"></a>00101   StkFloat target_;
-<a name="l00102"></a>00102   StkFloat attackRate_;
-<a name="l00103"></a>00103   StkFloat decayRate_;
-<a name="l00104"></a>00104   StkFloat releaseRate_;
-<a name="l00105"></a>00105   StkFloat sustainLevel_;
-<a name="l00106"></a>00106 };
-<a name="l00107"></a>00107 
-<a name="l00108"></a><a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975">00108</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">ADSR :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00109"></a>00109 {
-<a name="l00110"></a>00110   <span class="keywordflow">switch</span> ( state_ ) {
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112   <span class="keywordflow">case</span> <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba9518c737b76795fa49f997c09e074c8e">ATTACK</a>:
-<a name="l00113"></a>00113     value_ += attackRate_;
-<a name="l00114"></a>00114     <span class="keywordflow">if</span> ( value_ &gt;= target_ ) {
-<a name="l00115"></a>00115       value_ = target_;
-<a name="l00116"></a>00116       target_ = sustainLevel_;
-<a name="l00117"></a>00117              state_ = <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba75e1deeb861fe2989250b1977018cacf">DECAY</a>;
-<a name="l00118"></a>00118     }
-<a name="l00119"></a>00119     lastFrame_[0] = value_;
-<a name="l00120"></a>00120     <span class="keywordflow">break</span>;
-<a name="l00121"></a>00121 
-<a name="l00122"></a>00122   <span class="keywordflow">case</span> <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba75e1deeb861fe2989250b1977018cacf">DECAY</a>:
-<a name="l00123"></a>00123     value_ -= decayRate_;
-<a name="l00124"></a>00124     <span class="keywordflow">if</span> ( value_ &lt;= sustainLevel_ ) {
-<a name="l00125"></a>00125       value_ = sustainLevel_;
-<a name="l00126"></a>00126       state_ = <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba139dc35648a28ddc99a7a606e185f6ad">SUSTAIN</a>;
-<a name="l00127"></a>00127     }
-<a name="l00128"></a>00128     lastFrame_[0] = value_;
-<a name="l00129"></a>00129     <span class="keywordflow">break</span>;
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131   <span class="keywordflow">case</span> <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154ba7efc189b0b53e581201fd64f357a1756">RELEASE</a>:
-<a name="l00132"></a>00132     value_ -= releaseRate_;
-<a name="l00133"></a>00133     <span class="keywordflow">if</span> ( value_ &lt;= 0.0 ) {
-<a name="l00134"></a>00134       value_ = (StkFloat) 0.0;
-<a name="l00135"></a>00135       state_ = <a class="code" href="classstk_1_1ADSR.html#e1cdd1f2886d69a76fcd5b1e0e9154bac9fd188b8e5ad469e002f7ba3498028b">DONE</a>;
-<a name="l00136"></a>00136     }
-<a name="l00137"></a>00137     lastFrame_[0] = value_;
-<a name="l00138"></a>00138 
-<a name="l00139"></a>00139   }
-<a name="l00140"></a>00140 
-<a name="l00141"></a>00141   <span class="keywordflow">return</span> value_;
-<a name="l00142"></a>00142 }
-<a name="l00143"></a>00143 
-<a name="l00144"></a><a class="code" href="classstk_1_1ADSR.html#97a617c65e62aadb4f88bd10cf437a6a">00144</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">ADSR :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00145"></a>00145 {
-<a name="l00146"></a>00146 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00147"></a>00147 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00148"></a>00148     errorString_ &lt;&lt; <span class="stringliteral">"ADSR::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00149"></a>00149     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00150"></a>00150   }
-<a name="l00151"></a>00151 <span class="preprocessor">#endif</span>
-<a name="l00152"></a>00152 <span class="preprocessor"></span>
-<a name="l00153"></a>00153   StkFloat *samples = &amp;frames[channel];
-<a name="l00154"></a>00154   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00155"></a>00155   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00156"></a>00156     *samples = <a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">ADSR::tick</a>();
-<a name="l00157"></a>00157 
-<a name="l00158"></a>00158   <span class="keywordflow">return</span> frames;
-<a name="l00159"></a>00159 }
-<a name="l00160"></a>00160 
-<a name="l00161"></a>00161 } <span class="comment">// stk namespace</span>
-<a name="l00162"></a>00162 
-<a name="l00163"></a>00163 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/ADSR_8h_source.html b/doc/html/ADSR_8h_source.html
index ae13087..c3ef959 100644
--- a/doc/html/ADSR_8h_source.html
+++ b/doc/html/ADSR_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>ADSR.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ADSR_H</span>
@@ -20,132 +20,144 @@
 <a name="l00006"></a><a class="code" href="namespacestk.html">00006</a> <span class="keyword">namespace </span>stk {
 <a name="l00007"></a>00007 
 <a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 <span class="comment">/***************************************************/</span>
-<a name="l00020"></a>00020 
-<a name="l00021"></a><a class="code" href="classstk_1_1ADSR.html">00021</a> <span class="keyword">class </span><a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00022"></a>00022 {
-<a name="l00023"></a>00023  <span class="keyword">public</span>:
-<a name="l00024"></a>00024 
-<a name="l00026"></a>00026   <span class="keyword">enum</span> {
-<a name="l00027"></a><a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa9518c737b76795fa49f997c09e074c8e">00027</a>     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa9518c737b76795fa49f997c09e074c8e">ATTACK</a>,   
-<a name="l00028"></a><a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">00028</a>     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">DECAY</a>,    
-<a name="l00029"></a><a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa139dc35648a28ddc99a7a606e185f6ad">00029</a>     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa139dc35648a28ddc99a7a606e185f6ad">SUSTAIN</a>,  
-<a name="l00030"></a><a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756">00030</a>     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756">RELEASE</a>,  
-<a name="l00031"></a><a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baac9fd188b8e5ad469e002f7ba3498028b">00031</a>     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baac9fd188b8e5ad469e002f7ba3498028b">DONE</a>      
-<a name="l00032"></a>00032   };
-<a name="l00033"></a>00033 
-<a name="l00035"></a>00035   <a class="code" href="classstk_1_1ADSR.html#ac7473272021307b0dcf1ef602143e144" title="Default constructor.">ADSR</a>( <span class="keywordtype">void</span> );
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038   <a class="code" href="classstk_1_1ADSR.html#a714f0b9deb325050eba819bc1fe22127" title="Class destructor.">~ADSR</a>( <span class="keywordtype">void</span> );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#aad03e82009a20cfb49c1f04bae791631" title="Set target = 1, state = ADSR::ATTACK.">keyOn</a>( <span class="keywordtype">void</span> );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a9400e04b313ab8900a3ba9b693f448e6" title="Set target = 0, state = ADSR::RELEASE.">keyOff</a>( <span class="keywordtype">void</span> );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#aff18347235fd52ce307c4b5de18a9c62" title="Set the attack rate.">setAttackRate</a>( StkFloat rate );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a285f500b1e149aed48dba2a155b95cdd" title="Set the decay rate.">setDecayRate</a>( StkFloat rate );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a85138fb6bbcc7b7cd85ec8449d68f7d8" title="Set the sustain level.">setSustainLevel</a>( StkFloat level );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a29da04231df73c2968c0e9387b43be6e" title="Set the release rate.">setReleaseRate</a>( StkFloat rate );
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a48885319b8175cd4d6312fdf7980f116" title="Set the attack rate based on a time duration.">setAttackTime</a>( StkFloat time );
-<a name="l00060"></a>00060 
-<a name="l00062"></a>00062   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a450703c45384ae27eb766551843ce82d" title="Set the decay rate based on a time duration.">setDecayTime</a>( StkFloat time );
-<a name="l00063"></a>00063 
-<a name="l00065"></a>00065   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a91c14442557cb65286a327f8b297237a" title="Set the release rate based on a time duration.">setReleaseTime</a>( StkFloat time );
-<a name="l00066"></a>00066 
-<a name="l00068"></a>00068   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a3567b02a0e8ab82d18eb949d362f9708" title="Set sustain level and attack, decay, and release time durations.">setAllTimes</a>( StkFloat aTime, StkFloat dTime, StkFloat sLevel, StkFloat rTime );
-<a name="l00069"></a>00069 
-<a name="l00071"></a>00071   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a428eebd510e464ccd7bb4e5728f80d63" title="Set the target value.">setTarget</a>( StkFloat target );
-<a name="l00072"></a>00072 
-<a name="l00074"></a><a class="code" href="classstk_1_1ADSR.html#a87f9918cfa4104a841dc5b44f26f8904">00074</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1ADSR.html#a87f9918cfa4104a841dc5b44f26f8904" title="Return the current envelope state (ATTACK, DECAY, SUSTAIN, RELEASE, DONE).">getState</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> state_; };
-<a name="l00075"></a>00075 
-<a name="l00077"></a>00077   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#aa99bf5fca3885bf8d99a3edc4072a4b5" title="Set to state = ADSR::SUSTAIN with current and target values of value.">setValue</a>( StkFloat value );
-<a name="l00078"></a>00078 
-<a name="l00080"></a><a class="code" href="classstk_1_1ADSR.html#aedbcb85346c354139f139b3232f36f39">00080</a>   StkFloat <a class="code" href="classstk_1_1ADSR.html#aedbcb85346c354139f139b3232f36f39" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00081"></a>00081 
-<a name="l00083"></a>00083   StkFloat <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00084"></a>00084 
+<a name="l00021"></a>00021 <span class="comment">/***************************************************/</span>
+<a name="l00022"></a>00022 
+<a name="l00023"></a><a class="code" href="classstk_1_1ADSR.html">00023</a> <span class="keyword">class </span><a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
+<a name="l00024"></a>00024 {
+<a name="l00025"></a>00025  <span class="keyword">public</span>:
+<a name="l00026"></a>00026 
+<a name="l00028"></a>00028   <span class="keyword">enum</span> {
+<a name="l00029"></a><a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa9518c737b76795fa49f997c09e074c8e">00029</a>     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa9518c737b76795fa49f997c09e074c8e">ATTACK</a>,   
+<a name="l00030"></a><a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">00030</a>     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">DECAY</a>,    
+<a name="l00031"></a><a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa139dc35648a28ddc99a7a606e185f6ad">00031</a>     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa139dc35648a28ddc99a7a606e185f6ad">SUSTAIN</a>,  
+<a name="l00032"></a><a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756">00032</a>     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756">RELEASE</a>,  
+<a name="l00033"></a><a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8">00033</a>     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8">IDLE</a>      
+<a name="l00034"></a>00034   };
+<a name="l00035"></a>00035 
+<a name="l00037"></a>00037   <a class="code" href="classstk_1_1ADSR.html#ac7473272021307b0dcf1ef602143e144" title="Default constructor.">ADSR</a>( <span class="keywordtype">void</span> );
+<a name="l00038"></a>00038 
+<a name="l00040"></a>00040   <a class="code" href="classstk_1_1ADSR.html#a714f0b9deb325050eba819bc1fe22127" title="Class destructor.">~ADSR</a>( <span class="keywordtype">void</span> );
+<a name="l00041"></a>00041 
+<a name="l00043"></a>00043   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#aad03e82009a20cfb49c1f04bae791631" title="Set target = 1, state = ADSR::ATTACK.">keyOn</a>( <span class="keywordtype">void</span> );
+<a name="l00044"></a>00044 
+<a name="l00046"></a>00046   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a9400e04b313ab8900a3ba9b693f448e6" title="Set target = 0, state = ADSR::RELEASE.">keyOff</a>( <span class="keywordtype">void</span> );
+<a name="l00047"></a>00047 
+<a name="l00049"></a>00049   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#aff18347235fd52ce307c4b5de18a9c62" title="Set the attack rate.">setAttackRate</a>( StkFloat rate );
+<a name="l00050"></a>00050 
+<a name="l00052"></a>00052   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#ae0af300e39f83f79776c04a3e83a85b1" title="Set the target value for the attack (default = 1.0).">setAttackTarget</a>( StkFloat target );
+<a name="l00053"></a>00053 
+<a name="l00055"></a>00055   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a285f500b1e149aed48dba2a155b95cdd" title="Set the decay rate.">setDecayRate</a>( StkFloat rate );
+<a name="l00056"></a>00056 
+<a name="l00058"></a>00058   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a85138fb6bbcc7b7cd85ec8449d68f7d8" title="Set the sustain level.">setSustainLevel</a>( StkFloat level );
+<a name="l00059"></a>00059 
+<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a29da04231df73c2968c0e9387b43be6e" title="Set the release rate.">setReleaseRate</a>( StkFloat rate );
+<a name="l00062"></a>00062 
+<a name="l00064"></a>00064   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a48885319b8175cd4d6312fdf7980f116" title="Set the attack rate based on a time duration.">setAttackTime</a>( StkFloat time );
+<a name="l00065"></a>00065 
+<a name="l00067"></a>00067   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a450703c45384ae27eb766551843ce82d" title="Set the decay rate based on a time duration (seconds).">setDecayTime</a>( StkFloat time );
+<a name="l00068"></a>00068 
+<a name="l00070"></a>00070   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a91c14442557cb65286a327f8b297237a" title="Set the release rate based on a time duration (seconds).">setReleaseTime</a>( StkFloat time );
+<a name="l00071"></a>00071 
+<a name="l00073"></a>00073   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a3567b02a0e8ab82d18eb949d362f9708" title="Set sustain level and attack, decay, and release time durations.">setAllTimes</a>( StkFloat aTime, StkFloat dTime, StkFloat sLevel, StkFloat rTime );
+<a name="l00074"></a>00074 
+<a name="l00076"></a>00076   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#a428eebd510e464ccd7bb4e5728f80d63" title="Set a sustain target value and attack or decay from current value to target.">setTarget</a>( StkFloat target );
+<a name="l00077"></a>00077 
+<a name="l00079"></a><a class="code" href="classstk_1_1ADSR.html#a87f9918cfa4104a841dc5b44f26f8904">00079</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1ADSR.html#a87f9918cfa4104a841dc5b44f26f8904" title="Return the current envelope state (ATTACK, DECAY, SUSTAIN, RELEASE, IDLE).">getState</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> state_; };
+<a name="l00080"></a>00080 
+<a name="l00082"></a>00082   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ADSR.html#aa99bf5fca3885bf8d99a3edc4072a4b5" title="Set to state = ADSR::SUSTAIN with current and target values of value.">setValue</a>( StkFloat value );
+<a name="l00083"></a>00083 
+<a name="l00085"></a><a class="code" href="classstk_1_1ADSR.html#aedbcb85346c354139f139b3232f36f39">00085</a>   StkFloat <a class="code" href="classstk_1_1ADSR.html#aedbcb85346c354139f139b3232f36f39" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
 <a name="l00086"></a>00086 
-<a name="l00093"></a>00093   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00094"></a>00094 
-<a name="l00095"></a>00095  <span class="keyword">protected</span>:  
-<a name="l00096"></a>00096 
-<a name="l00097"></a>00097   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00098"></a>00098 
-<a name="l00099"></a>00099   <span class="keywordtype">int</span> state_;
-<a name="l00100"></a>00100   StkFloat value_;
-<a name="l00101"></a>00101   StkFloat target_;
-<a name="l00102"></a>00102   StkFloat attackRate_;
-<a name="l00103"></a>00103   StkFloat decayRate_;
-<a name="l00104"></a>00104   StkFloat releaseRate_;
-<a name="l00105"></a>00105   StkFloat sustainLevel_;
-<a name="l00106"></a>00106 };
-<a name="l00107"></a>00107 
-<a name="l00108"></a><a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975">00108</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">ADSR :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00109"></a>00109 {
-<a name="l00110"></a>00110   <span class="keywordflow">switch</span> ( state_ ) {
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112   <span class="keywordflow">case</span> <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa9518c737b76795fa49f997c09e074c8e">ATTACK</a>:
-<a name="l00113"></a>00113     value_ += attackRate_;
-<a name="l00114"></a>00114     <span class="keywordflow">if</span> ( value_ &gt;= target_ ) {
-<a name="l00115"></a>00115       value_ = target_;
-<a name="l00116"></a>00116       target_ = sustainLevel_;
-<a name="l00117"></a>00117              state_ = <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">DECAY</a>;
-<a name="l00118"></a>00118     }
-<a name="l00119"></a>00119     lastFrame_[0] = value_;
-<a name="l00120"></a>00120     <span class="keywordflow">break</span>;
-<a name="l00121"></a>00121 
-<a name="l00122"></a>00122   <span class="keywordflow">case</span> <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">DECAY</a>:
-<a name="l00123"></a>00123     value_ -= decayRate_;
-<a name="l00124"></a>00124     <span class="keywordflow">if</span> ( value_ &lt;= sustainLevel_ ) {
-<a name="l00125"></a>00125       value_ = sustainLevel_;
-<a name="l00126"></a>00126       state_ = <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa139dc35648a28ddc99a7a606e185f6ad">SUSTAIN</a>;
-<a name="l00127"></a>00127     }
-<a name="l00128"></a>00128     lastFrame_[0] = value_;
-<a name="l00129"></a>00129     <span class="keywordflow">break</span>;
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131   <span class="keywordflow">case</span> <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756">RELEASE</a>:
-<a name="l00132"></a>00132     value_ -= releaseRate_;
-<a name="l00133"></a>00133     <span class="keywordflow">if</span> ( value_ &lt;= 0.0 ) {
-<a name="l00134"></a>00134       value_ = (StkFloat) 0.0;
-<a name="l00135"></a>00135       state_ = <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baac9fd188b8e5ad469e002f7ba3498028b">DONE</a>;
-<a name="l00136"></a>00136     }
-<a name="l00137"></a>00137     lastFrame_[0] = value_;
-<a name="l00138"></a>00138 
-<a name="l00139"></a>00139   }
-<a name="l00140"></a>00140 
-<a name="l00141"></a>00141   <span class="keywordflow">return</span> value_;
-<a name="l00142"></a>00142 }
-<a name="l00143"></a>00143 
-<a name="l00144"></a><a class="code" href="classstk_1_1ADSR.html#a97a617c65e62aadb4f88bd10cf437a6a">00144</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">ADSR :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00145"></a>00145 {
-<a name="l00146"></a>00146 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00147"></a>00147 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00148"></a>00148     errorString_ &lt;&lt; <span class="stringliteral">&quot;ADSR::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00149"></a>00149     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00150"></a>00150   }
-<a name="l00151"></a>00151 <span class="preprocessor">#endif</span>
-<a name="l00152"></a>00152 <span class="preprocessor"></span>
-<a name="l00153"></a>00153   StkFloat *samples = &amp;frames[channel];
-<a name="l00154"></a>00154   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00155"></a>00155   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00156"></a>00156     *samples = <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">ADSR::tick</a>();
-<a name="l00157"></a>00157 
-<a name="l00158"></a>00158   <span class="keywordflow">return</span> frames;
-<a name="l00159"></a>00159 }
-<a name="l00160"></a>00160 
-<a name="l00161"></a>00161 } <span class="comment">// stk namespace</span>
-<a name="l00162"></a>00162 
-<a name="l00163"></a>00163 <span class="preprocessor">#endif</span>
+<a name="l00088"></a>00088   StkFloat <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
+<a name="l00089"></a>00089 
+<a name="l00091"></a>00091 
+<a name="l00098"></a>00098   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00099"></a>00099 
+<a name="l00100"></a>00100  <span class="keyword">protected</span>:  
+<a name="l00101"></a>00101 
+<a name="l00102"></a>00102   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
+<a name="l00103"></a>00103 
+<a name="l00104"></a>00104   <span class="keywordtype">int</span> state_;
+<a name="l00105"></a>00105   StkFloat value_;
+<a name="l00106"></a>00106   StkFloat target_;
+<a name="l00107"></a>00107   StkFloat attackRate_;
+<a name="l00108"></a>00108   StkFloat decayRate_;
+<a name="l00109"></a>00109   StkFloat releaseRate_;
+<a name="l00110"></a>00110   StkFloat releaseTime_;
+<a name="l00111"></a>00111   StkFloat sustainLevel_;
+<a name="l00112"></a>00112 };
+<a name="l00113"></a>00113 
+<a name="l00114"></a><a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975">00114</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">ADSR :: tick</a>( <span class="keywordtype">void</span> )
+<a name="l00115"></a>00115 {
+<a name="l00116"></a>00116   <span class="keywordflow">switch</span> ( state_ ) {
+<a name="l00117"></a>00117 
+<a name="l00118"></a>00118   <span class="keywordflow">case</span> <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa9518c737b76795fa49f997c09e074c8e">ATTACK</a>:
+<a name="l00119"></a>00119     value_ += attackRate_;
+<a name="l00120"></a>00120     <span class="keywordflow">if</span> ( value_ &gt;= target_ ) {
+<a name="l00121"></a>00121       value_ = target_;
+<a name="l00122"></a>00122       target_ = sustainLevel_;
+<a name="l00123"></a>00123              state_ = <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">DECAY</a>;
+<a name="l00124"></a>00124     }
+<a name="l00125"></a>00125     lastFrame_[0] = value_;
+<a name="l00126"></a>00126     <span class="keywordflow">break</span>;
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128   <span class="keywordflow">case</span> <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">DECAY</a>:
+<a name="l00129"></a>00129     <span class="keywordflow">if</span> ( value_ &gt; sustainLevel_ ) {
+<a name="l00130"></a>00130       value_ -= decayRate_;
+<a name="l00131"></a>00131       <span class="keywordflow">if</span> ( value_ &lt;= sustainLevel_ ) {
+<a name="l00132"></a>00132         value_ = sustainLevel_;
+<a name="l00133"></a>00133         state_ = <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa139dc35648a28ddc99a7a606e185f6ad">SUSTAIN</a>;
+<a name="l00134"></a>00134       }
+<a name="l00135"></a>00135     }
+<a name="l00136"></a>00136     <span class="keywordflow">else</span> {
+<a name="l00137"></a>00137       value_ += decayRate_; <span class="comment">// attack target &lt; sustain level</span>
+<a name="l00138"></a>00138       <span class="keywordflow">if</span> ( value_ &gt;= sustainLevel_ ) {
+<a name="l00139"></a>00139         value_ = sustainLevel_;
+<a name="l00140"></a>00140         state_ = <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa139dc35648a28ddc99a7a606e185f6ad">SUSTAIN</a>;
+<a name="l00141"></a>00141       }
+<a name="l00142"></a>00142     }
+<a name="l00143"></a>00143     lastFrame_[0] = value_;
+<a name="l00144"></a>00144     <span class="keywordflow">break</span>;
+<a name="l00145"></a>00145 
+<a name="l00146"></a>00146   <span class="keywordflow">case</span> <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756">RELEASE</a>:
+<a name="l00147"></a>00147     value_ -= releaseRate_;
+<a name="l00148"></a>00148     <span class="keywordflow">if</span> ( value_ &lt;= 0.0 ) {
+<a name="l00149"></a>00149       value_ = 0.0;
+<a name="l00150"></a>00150       state_ = <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8">IDLE</a>;
+<a name="l00151"></a>00151     }
+<a name="l00152"></a>00152     lastFrame_[0] = value_;
+<a name="l00153"></a>00153 
+<a name="l00154"></a>00154   }
+<a name="l00155"></a>00155 
+<a name="l00156"></a>00156   <span class="keywordflow">return</span> value_;
+<a name="l00157"></a>00157 }
+<a name="l00158"></a>00158 
+<a name="l00159"></a><a class="code" href="classstk_1_1ADSR.html#a97a617c65e62aadb4f88bd10cf437a6a">00159</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">ADSR :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00160"></a>00160 {
+<a name="l00161"></a>00161 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00162"></a>00162 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00163"></a>00163     oStream_ &lt;&lt; <span class="stringliteral">&quot;ADSR::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00164"></a>00164     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00165"></a>00165   }
+<a name="l00166"></a>00166 <span class="preprocessor">#endif</span>
+<a name="l00167"></a>00167 <span class="preprocessor"></span>
+<a name="l00168"></a>00168   StkFloat *samples = &amp;frames[channel];
+<a name="l00169"></a>00169   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00170"></a>00170   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00171"></a>00171     *samples = <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">ADSR::tick</a>();
+<a name="l00172"></a>00172 
+<a name="l00173"></a>00173   <span class="keywordflow">return</span> frames;
+<a name="l00174"></a>00174 }
+<a name="l00175"></a>00175 
+<a name="l00176"></a>00176 } <span class="comment">// stk namespace</span>
+<a name="l00177"></a>00177 
+<a name="l00178"></a>00178 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Asymp_8h-source.html b/doc/html/Asymp_8h-source.html
deleted file mode 100644
index 59cc4ac..0000000
--- a/doc/html/Asymp_8h-source.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Asymp.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ASYMP_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_ASYMP_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Generator.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00031"></a>00031 <span class="comment">/***************************************************/</span>
-<a name="l00032"></a>00032 
-<a name="l00033"></a>00033 <span class="keyword">const</span> StkFloat TARGET_THRESHOLD = 0.000001;
-<a name="l00034"></a>00034 
-<a name="l00035"></a><a class="code" href="classstk_1_1Asymp.html">00035</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Asymp.html" title="STK asymptotic curve envelope class.">Asymp</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00036"></a>00036 {
-<a name="l00037"></a>00037  <span class="keyword">public</span>:
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1Asymp.html#d8ea9fc5621a1d8b81001d459de265a0" title="Default constructor.">Asymp</a>( <span class="keywordtype">void</span> );
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <a class="code" href="classstk_1_1Asymp.html#d869abbd938c263a2c177de636f5a57c" title="Class destructor.">~Asymp</a>( <span class="keywordtype">void</span> );
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#51f0aad846eb6bda4c20eb63534786e2" title="Set target = 1.">keyOn</a>( <span class="keywordtype">void</span> );
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#082e765dc3bd6b452e92b602af7a1042" title="Set target = 0.">keyOff</a>( <span class="keywordtype">void</span> );
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052 
-<a name="l00058"></a>00058   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#ebd8ebaf6f6c9570d3ee78e1bcbbcbd2" title="Set the asymptotic rate via the time factor tau (must be &amp;gt; 0).">setTau</a>( StkFloat tau );
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#ca998e9c4ae86b4958da59fc9433268c" title="Set the asymptotic rate based on a time duration (must be &amp;gt; 0).">setTime</a>( StkFloat time );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#7b0f7025ba5f268f1e5ce097b209f0ec" title="Set the target value.">setTarget</a>( StkFloat target );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#81881bb8aca615f69bbbfd56267f971c" title="Set current and target values to value.">setValue</a>( StkFloat value );
-<a name="l00068"></a>00068 
-<a name="l00070"></a><a class="code" href="classstk_1_1Asymp.html#aba01ef0ac1a493a14a73c3b29259bde">00070</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Asymp.html#aba01ef0ac1a493a14a73c3b29259bde" title="Return the current envelope state (0 = at target, 1 otherwise).">getState</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> state_; };
-<a name="l00071"></a>00071 
-<a name="l00073"></a><a class="code" href="classstk_1_1Asymp.html#eb868c171e07206e2d5d30f8ce8f4436">00073</a>   StkFloat <a class="code" href="classstk_1_1Asymp.html#eb868c171e07206e2d5d30f8ce8f4436" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00074"></a>00074 
-<a name="l00076"></a>00076   StkFloat <a class="code" href="classstk_1_1Asymp.html#64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079 
-<a name="l00086"></a>00086   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Asymp.html#64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088  <span class="keyword">protected</span>:
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092   StkFloat value_;
-<a name="l00093"></a>00093   StkFloat target_;
-<a name="l00094"></a>00094   StkFloat factor_;
-<a name="l00095"></a>00095   StkFloat constant_;
-<a name="l00096"></a>00096   <span class="keywordtype">int</span> state_;
-<a name="l00097"></a>00097 };
-<a name="l00098"></a>00098 
-<a name="l00099"></a><a class="code" href="classstk_1_1Asymp.html#64df3b44aa1033b642d7a8a93659580e">00099</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Asymp.html#64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">Asymp :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00100"></a>00100 {
-<a name="l00101"></a>00101   <span class="keywordflow">if</span> ( state_ ) {
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103     value_ = factor_ * value_ + constant_;
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105     <span class="comment">// Check threshold.</span>
-<a name="l00106"></a>00106     <span class="keywordflow">if</span> ( target_ &gt; value_ ) {
-<a name="l00107"></a>00107       <span class="keywordflow">if</span> ( target_ - value_ &lt;= TARGET_THRESHOLD ) {
-<a name="l00108"></a>00108         value_ = target_;
-<a name="l00109"></a>00109         state_ = 0;
-<a name="l00110"></a>00110       }
-<a name="l00111"></a>00111     }
-<a name="l00112"></a>00112     <span class="keywordflow">else</span> {
-<a name="l00113"></a>00113       <span class="keywordflow">if</span> ( value_ - target_ &lt;= TARGET_THRESHOLD ) {
-<a name="l00114"></a>00114         value_ = target_;
-<a name="l00115"></a>00115         state_ = 0;
-<a name="l00116"></a>00116       }
-<a name="l00117"></a>00117     }
-<a name="l00118"></a>00118     lastFrame_[0] = value_;
-<a name="l00119"></a>00119   }
-<a name="l00120"></a>00120 
-<a name="l00121"></a>00121   <span class="keywordflow">return</span> value_;
-<a name="l00122"></a>00122 }
-<a name="l00123"></a>00123 
-<a name="l00124"></a><a class="code" href="classstk_1_1Asymp.html#2647bc013816f026915b1e92ddd6a322">00124</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Asymp.html#64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">Asymp :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00125"></a>00125 {
-<a name="l00126"></a>00126 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00127"></a>00127 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00128"></a>00128     errorString_ &lt;&lt; <span class="stringliteral">"Asymp::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00129"></a>00129     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00130"></a>00130   }
-<a name="l00131"></a>00131 <span class="preprocessor">#endif</span>
-<a name="l00132"></a>00132 <span class="preprocessor"></span>
-<a name="l00133"></a>00133   StkFloat *samples = &amp;frames[channel];
-<a name="l00134"></a>00134   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00135"></a>00135   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00136"></a>00136     *samples = <a class="code" href="classstk_1_1Asymp.html#64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">Asymp::tick</a>();
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138   <span class="keywordflow">return</span> frames;
-<a name="l00139"></a>00139 }
-<a name="l00140"></a>00140 
-<a name="l00141"></a>00141 } <span class="comment">// stk namespace</span>
-<a name="l00142"></a>00142 
-<a name="l00143"></a>00143 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Asymp_8h_source.html b/doc/html/Asymp_8h_source.html
index 4230c1c..40233fa 100644
--- a/doc/html/Asymp_8h_source.html
+++ b/doc/html/Asymp_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Asymp.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ASYMP_H</span>
@@ -41,81 +41,83 @@
 <a name="l00059"></a>00059 
 <a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#aca998e9c4ae86b4958da59fc9433268c" title="Set the asymptotic rate based on a time duration (must be &amp;gt; 0).">setTime</a>( StkFloat time );
 <a name="l00062"></a>00062 
-<a name="l00064"></a>00064   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#a7b0f7025ba5f268f1e5ce097b209f0ec" title="Set the target value.">setTarget</a>( StkFloat target );
+<a name="l00064"></a>00064   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#afa6fcf4bf3060c0c6092701e409d5fbf" title="Set the asymptotic rate such that the target value is perceptually reached (to within...">setT60</a>( StkFloat t60 );
 <a name="l00065"></a>00065 
-<a name="l00067"></a>00067   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#a81881bb8aca615f69bbbfd56267f971c" title="Set current and target values to value.">setValue</a>( StkFloat value );
+<a name="l00067"></a>00067   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#a7b0f7025ba5f268f1e5ce097b209f0ec" title="Set the target value.">setTarget</a>( StkFloat target );
 <a name="l00068"></a>00068 
-<a name="l00070"></a><a class="code" href="classstk_1_1Asymp.html#aaba01ef0ac1a493a14a73c3b29259bde">00070</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Asymp.html#aaba01ef0ac1a493a14a73c3b29259bde" title="Return the current envelope state (0 = at target, 1 otherwise).">getState</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> state_; };
+<a name="l00070"></a>00070   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Asymp.html#a81881bb8aca615f69bbbfd56267f971c" title="Set current and target values to value.">setValue</a>( StkFloat value );
 <a name="l00071"></a>00071 
-<a name="l00073"></a><a class="code" href="classstk_1_1Asymp.html#aeb868c171e07206e2d5d30f8ce8f4436">00073</a>   StkFloat <a class="code" href="classstk_1_1Asymp.html#aeb868c171e07206e2d5d30f8ce8f4436" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
+<a name="l00073"></a><a class="code" href="classstk_1_1Asymp.html#aaba01ef0ac1a493a14a73c3b29259bde">00073</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Asymp.html#aaba01ef0ac1a493a14a73c3b29259bde" title="Return the current envelope state (0 = at target, 1 otherwise).">getState</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> state_; };
 <a name="l00074"></a>00074 
-<a name="l00076"></a>00076   StkFloat <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
+<a name="l00076"></a><a class="code" href="classstk_1_1Asymp.html#aeb868c171e07206e2d5d30f8ce8f4436">00076</a>   StkFloat <a class="code" href="classstk_1_1Asymp.html#aeb868c171e07206e2d5d30f8ce8f4436" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
 <a name="l00077"></a>00077 
-<a name="l00079"></a>00079 
-<a name="l00086"></a>00086   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088  <span class="keyword">protected</span>:
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092   StkFloat value_;
-<a name="l00093"></a>00093   StkFloat target_;
-<a name="l00094"></a>00094   StkFloat factor_;
-<a name="l00095"></a>00095   StkFloat constant_;
-<a name="l00096"></a>00096   <span class="keywordtype">int</span> state_;
-<a name="l00097"></a>00097 };
-<a name="l00098"></a>00098 
-<a name="l00099"></a><a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e">00099</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">Asymp :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00100"></a>00100 {
-<a name="l00101"></a>00101   <span class="keywordflow">if</span> ( state_ ) {
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103     value_ = factor_ * value_ + constant_;
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105     <span class="comment">// Check threshold.</span>
-<a name="l00106"></a>00106     <span class="keywordflow">if</span> ( target_ &gt; value_ ) {
-<a name="l00107"></a>00107       <span class="keywordflow">if</span> ( target_ - value_ &lt;= TARGET_THRESHOLD ) {
-<a name="l00108"></a>00108         value_ = target_;
-<a name="l00109"></a>00109         state_ = 0;
-<a name="l00110"></a>00110       }
-<a name="l00111"></a>00111     }
-<a name="l00112"></a>00112     <span class="keywordflow">else</span> {
-<a name="l00113"></a>00113       <span class="keywordflow">if</span> ( value_ - target_ &lt;= TARGET_THRESHOLD ) {
-<a name="l00114"></a>00114         value_ = target_;
-<a name="l00115"></a>00115         state_ = 0;
-<a name="l00116"></a>00116       }
-<a name="l00117"></a>00117     }
-<a name="l00118"></a>00118     lastFrame_[0] = value_;
-<a name="l00119"></a>00119   }
-<a name="l00120"></a>00120 
-<a name="l00121"></a>00121   <span class="keywordflow">return</span> value_;
-<a name="l00122"></a>00122 }
+<a name="l00079"></a>00079   StkFloat <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
+<a name="l00080"></a>00080 
+<a name="l00082"></a>00082 
+<a name="l00089"></a>00089   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00090"></a>00090 
+<a name="l00091"></a>00091  <span class="keyword">protected</span>:
+<a name="l00092"></a>00092 
+<a name="l00093"></a>00093   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
+<a name="l00094"></a>00094 
+<a name="l00095"></a>00095   StkFloat value_;
+<a name="l00096"></a>00096   StkFloat target_;
+<a name="l00097"></a>00097   StkFloat factor_;
+<a name="l00098"></a>00098   StkFloat constant_;
+<a name="l00099"></a>00099   <span class="keywordtype">int</span> state_;
+<a name="l00100"></a>00100 };
+<a name="l00101"></a>00101 
+<a name="l00102"></a><a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e">00102</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">Asymp :: tick</a>( <span class="keywordtype">void</span> )
+<a name="l00103"></a>00103 {
+<a name="l00104"></a>00104   <span class="keywordflow">if</span> ( state_ ) {
+<a name="l00105"></a>00105 
+<a name="l00106"></a>00106     value_ = factor_ * value_ + constant_;
+<a name="l00107"></a>00107 
+<a name="l00108"></a>00108     <span class="comment">// Check threshold.</span>
+<a name="l00109"></a>00109     <span class="keywordflow">if</span> ( target_ &gt; value_ ) {
+<a name="l00110"></a>00110       <span class="keywordflow">if</span> ( target_ - value_ &lt;= TARGET_THRESHOLD ) {
+<a name="l00111"></a>00111         value_ = target_;
+<a name="l00112"></a>00112         state_ = 0;
+<a name="l00113"></a>00113       }
+<a name="l00114"></a>00114     }
+<a name="l00115"></a>00115     <span class="keywordflow">else</span> {
+<a name="l00116"></a>00116       <span class="keywordflow">if</span> ( value_ - target_ &lt;= TARGET_THRESHOLD ) {
+<a name="l00117"></a>00117         value_ = target_;
+<a name="l00118"></a>00118         state_ = 0;
+<a name="l00119"></a>00119       }
+<a name="l00120"></a>00120     }
+<a name="l00121"></a>00121     lastFrame_[0] = value_;
+<a name="l00122"></a>00122   }
 <a name="l00123"></a>00123 
-<a name="l00124"></a><a class="code" href="classstk_1_1Asymp.html#a2647bc013816f026915b1e92ddd6a322">00124</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">Asymp :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00125"></a>00125 {
-<a name="l00126"></a>00126 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00127"></a>00127 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00128"></a>00128     errorString_ &lt;&lt; <span class="stringliteral">&quot;Asymp::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00129"></a>00129     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00130"></a>00130   }
-<a name="l00131"></a>00131 <span class="preprocessor">#endif</span>
-<a name="l00132"></a>00132 <span class="preprocessor"></span>
-<a name="l00133"></a>00133   StkFloat *samples = &amp;frames[channel];
-<a name="l00134"></a>00134   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00135"></a>00135   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00136"></a>00136     *samples = <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">Asymp::tick</a>();
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138   <span class="keywordflow">return</span> frames;
-<a name="l00139"></a>00139 }
+<a name="l00124"></a>00124   <span class="keywordflow">return</span> value_;
+<a name="l00125"></a>00125 }
+<a name="l00126"></a>00126 
+<a name="l00127"></a><a class="code" href="classstk_1_1Asymp.html#a2647bc013816f026915b1e92ddd6a322">00127</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">Asymp :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00128"></a>00128 {
+<a name="l00129"></a>00129 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00130"></a>00130 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00131"></a>00131     oStream_ &lt;&lt; <span class="stringliteral">&quot;Asymp::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00132"></a>00132     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00133"></a>00133   }
+<a name="l00134"></a>00134 <span class="preprocessor">#endif</span>
+<a name="l00135"></a>00135 <span class="preprocessor"></span>
+<a name="l00136"></a>00136   StkFloat *samples = &amp;frames[channel];
+<a name="l00137"></a>00137   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00138"></a>00138   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00139"></a>00139     *samples = <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">Asymp::tick</a>();
 <a name="l00140"></a>00140 
-<a name="l00141"></a>00141 } <span class="comment">// stk namespace</span>
-<a name="l00142"></a>00142 
-<a name="l00143"></a>00143 <span class="preprocessor">#endif</span>
+<a name="l00141"></a>00141   <span class="keywordflow">return</span> frames;
+<a name="l00142"></a>00142 }
+<a name="l00143"></a>00143 
+<a name="l00144"></a>00144 } <span class="comment">// stk namespace</span>
+<a name="l00145"></a>00145 
+<a name="l00146"></a>00146 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/BandedWG_8h-source.html b/doc/html/BandedWG_8h-source.html
deleted file mode 100644
index f31864c..0000000
--- a/doc/html/BandedWG_8h-source.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>BandedWG.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BANDEDWG_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BANDEDWG_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayL.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "BowTable.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "ADSR.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "BiQuad.h"</span>
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="keyword">namespace </span>stk {
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="comment">/***************************************************/</span>
-<a name="l00041"></a>00041 <span class="comment">/***************************************************/</span>
-<a name="l00042"></a>00042 
-<a name="l00043"></a>00043 <span class="keyword">const</span> <span class="keywordtype">int</span> MAX_BANDED_MODES = 20;
-<a name="l00044"></a>00044 
-<a name="l00045"></a><a class="code" href="classstk_1_1BandedWG.html">00045</a> <span class="keyword">class </span><a class="code" href="classstk_1_1BandedWG.html" title="Banded waveguide modeling class.">BandedWG</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00046"></a>00046 {
-<a name="l00047"></a>00047  <span class="keyword">public</span>:
-<a name="l00049"></a>00049   <a class="code" href="classstk_1_1BandedWG.html#d449f248adaa49344c2bd25be4a7872d" title="Class constructor.">BandedWG</a>( <span class="keywordtype">void</span> );
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052   <a class="code" href="classstk_1_1BandedWG.html#c4044055c28bad672c9537b985d18289" title="Class destructor.">~BandedWG</a>( <span class="keywordtype">void</span> );
-<a name="l00053"></a>00053 
-<a name="l00055"></a>00055   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BandedWG.html#182dbf5d75aebf5714bd6df15b0df90c" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BandedWG.html#4394ee4cd1c84a8b3f92713e60715c4d" title="Set strike position (0.0 - 1.0).">setStrikePosition</a>( StkFloat position );
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BandedWG.html#b1e3a367eef86e6cb372b4ee232e1804" title="Select a preset.">setPreset</a>( <span class="keywordtype">int</span> preset );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BandedWG.html#cf104d4ed663b5f0cd034c8025f4d420" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BandedWG.html#37b20c2554e7100241a99758f5a4433e" title="Apply bow velocity/pressure to instrument with given amplitude and rate of increase...">startBowing</a>( StkFloat amplitude, StkFloat rate );
-<a name="l00068"></a>00068 
-<a name="l00070"></a>00070   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BandedWG.html#a14786c32af030311e2118db3b68a892" title="Decrease bow velocity/breath pressure with given rate of decrease.">stopBowing</a>( StkFloat rate );
-<a name="l00071"></a>00071 
-<a name="l00073"></a>00073   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BandedWG.html#271573afaa2dc655446482bad6745cc1" title="Pluck the instrument with given amplitude.">pluck</a>( StkFloat amp );
-<a name="l00074"></a>00074 
-<a name="l00076"></a>00076   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BandedWG.html#8f334ae49b7baf561d74a0b6ec3c4f9a" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BandedWG.html#c9c3c3ec0e821b1a080774bb55d3b881" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00080"></a>00080 
-<a name="l00082"></a>00082   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BandedWG.html#16baac1cc6612332d6d0aa40a661c137" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00083"></a>00083 
-<a name="l00085"></a>00085   StkFloat <a class="code" href="classstk_1_1BandedWG.html#44f37146d33354afb085806bd8340497" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087  <span class="keyword">protected</span>:
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089   <span class="keywordtype">bool</span> doPluck_;
-<a name="l00090"></a>00090   <span class="keywordtype">bool</span> trackVelocity_;
-<a name="l00091"></a>00091   <span class="keywordtype">int</span> nModes_;
-<a name="l00092"></a>00092   <span class="keywordtype">int</span> presetModes_;
-<a name="l00093"></a>00093   <a class="code" href="classstk_1_1BowTable.html" title="STK bowed string table class.">BowTable</a> bowTable_;
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   bandpass_[MAX_BANDED_MODES];
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   delay_[MAX_BANDED_MODES];
-<a name="l00097"></a>00097   StkFloat maxVelocity_;
-<a name="l00098"></a>00098   StkFloat modes_[MAX_BANDED_MODES];
-<a name="l00099"></a>00099   StkFloat frequency_;
-<a name="l00100"></a>00100   StkFloat baseGain_;
-<a name="l00101"></a>00101   StkFloat gains_[MAX_BANDED_MODES];
-<a name="l00102"></a>00102   StkFloat basegains_[MAX_BANDED_MODES];
-<a name="l00103"></a>00103   StkFloat excitation_[MAX_BANDED_MODES];
-<a name="l00104"></a>00104   StkFloat integrationConstant_;
-<a name="l00105"></a>00105   StkFloat velocityInput_;
-<a name="l00106"></a>00106   StkFloat bowVelocity_;
-<a name="l00107"></a>00107   StkFloat bowTarget_;
-<a name="l00108"></a>00108   StkFloat bowPosition_;
-<a name="l00109"></a>00109   StkFloat strikeAmp_;
-<a name="l00110"></a>00110   <span class="keywordtype">int</span> strikePosition_;
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112 };
-<a name="l00113"></a>00113 
-<a name="l00114"></a>00114 } <span class="comment">// stk namespace</span>
-<a name="l00115"></a>00115 
-<a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/BandedWG_8h_source.html b/doc/html/BandedWG_8h_source.html
index e13a489..049e1dd 100644
--- a/doc/html/BandedWG_8h_source.html
+++ b/doc/html/BandedWG_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>BandedWG.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BANDEDWG_H</span>
@@ -57,42 +57,72 @@
 <a name="l00083"></a>00083 
 <a name="l00085"></a>00085   StkFloat <a class="code" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00086"></a>00086 
-<a name="l00087"></a>00087  <span class="keyword">protected</span>:
 <a name="l00088"></a>00088 
-<a name="l00089"></a>00089   <span class="keywordtype">bool</span> doPluck_;
-<a name="l00090"></a>00090   <span class="keywordtype">bool</span> trackVelocity_;
-<a name="l00091"></a>00091   <span class="keywordtype">int</span> nModes_;
-<a name="l00092"></a>00092   <span class="keywordtype">int</span> presetModes_;
-<a name="l00093"></a>00093   <a class="code" href="classstk_1_1BowTable.html" title="STK bowed string table class.">BowTable</a> bowTable_;
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   bandpass_[MAX_BANDED_MODES];
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   delay_[MAX_BANDED_MODES];
-<a name="l00097"></a>00097   StkFloat maxVelocity_;
-<a name="l00098"></a>00098   StkFloat modes_[MAX_BANDED_MODES];
-<a name="l00099"></a>00099   StkFloat frequency_;
-<a name="l00100"></a>00100   StkFloat baseGain_;
-<a name="l00101"></a>00101   StkFloat gains_[MAX_BANDED_MODES];
-<a name="l00102"></a>00102   StkFloat basegains_[MAX_BANDED_MODES];
-<a name="l00103"></a>00103   StkFloat excitation_[MAX_BANDED_MODES];
-<a name="l00104"></a>00104   StkFloat integrationConstant_;
-<a name="l00105"></a>00105   StkFloat velocityInput_;
-<a name="l00106"></a>00106   StkFloat bowVelocity_;
-<a name="l00107"></a>00107   StkFloat bowTarget_;
-<a name="l00108"></a>00108   StkFloat bowPosition_;
-<a name="l00109"></a>00109   StkFloat strikeAmp_;
-<a name="l00110"></a>00110   <span class="keywordtype">int</span> strikePosition_;
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112 };
-<a name="l00113"></a>00113 
-<a name="l00114"></a>00114 } <span class="comment">// stk namespace</span>
-<a name="l00115"></a>00115 
-<a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
+<a name="l00095"></a>00095   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00096"></a>00096 
+<a name="l00097"></a>00097  <span class="keyword">protected</span>:
+<a name="l00098"></a>00098 
+<a name="l00099"></a>00099   <span class="keywordtype">bool</span> doPluck_;
+<a name="l00100"></a>00100   <span class="keywordtype">bool</span> trackVelocity_;
+<a name="l00101"></a>00101   <span class="keywordtype">int</span> nModes_;
+<a name="l00102"></a>00102   <span class="keywordtype">int</span> presetModes_;
+<a name="l00103"></a>00103   <a class="code" href="classstk_1_1BowTable.html" title="STK bowed string table class.">BowTable</a> bowTable_;
+<a name="l00104"></a>00104   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
+<a name="l00105"></a>00105   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   bandpass_[MAX_BANDED_MODES];
+<a name="l00106"></a>00106   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   delay_[MAX_BANDED_MODES];
+<a name="l00107"></a>00107   StkFloat maxVelocity_;
+<a name="l00108"></a>00108   StkFloat modes_[MAX_BANDED_MODES];
+<a name="l00109"></a>00109   StkFloat frequency_;
+<a name="l00110"></a>00110   StkFloat baseGain_;
+<a name="l00111"></a>00111   StkFloat gains_[MAX_BANDED_MODES];
+<a name="l00112"></a>00112   StkFloat basegains_[MAX_BANDED_MODES];
+<a name="l00113"></a>00113   StkFloat excitation_[MAX_BANDED_MODES];
+<a name="l00114"></a>00114   StkFloat integrationConstant_;
+<a name="l00115"></a>00115   StkFloat velocityInput_;
+<a name="l00116"></a>00116   StkFloat bowVelocity_;
+<a name="l00117"></a>00117   StkFloat bowTarget_;
+<a name="l00118"></a>00118   StkFloat bowPosition_;
+<a name="l00119"></a>00119   StkFloat strikeAmp_;
+<a name="l00120"></a>00120   <span class="keywordtype">int</span> strikePosition_;
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122 };
+<a name="l00123"></a>00123 
+<a name="l00124"></a><a class="code" href="classstk_1_1BandedWG.html#a6c2ebb66862b173c4835add6847801c9">00124</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497" title="Compute and return one output sample.">BandedWG :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00125"></a>00125 {
+<a name="l00126"></a>00126   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00127"></a>00127 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00128"></a>00128 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00129"></a>00129     oStream_ &lt;&lt; <span class="stringliteral">&quot;BandedWG::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00130"></a>00130     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00131"></a>00131   }
+<a name="l00132"></a>00132 <span class="preprocessor">#endif</span>
+<a name="l00133"></a>00133 <span class="preprocessor"></span>
+<a name="l00134"></a>00134   StkFloat *samples = &amp;frames[channel];
+<a name="l00135"></a>00135   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00136"></a>00136   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00137"></a>00137     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00138"></a>00138       *samples++ = <a class="code" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497" title="Compute and return one output sample.">tick</a>();
+<a name="l00139"></a>00139   }
+<a name="l00140"></a>00140   <span class="keywordflow">else</span> {
+<a name="l00141"></a>00141     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00142"></a>00142       *samples++ = <a class="code" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497" title="Compute and return one output sample.">tick</a>();
+<a name="l00143"></a>00143       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00144"></a>00144         *samples++ = lastFrame_[j];
+<a name="l00145"></a>00145     }
+<a name="l00146"></a>00146   }
+<a name="l00147"></a>00147 
+<a name="l00148"></a>00148   <span class="keywordflow">return</span> frames;
+<a name="l00149"></a>00149 }
+<a name="l00150"></a>00150 
+<a name="l00151"></a>00151 } <span class="comment">// stk namespace</span>
+<a name="l00152"></a>00152 
+<a name="l00153"></a>00153 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/BeeThree_8h-source.html b/doc/html/BeeThree_8h-source.html
deleted file mode 100644
index 7580c15..0000000
--- a/doc/html/BeeThree_8h-source.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>BeeThree.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BEETHREE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BEETHREE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "FM.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00040"></a>00040 <span class="comment">/***************************************************/</span>
-<a name="l00041"></a>00041 
-<a name="l00042"></a><a class="code" href="classstk_1_1BeeThree.html">00042</a> <span class="keyword">class </span><a class="code" href="classstk_1_1BeeThree.html" title="STK Hammond-oid organ FM synthesis instrument.">BeeThree</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a>
-<a name="l00043"></a>00043 {
-<a name="l00044"></a>00044  <span class="keyword">public</span>:
-<a name="l00046"></a>00046 
-<a name="l00049"></a>00049   <a class="code" href="classstk_1_1BeeThree.html#b4534210b85a2c4798bf1c88b348c20a" title="Class constructor.">BeeThree</a>( <span class="keywordtype">void</span> );
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052   <a class="code" href="classstk_1_1BeeThree.html#f2a0c982731438cf6200b3e5642a288d" title="Class destructor.">~BeeThree</a>( <span class="keywordtype">void</span> );
-<a name="l00053"></a>00053 
-<a name="l00055"></a>00055   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BeeThree.html#480c0fe8d4c2df9c00b82b192dd7eae4" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058   StkFloat <a class="code" href="classstk_1_1BeeThree.html#4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00059"></a>00059 
-<a name="l00060"></a>00060  <span class="keyword">protected</span>:
-<a name="l00061"></a>00061 
-<a name="l00062"></a>00062 };
-<a name="l00063"></a>00063 
-<a name="l00064"></a><a class="code" href="classstk_1_1BeeThree.html#4649b9471bde3b978c20fcafcbef0fc7">00064</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BeeThree.html#4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">BeeThree :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00065"></a>00065 {
-<a name="l00066"></a>00066   <span class="keyword">register</span> StkFloat temp;
-<a name="l00067"></a>00067 
-<a name="l00068"></a>00068   <span class="keywordflow">if</span> ( modDepth_ &gt; 0.0 )   {
-<a name="l00069"></a>00069     temp = 1.0 + ( modDepth_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * 0.1 );
-<a name="l00070"></a>00070     waves_[0]-&gt;setFrequency( baseFrequency_ * temp * ratios_[0] );
-<a name="l00071"></a>00071     waves_[1]-&gt;setFrequency( baseFrequency_ * temp * ratios_[1] );
-<a name="l00072"></a>00072     waves_[2]-&gt;setFrequency( baseFrequency_ * temp * ratios_[2] );
-<a name="l00073"></a>00073     waves_[3]-&gt;setFrequency( baseFrequency_ * temp * ratios_[3] );
-<a name="l00074"></a>00074   }
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#e9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00077"></a>00077   temp = control1_ * 2.0 * gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00078"></a>00078   twozero_.<a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( temp );
-<a name="l00079"></a>00079 
-<a name="l00080"></a>00080   temp += control2_ * 2.0 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00081"></a>00081   temp += gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00082"></a>00082   temp += gains_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084   lastFrame_[0] = temp * 0.125;
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088 } <span class="comment">// stk namespace</span>
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/BeeThree_8h_source.html b/doc/html/BeeThree_8h_source.html
index 8c40a4c..9187ef3 100644
--- a/doc/html/BeeThree_8h_source.html
+++ b/doc/html/BeeThree_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>BeeThree.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BEETHREE_H</span>
@@ -34,43 +34,73 @@
 <a name="l00056"></a>00056 
 <a name="l00058"></a>00058   StkFloat <a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00059"></a>00059 
-<a name="l00060"></a>00060  <span class="keyword">protected</span>:
 <a name="l00061"></a>00061 
-<a name="l00062"></a>00062 };
-<a name="l00063"></a>00063 
-<a name="l00064"></a><a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7">00064</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">BeeThree :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00065"></a>00065 {
-<a name="l00066"></a>00066   <span class="keyword">register</span> StkFloat temp;
-<a name="l00067"></a>00067 
-<a name="l00068"></a>00068   <span class="keywordflow">if</span> ( modDepth_ &gt; 0.0 )   {
-<a name="l00069"></a>00069     temp = 1.0 + ( modDepth_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * 0.1 );
-<a name="l00070"></a>00070     waves_[0]-&gt;setFrequency( baseFrequency_ * temp * ratios_[0] );
-<a name="l00071"></a>00071     waves_[1]-&gt;setFrequency( baseFrequency_ * temp * ratios_[1] );
-<a name="l00072"></a>00072     waves_[2]-&gt;setFrequency( baseFrequency_ * temp * ratios_[2] );
-<a name="l00073"></a>00073     waves_[3]-&gt;setFrequency( baseFrequency_ * temp * ratios_[3] );
-<a name="l00074"></a>00074   }
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00077"></a>00077   temp = control1_ * 2.0 * gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00078"></a>00078   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( temp );
-<a name="l00079"></a>00079 
-<a name="l00080"></a>00080   temp += control2_ * 2.0 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00081"></a>00081   temp += gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00082"></a>00082   temp += gains_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084   lastFrame_[0] = temp * 0.125;
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088 } <span class="comment">// stk namespace</span>
+<a name="l00068"></a>00068   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00069"></a>00069 
+<a name="l00070"></a>00070  <span class="keyword">protected</span>:
+<a name="l00071"></a>00071 
+<a name="l00072"></a>00072 };
+<a name="l00073"></a>00073 
+<a name="l00074"></a><a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7">00074</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">BeeThree :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00075"></a>00075 {
+<a name="l00076"></a>00076   <span class="keyword">register</span> StkFloat temp;
+<a name="l00077"></a>00077 
+<a name="l00078"></a>00078   <span class="keywordflow">if</span> ( modDepth_ &gt; 0.0 )   {
+<a name="l00079"></a>00079     temp = 1.0 + ( modDepth_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * 0.1 );
+<a name="l00080"></a>00080     waves_[0]-&gt;setFrequency( baseFrequency_ * temp * ratios_[0] );
+<a name="l00081"></a>00081     waves_[1]-&gt;setFrequency( baseFrequency_ * temp * ratios_[1] );
+<a name="l00082"></a>00082     waves_[2]-&gt;setFrequency( baseFrequency_ * temp * ratios_[2] );
+<a name="l00083"></a>00083     waves_[3]-&gt;setFrequency( baseFrequency_ * temp * ratios_[3] );
+<a name="l00084"></a>00084   }
+<a name="l00085"></a>00085 
+<a name="l00086"></a>00086   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
+<a name="l00087"></a>00087   temp = control1_ * 2.0 * gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
+<a name="l00088"></a>00088   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( temp );
 <a name="l00089"></a>00089 
-<a name="l00090"></a>00090 <span class="preprocessor">#endif</span>
+<a name="l00090"></a>00090   temp += control2_ * 2.0 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
+<a name="l00091"></a>00091   temp += gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
+<a name="l00092"></a>00092   temp += gains_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
+<a name="l00093"></a>00093 
+<a name="l00094"></a>00094   lastFrame_[0] = temp * 0.125;
+<a name="l00095"></a>00095   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00096"></a>00096 }
+<a name="l00097"></a>00097 
+<a name="l00098"></a><a class="code" href="classstk_1_1BeeThree.html#a30520efff3fac0674d3c7ab95ac35999">00098</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">BeeThree :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00099"></a>00099 {
+<a name="l00100"></a>00100   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00101"></a>00101 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00102"></a>00102 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00103"></a>00103     oStream_ &lt;&lt; <span class="stringliteral">&quot;BeeThree::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00104"></a>00104     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106 <span class="preprocessor">#endif</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span>
+<a name="l00108"></a>00108   StkFloat *samples = &amp;frames[channel];
+<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00110"></a>00110   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00111"></a>00111     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00112"></a>00112       *samples++ = <a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">tick</a>();
+<a name="l00113"></a>00113   }
+<a name="l00114"></a>00114   <span class="keywordflow">else</span> {
+<a name="l00115"></a>00115     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00116"></a>00116       *samples++ = <a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">tick</a>();
+<a name="l00117"></a>00117       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00118"></a>00118         *samples++ = lastFrame_[j];
+<a name="l00119"></a>00119     }
+<a name="l00120"></a>00120   }
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122   <span class="keywordflow">return</span> frames;
+<a name="l00123"></a>00123 }
+<a name="l00124"></a>00124 
+<a name="l00125"></a>00125 } <span class="comment">// stk namespace</span>
+<a name="l00126"></a>00126 
+<a name="l00127"></a>00127 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/BiQuad_8h-source.html b/doc/html/BiQuad_8h-source.html
deleted file mode 100644
index 267d95e..0000000
--- a/doc/html/BiQuad_8h-source.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>BiQuad.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BIQUAD_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BIQUAD_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1BiQuad.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022 <span class="keyword">public</span>:
-<a name="l00023"></a>00023 
-<a name="l00025"></a>00025   <a class="code" href="classstk_1_1BiQuad.html#91aab9d1b4833e156edcf59cbe276e3f" title="Default constructor creates a second-order pass-through filter.">BiQuad</a>();
-<a name="l00026"></a>00026 
-<a name="l00028"></a>00028   <a class="code" href="classstk_1_1BiQuad.html#d7e81be1c4e5c5ab69474f6df2610984" title="Class destructor.">~BiQuad</a>();
-<a name="l00029"></a>00029 
-<a name="l00031"></a><a class="code" href="classstk_1_1BiQuad.html#ab468cd1aa79b95442b15bb04d8bb211">00031</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#ab468cd1aa79b95442b15bb04d8bb211" title="A function to enable/disable the automatic updating of class data when the STK sample...">ignoreSampleRateChange</a>( <span class="keywordtype">bool</span> ignore = <span class="keyword">true</span> ) { ignoreSampleRateChange_ = ignore; };
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#eed58196cf798f664cddbb9a8564c7b5" title="Set all filter coefficients.">setCoefficients</a>( StkFloat b0, StkFloat b1, StkFloat b2, StkFloat a1, StkFloat a2, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
-<a name="l00035"></a>00035 
-<a name="l00037"></a><a class="code" href="classstk_1_1BiQuad.html#26ee25d08116b20f326001166f087853">00037</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#26ee25d08116b20f326001166f087853" title="Set the b[0] coefficient value.">setB0</a>( StkFloat b0 ) { b_[0] = b0; };
-<a name="l00038"></a>00038 
-<a name="l00040"></a><a class="code" href="classstk_1_1BiQuad.html#dd364ed410b3ed2a2b29b8a5fea127c8">00040</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#dd364ed410b3ed2a2b29b8a5fea127c8" title="Set the b[1] coefficient value.">setB1</a>( StkFloat b1 ) { b_[1] = b1; };
-<a name="l00041"></a>00041 
-<a name="l00043"></a><a class="code" href="classstk_1_1BiQuad.html#208a654dd3393ed0b2b86ad56d9cf3e1">00043</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#208a654dd3393ed0b2b86ad56d9cf3e1" title="Set the b[2] coefficient value.">setB2</a>( StkFloat b2 ) { b_[2] = b2; };
-<a name="l00044"></a>00044 
-<a name="l00046"></a><a class="code" href="classstk_1_1BiQuad.html#1c9799e47163fe8a59fd85196c089cb3">00046</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#1c9799e47163fe8a59fd85196c089cb3" title="Set the a[1] coefficient value.">setA1</a>( StkFloat a1 ) { a_[1] = a1; };
-<a name="l00047"></a>00047 
-<a name="l00049"></a><a class="code" href="classstk_1_1BiQuad.html#e28afd560df11435ea54f128d23b9383">00049</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#e28afd560df11435ea54f128d23b9383" title="Set the a[2] coefficient value.">setA2</a>( StkFloat a2 ) { a_[2] = a2; };
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#55aaa01fd4156f1fac1168f526e3d969" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>( StkFloat frequency, StkFloat radius, <span class="keywordtype">bool</span> normalize = <span class="keyword">false</span> );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066 
-<a name="l00072"></a>00072   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#e10a26fc319ba357bc92df4e528c2d8f" title="Set the filter coefficients for a notch at frequency (in Hz).">setNotch</a>( StkFloat frequency, StkFloat radius );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075 
-<a name="l00081"></a>00081   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#28881f5876ce5bdcc846367cca9363f7" title="Sets the filter zeroes for equal resonance gain.">setEqualGainZeroes</a>( <span class="keywordtype">void</span> );
-<a name="l00082"></a>00082 
-<a name="l00084"></a><a class="code" href="classstk_1_1BiQuad.html#412f224363b1a222423ecf0cd7be9063">00084</a>   StkFloat <a class="code" href="classstk_1_1BiQuad.html#412f224363b1a222423ecf0cd7be9063" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00085"></a>00085 
-<a name="l00087"></a>00087   StkFloat <a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( StkFloat input );
-<a name="l00088"></a>00088 
-<a name="l00090"></a>00090 
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00099"></a>00099 
-<a name="l00101"></a>00101 
-<a name="l00109"></a>00109   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00110"></a>00110 
-<a name="l00111"></a>00111  <span class="keyword">protected</span>:
-<a name="l00112"></a>00112 
-<a name="l00113"></a>00113   <span class="keyword">virtual</span> <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00114"></a>00114 };
-<a name="l00115"></a>00115 
-<a name="l00116"></a><a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635">00116</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">BiQuad :: tick</a>( StkFloat input )
-<a name="l00117"></a>00117 {
-<a name="l00118"></a>00118   inputs_[0] = gain_ * input;
-<a name="l00119"></a>00119   lastFrame_[0] = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
-<a name="l00120"></a>00120   lastFrame_[0] -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
-<a name="l00121"></a>00121   inputs_[2] = inputs_[1];
-<a name="l00122"></a>00122   inputs_[1] = inputs_[0];
-<a name="l00123"></a>00123   outputs_[2] = outputs_[1];
-<a name="l00124"></a>00124   outputs_[1] = lastFrame_[0];
-<a name="l00125"></a>00125 
-<a name="l00126"></a>00126   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00127"></a>00127 }
-<a name="l00128"></a>00128 
-<a name="l00129"></a><a class="code" href="classstk_1_1BiQuad.html#f903e41217838470a5f267a20b905a12">00129</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">BiQuad :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00130"></a>00130 {
-<a name="l00131"></a>00131 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00132"></a>00132 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00133"></a>00133     errorString_ &lt;&lt; <span class="stringliteral">"BiQuad::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00134"></a>00134     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00135"></a>00135   }
-<a name="l00136"></a>00136 <span class="preprocessor">#endif</span>
-<a name="l00137"></a>00137 <span class="preprocessor"></span>
-<a name="l00138"></a>00138   StkFloat *samples = &amp;frames[channel];
-<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00140"></a>00140   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00141"></a>00141     inputs_[0] = gain_ * *samples;
-<a name="l00142"></a>00142     *samples = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
-<a name="l00143"></a>00143     *samples -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
-<a name="l00144"></a>00144     inputs_[2] = inputs_[1];
-<a name="l00145"></a>00145     inputs_[1] = inputs_[0];
-<a name="l00146"></a>00146     outputs_[2] = outputs_[1];
-<a name="l00147"></a>00147     outputs_[1] = *samples;
-<a name="l00148"></a>00148   }
-<a name="l00149"></a>00149 
-<a name="l00150"></a>00150   lastFrame_[0] = outputs_[1];
-<a name="l00151"></a>00151   <span class="keywordflow">return</span> frames;
-<a name="l00152"></a>00152 }
-<a name="l00153"></a>00153 
-<a name="l00154"></a><a class="code" href="classstk_1_1BiQuad.html#c9836f0e074ea9516727f27eb9b411aa">00154</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">BiQuad :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00155"></a>00155 {
-<a name="l00156"></a>00156 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00157"></a>00157 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00158"></a>00158     errorString_ &lt;&lt; <span class="stringliteral">"BiQuad::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00159"></a>00159     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00160"></a>00160   }
-<a name="l00161"></a>00161 <span class="preprocessor">#endif</span>
-<a name="l00162"></a>00162 <span class="preprocessor"></span>
-<a name="l00163"></a>00163   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00164"></a>00164   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00165"></a>00165   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00166"></a>00166   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00167"></a>00167     inputs_[0] = gain_ * *iSamples;
-<a name="l00168"></a>00168     *oSamples = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
-<a name="l00169"></a>00169     *oSamples -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
-<a name="l00170"></a>00170     inputs_[2] = inputs_[1];
-<a name="l00171"></a>00171     inputs_[1] = inputs_[0];
-<a name="l00172"></a>00172     outputs_[2] = outputs_[1];
-<a name="l00173"></a>00173     outputs_[1] = *oSamples;
-<a name="l00174"></a>00174   }
-<a name="l00175"></a>00175 
-<a name="l00176"></a>00176   lastFrame_[0] = outputs_[1];
-<a name="l00177"></a>00177   <span class="keywordflow">return</span> iFrames;
-<a name="l00178"></a>00178 }
-<a name="l00179"></a>00179 
-<a name="l00180"></a>00180 } <span class="comment">// stk namespace</span>
-<a name="l00181"></a>00181 
-<a name="l00182"></a>00182 <span class="preprocessor">#endif</span>
-<a name="l00183"></a>00183 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/BiQuad_8h_source.html b/doc/html/BiQuad_8h_source.html
index 137321e..34fcd84 100644
--- a/doc/html/BiQuad_8h_source.html
+++ b/doc/html/BiQuad_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>BiQuad.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BIQUAD_H</span>
@@ -45,103 +45,103 @@
 <a name="l00049"></a><a class="code" href="classstk_1_1BiQuad.html#ae28afd560df11435ea54f128d23b9383">00049</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#ae28afd560df11435ea54f128d23b9383" title="Set the a[2] coefficient value.">setA2</a>( StkFloat a2 ) { a_[2] = a2; };
 <a name="l00050"></a>00050 
 <a name="l00052"></a>00052 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#a55aaa01fd4156f1fac1168f526e3d969" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>( StkFloat frequency, StkFloat radius, <span class="keywordtype">bool</span> normalize = <span class="keyword">false</span> );
-<a name="l00064"></a>00064 
+<a name="l00065"></a>00065   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#a55aaa01fd4156f1fac1168f526e3d969" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>( StkFloat frequency, StkFloat radius, <span class="keywordtype">bool</span> normalize = <span class="keyword">false</span> );
 <a name="l00066"></a>00066 
-<a name="l00072"></a>00072   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#ae10a26fc319ba357bc92df4e528c2d8f" title="Set the filter coefficients for a notch at frequency (in Hz).">setNotch</a>( StkFloat frequency, StkFloat radius );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075 
-<a name="l00081"></a>00081   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#a28881f5876ce5bdcc846367cca9363f7" title="Sets the filter zeroes for equal resonance gain.">setEqualGainZeroes</a>( <span class="keywordtype">void</span> );
-<a name="l00082"></a>00082 
-<a name="l00084"></a><a class="code" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063">00084</a>   StkFloat <a class="code" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
+<a name="l00068"></a>00068 
+<a name="l00075"></a>00075   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#ae10a26fc319ba357bc92df4e528c2d8f" title="Set the filter coefficients for a notch at frequency (in Hz).">setNotch</a>( StkFloat frequency, StkFloat radius );
+<a name="l00076"></a>00076 
+<a name="l00078"></a>00078 
+<a name="l00084"></a>00084   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BiQuad.html#a28881f5876ce5bdcc846367cca9363f7" title="Sets the filter zeroes for equal resonance gain.">setEqualGainZeroes</a>( <span class="keywordtype">void</span> );
 <a name="l00085"></a>00085 
-<a name="l00087"></a>00087   StkFloat <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( StkFloat input );
+<a name="l00087"></a><a class="code" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063">00087</a>   StkFloat <a class="code" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
 <a name="l00088"></a>00088 
-<a name="l00090"></a>00090 
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00099"></a>00099 
-<a name="l00101"></a>00101 
-<a name="l00109"></a>00109   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00110"></a>00110 
-<a name="l00111"></a>00111  <span class="keyword">protected</span>:
-<a name="l00112"></a>00112 
-<a name="l00113"></a>00113   <span class="keyword">virtual</span> <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00114"></a>00114 };
+<a name="l00090"></a>00090   StkFloat <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( StkFloat input );
+<a name="l00091"></a>00091 
+<a name="l00093"></a>00093 
+<a name="l00101"></a>00101   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00102"></a>00102 
+<a name="l00104"></a>00104 
+<a name="l00112"></a>00112   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
+<a name="l00113"></a>00113 
+<a name="l00114"></a>00114  <span class="keyword">protected</span>:
 <a name="l00115"></a>00115 
-<a name="l00116"></a><a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635">00116</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">BiQuad :: tick</a>( StkFloat input )
-<a name="l00117"></a>00117 {
-<a name="l00118"></a>00118   inputs_[0] = gain_ * input;
-<a name="l00119"></a>00119   lastFrame_[0] = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
-<a name="l00120"></a>00120   lastFrame_[0] -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
-<a name="l00121"></a>00121   inputs_[2] = inputs_[1];
-<a name="l00122"></a>00122   inputs_[1] = inputs_[0];
-<a name="l00123"></a>00123   outputs_[2] = outputs_[1];
-<a name="l00124"></a>00124   outputs_[1] = lastFrame_[0];
-<a name="l00125"></a>00125 
-<a name="l00126"></a>00126   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00127"></a>00127 }
+<a name="l00116"></a>00116   <span class="keyword">virtual</span> <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
+<a name="l00117"></a>00117 };
+<a name="l00118"></a>00118 
+<a name="l00119"></a><a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635">00119</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">BiQuad :: tick</a>( StkFloat input )
+<a name="l00120"></a>00120 {
+<a name="l00121"></a>00121   inputs_[0] = gain_ * input;
+<a name="l00122"></a>00122   lastFrame_[0] = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
+<a name="l00123"></a>00123   lastFrame_[0] -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
+<a name="l00124"></a>00124   inputs_[2] = inputs_[1];
+<a name="l00125"></a>00125   inputs_[1] = inputs_[0];
+<a name="l00126"></a>00126   outputs_[2] = outputs_[1];
+<a name="l00127"></a>00127   outputs_[1] = lastFrame_[0];
 <a name="l00128"></a>00128 
-<a name="l00129"></a><a class="code" href="classstk_1_1BiQuad.html#af903e41217838470a5f267a20b905a12">00129</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">BiQuad :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00130"></a>00130 {
-<a name="l00131"></a>00131 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00132"></a>00132 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00133"></a>00133     errorString_ &lt;&lt; <span class="stringliteral">&quot;BiQuad::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00134"></a>00134     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00135"></a>00135   }
-<a name="l00136"></a>00136 <span class="preprocessor">#endif</span>
-<a name="l00137"></a>00137 <span class="preprocessor"></span>
-<a name="l00138"></a>00138   StkFloat *samples = &amp;frames[channel];
-<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00140"></a>00140   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00141"></a>00141     inputs_[0] = gain_ * *samples;
-<a name="l00142"></a>00142     *samples = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
-<a name="l00143"></a>00143     *samples -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
-<a name="l00144"></a>00144     inputs_[2] = inputs_[1];
-<a name="l00145"></a>00145     inputs_[1] = inputs_[0];
-<a name="l00146"></a>00146     outputs_[2] = outputs_[1];
-<a name="l00147"></a>00147     outputs_[1] = *samples;
-<a name="l00148"></a>00148   }
-<a name="l00149"></a>00149 
-<a name="l00150"></a>00150   lastFrame_[0] = outputs_[1];
-<a name="l00151"></a>00151   <span class="keywordflow">return</span> frames;
-<a name="l00152"></a>00152 }
-<a name="l00153"></a>00153 
-<a name="l00154"></a><a class="code" href="classstk_1_1BiQuad.html#ac9836f0e074ea9516727f27eb9b411aa">00154</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">BiQuad :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00155"></a>00155 {
-<a name="l00156"></a>00156 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00157"></a>00157 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00158"></a>00158     errorString_ &lt;&lt; <span class="stringliteral">&quot;BiQuad::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00159"></a>00159     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00160"></a>00160   }
-<a name="l00161"></a>00161 <span class="preprocessor">#endif</span>
-<a name="l00162"></a>00162 <span class="preprocessor"></span>
-<a name="l00163"></a>00163   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00164"></a>00164   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00165"></a>00165   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00166"></a>00166   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00167"></a>00167     inputs_[0] = gain_ * *iSamples;
-<a name="l00168"></a>00168     *oSamples = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
-<a name="l00169"></a>00169     *oSamples -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
-<a name="l00170"></a>00170     inputs_[2] = inputs_[1];
-<a name="l00171"></a>00171     inputs_[1] = inputs_[0];
-<a name="l00172"></a>00172     outputs_[2] = outputs_[1];
-<a name="l00173"></a>00173     outputs_[1] = *oSamples;
-<a name="l00174"></a>00174   }
-<a name="l00175"></a>00175 
-<a name="l00176"></a>00176   lastFrame_[0] = outputs_[1];
-<a name="l00177"></a>00177   <span class="keywordflow">return</span> iFrames;
-<a name="l00178"></a>00178 }
-<a name="l00179"></a>00179 
-<a name="l00180"></a>00180 } <span class="comment">// stk namespace</span>
-<a name="l00181"></a>00181 
-<a name="l00182"></a>00182 <span class="preprocessor">#endif</span>
-<a name="l00183"></a>00183 <span class="preprocessor"></span>
+<a name="l00129"></a>00129   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00130"></a>00130 }
+<a name="l00131"></a>00131 
+<a name="l00132"></a><a class="code" href="classstk_1_1BiQuad.html#af903e41217838470a5f267a20b905a12">00132</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">BiQuad :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00133"></a>00133 {
+<a name="l00134"></a>00134 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00135"></a>00135 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00136"></a>00136     oStream_ &lt;&lt; <span class="stringliteral">&quot;BiQuad::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00137"></a>00137     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00138"></a>00138   }
+<a name="l00139"></a>00139 <span class="preprocessor">#endif</span>
+<a name="l00140"></a>00140 <span class="preprocessor"></span>
+<a name="l00141"></a>00141   StkFloat *samples = &amp;frames[channel];
+<a name="l00142"></a>00142   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00143"></a>00143   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00144"></a>00144     inputs_[0] = gain_ * *samples;
+<a name="l00145"></a>00145     *samples = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
+<a name="l00146"></a>00146     *samples -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
+<a name="l00147"></a>00147     inputs_[2] = inputs_[1];
+<a name="l00148"></a>00148     inputs_[1] = inputs_[0];
+<a name="l00149"></a>00149     outputs_[2] = outputs_[1];
+<a name="l00150"></a>00150     outputs_[1] = *samples;
+<a name="l00151"></a>00151   }
+<a name="l00152"></a>00152 
+<a name="l00153"></a>00153   lastFrame_[0] = outputs_[1];
+<a name="l00154"></a>00154   <span class="keywordflow">return</span> frames;
+<a name="l00155"></a>00155 }
+<a name="l00156"></a>00156 
+<a name="l00157"></a><a class="code" href="classstk_1_1BiQuad.html#ac9836f0e074ea9516727f27eb9b411aa">00157</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">BiQuad :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00158"></a>00158 {
+<a name="l00159"></a>00159 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00160"></a>00160 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00161"></a>00161     oStream_ &lt;&lt; <span class="stringliteral">&quot;BiQuad::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00162"></a>00162     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00163"></a>00163   }
+<a name="l00164"></a>00164 <span class="preprocessor">#endif</span>
+<a name="l00165"></a>00165 <span class="preprocessor"></span>
+<a name="l00166"></a>00166   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00167"></a>00167   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00168"></a>00168   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00169"></a>00169   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00170"></a>00170     inputs_[0] = gain_ * *iSamples;
+<a name="l00171"></a>00171     *oSamples = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
+<a name="l00172"></a>00172     *oSamples -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
+<a name="l00173"></a>00173     inputs_[2] = inputs_[1];
+<a name="l00174"></a>00174     inputs_[1] = inputs_[0];
+<a name="l00175"></a>00175     outputs_[2] = outputs_[1];
+<a name="l00176"></a>00176     outputs_[1] = *oSamples;
+<a name="l00177"></a>00177   }
+<a name="l00178"></a>00178 
+<a name="l00179"></a>00179   lastFrame_[0] = outputs_[1];
+<a name="l00180"></a>00180   <span class="keywordflow">return</span> iFrames;
+<a name="l00181"></a>00181 }
+<a name="l00182"></a>00182 
+<a name="l00183"></a>00183 } <span class="comment">// stk namespace</span>
+<a name="l00184"></a>00184 
+<a name="l00185"></a>00185 <span class="preprocessor">#endif</span>
+<a name="l00186"></a>00186 <span class="preprocessor"></span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/BlitSaw_8h-source.html b/doc/html/BlitSaw_8h-source.html
deleted file mode 100644
index 456f6fe..0000000
--- a/doc/html/BlitSaw_8h-source.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>BlitSaw.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BLITSAW_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BLITSAW_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Generator.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;cmath&gt;</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include &lt;limits&gt;</span>
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 
-<a name="l00031"></a><a class="code" href="classstk_1_1BlitSaw.html">00031</a> <span class="keyword">class </span><a class="code" href="classstk_1_1BlitSaw.html" title="STK band-limited sawtooth wave class.">BlitSaw</a>: <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00032"></a>00032 {
-<a name="l00033"></a>00033  <span class="keyword">public</span>:
-<a name="l00035"></a>00035   <a class="code" href="classstk_1_1BlitSaw.html#8a245ef05cc58c521edaded5c6cdd5ee" title="Class constructor.">BlitSaw</a>( StkFloat frequency = 220.0 );
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038   <a class="code" href="classstk_1_1BlitSaw.html#24cd2cc9852ce73252a99f7eff63879b" title="Class destructor.">~BlitSaw</a>();
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlitSaw.html#3010cf9a0905368b857df2d332968036" title="Resets the oscillator state and phase to 0.">reset</a>();
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlitSaw.html#fa6f1103a61221eebf5f49f3a7df4145" title="Set the sawtooth oscillator rate in terms of a frequency in Hz.">setFrequency</a>( StkFloat frequency );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047 
-<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlitSaw.html#8abd2b9a5b8d26926a383c1e56605545" title="Set the number of harmonics generated in the signal.">setHarmonics</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nHarmonics = 0 );
-<a name="l00060"></a>00060 
-<a name="l00062"></a><a class="code" href="classstk_1_1BlitSaw.html#254758ecd4166cc4e7d6fced5650a198">00062</a>   StkFloat <a class="code" href="classstk_1_1BlitSaw.html#254758ecd4166cc4e7d6fced5650a198" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00063"></a>00063 
-<a name="l00065"></a>00065   StkFloat <a class="code" href="classstk_1_1BlitSaw.html#03536a1f1823ea41649b4a62ba98007c" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00066"></a>00066 
-<a name="l00068"></a>00068 
-<a name="l00075"></a>00075   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BlitSaw.html#03536a1f1823ea41649b4a62ba98007c" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077  <span class="keyword">protected</span>:
-<a name="l00078"></a>00078 
-<a name="l00079"></a>00079   <span class="keywordtype">void</span> updateHarmonics( <span class="keywordtype">void</span> );
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nHarmonics_;
-<a name="l00082"></a>00082   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> m_;
-<a name="l00083"></a>00083   StkFloat rate_;
-<a name="l00084"></a>00084   StkFloat phase_;
-<a name="l00085"></a>00085   StkFloat p_;
-<a name="l00086"></a>00086   StkFloat C2_;
-<a name="l00087"></a>00087   StkFloat a_;
-<a name="l00088"></a>00088   StkFloat state_;
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 };
-<a name="l00091"></a>00091 
-<a name="l00092"></a><a class="code" href="classstk_1_1BlitSaw.html#03536a1f1823ea41649b4a62ba98007c">00092</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BlitSaw.html#03536a1f1823ea41649b4a62ba98007c" title="Compute and return one output sample.">BlitSaw :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00093"></a>00093 {
-<a name="l00094"></a>00094   <span class="comment">// The code below implements the BLIT algorithm of Stilson and</span>
-<a name="l00095"></a>00095   <span class="comment">// Smith, followed by a summation and filtering operation to produce</span>
-<a name="l00096"></a>00096   <span class="comment">// a sawtooth waveform.  After experimenting with various approaches</span>
-<a name="l00097"></a>00097   <span class="comment">// to calculate the average value of the BLIT over one period, I</span>
-<a name="l00098"></a>00098   <span class="comment">// found that an estimate of C2_ = 1.0 / period (in samples) worked</span>
-<a name="l00099"></a>00099   <span class="comment">// most consistently.  A "leaky integrator" is then applied to the</span>
-<a name="l00100"></a>00100   <span class="comment">// difference of the BLIT output and C2_. (GPS - 1 October 2005)</span>
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="comment">// A fully  optimized version of this code would replace the two sin </span>
-<a name="l00103"></a>00103   <span class="comment">// calls with a pair of fast sin oscillators, for which stable fast </span>
-<a name="l00104"></a>00104   <span class="comment">// two-multiply algorithms are well known. In the spirit of STK,</span>
-<a name="l00105"></a>00105   <span class="comment">// which favors clarity over performance, the optimization has </span>
-<a name="l00106"></a>00106   <span class="comment">// not been made here.</span>
-<a name="l00107"></a>00107 
-<a name="l00108"></a>00108   <span class="comment">// Avoid a divide by zero, or use of a denormalized divisor </span>
-<a name="l00109"></a>00109   <span class="comment">// at the sinc peak, which has a limiting value of m_ / p_.</span>
-<a name="l00110"></a>00110   StkFloat tmp, denominator = sin( phase_ );
-<a name="l00111"></a>00111   <span class="keywordflow">if</span> ( fabs(denominator) &lt;= std::numeric_limits&lt;StkFloat&gt;::epsilon() )
-<a name="l00112"></a>00112     tmp = a_;
-<a name="l00113"></a>00113   <span class="keywordflow">else</span> {
-<a name="l00114"></a>00114     tmp =  sin( m_ * phase_ );
-<a name="l00115"></a>00115     tmp /= p_ * denominator;
-<a name="l00116"></a>00116   }
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   tmp += state_ - C2_;
-<a name="l00119"></a>00119   state_ = tmp * 0.995;
-<a name="l00120"></a>00120 
-<a name="l00121"></a>00121   phase_ += rate_;
-<a name="l00122"></a>00122   <span class="keywordflow">if</span> ( phase_ &gt;= PI ) phase_ -= PI;
-<a name="l00123"></a>00123     
-<a name="l00124"></a>00124   lastFrame_[0] = tmp;
-<a name="l00125"></a>00125          <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00126"></a>00126 }
-<a name="l00127"></a>00127 
-<a name="l00128"></a><a class="code" href="classstk_1_1BlitSaw.html#b53f6ba99ef5c4f8982f6c0f07bf2e1d">00128</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BlitSaw.html#03536a1f1823ea41649b4a62ba98007c" title="Compute and return one output sample.">BlitSaw :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00129"></a>00129 {
-<a name="l00130"></a>00130 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00131"></a>00131 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00132"></a>00132     errorString_ &lt;&lt; <span class="stringliteral">"BlitSaw::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00133"></a>00133     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00134"></a>00134   }
-<a name="l00135"></a>00135 <span class="preprocessor">#endif</span>
-<a name="l00136"></a>00136 <span class="preprocessor"></span>
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138   StkFloat *samples = &amp;frames[channel];
-<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00140"></a>00140   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00141"></a>00141     *samples = <a class="code" href="classstk_1_1BlitSaw.html#03536a1f1823ea41649b4a62ba98007c" title="Compute and return one output sample.">BlitSaw::tick</a>();
-<a name="l00142"></a>00142 
-<a name="l00143"></a>00143   <span class="keywordflow">return</span> frames;
-<a name="l00144"></a>00144 }
-<a name="l00145"></a>00145 
-<a name="l00146"></a>00146 } <span class="comment">// stk namespace</span>
-<a name="l00147"></a>00147 
-<a name="l00148"></a>00148 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/BlitSaw_8h_source.html b/doc/html/BlitSaw_8h_source.html
index 8a3742d..9329875 100644
--- a/doc/html/BlitSaw_8h_source.html
+++ b/doc/html/BlitSaw_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>BlitSaw.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BLITSAW_H</span>
@@ -100,7 +100,7 @@
 <a name="l00129"></a>00129 {
 <a name="l00130"></a>00130 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00131"></a>00131 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00132"></a>00132     errorString_ &lt;&lt; <span class="stringliteral">&quot;BlitSaw::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00132"></a>00132     oStream_ &lt;&lt; <span class="stringliteral">&quot;BlitSaw::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00133"></a>00133     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00134"></a>00134   }
 <a name="l00135"></a>00135 <span class="preprocessor">#endif</span>
@@ -122,7 +122,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/BlitSquare_8h-source.html b/doc/html/BlitSquare_8h-source.html
deleted file mode 100644
index 5b27eb5..0000000
--- a/doc/html/BlitSquare_8h-source.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>BlitSquare.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BLITSQUARE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BLITSQUARE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Generator.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;cmath&gt;</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include &lt;limits&gt;</span>
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
-<a name="l00040"></a>00040 <span class="comment">/***************************************************/</span>
-<a name="l00041"></a>00041 
-<a name="l00042"></a><a class="code" href="classstk_1_1BlitSquare.html">00042</a> <span class="keyword">class </span><a class="code" href="classstk_1_1BlitSquare.html" title="STK band-limited square wave class.">BlitSquare</a>: <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00043"></a>00043 {
-<a name="l00044"></a>00044  <span class="keyword">public</span>:
-<a name="l00046"></a>00046   <a class="code" href="classstk_1_1BlitSquare.html#2cb3aee415a6ee75fa85b01e4e85d70b" title="Default constructor that initializes BLIT frequency to 220 Hz.">BlitSquare</a>( StkFloat frequency = 220.0 );
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049   <a class="code" href="classstk_1_1BlitSquare.html#4bc6e424ca1631f353f55846084634ef" title="Class destructor.">~BlitSquare</a>();
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlitSquare.html#8f6dbe07d7f64b24cc9a41f6208dd6c4" title="Resets the oscillator state and phase to 0.">reset</a>();
-<a name="l00053"></a>00053 
-<a name="l00055"></a>00055 
-<a name="l00058"></a><a class="code" href="classstk_1_1BlitSquare.html#eface58980a3ec865131f3cad59bbbef">00058</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlitSquare.html#eface58980a3ec865131f3cad59bbbef" title="Set the phase of the signal.">setPhase</a>( StkFloat phase ) { phase_ = PI * phase; };
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061 
-<a name="l00064"></a><a class="code" href="classstk_1_1BlitSquare.html#bbda8cb84bcd36fc6d96130e9832a6af">00064</a>   StkFloat <a class="code" href="classstk_1_1BlitSquare.html#bbda8cb84bcd36fc6d96130e9832a6af" title="Get the current phase of the signal.">getPhase</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> phase_ / PI; };
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlitSquare.html#8d0d8e0a12987ebccc56c09c7e7dbd6a" title="Set the impulse train rate in terms of a frequency in Hz.">setFrequency</a>( StkFloat frequency );
-<a name="l00068"></a>00068 
-<a name="l00070"></a>00070 
-<a name="l00082"></a>00082   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlitSquare.html#94521b4224d0873f5e783c721c123b21" title="Set the number of harmonics generated in the signal.">setHarmonics</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nHarmonics = 0 );
-<a name="l00083"></a>00083 
-<a name="l00085"></a><a class="code" href="classstk_1_1BlitSquare.html#77972e4e1c53600bf80cf692601ccae1">00085</a>   StkFloat <a class="code" href="classstk_1_1BlitSquare.html#77972e4e1c53600bf80cf692601ccae1" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00086"></a>00086 
-<a name="l00088"></a>00088   StkFloat <a class="code" href="classstk_1_1BlitSquare.html#04366d55cecb4c8a726ea0519683d817" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00089"></a>00089 
-<a name="l00091"></a>00091 
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BlitSquare.html#04366d55cecb4c8a726ea0519683d817" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00099"></a>00099 
-<a name="l00100"></a>00100  <span class="keyword">protected</span>:
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="keywordtype">void</span> updateHarmonics( <span class="keywordtype">void</span> );
-<a name="l00103"></a>00103 
-<a name="l00104"></a>00104   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nHarmonics_;
-<a name="l00105"></a>00105   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> m_;
-<a name="l00106"></a>00106   StkFloat rate_;
-<a name="l00107"></a>00107   StkFloat phase_;
-<a name="l00108"></a>00108   StkFloat p_;
-<a name="l00109"></a>00109   StkFloat a_;
-<a name="l00110"></a>00110   StkFloat lastBlitOutput_;
-<a name="l00111"></a>00111   StkFloat dcbState_;
-<a name="l00112"></a>00112 };
-<a name="l00113"></a>00113 
-<a name="l00114"></a><a class="code" href="classstk_1_1BlitSquare.html#04366d55cecb4c8a726ea0519683d817">00114</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BlitSquare.html#04366d55cecb4c8a726ea0519683d817" title="Compute and return one output sample.">BlitSquare :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00115"></a>00115 {
-<a name="l00116"></a>00116   StkFloat temp = lastBlitOutput_;
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   <span class="comment">// A fully  optimized version of this would replace the two sin calls</span>
-<a name="l00119"></a>00119   <span class="comment">// with a pair of fast sin oscillators, for which stable fast </span>
-<a name="l00120"></a>00120   <span class="comment">// two-multiply algorithms are well known. In the spirit of STK,</span>
-<a name="l00121"></a>00121   <span class="comment">// which favors clarity over performance, the optimization has </span>
-<a name="l00122"></a>00122   <span class="comment">// not been made here.</span>
-<a name="l00123"></a>00123 
-<a name="l00124"></a>00124   <span class="comment">// Avoid a divide by zero, or use of a denomralized divisor</span>
-<a name="l00125"></a>00125   <span class="comment">// at the sinc peak, which has a limiting value of 1.0.</span>
-<a name="l00126"></a>00126   StkFloat denominator = sin( phase_ );
-<a name="l00127"></a>00127   <span class="keywordflow">if</span> ( fabs( denominator )  &lt; std::numeric_limits&lt;StkFloat&gt;::epsilon() ) {
-<a name="l00128"></a>00128     <span class="comment">// Inexact comparison safely distinguishes betwen *close to zero*, and *close to PI*.</span>
-<a name="l00129"></a>00129     <span class="keywordflow">if</span> ( phase_ &lt; 0.1f || phase_ &gt; TWO_PI - 0.1f )
-<a name="l00130"></a>00130       lastBlitOutput_ = a_;
-<a name="l00131"></a>00131     <span class="keywordflow">else</span>
-<a name="l00132"></a>00132       lastBlitOutput_ = -a_;
-<a name="l00133"></a>00133   }
-<a name="l00134"></a>00134   <span class="keywordflow">else</span> {
-<a name="l00135"></a>00135     lastBlitOutput_ =  sin( m_ * phase_ );
-<a name="l00136"></a>00136     lastBlitOutput_ /= p_ * denominator;
-<a name="l00137"></a>00137   }
-<a name="l00138"></a>00138 
-<a name="l00139"></a>00139   lastBlitOutput_ += temp;
-<a name="l00140"></a>00140 
-<a name="l00141"></a>00141   <span class="comment">// Now apply DC blocker.</span>
-<a name="l00142"></a>00142   lastFrame_[0] = lastBlitOutput_ - dcbState_ + 0.999 * lastFrame_[0];
-<a name="l00143"></a>00143   dcbState_ = lastBlitOutput_;
-<a name="l00144"></a>00144 
-<a name="l00145"></a>00145   phase_ += rate_;
-<a name="l00146"></a>00146   <span class="keywordflow">if</span> ( phase_ &gt;= TWO_PI ) phase_ -= TWO_PI;
-<a name="l00147"></a>00147 
-<a name="l00148"></a>00148          <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00149"></a>00149 }
-<a name="l00150"></a>00150 
-<a name="l00151"></a><a class="code" href="classstk_1_1BlitSquare.html#7df894d40b3d6effbb2a09819356258d">00151</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BlitSquare.html#04366d55cecb4c8a726ea0519683d817" title="Compute and return one output sample.">BlitSquare :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00152"></a>00152 {
-<a name="l00153"></a>00153 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00154"></a>00154 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00155"></a>00155     errorString_ &lt;&lt; <span class="stringliteral">"BlitSquare::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00156"></a>00156     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00157"></a>00157   }
-<a name="l00158"></a>00158 <span class="preprocessor">#endif</span>
-<a name="l00159"></a>00159 <span class="preprocessor"></span>
-<a name="l00160"></a>00160   StkFloat *samples = &amp;frames[channel];
-<a name="l00161"></a>00161   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00162"></a>00162   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00163"></a>00163     *samples = <a class="code" href="classstk_1_1BlitSquare.html#04366d55cecb4c8a726ea0519683d817" title="Compute and return one output sample.">BlitSquare::tick</a>();
-<a name="l00164"></a>00164 
-<a name="l00165"></a>00165   <span class="keywordflow">return</span> frames;
-<a name="l00166"></a>00166 }
-<a name="l00167"></a>00167 
-<a name="l00168"></a>00168 } <span class="comment">// stk namespace</span>
-<a name="l00169"></a>00169 
-<a name="l00170"></a>00170 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/BlitSquare_8h_source.html b/doc/html/BlitSquare_8h_source.html
index c53b5bc..62e6f2e 100644
--- a/doc/html/BlitSquare_8h_source.html
+++ b/doc/html/BlitSquare_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>BlitSquare.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BLITSQUARE_H</span>
@@ -106,7 +106,7 @@
 <a name="l00152"></a>00152 {
 <a name="l00153"></a>00153 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00154"></a>00154 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00155"></a>00155     errorString_ &lt;&lt; <span class="stringliteral">&quot;BlitSquare::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00155"></a>00155     oStream_ &lt;&lt; <span class="stringliteral">&quot;BlitSquare::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00156"></a>00156     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00157"></a>00157   }
 <a name="l00158"></a>00158 <span class="preprocessor">#endif</span>
@@ -127,7 +127,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Blit_8h-source.html b/doc/html/Blit_8h-source.html
deleted file mode 100644
index 68ff1d8..0000000
--- a/doc/html/Blit_8h-source.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Blit.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BLIT_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BLIT_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Generator.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;cmath&gt;</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include &lt;limits&gt;</span>
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
-<a name="l00031"></a>00031 <span class="comment">/***************************************************/</span>
-<a name="l00032"></a>00032 
-<a name="l00033"></a><a class="code" href="classstk_1_1Blit.html">00033</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Blit.html" title="STK band-limited impulse train class.">Blit</a>: <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00034"></a>00034 {
-<a name="l00035"></a>00035  <span class="keyword">public</span>:
-<a name="l00037"></a>00037   <a class="code" href="classstk_1_1Blit.html#63c5e6dca28aa3b3c01808e049f3da33" title="Default constructor that initializes BLIT frequency to 220 Hz.">Blit</a>( StkFloat frequency = 220.0 );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1Blit.html#bed25206cc6cdb5fa8d667e7db0056a9" title="Class destructor.">~Blit</a>();
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Blit.html#bbe50319cd6ed762c15e148a8abb4920" title="Resets the oscillator state and phase to 0.">reset</a>();
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046 
-<a name="l00049"></a><a class="code" href="classstk_1_1Blit.html#58e2197cedfc366145b729256bf365cb">00049</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Blit.html#58e2197cedfc366145b729256bf365cb" title="Set the phase of the signal.">setPhase</a>( StkFloat phase ) { phase_ = PI * phase; };
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052 
-<a name="l00055"></a><a class="code" href="classstk_1_1Blit.html#01fb40970e8905e47b7f39a1fb01589f">00055</a>   StkFloat <a class="code" href="classstk_1_1Blit.html#01fb40970e8905e47b7f39a1fb01589f" title="Get the current phase of the signal.">getPhase</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> phase_ / PI; };
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Blit.html#5571562e489947c4beccc206ecccfbdd" title="Set the impulse train rate in terms of a frequency in Hz.">setFrequency</a>( StkFloat frequency );
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061 
-<a name="l00073"></a>00073   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Blit.html#5a1fd506ab12ae614afaf0e402d24d30" title="Set the number of harmonics generated in the signal.">setHarmonics</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nHarmonics = 0 );
-<a name="l00074"></a>00074 
-<a name="l00076"></a><a class="code" href="classstk_1_1Blit.html#530af82a27731734af4f4b58bce283de">00076</a>   StkFloat <a class="code" href="classstk_1_1Blit.html#530af82a27731734af4f4b58bce283de" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079   StkFloat <a class="code" href="classstk_1_1Blit.html#528b8dc95499b11d6173cf065d62c717" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00080"></a>00080 
-<a name="l00082"></a>00082 
-<a name="l00089"></a>00089   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Blit.html#528b8dc95499b11d6173cf065d62c717" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091  <span class="keyword">protected</span>:
-<a name="l00092"></a>00092 
-<a name="l00093"></a>00093   <span class="keywordtype">void</span> updateHarmonics( <span class="keywordtype">void</span> );
-<a name="l00094"></a>00094 
-<a name="l00095"></a>00095   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nHarmonics_;
-<a name="l00096"></a>00096   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> m_;
-<a name="l00097"></a>00097   StkFloat rate_;
-<a name="l00098"></a>00098   StkFloat phase_;
-<a name="l00099"></a>00099   StkFloat p_;
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101 };
-<a name="l00102"></a>00102 
-<a name="l00103"></a><a class="code" href="classstk_1_1Blit.html#528b8dc95499b11d6173cf065d62c717">00103</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Blit.html#528b8dc95499b11d6173cf065d62c717" title="Compute and return one output sample.">Blit :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00104"></a>00104 {
-<a name="l00105"></a>00105   <span class="comment">// The code below implements the SincM algorithm of Stilson and</span>
-<a name="l00106"></a>00106   <span class="comment">// Smith with an additional scale factor of P / M applied to</span>
-<a name="l00107"></a>00107   <span class="comment">// normalize the output.</span>
-<a name="l00108"></a>00108 
-<a name="l00109"></a>00109   <span class="comment">// A fully optimized version of this code would replace the two sin</span>
-<a name="l00110"></a>00110   <span class="comment">// calls with a pair of fast sin oscillators, for which stable fast</span>
-<a name="l00111"></a>00111   <span class="comment">// two-multiply algorithms are well known. In the spirit of STK,</span>
-<a name="l00112"></a>00112   <span class="comment">// which favors clarity over performance, the optimization has not</span>
-<a name="l00113"></a>00113   <span class="comment">// been made here.</span>
-<a name="l00114"></a>00114 
-<a name="l00115"></a>00115   <span class="comment">// Avoid a divide by zero at the sinc peak, which has a limiting</span>
-<a name="l00116"></a>00116   <span class="comment">// value of 1.0.</span>
-<a name="l00117"></a>00117   StkFloat tmp, denominator = sin( phase_ );
-<a name="l00118"></a>00118   <span class="keywordflow">if</span> ( denominator &lt;= std::numeric_limits&lt;StkFloat&gt;::epsilon() )
-<a name="l00119"></a>00119     tmp = 1.0;
-<a name="l00120"></a>00120   <span class="keywordflow">else</span> {
-<a name="l00121"></a>00121     tmp =  sin( m_ * phase_ );
-<a name="l00122"></a>00122     tmp /= m_ * denominator;
-<a name="l00123"></a>00123   }
-<a name="l00124"></a>00124 
-<a name="l00125"></a>00125   phase_ += rate_;
-<a name="l00126"></a>00126   <span class="keywordflow">if</span> ( phase_ &gt;= PI ) phase_ -= PI;
-<a name="l00127"></a>00127 
-<a name="l00128"></a>00128   lastFrame_[0] = tmp;
-<a name="l00129"></a>00129          <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00130"></a>00130 }
-<a name="l00131"></a>00131 
-<a name="l00132"></a><a class="code" href="classstk_1_1Blit.html#20a3634131ff890641931c1d04df19ad">00132</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Blit.html#528b8dc95499b11d6173cf065d62c717" title="Compute and return one output sample.">Blit :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00133"></a>00133 {
-<a name="l00134"></a>00134 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00135"></a>00135 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00136"></a>00136     errorString_ &lt;&lt; <span class="stringliteral">"Blit::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00137"></a>00137     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00138"></a>00138   }
-<a name="l00139"></a>00139 <span class="preprocessor">#endif</span>
-<a name="l00140"></a>00140 <span class="preprocessor"></span>
-<a name="l00141"></a>00141   StkFloat *samples = &amp;frames[channel];
-<a name="l00142"></a>00142   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00143"></a>00143   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00144"></a>00144     *samples = <a class="code" href="classstk_1_1Blit.html#528b8dc95499b11d6173cf065d62c717" title="Compute and return one output sample.">Blit::tick</a>();
-<a name="l00145"></a>00145 
-<a name="l00146"></a>00146   <span class="keywordflow">return</span> frames;
-<a name="l00147"></a>00147 }
-<a name="l00148"></a>00148 
-<a name="l00149"></a>00149 } <span class="comment">// stk namespace</span>
-<a name="l00150"></a>00150 
-<a name="l00151"></a>00151 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Blit_8h_source.html b/doc/html/Blit_8h_source.html
index d9ec175..4caff62 100644
--- a/doc/html/Blit_8h_source.html
+++ b/doc/html/Blit_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Blit.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BLIT_H</span>
@@ -96,7 +96,7 @@
 <a name="l00133"></a>00133 {
 <a name="l00134"></a>00134 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00135"></a>00135 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00136"></a>00136     errorString_ &lt;&lt; <span class="stringliteral">&quot;Blit::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00136"></a>00136     oStream_ &lt;&lt; <span class="stringliteral">&quot;Blit::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00137"></a>00137     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00138"></a>00138   }
 <a name="l00139"></a>00139 <span class="preprocessor">#endif</span>
@@ -117,7 +117,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/BlowBotl_8h-source.html b/doc/html/BlowBotl_8h-source.html
deleted file mode 100644
index b3bd739..0000000
--- a/doc/html/BlowBotl_8h-source.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>BlowBotl.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BLOWBOTL_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BLOWBOTL_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "JetTable.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "BiQuad.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "PoleZero.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "ADSR.h"</span>
-<a name="l00010"></a>00010 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="keyword">namespace </span>stk {
-<a name="l00013"></a>00013 
-<a name="l00014"></a>00014 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 <span class="comment">/***************************************************/</span>
-<a name="l00031"></a>00031 
-<a name="l00032"></a><a class="code" href="classstk_1_1BlowBotl.html">00032</a> <span class="keyword">class </span><a class="code" href="classstk_1_1BlowBotl.html" title="STK blown bottle instrument class.">BlowBotl</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00033"></a>00033 {
-<a name="l00034"></a>00034  <span class="keyword">public</span>:
-<a name="l00036"></a>00036 
-<a name="l00039"></a>00039   <a class="code" href="classstk_1_1BlowBotl.html#a505b4fc32ffe974b5840163395c321c" title="Class constructor.">BlowBotl</a>( <span class="keywordtype">void</span> );
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1BlowBotl.html#dae826b0487471da1779761b0f885cb8" title="Class destructor.">~BlowBotl</a>( <span class="keywordtype">void</span> );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowBotl.html#271161f45e0a706d8ccd299f9aaf2ada" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowBotl.html#75b679cd641bb4bae9bc4ac3021a03e3" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowBotl.html#926d428669edf9c87a1f88faf01550c4" title="Apply breath velocity to instrument with given amplitude and rate of increase.">startBlowing</a>( StkFloat amplitude, StkFloat rate );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowBotl.html#91a174c3501aafbbfe6841f6915fe4f3" title="Decrease breath velocity with given rate of decrease.">stopBlowing</a>( StkFloat rate );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowBotl.html#faf3f964cbdf99eddd7af99626169c02" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowBotl.html#132c87a453ecf25301243dc62f57f587" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowBotl.html#21a4b2aaaac7afcc67b4abe5ed833bfd" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   StkFloat <a class="code" href="classstk_1_1BlowBotl.html#68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00067"></a>00067 
-<a name="l00068"></a>00068  <span class="keyword">protected</span>:
-<a name="l00069"></a>00069 
-<a name="l00070"></a>00070   <a class="code" href="classstk_1_1JetTable.html" title="STK jet table class.">JetTable</a> jetTable_;
-<a name="l00071"></a>00071   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> resonator_;
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a> dcBlock_;
-<a name="l00073"></a>00073   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise_;
-<a name="l00074"></a>00074   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> adsr_;
-<a name="l00075"></a>00075   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00076"></a>00076   StkFloat maxPressure_;
-<a name="l00077"></a>00077   StkFloat noiseGain_;
-<a name="l00078"></a>00078   StkFloat vibratoGain_;
-<a name="l00079"></a>00079   StkFloat outputGain_;
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081 };
-<a name="l00082"></a>00082 
-<a name="l00083"></a><a class="code" href="classstk_1_1BlowBotl.html#68501c2422994c8dca50086b3d944119">00083</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BlowBotl.html#68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">BlowBotl :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00084"></a>00084 {
-<a name="l00085"></a>00085   StkFloat breathPressure;
-<a name="l00086"></a>00086   StkFloat randPressure;
-<a name="l00087"></a>00087   StkFloat pressureDiff;
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089   <span class="comment">// Calculate the breath pressure (envelope + vibrato)</span>
-<a name="l00090"></a>00090   breathPressure = maxPressure_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00091"></a>00091   breathPressure += vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
-<a name="l00092"></a>00092 
-<a name="l00093"></a>00093   pressureDiff = breathPressure - resonator_.<a class="code" href="classstk_1_1BiQuad.html#412f224363b1a222423ecf0cd7be9063" title="Return the last computed output value.">lastOut</a>();
-<a name="l00094"></a>00094 
-<a name="l00095"></a>00095   randPressure = noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00096"></a>00096   randPressure *= breathPressure;
-<a name="l00097"></a>00097   randPressure *= (1.0 + pressureDiff);
-<a name="l00098"></a>00098 
-<a name="l00099"></a>00099   resonator_.<a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( breathPressure + randPressure - ( jetTable_.<a class="code" href="classstk_1_1JetTable.html#3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">tick</a>( pressureDiff ) * pressureDiff ) );
-<a name="l00100"></a>00100   lastFrame_[0] = 0.2 * outputGain_ * dcBlock_.<a class="code" href="classstk_1_1PoleZero.html#1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( pressureDiff );
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00103"></a>00103 }
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105 } <span class="comment">// stk namespace</span>
-<a name="l00106"></a>00106 
-<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/BlowBotl_8h_source.html b/doc/html/BlowBotl_8h_source.html
index d7fef83..e192ba6 100644
--- a/doc/html/BlowBotl_8h_source.html
+++ b/doc/html/BlowBotl_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>BlowBotl.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BLOWBOTL_H</span>
@@ -52,52 +52,82 @@
 <a name="l00064"></a>00064 
 <a name="l00066"></a>00066   StkFloat <a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00067"></a>00067 
-<a name="l00068"></a>00068  <span class="keyword">protected</span>:
 <a name="l00069"></a>00069 
-<a name="l00070"></a>00070   <a class="code" href="classstk_1_1JetTable.html" title="STK jet table class.">JetTable</a> jetTable_;
-<a name="l00071"></a>00071   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> resonator_;
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a> dcBlock_;
-<a name="l00073"></a>00073   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise_;
-<a name="l00074"></a>00074   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> adsr_;
-<a name="l00075"></a>00075   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00076"></a>00076   StkFloat maxPressure_;
-<a name="l00077"></a>00077   StkFloat noiseGain_;
-<a name="l00078"></a>00078   StkFloat vibratoGain_;
-<a name="l00079"></a>00079   StkFloat outputGain_;
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081 };
-<a name="l00082"></a>00082 
-<a name="l00083"></a><a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119">00083</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">BlowBotl :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00084"></a>00084 {
-<a name="l00085"></a>00085   StkFloat breathPressure;
-<a name="l00086"></a>00086   StkFloat randPressure;
-<a name="l00087"></a>00087   StkFloat pressureDiff;
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089   <span class="comment">// Calculate the breath pressure (envelope + vibrato)</span>
-<a name="l00090"></a>00090   breathPressure = maxPressure_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00091"></a>00091   breathPressure += vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
+<a name="l00076"></a>00076   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00077"></a>00077 
+<a name="l00078"></a>00078  <span class="keyword">protected</span>:
+<a name="l00079"></a>00079 
+<a name="l00080"></a>00080   <a class="code" href="classstk_1_1JetTable.html" title="STK jet table class.">JetTable</a> jetTable_;
+<a name="l00081"></a>00081   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> resonator_;
+<a name="l00082"></a>00082   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a> dcBlock_;
+<a name="l00083"></a>00083   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise_;
+<a name="l00084"></a>00084   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> adsr_;
+<a name="l00085"></a>00085   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
+<a name="l00086"></a>00086   StkFloat maxPressure_;
+<a name="l00087"></a>00087   StkFloat noiseGain_;
+<a name="l00088"></a>00088   StkFloat vibratoGain_;
+<a name="l00089"></a>00089   StkFloat outputGain_;
+<a name="l00090"></a>00090 
+<a name="l00091"></a>00091 };
 <a name="l00092"></a>00092 
-<a name="l00093"></a>00093   pressureDiff = breathPressure - resonator_.<a class="code" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063" title="Return the last computed output value.">lastOut</a>();
-<a name="l00094"></a>00094 
-<a name="l00095"></a>00095   randPressure = noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00096"></a>00096   randPressure *= breathPressure;
-<a name="l00097"></a>00097   randPressure *= (1.0 + pressureDiff);
+<a name="l00093"></a><a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119">00093</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">BlowBotl :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00094"></a>00094 {
+<a name="l00095"></a>00095   StkFloat breathPressure;
+<a name="l00096"></a>00096   StkFloat randPressure;
+<a name="l00097"></a>00097   StkFloat pressureDiff;
 <a name="l00098"></a>00098 
-<a name="l00099"></a>00099   resonator_.<a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( breathPressure + randPressure - ( jetTable_.<a class="code" href="classstk_1_1JetTable.html#a3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">tick</a>( pressureDiff ) * pressureDiff ) );
-<a name="l00100"></a>00100   lastFrame_[0] = 0.2 * outputGain_ * dcBlock_.<a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( pressureDiff );
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00103"></a>00103 }
+<a name="l00099"></a>00099   <span class="comment">// Calculate the breath pressure (envelope + vibrato)</span>
+<a name="l00100"></a>00100   breathPressure = maxPressure_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
+<a name="l00101"></a>00101   breathPressure += vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
+<a name="l00102"></a>00102 
+<a name="l00103"></a>00103   pressureDiff = breathPressure - resonator_.<a class="code" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063" title="Return the last computed output value.">lastOut</a>();
 <a name="l00104"></a>00104 
-<a name="l00105"></a>00105 } <span class="comment">// stk namespace</span>
-<a name="l00106"></a>00106 
-<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00105"></a>00105   randPressure = noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
+<a name="l00106"></a>00106   randPressure *= breathPressure;
+<a name="l00107"></a>00107   randPressure *= (1.0 + pressureDiff);
+<a name="l00108"></a>00108 
+<a name="l00109"></a>00109   resonator_.<a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( breathPressure + randPressure - ( jetTable_.<a class="code" href="classstk_1_1JetTable.html#a3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">tick</a>( pressureDiff ) * pressureDiff ) );
+<a name="l00110"></a>00110   lastFrame_[0] = 0.2 * outputGain_ * dcBlock_.<a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( pressureDiff );
+<a name="l00111"></a>00111 
+<a name="l00112"></a>00112   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00113"></a>00113 }
+<a name="l00114"></a>00114 
+<a name="l00115"></a><a class="code" href="classstk_1_1BlowBotl.html#a49e1f536d821a8b2bf133533cb4bc93e">00115</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">BlowBotl :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00116"></a>00116 {
+<a name="l00117"></a>00117   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00118"></a>00118 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00119"></a>00119 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00120"></a>00120     oStream_ &lt;&lt; <span class="stringliteral">&quot;BlowBotl::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00121"></a>00121     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 <span class="preprocessor">#endif</span>
+<a name="l00124"></a>00124 <span class="preprocessor"></span>
+<a name="l00125"></a>00125   StkFloat *samples = &amp;frames[channel];
+<a name="l00126"></a>00126   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00127"></a>00127   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00128"></a>00128     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00129"></a>00129       *samples++ = <a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">tick</a>();
+<a name="l00130"></a>00130   }
+<a name="l00131"></a>00131   <span class="keywordflow">else</span> {
+<a name="l00132"></a>00132     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00133"></a>00133       *samples++ = <a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">tick</a>();
+<a name="l00134"></a>00134       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00135"></a>00135         *samples++ = lastFrame_[j];
+<a name="l00136"></a>00136     }
+<a name="l00137"></a>00137   }
+<a name="l00138"></a>00138 
+<a name="l00139"></a>00139   <span class="keywordflow">return</span> frames;
+<a name="l00140"></a>00140 }
+<a name="l00141"></a>00141 
+<a name="l00142"></a>00142 } <span class="comment">// stk namespace</span>
+<a name="l00143"></a>00143 
+<a name="l00144"></a>00144 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/BlowHole_8h-source.html b/doc/html/BlowHole_8h-source.html
deleted file mode 100644
index f43dba0..0000000
--- a/doc/html/BlowHole_8h-source.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>BlowHole.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BLOWHOLE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BLOWHOLE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayL.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "ReedTable.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OneZero.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "PoleZero.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "Envelope.h"</span>
-<a name="l00010"></a>00010 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00011"></a>00011 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00012"></a>00012 
-<a name="l00013"></a>00013 <span class="keyword">namespace </span>stk {
-<a name="l00014"></a>00014 
-<a name="l00015"></a>00015 <span class="comment">/***************************************************/</span>
-<a name="l00048"></a>00048 <span class="comment">/***************************************************/</span>
-<a name="l00049"></a>00049 
-<a name="l00050"></a><a class="code" href="classstk_1_1BlowHole.html">00050</a> <span class="keyword">class </span><a class="code" href="classstk_1_1BlowHole.html" title="STK clarinet physical model with one register hole and one tonehole.">BlowHole</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00051"></a>00051 {
-<a name="l00052"></a>00052  <span class="keyword">public</span>:
-<a name="l00054"></a>00054 
-<a name="l00057"></a>00057   <a class="code" href="classstk_1_1BlowHole.html#7f0aed9f79544d930c7f91dfa3e0efd9" title="Class constructor.">BlowHole</a>( StkFloat lowestFrequency );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <a class="code" href="classstk_1_1BlowHole.html#691a14023e9283d12b0105dd886fba86" title="Class destructor.">~BlowHole</a>( <span class="keywordtype">void</span> );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowHole.html#43b829201197f2d0f0e8a72072e6798a" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowHole.html#023aa77cd11c9dc3a8013242ff92f982" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowHole.html#aacb152624133d82e311b9e0b8218289" title="Set the tonehole state (0.0 = closed, 1.0 = fully open).">setTonehole</a>( StkFloat newValue );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowHole.html#11c8a4a8483acf0f3e73c1d00008daff" title="Set the register hole state (0.0 = closed, 1.0 = fully open).">setVent</a>( StkFloat newValue );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowHole.html#1be64a601f2fbc8e9efaec5a53c55866" title="Apply breath pressure to instrument with given amplitude and rate of increase.">startBlowing</a>( StkFloat amplitude, StkFloat rate );
-<a name="l00076"></a>00076 
-<a name="l00078"></a>00078   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowHole.html#eb4dfd7d75b1996e15833c0928ed39c4" title="Decrease breath pressure with given rate of decrease.">stopBlowing</a>( StkFloat rate );
-<a name="l00079"></a>00079 
-<a name="l00081"></a>00081   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowHole.html#67e071cb26c1bba35e32f168d59b9be1" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00082"></a>00082 
-<a name="l00084"></a>00084   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowHole.html#bc3743ac2c8a9620c44cca41ce73e5b0" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00085"></a>00085 
-<a name="l00087"></a>00087   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BlowHole.html#0d8ad0201c455894acb1416ffb21614b" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00088"></a>00088 
-<a name="l00090"></a>00090   StkFloat <a class="code" href="classstk_1_1BlowHole.html#3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092  <span class="keyword">protected</span>:
-<a name="l00093"></a>00093 
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>    delays_[3];
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1ReedTable.html" title="STK reed table class.">ReedTable</a> reedTable_;
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>   filter_;
-<a name="l00097"></a>00097   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a>  tonehole_;
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a>  vent_;
-<a name="l00099"></a>00099   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a>  envelope_;
-<a name="l00100"></a>00100   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>     noise_;
-<a name="l00101"></a>00101   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00102"></a>00102   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00103"></a>00103   StkFloat scatter_;
-<a name="l00104"></a>00104   StkFloat thCoeff_;
-<a name="l00105"></a>00105   StkFloat rhGain_;
-<a name="l00106"></a>00106   StkFloat outputGain_;
-<a name="l00107"></a>00107   StkFloat noiseGain_;
-<a name="l00108"></a>00108   StkFloat vibratoGain_;
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 };
-<a name="l00111"></a>00111 
-<a name="l00112"></a><a class="code" href="classstk_1_1BlowHole.html#3438c72b975481dae7d51f33f6f6fd94">00112</a>   <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BlowHole.html#3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">BlowHole :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00113"></a>00113 {
-<a name="l00114"></a>00114   StkFloat pressureDiff;
-<a name="l00115"></a>00115   StkFloat breathPressure;
-<a name="l00116"></a>00116   StkFloat temp;
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
-<a name="l00119"></a>00119   breathPressure = envelope_.<a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>(); 
-<a name="l00120"></a>00120   breathPressure += breathPressure * noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00121"></a>00121   breathPressure += breathPressure * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
-<a name="l00122"></a>00122 
-<a name="l00123"></a>00123   <span class="comment">// Calculate the differential pressure = reflected - mouthpiece pressures</span>
-<a name="l00124"></a>00124   pressureDiff = delays_[0].<a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() - breathPressure;
-<a name="l00125"></a>00125 
-<a name="l00126"></a>00126   <span class="comment">// Do two-port junction scattering for register vent</span>
-<a name="l00127"></a>00127   StkFloat pa = breathPressure + pressureDiff * reedTable_.<a class="code" href="classstk_1_1ReedTable.html#3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>( pressureDiff );
-<a name="l00128"></a>00128   StkFloat pb = delays_[1].<a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
-<a name="l00129"></a>00129   vent_.<a class="code" href="classstk_1_1PoleZero.html#1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( pa+pb );
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131   lastFrame_[0] = delays_[0].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( vent_.<a class="code" href="classstk_1_1PoleZero.html#03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>()+pb );
-<a name="l00132"></a>00132   lastFrame_[0] *= outputGain_;
-<a name="l00133"></a>00133 
-<a name="l00134"></a>00134   <span class="comment">// Do three-port junction scattering (under tonehole)</span>
-<a name="l00135"></a>00135   pa += vent_.<a class="code" href="classstk_1_1PoleZero.html#03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>();
-<a name="l00136"></a>00136   pb = delays_[2].<a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
-<a name="l00137"></a>00137   StkFloat pth = tonehole_.<a class="code" href="classstk_1_1PoleZero.html#03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>();
-<a name="l00138"></a>00138   temp = scatter_ * (pa + pb - 2 * pth);
-<a name="l00139"></a>00139 
-<a name="l00140"></a>00140   delays_[2].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( filter_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>(pa + temp) * -0.95 );
-<a name="l00141"></a>00141   delays_[1].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( pb + temp );
-<a name="l00142"></a>00142   tonehole_.<a class="code" href="classstk_1_1PoleZero.html#1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( pa + pb - pth + temp );
-<a name="l00143"></a>00143 
-<a name="l00144"></a>00144   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00145"></a>00145 }
-<a name="l00146"></a>00146 
-<a name="l00147"></a>00147 } <span class="comment">// stk namespace</span>
-<a name="l00148"></a>00148 
-<a name="l00149"></a>00149 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/BlowHole_8h_source.html b/doc/html/BlowHole_8h_source.html
index 98073ad..90b4e1b 100644
--- a/doc/html/BlowHole_8h_source.html
+++ b/doc/html/BlowHole_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>BlowHole.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BLOWHOLE_H</span>
@@ -57,70 +57,99 @@
 <a name="l00088"></a>00088 
 <a name="l00090"></a>00090   StkFloat <a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00091"></a>00091 
-<a name="l00092"></a>00092  <span class="keyword">protected</span>:
 <a name="l00093"></a>00093 
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>    delays_[3];
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1ReedTable.html" title="STK reed table class.">ReedTable</a> reedTable_;
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>   filter_;
-<a name="l00097"></a>00097   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a>  tonehole_;
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a>  vent_;
-<a name="l00099"></a>00099   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a>  envelope_;
-<a name="l00100"></a>00100   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>     noise_;
-<a name="l00101"></a>00101   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00102"></a>00102   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00103"></a>00103   StkFloat scatter_;
-<a name="l00104"></a>00104   StkFloat thCoeff_;
-<a name="l00105"></a>00105   StkFloat rhGain_;
-<a name="l00106"></a>00106   StkFloat outputGain_;
-<a name="l00107"></a>00107   StkFloat noiseGain_;
-<a name="l00108"></a>00108   StkFloat vibratoGain_;
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 };
-<a name="l00111"></a>00111 
-<a name="l00112"></a><a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94">00112</a>   <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">BlowHole :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00113"></a>00113 {
-<a name="l00114"></a>00114   StkFloat pressureDiff;
-<a name="l00115"></a>00115   StkFloat breathPressure;
-<a name="l00116"></a>00116   StkFloat temp;
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
-<a name="l00119"></a>00119   breathPressure = envelope_.<a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>(); 
-<a name="l00120"></a>00120   breathPressure += breathPressure * noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00121"></a>00121   breathPressure += breathPressure * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
-<a name="l00122"></a>00122 
-<a name="l00123"></a>00123   <span class="comment">// Calculate the differential pressure = reflected - mouthpiece pressures</span>
-<a name="l00124"></a>00124   pressureDiff = delays_[0].<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() - breathPressure;
-<a name="l00125"></a>00125 
-<a name="l00126"></a>00126   <span class="comment">// Do two-port junction scattering for register vent</span>
-<a name="l00127"></a>00127   StkFloat pa = breathPressure + pressureDiff * reedTable_.<a class="code" href="classstk_1_1ReedTable.html#a3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>( pressureDiff );
-<a name="l00128"></a>00128   StkFloat pb = delays_[1].<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
-<a name="l00129"></a>00129   vent_.<a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( pa+pb );
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131   lastFrame_[0] = delays_[0].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( vent_.<a class="code" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>()+pb );
-<a name="l00132"></a>00132   lastFrame_[0] *= outputGain_;
-<a name="l00133"></a>00133 
-<a name="l00134"></a>00134   <span class="comment">// Do three-port junction scattering (under tonehole)</span>
-<a name="l00135"></a>00135   pa += vent_.<a class="code" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>();
-<a name="l00136"></a>00136   pb = delays_[2].<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
-<a name="l00137"></a>00137   StkFloat pth = tonehole_.<a class="code" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>();
-<a name="l00138"></a>00138   temp = scatter_ * (pa + pb - 2 * pth);
+<a name="l00100"></a>00100   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00101"></a>00101 
+<a name="l00102"></a>00102  <span class="keyword">protected</span>:
+<a name="l00103"></a>00103 
+<a name="l00104"></a>00104   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>    delays_[3];
+<a name="l00105"></a>00105   <a class="code" href="classstk_1_1ReedTable.html" title="STK reed table class.">ReedTable</a> reedTable_;
+<a name="l00106"></a>00106   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>   filter_;
+<a name="l00107"></a>00107   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a>  tonehole_;
+<a name="l00108"></a>00108   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a>  vent_;
+<a name="l00109"></a>00109   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a>  envelope_;
+<a name="l00110"></a>00110   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>     noise_;
+<a name="l00111"></a>00111   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a>  vibrato_;
+<a name="l00112"></a>00112 
+<a name="l00113"></a>00113   StkFloat scatter_;
+<a name="l00114"></a>00114   StkFloat thCoeff_;
+<a name="l00115"></a>00115   StkFloat rhGain_;
+<a name="l00116"></a>00116   StkFloat outputGain_;
+<a name="l00117"></a>00117   StkFloat noiseGain_;
+<a name="l00118"></a>00118   StkFloat vibratoGain_;
+<a name="l00119"></a>00119 };
+<a name="l00120"></a>00120 
+<a name="l00121"></a><a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94">00121</a>   <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">BlowHole :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00122"></a>00122 {
+<a name="l00123"></a>00123   StkFloat pressureDiff;
+<a name="l00124"></a>00124   StkFloat breathPressure;
+<a name="l00125"></a>00125   StkFloat temp;
+<a name="l00126"></a>00126 
+<a name="l00127"></a>00127   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
+<a name="l00128"></a>00128   breathPressure = envelope_.<a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>(); 
+<a name="l00129"></a>00129   breathPressure += breathPressure * noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
+<a name="l00130"></a>00130   breathPressure += breathPressure * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
+<a name="l00131"></a>00131 
+<a name="l00132"></a>00132   <span class="comment">// Calculate the differential pressure = reflected - mouthpiece pressures</span>
+<a name="l00133"></a>00133   pressureDiff = delays_[0].<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() - breathPressure;
+<a name="l00134"></a>00134 
+<a name="l00135"></a>00135   <span class="comment">// Do two-port junction scattering for register vent</span>
+<a name="l00136"></a>00136   StkFloat pa = breathPressure + pressureDiff * reedTable_.<a class="code" href="classstk_1_1ReedTable.html#a3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>( pressureDiff );
+<a name="l00137"></a>00137   StkFloat pb = delays_[1].<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
+<a name="l00138"></a>00138   vent_.<a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( pa+pb );
 <a name="l00139"></a>00139 
-<a name="l00140"></a>00140   delays_[2].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( filter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>(pa + temp) * -0.95 );
-<a name="l00141"></a>00141   delays_[1].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( pb + temp );
-<a name="l00142"></a>00142   tonehole_.<a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( pa + pb - pth + temp );
-<a name="l00143"></a>00143 
-<a name="l00144"></a>00144   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00145"></a>00145 }
-<a name="l00146"></a>00146 
-<a name="l00147"></a>00147 } <span class="comment">// stk namespace</span>
+<a name="l00140"></a>00140   lastFrame_[0] = delays_[0].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( vent_.<a class="code" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>()+pb );
+<a name="l00141"></a>00141   lastFrame_[0] *= outputGain_;
+<a name="l00142"></a>00142 
+<a name="l00143"></a>00143   <span class="comment">// Do three-port junction scattering (under tonehole)</span>
+<a name="l00144"></a>00144   pa += vent_.<a class="code" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>();
+<a name="l00145"></a>00145   pb = delays_[2].<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
+<a name="l00146"></a>00146   StkFloat pth = tonehole_.<a class="code" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>();
+<a name="l00147"></a>00147   temp = scatter_ * (pa + pb - 2 * pth);
 <a name="l00148"></a>00148 
-<a name="l00149"></a>00149 <span class="preprocessor">#endif</span>
+<a name="l00149"></a>00149   delays_[2].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( filter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>(pa + temp) * -0.95 );
+<a name="l00150"></a>00150   delays_[1].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( pb + temp );
+<a name="l00151"></a>00151   tonehole_.<a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( pa + pb - pth + temp );
+<a name="l00152"></a>00152 
+<a name="l00153"></a>00153   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00154"></a>00154 }
+<a name="l00155"></a>00155 
+<a name="l00156"></a><a class="code" href="classstk_1_1BlowHole.html#ad220cd597fa5f6edd043c0783bdc2ec7">00156</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">BlowHole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00157"></a>00157 {
+<a name="l00158"></a>00158   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00159"></a>00159 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00160"></a>00160 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00161"></a>00161     oStream_ &lt;&lt; <span class="stringliteral">&quot;BlowHole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00162"></a>00162     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00163"></a>00163   }
+<a name="l00164"></a>00164 <span class="preprocessor">#endif</span>
+<a name="l00165"></a>00165 <span class="preprocessor"></span>
+<a name="l00166"></a>00166   StkFloat *samples = &amp;frames[channel];
+<a name="l00167"></a>00167   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00168"></a>00168   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00169"></a>00169     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00170"></a>00170       *samples++ = <a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">tick</a>();
+<a name="l00171"></a>00171   }
+<a name="l00172"></a>00172   <span class="keywordflow">else</span> {
+<a name="l00173"></a>00173     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00174"></a>00174       *samples++ = <a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">tick</a>();
+<a name="l00175"></a>00175       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00176"></a>00176         *samples++ = lastFrame_[j];
+<a name="l00177"></a>00177     }
+<a name="l00178"></a>00178   }
+<a name="l00179"></a>00179 
+<a name="l00180"></a>00180   <span class="keywordflow">return</span> frames;
+<a name="l00181"></a>00181 }
+<a name="l00182"></a>00182 
+<a name="l00183"></a>00183 } <span class="comment">// stk namespace</span>
+<a name="l00184"></a>00184 
+<a name="l00185"></a>00185 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/BowTable_8h-source.html b/doc/html/BowTable_8h-source.html
deleted file mode 100644
index 3810456..0000000
--- a/doc/html/BowTable_8h-source.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>BowTable.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BOWTABL_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BOWTABL_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Function.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;cmath&gt;</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1BowTable.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1BowTable.html" title="STK bowed string table class.">BowTable</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Function.html" title="STK abstract function parent class.">Function</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022 <span class="keyword">public</span>:
-<a name="l00024"></a><a class="code" href="classstk_1_1BowTable.html#25d0985fd6821a7e1608af1e8f51952a">00024</a>   <a class="code" href="classstk_1_1BowTable.html#25d0985fd6821a7e1608af1e8f51952a" title="Default constructor.">BowTable</a>( <span class="keywordtype">void</span> ) : offset_(0.0), slope_(0.1) {};
-<a name="l00025"></a>00025 
-<a name="l00027"></a>00027 
-<a name="l00033"></a><a class="code" href="classstk_1_1BowTable.html#9adcc3c36085b73d3b877828071a3b2c">00033</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BowTable.html#9adcc3c36085b73d3b877828071a3b2c" title="Set the table offset value.">setOffset</a>( StkFloat offset ) { offset_ = offset; };
-<a name="l00034"></a>00034 
-<a name="l00036"></a>00036 
-<a name="l00040"></a><a class="code" href="classstk_1_1BowTable.html#d8391e46941ff9f49b78bf4f77c35143">00040</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BowTable.html#d8391e46941ff9f49b78bf4f77c35143" title="Set the table slope value.">setSlope</a>( StkFloat slope ) { slope_ = slope; };
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   StkFloat <a class="code" href="classstk_1_1BowTable.html#8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( StkFloat input );
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046 
-<a name="l00054"></a>00054   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057 
-<a name="l00065"></a>00065   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067 <span class="keyword">protected</span>:
-<a name="l00068"></a>00068 
-<a name="l00069"></a>00069   StkFloat offset_;
-<a name="l00070"></a>00070   StkFloat slope_;
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072 };
-<a name="l00073"></a>00073 
-<a name="l00074"></a><a class="code" href="classstk_1_1BowTable.html#8dc58c69ecda1471dce6d142cb5f4b19">00074</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BowTable.html#8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">BowTable :: tick</a>( StkFloat input )
-<a name="l00075"></a>00075 {
-<a name="l00076"></a>00076   <span class="comment">// The input represents differential string vs. bow velocity.</span>
-<a name="l00077"></a>00077   StkFloat sample  = input + offset_;  <span class="comment">// add bias to input</span>
-<a name="l00078"></a>00078   sample *= slope_;          <span class="comment">// then scale it</span>
-<a name="l00079"></a>00079   lastFrame_[0] = (StkFloat) fabs( (<span class="keywordtype">double</span>) sample ) + (StkFloat) 0.75;
-<a name="l00080"></a>00080   lastFrame_[0] = (StkFloat) pow( lastFrame_[0], (StkFloat) -4.0 );
-<a name="l00081"></a>00081 
-<a name="l00082"></a>00082   <span class="comment">// Set minimum friction to 0.0</span>
-<a name="l00083"></a>00083   <span class="comment">// if ( lastFrame_[0] &lt; 0.0 ) lastFrame_[0] = 0.0;</span>
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085   <span class="comment">// Set maximum friction to 1.0.</span>
-<a name="l00086"></a>00086   <span class="keywordflow">if</span> ( lastFrame_[0] &gt; 1.0 ) lastFrame_[0] = (StkFloat) 1.0;
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00089"></a>00089 }
-<a name="l00090"></a>00090 
-<a name="l00091"></a><a class="code" href="classstk_1_1BowTable.html#8ad2766def014b62dcbbd8765e133246">00091</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">BowTable :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00092"></a>00092 {
-<a name="l00093"></a>00093 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00094"></a>00094 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00095"></a>00095     errorString_ &lt;&lt; <span class="stringliteral">"BowTable::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00096"></a>00096     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00097"></a>00097   }
-<a name="l00098"></a>00098 <span class="preprocessor">#endif</span>
-<a name="l00099"></a>00099 <span class="preprocessor"></span>
-<a name="l00100"></a>00100   StkFloat *samples = &amp;frames[channel];
-<a name="l00101"></a>00101   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00102"></a>00102   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00103"></a>00103     *samples = *samples + offset_;
-<a name="l00104"></a>00104     *samples *= slope_;
-<a name="l00105"></a>00105     *samples = (StkFloat) fabs( (<span class="keywordtype">double</span>) *samples ) + 0.75;
-<a name="l00106"></a>00106     *samples = (StkFloat) pow( *samples, (StkFloat) -4.0 );
-<a name="l00107"></a>00107     <span class="keywordflow">if</span> ( *samples &gt; 1.0) *samples = 1.0;
-<a name="l00108"></a>00108   }
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110   lastFrame_[0] = *(samples-hop);
-<a name="l00111"></a>00111   <span class="keywordflow">return</span> frames;
-<a name="l00112"></a>00112 }
-<a name="l00113"></a>00113 
-<a name="l00114"></a><a class="code" href="classstk_1_1BowTable.html#af72f823f210b18f417337ac7181cde5">00114</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">BowTable :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00115"></a>00115 {
-<a name="l00116"></a>00116 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00117"></a>00117 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00118"></a>00118     errorString_ &lt;&lt; <span class="stringliteral">"BowTable::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00119"></a>00119     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00120"></a>00120   }
-<a name="l00121"></a>00121 <span class="preprocessor">#endif</span>
-<a name="l00122"></a>00122 <span class="preprocessor"></span>
-<a name="l00123"></a>00123   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00124"></a>00124   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00125"></a>00125   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00126"></a>00126   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00127"></a>00127     *oSamples = *iSamples + offset_;
-<a name="l00128"></a>00128     *oSamples *= slope_;
-<a name="l00129"></a>00129     *oSamples = (StkFloat) fabs( (<span class="keywordtype">double</span>) *oSamples ) + 0.75;
-<a name="l00130"></a>00130     *oSamples = (StkFloat) pow( *oSamples, (StkFloat) -4.0 );
-<a name="l00131"></a>00131     <span class="keywordflow">if</span> ( *oSamples &gt; 1.0) *oSamples = 1.0;
-<a name="l00132"></a>00132   }
-<a name="l00133"></a>00133 
-<a name="l00134"></a>00134   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00135"></a>00135   <span class="keywordflow">return</span> iFrames;
-<a name="l00136"></a>00136 }
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138 } <span class="comment">// stk namespace</span>
-<a name="l00139"></a>00139 
-<a name="l00140"></a>00140 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/BowTable_8h_source.html b/doc/html/BowTable_8h_source.html
index 117d5e6..5b0f28f 100644
--- a/doc/html/BowTable_8h_source.html
+++ b/doc/html/BowTable_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>BowTable.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BOWTABL_H</span>
@@ -21,107 +21,113 @@
 <a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
 <a name="l00008"></a>00008 
 <a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1BowTable.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1BowTable.html" title="STK bowed string table class.">BowTable</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Function.html" title="STK abstract function parent class.">Function</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022 <span class="keyword">public</span>:
-<a name="l00024"></a><a class="code" href="classstk_1_1BowTable.html#a25d0985fd6821a7e1608af1e8f51952a">00024</a>   <a class="code" href="classstk_1_1BowTable.html#a25d0985fd6821a7e1608af1e8f51952a" title="Default constructor.">BowTable</a>( <span class="keywordtype">void</span> ) : offset_(0.0), slope_(0.1) {};
-<a name="l00025"></a>00025 
+<a name="l00020"></a>00020 <span class="comment">/***************************************************/</span>
+<a name="l00021"></a>00021 
+<a name="l00022"></a><a class="code" href="classstk_1_1BowTable.html">00022</a> <span class="keyword">class </span><a class="code" href="classstk_1_1BowTable.html" title="STK bowed string table class.">BowTable</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Function.html" title="STK abstract function parent class.">Function</a>
+<a name="l00023"></a>00023 {
+<a name="l00024"></a>00024 <span class="keyword">public</span>:
+<a name="l00026"></a><a class="code" href="classstk_1_1BowTable.html#a25d0985fd6821a7e1608af1e8f51952a">00026</a>   <a class="code" href="classstk_1_1BowTable.html#a25d0985fd6821a7e1608af1e8f51952a" title="Default constructor.">BowTable</a>( <span class="keywordtype">void</span> ) : offset_(0.0), slope_(0.1), minOutput_(0.01), maxOutput_(0.98) {};
 <a name="l00027"></a>00027 
-<a name="l00033"></a><a class="code" href="classstk_1_1BowTable.html#a9adcc3c36085b73d3b877828071a3b2c">00033</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BowTable.html#a9adcc3c36085b73d3b877828071a3b2c" title="Set the table offset value.">setOffset</a>( StkFloat offset ) { offset_ = offset; };
-<a name="l00034"></a>00034 
+<a name="l00029"></a>00029 
+<a name="l00035"></a><a class="code" href="classstk_1_1BowTable.html#a9adcc3c36085b73d3b877828071a3b2c">00035</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BowTable.html#a9adcc3c36085b73d3b877828071a3b2c" title="Set the table offset value.">setOffset</a>( StkFloat offset ) { offset_ = offset; };
 <a name="l00036"></a>00036 
-<a name="l00040"></a><a class="code" href="classstk_1_1BowTable.html#ad8391e46941ff9f49b78bf4f77c35143">00040</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BowTable.html#ad8391e46941ff9f49b78bf4f77c35143" title="Set the table slope value.">setSlope</a>( StkFloat slope ) { slope_ = slope; };
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   StkFloat <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( StkFloat input );
-<a name="l00044"></a>00044 
+<a name="l00038"></a>00038 
+<a name="l00042"></a><a class="code" href="classstk_1_1BowTable.html#ad8391e46941ff9f49b78bf4f77c35143">00042</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BowTable.html#ad8391e46941ff9f49b78bf4f77c35143" title="Set the table slope value.">setSlope</a>( StkFloat slope ) { slope_ = slope; };
+<a name="l00043"></a>00043 
+<a name="l00045"></a><a class="code" href="classstk_1_1BowTable.html#a9540d5c56cfd4556ab25c25f0612b25d">00045</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BowTable.html#a9540d5c56cfd4556ab25c25f0612b25d" title="Set the minimum table output value (0.0 - 1.0).">setMinOutput</a>( StkFloat minimum ) { minOutput_ = minimum; };
 <a name="l00046"></a>00046 
-<a name="l00054"></a>00054   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057 
-<a name="l00065"></a>00065   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067 <span class="keyword">protected</span>:
-<a name="l00068"></a>00068 
-<a name="l00069"></a>00069   StkFloat offset_;
-<a name="l00070"></a>00070   StkFloat slope_;
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072 };
-<a name="l00073"></a>00073 
-<a name="l00074"></a><a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19">00074</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">BowTable :: tick</a>( StkFloat input )
-<a name="l00075"></a>00075 {
-<a name="l00076"></a>00076   <span class="comment">// The input represents differential string vs. bow velocity.</span>
-<a name="l00077"></a>00077   StkFloat sample  = input + offset_;  <span class="comment">// add bias to input</span>
-<a name="l00078"></a>00078   sample *= slope_;          <span class="comment">// then scale it</span>
-<a name="l00079"></a>00079   lastFrame_[0] = (StkFloat) fabs( (<span class="keywordtype">double</span>) sample ) + (StkFloat) 0.75;
-<a name="l00080"></a>00080   lastFrame_[0] = (StkFloat) pow( lastFrame_[0], (StkFloat) -4.0 );
+<a name="l00048"></a><a class="code" href="classstk_1_1BowTable.html#a634d5063eba886445f4057c823b00ff7">00048</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1BowTable.html#a634d5063eba886445f4057c823b00ff7" title="Set the maximum table output value (0.0 - 1.0).">setMaxOutput</a>( StkFloat maximum ) { maxOutput_ = maximum; };
+<a name="l00049"></a>00049 
+<a name="l00051"></a>00051   StkFloat <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( StkFloat input );
+<a name="l00052"></a>00052 
+<a name="l00054"></a>00054 
+<a name="l00062"></a>00062   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00063"></a>00063 
+<a name="l00065"></a>00065 
+<a name="l00073"></a>00073   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
+<a name="l00074"></a>00074 
+<a name="l00075"></a>00075 <span class="keyword">protected</span>:
+<a name="l00076"></a>00076 
+<a name="l00077"></a>00077   StkFloat offset_;
+<a name="l00078"></a>00078   StkFloat slope_;
+<a name="l00079"></a>00079   StkFloat minOutput_;
+<a name="l00080"></a>00080   StkFloat maxOutput_;
 <a name="l00081"></a>00081 
-<a name="l00082"></a>00082   <span class="comment">// Set minimum friction to 0.0</span>
-<a name="l00083"></a>00083   <span class="comment">// if ( lastFrame_[0] &lt; 0.0 ) lastFrame_[0] = 0.0;</span>
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085   <span class="comment">// Set maximum friction to 1.0.</span>
-<a name="l00086"></a>00086   <span class="keywordflow">if</span> ( lastFrame_[0] &gt; 1.0 ) lastFrame_[0] = (StkFloat) 1.0;
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00089"></a>00089 }
-<a name="l00090"></a>00090 
-<a name="l00091"></a><a class="code" href="classstk_1_1BowTable.html#a8ad2766def014b62dcbbd8765e133246">00091</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">BowTable :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00092"></a>00092 {
-<a name="l00093"></a>00093 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00094"></a>00094 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00095"></a>00095     errorString_ &lt;&lt; <span class="stringliteral">&quot;BowTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00096"></a>00096     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00097"></a>00097   }
-<a name="l00098"></a>00098 <span class="preprocessor">#endif</span>
-<a name="l00099"></a>00099 <span class="preprocessor"></span>
-<a name="l00100"></a>00100   StkFloat *samples = &amp;frames[channel];
-<a name="l00101"></a>00101   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00102"></a>00102   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00103"></a>00103     *samples = *samples + offset_;
-<a name="l00104"></a>00104     *samples *= slope_;
-<a name="l00105"></a>00105     *samples = (StkFloat) fabs( (<span class="keywordtype">double</span>) *samples ) + 0.75;
-<a name="l00106"></a>00106     *samples = (StkFloat) pow( *samples, (StkFloat) -4.0 );
-<a name="l00107"></a>00107     <span class="keywordflow">if</span> ( *samples &gt; 1.0) *samples = 1.0;
-<a name="l00108"></a>00108   }
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110   lastFrame_[0] = *(samples-hop);
-<a name="l00111"></a>00111   <span class="keywordflow">return</span> frames;
-<a name="l00112"></a>00112 }
-<a name="l00113"></a>00113 
-<a name="l00114"></a><a class="code" href="classstk_1_1BowTable.html#aaf72f823f210b18f417337ac7181cde5">00114</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">BowTable :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00115"></a>00115 {
-<a name="l00116"></a>00116 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00117"></a>00117 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00118"></a>00118     errorString_ &lt;&lt; <span class="stringliteral">&quot;BowTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00119"></a>00119     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00120"></a>00120   }
-<a name="l00121"></a>00121 <span class="preprocessor">#endif</span>
-<a name="l00122"></a>00122 <span class="preprocessor"></span>
-<a name="l00123"></a>00123   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00124"></a>00124   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00125"></a>00125   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00126"></a>00126   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00127"></a>00127     *oSamples = *iSamples + offset_;
-<a name="l00128"></a>00128     *oSamples *= slope_;
-<a name="l00129"></a>00129     *oSamples = (StkFloat) fabs( (<span class="keywordtype">double</span>) *oSamples ) + 0.75;
-<a name="l00130"></a>00130     *oSamples = (StkFloat) pow( *oSamples, (StkFloat) -4.0 );
-<a name="l00131"></a>00131     <span class="keywordflow">if</span> ( *oSamples &gt; 1.0) *oSamples = 1.0;
-<a name="l00132"></a>00132   }
-<a name="l00133"></a>00133 
-<a name="l00134"></a>00134   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00135"></a>00135   <span class="keywordflow">return</span> iFrames;
-<a name="l00136"></a>00136 }
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138 } <span class="comment">// stk namespace</span>
-<a name="l00139"></a>00139 
-<a name="l00140"></a>00140 <span class="preprocessor">#endif</span>
+<a name="l00082"></a>00082 };
+<a name="l00083"></a>00083 
+<a name="l00084"></a><a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19">00084</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">BowTable :: tick</a>( StkFloat input )
+<a name="l00085"></a>00085 {
+<a name="l00086"></a>00086   <span class="comment">// The input represents differential string vs. bow velocity.</span>
+<a name="l00087"></a>00087   StkFloat sample  = input + offset_;  <span class="comment">// add bias to input</span>
+<a name="l00088"></a>00088   sample *= slope_;          <span class="comment">// then scale it</span>
+<a name="l00089"></a>00089   lastFrame_[0] = (StkFloat) fabs( (<span class="keywordtype">double</span>) sample ) + (StkFloat) 0.75;
+<a name="l00090"></a>00090   lastFrame_[0] = (StkFloat) pow( lastFrame_[0], (StkFloat) -4.0 );
+<a name="l00091"></a>00091 
+<a name="l00092"></a>00092   <span class="comment">// Set minimum threshold</span>
+<a name="l00093"></a>00093   <span class="keywordflow">if</span> ( lastFrame_[0] &lt; minOutput_ ) lastFrame_[0] = minOutput_;
+<a name="l00094"></a>00094 
+<a name="l00095"></a>00095   <span class="comment">// Set maximum threshold</span>
+<a name="l00096"></a>00096   <span class="keywordflow">if</span> ( lastFrame_[0] &gt; maxOutput_ ) lastFrame_[0] = maxOutput_;
+<a name="l00097"></a>00097 
+<a name="l00098"></a>00098   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00099"></a>00099 }
+<a name="l00100"></a>00100 
+<a name="l00101"></a><a class="code" href="classstk_1_1BowTable.html#a8ad2766def014b62dcbbd8765e133246">00101</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">BowTable :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00102"></a>00102 {
+<a name="l00103"></a>00103 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00104"></a>00104 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00105"></a>00105     oStream_ &lt;&lt; <span class="stringliteral">&quot;BowTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00106"></a>00106     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00107"></a>00107   }
+<a name="l00108"></a>00108 <span class="preprocessor">#endif</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span>
+<a name="l00110"></a>00110   StkFloat *samples = &amp;frames[channel];
+<a name="l00111"></a>00111   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00112"></a>00112   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00113"></a>00113     *samples = *samples + offset_;
+<a name="l00114"></a>00114     *samples *= slope_;
+<a name="l00115"></a>00115     *samples = (StkFloat) fabs( (<span class="keywordtype">double</span>) *samples ) + 0.75;
+<a name="l00116"></a>00116     *samples = (StkFloat) pow( *samples, (StkFloat) -4.0 );
+<a name="l00117"></a>00117     <span class="keywordflow">if</span> ( *samples &gt; 1.0) *samples = 1.0;
+<a name="l00118"></a>00118   }
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   lastFrame_[0] = *(samples-hop);
+<a name="l00121"></a>00121   <span class="keywordflow">return</span> frames;
+<a name="l00122"></a>00122 }
+<a name="l00123"></a>00123 
+<a name="l00124"></a><a class="code" href="classstk_1_1BowTable.html#aaf72f823f210b18f417337ac7181cde5">00124</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">BowTable :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00125"></a>00125 {
+<a name="l00126"></a>00126 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00127"></a>00127 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00128"></a>00128     oStream_ &lt;&lt; <span class="stringliteral">&quot;BowTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00129"></a>00129     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00130"></a>00130   }
+<a name="l00131"></a>00131 <span class="preprocessor">#endif</span>
+<a name="l00132"></a>00132 <span class="preprocessor"></span>
+<a name="l00133"></a>00133   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00134"></a>00134   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00135"></a>00135   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00136"></a>00136   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00137"></a>00137     *oSamples = *iSamples + offset_;
+<a name="l00138"></a>00138     *oSamples *= slope_;
+<a name="l00139"></a>00139     *oSamples = (StkFloat) fabs( (<span class="keywordtype">double</span>) *oSamples ) + 0.75;
+<a name="l00140"></a>00140     *oSamples = (StkFloat) pow( *oSamples, (StkFloat) -4.0 );
+<a name="l00141"></a>00141     <span class="keywordflow">if</span> ( *oSamples &gt; 1.0) *oSamples = 1.0;
+<a name="l00142"></a>00142   }
+<a name="l00143"></a>00143 
+<a name="l00144"></a>00144   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00145"></a>00145   <span class="keywordflow">return</span> iFrames;
+<a name="l00146"></a>00146 }
+<a name="l00147"></a>00147 
+<a name="l00148"></a>00148 } <span class="comment">// stk namespace</span>
+<a name="l00149"></a>00149 
+<a name="l00150"></a>00150 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Bowed_8h-source.html b/doc/html/Bowed_8h-source.html
deleted file mode 100644
index 298a440..0000000
--- a/doc/html/Bowed_8h-source.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Bowed.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BOWED_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BOWED_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayL.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "BowTable.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "BiQuad.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00010"></a>00010 <span class="preprocessor">#include "ADSR.h"</span>
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="keyword">namespace </span>stk {
-<a name="l00013"></a>00013 
-<a name="l00014"></a>00014 <span class="comment">/***************************************************/</span>
-<a name="l00035"></a>00035 <span class="comment">/***************************************************/</span>
-<a name="l00036"></a>00036 
-<a name="l00037"></a><a class="code" href="classstk_1_1Bowed.html">00037</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Bowed.html" title="STK bowed string instrument class.">Bowed</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00038"></a>00038 {
-<a name="l00039"></a>00039  <span class="keyword">public</span>:
-<a name="l00041"></a>00041   <a class="code" href="classstk_1_1Bowed.html#b776c34c271de25c0cd036946d764158" title="Class constructor, taking the lowest desired playing frequency.">Bowed</a>( StkFloat lowestFrequency );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <a class="code" href="classstk_1_1Bowed.html#8067e4808bf7576922be4698f853c96c" title="Class destructor.">~Bowed</a>( <span class="keywordtype">void</span> );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#8d522c36a35b86f90a06cf135fc83b11" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#02dbcfbd0766fee8a2e75a8df809e62c" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#7cf229e206a61259d381cf153a1c5096" title="Set vibrato gain.">setVibrato</a>( StkFloat gain );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#519d511ddcc1cf23e897aeacdfe45020" title="Apply breath pressure to instrument with given amplitude and rate of increase.">startBowing</a>( StkFloat amplitude, StkFloat rate );
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#ae2a57d8e23536fd37a00af1fe07f21c" title="Decrease breath pressure with given rate of decrease.">stopBowing</a>( StkFloat rate );
-<a name="l00060"></a>00060 
-<a name="l00062"></a>00062   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#4ebaf6bd27d90975e7b0aea0ee727dc1" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00063"></a>00063 
-<a name="l00065"></a>00065   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#b86db568328b51e4adfae8b62987fc85" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00066"></a>00066 
-<a name="l00068"></a>00068   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#d066af9bb1340b6fcf9002d6922021f4" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00069"></a>00069 
-<a name="l00071"></a>00071   StkFloat <a class="code" href="classstk_1_1Bowed.html#4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00072"></a>00072 
-<a name="l00073"></a>00073  <span class="keyword">protected</span>:
-<a name="l00074"></a>00074 
-<a name="l00075"></a>00075   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   neckDelay_;
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   bridgeDelay_;
-<a name="l00077"></a>00077   <a class="code" href="classstk_1_1BowTable.html" title="STK bowed string table class.">BowTable</a> bowTable_;
-<a name="l00078"></a>00078   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  stringFilter_;
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   bodyFilter_;
-<a name="l00080"></a>00080   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00081"></a>00081   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
-<a name="l00082"></a>00082   StkFloat maxVelocity_;
-<a name="l00083"></a>00083   StkFloat baseDelay_;
-<a name="l00084"></a>00084   StkFloat vibratoGain_;
-<a name="l00085"></a>00085   StkFloat betaRatio_;
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 };
-<a name="l00088"></a>00088 
-<a name="l00089"></a><a class="code" href="classstk_1_1Bowed.html#4d583369f0b22335fff8cee3ce6f2750">00089</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Bowed.html#4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">Bowed :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00090"></a>00090 {
-<a name="l00091"></a>00091   StkFloat bowVelocity = maxVelocity_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00092"></a>00092   StkFloat bridgeRefl = -stringFilter_.<a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( bridgeDelay_.<a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00093"></a>00093   StkFloat nutRefl = -neckDelay_.<a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
-<a name="l00094"></a>00094   StkFloat stringVel = bridgeRefl + nutRefl;               <span class="comment">// Sum is string velocity</span>
-<a name="l00095"></a>00095   StkFloat velDiff = bowVelocity - stringVel;              <span class="comment">// Differential velocity</span>
-<a name="l00096"></a>00096   StkFloat newVel = velDiff * bowTable_.<a class="code" href="classstk_1_1BowTable.html#8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( velDiff );   <span class="comment">// Non-Linear bow function</span>
-<a name="l00097"></a>00097   neckDelay_.<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>(bridgeRefl + newVel);                    <span class="comment">// Do string propagations</span>
-<a name="l00098"></a>00098   bridgeDelay_.<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>(nutRefl + newVel);
-<a name="l00099"></a>00099     
-<a name="l00100"></a>00100   <span class="keywordflow">if</span> ( vibratoGain_ &gt; 0.0 )  {
-<a name="l00101"></a>00101     neckDelay_.<a class="code" href="classstk_1_1DelayL.html#80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( (baseDelay_ * (1.0 - betaRatio_) ) + 
-<a name="l00102"></a>00102                          (baseDelay_ * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>()) );
-<a name="l00103"></a>00103   }
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   lastFrame_[0] = bodyFilter_.<a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( bridgeDelay_.<a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00106"></a>00106 
-<a name="l00107"></a>00107   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00108"></a>00108 }
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 } <span class="comment">// stk namespace</span>
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Bowed_8h_source.html b/doc/html/Bowed_8h_source.html
index 87e1cb5..62703ab 100644
--- a/doc/html/Bowed_8h_source.html
+++ b/doc/html/Bowed_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Bowed.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BOWED_H</span>
@@ -26,79 +26,114 @@
 <a name="l00012"></a>00012 <span class="keyword">namespace </span>stk {
 <a name="l00013"></a>00013 
 <a name="l00014"></a>00014 <span class="comment">/***************************************************/</span>
-<a name="l00035"></a>00035 <span class="comment">/***************************************************/</span>
-<a name="l00036"></a>00036 
-<a name="l00037"></a><a class="code" href="classstk_1_1Bowed.html">00037</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Bowed.html" title="STK bowed string instrument class.">Bowed</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00038"></a>00038 {
-<a name="l00039"></a>00039  <span class="keyword">public</span>:
-<a name="l00041"></a>00041   <a class="code" href="classstk_1_1Bowed.html#ab776c34c271de25c0cd036946d764158" title="Class constructor, taking the lowest desired playing frequency.">Bowed</a>( StkFloat lowestFrequency );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <a class="code" href="classstk_1_1Bowed.html#a8067e4808bf7576922be4698f853c96c" title="Class destructor.">~Bowed</a>( <span class="keywordtype">void</span> );
+<a name="l00038"></a>00038 <span class="comment">/***************************************************/</span>
+<a name="l00039"></a>00039 
+<a name="l00040"></a><a class="code" href="classstk_1_1Bowed.html">00040</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Bowed.html" title="STK bowed string instrument class.">Bowed</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
+<a name="l00041"></a>00041 {
+<a name="l00042"></a>00042  <span class="keyword">public</span>:
+<a name="l00044"></a>00044   <a class="code" href="classstk_1_1Bowed.html#a1b442f60bbec3d07d2dd322ff761c767" title="Class constructor, taking the lowest desired playing frequency.">Bowed</a>( StkFloat lowestFrequency = 8.0 );
 <a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#a8d522c36a35b86f90a06cf135fc83b11" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
+<a name="l00047"></a>00047   <a class="code" href="classstk_1_1Bowed.html#a8067e4808bf7576922be4698f853c96c" title="Class destructor.">~Bowed</a>( <span class="keywordtype">void</span> );
 <a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#a02dbcfbd0766fee8a2e75a8df809e62c" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
+<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#a8d522c36a35b86f90a06cf135fc83b11" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
 <a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#a7cf229e206a61259d381cf153a1c5096" title="Set vibrato gain.">setVibrato</a>( StkFloat gain );
+<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#a02dbcfbd0766fee8a2e75a8df809e62c" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
 <a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#a519d511ddcc1cf23e897aeacdfe45020" title="Apply breath pressure to instrument with given amplitude and rate of increase.">startBowing</a>( StkFloat amplitude, StkFloat rate );
+<a name="l00056"></a><a class="code" href="classstk_1_1Bowed.html#a7cf229e206a61259d381cf153a1c5096">00056</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#a7cf229e206a61259d381cf153a1c5096" title="Set vibrato gain.">setVibrato</a>( StkFloat gain ) { vibratoGain_ = gain; };
 <a name="l00057"></a>00057 
-<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#aae2a57d8e23536fd37a00af1fe07f21c" title="Decrease breath pressure with given rate of decrease.">stopBowing</a>( StkFloat rate );
+<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#a519d511ddcc1cf23e897aeacdfe45020" title="Apply breath pressure to instrument with given amplitude and rate of increase.">startBowing</a>( StkFloat amplitude, StkFloat rate );
 <a name="l00060"></a>00060 
-<a name="l00062"></a>00062   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#a4ebaf6bd27d90975e7b0aea0ee727dc1" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
+<a name="l00062"></a>00062   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#aae2a57d8e23536fd37a00af1fe07f21c" title="Decrease breath pressure with given rate of decrease.">stopBowing</a>( StkFloat rate );
 <a name="l00063"></a>00063 
-<a name="l00065"></a>00065   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#ab86db568328b51e4adfae8b62987fc85" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
+<a name="l00065"></a>00065   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#a4ebaf6bd27d90975e7b0aea0ee727dc1" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
 <a name="l00066"></a>00066 
-<a name="l00068"></a>00068   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#ad066af9bb1340b6fcf9002d6922021f4" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
+<a name="l00068"></a>00068   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#ab86db568328b51e4adfae8b62987fc85" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
 <a name="l00069"></a>00069 
-<a name="l00071"></a>00071   StkFloat <a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00071"></a>00071   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Bowed.html#ad066af9bb1340b6fcf9002d6922021f4" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
 <a name="l00072"></a>00072 
-<a name="l00073"></a>00073  <span class="keyword">protected</span>:
-<a name="l00074"></a>00074 
-<a name="l00075"></a>00075   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   neckDelay_;
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   bridgeDelay_;
-<a name="l00077"></a>00077   <a class="code" href="classstk_1_1BowTable.html" title="STK bowed string table class.">BowTable</a> bowTable_;
-<a name="l00078"></a>00078   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  stringFilter_;
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   bodyFilter_;
-<a name="l00080"></a>00080   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00081"></a>00081   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
-<a name="l00082"></a>00082   StkFloat maxVelocity_;
-<a name="l00083"></a>00083   StkFloat baseDelay_;
-<a name="l00084"></a>00084   StkFloat vibratoGain_;
-<a name="l00085"></a>00085   StkFloat betaRatio_;
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 };
-<a name="l00088"></a>00088 
-<a name="l00089"></a><a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750">00089</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">Bowed :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00090"></a>00090 {
-<a name="l00091"></a>00091   StkFloat bowVelocity = maxVelocity_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00092"></a>00092   StkFloat bridgeRefl = -stringFilter_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( bridgeDelay_.<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00093"></a>00093   StkFloat nutRefl = -neckDelay_.<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
-<a name="l00094"></a>00094   StkFloat stringVel = bridgeRefl + nutRefl;               <span class="comment">// Sum is string velocity</span>
-<a name="l00095"></a>00095   StkFloat velDiff = bowVelocity - stringVel;              <span class="comment">// Differential velocity</span>
-<a name="l00096"></a>00096   StkFloat newVel = velDiff * bowTable_.<a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( velDiff );   <span class="comment">// Non-Linear bow function</span>
-<a name="l00097"></a>00097   neckDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>(bridgeRefl + newVel);                    <span class="comment">// Do string propagations</span>
-<a name="l00098"></a>00098   bridgeDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>(nutRefl + newVel);
-<a name="l00099"></a>00099     
-<a name="l00100"></a>00100   <span class="keywordflow">if</span> ( vibratoGain_ &gt; 0.0 )  {
-<a name="l00101"></a>00101     neckDelay_.<a class="code" href="classstk_1_1DelayL.html#a80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( (baseDelay_ * (1.0 - betaRatio_) ) + 
-<a name="l00102"></a>00102                          (baseDelay_ * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>()) );
-<a name="l00103"></a>00103   }
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   lastFrame_[0] = bodyFilter_.<a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( bridgeDelay_.<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00106"></a>00106 
-<a name="l00107"></a>00107   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00108"></a>00108 }
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 } <span class="comment">// stk namespace</span>
+<a name="l00074"></a>00074   StkFloat <a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00075"></a>00075 
+<a name="l00077"></a>00077 
+<a name="l00084"></a>00084   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00085"></a>00085 
+<a name="l00086"></a>00086  <span class="keyword">protected</span>:
+<a name="l00087"></a>00087 
+<a name="l00088"></a>00088   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   neckDelay_;
+<a name="l00089"></a>00089   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   bridgeDelay_;
+<a name="l00090"></a>00090   <a class="code" href="classstk_1_1BowTable.html" title="STK bowed string table class.">BowTable</a> bowTable_;
+<a name="l00091"></a>00091   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  stringFilter_;
+<a name="l00092"></a>00092   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   bodyFilters_[6];
+<a name="l00093"></a>00093   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
+<a name="l00094"></a>00094   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
+<a name="l00095"></a>00095 
+<a name="l00096"></a>00096   <span class="keywordtype">bool</span>     bowDown_;
+<a name="l00097"></a>00097   StkFloat maxVelocity_;
+<a name="l00098"></a>00098   StkFloat baseDelay_;
+<a name="l00099"></a>00099   StkFloat vibratoGain_;
+<a name="l00100"></a>00100   StkFloat betaRatio_;
+<a name="l00101"></a>00101 
+<a name="l00102"></a>00102 };
+<a name="l00103"></a>00103 
+<a name="l00104"></a><a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750">00104</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">Bowed :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00105"></a>00105 {
+<a name="l00106"></a>00106   StkFloat bowVelocity = maxVelocity_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
+<a name="l00107"></a>00107   StkFloat bridgeReflection = -stringFilter_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( bridgeDelay_.<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
+<a name="l00108"></a>00108   StkFloat nutReflection = -neckDelay_.<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
+<a name="l00109"></a>00109   StkFloat stringVelocity = bridgeReflection + nutReflection;
+<a name="l00110"></a>00110   StkFloat deltaV = bowVelocity - stringVelocity;             <span class="comment">// Differential velocity</span>
 <a name="l00111"></a>00111 
-<a name="l00112"></a>00112 <span class="preprocessor">#endif</span>
+<a name="l00112"></a>00112   StkFloat newVelocity = 0.0;
+<a name="l00113"></a>00113   <span class="keywordflow">if</span> ( bowDown_ )
+<a name="l00114"></a>00114     newVelocity = deltaV * bowTable_.<a class="code" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19" title="Take one sample input and map to one sample of output.">tick</a>( deltaV );     <span class="comment">// Non-Linear bow function</span>
+<a name="l00115"></a>00115   neckDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( bridgeReflection + newVelocity);      <span class="comment">// Do string propagations</span>
+<a name="l00116"></a>00116   bridgeDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>(nutReflection + newVelocity);
+<a name="l00117"></a>00117     
+<a name="l00118"></a>00118   <span class="keywordflow">if</span> ( vibratoGain_ &gt; 0.0 )  {
+<a name="l00119"></a>00119     neckDelay_.<a class="code" href="classstk_1_1DelayL.html#a80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( (baseDelay_ * (1.0 - betaRatio_) ) + 
+<a name="l00120"></a>00120                          (baseDelay_ * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>()) );
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122 
+<a name="l00123"></a>00123   lastFrame_[0] = 0.1248 * bodyFilters_[5].<a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( bodyFilters_[4].<a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>( bodyFilters_[3].<a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>( bodyFilters_[2].<a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>( bodyFilters_[1].<a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>( bodyFilters_[0].<a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>( bridgeDelay_.<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() ) ) ) ) ) );
+<a name="l00124"></a>00124 
+<a name="l00125"></a>00125   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00126"></a>00126 }
+<a name="l00127"></a>00127 
+<a name="l00128"></a><a class="code" href="classstk_1_1Bowed.html#ab7985e95058016201d16f3717039e1cd">00128</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">Bowed :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00129"></a>00129 {
+<a name="l00130"></a>00130   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00131"></a>00131 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00132"></a>00132 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00133"></a>00133     oStream_ &lt;&lt; <span class="stringliteral">&quot;Bowed::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00134"></a>00134     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00135"></a>00135   }
+<a name="l00136"></a>00136 <span class="preprocessor">#endif</span>
+<a name="l00137"></a>00137 <span class="preprocessor"></span>
+<a name="l00138"></a>00138   StkFloat *samples = &amp;frames[channel];
+<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00140"></a>00140   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00141"></a>00141     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00142"></a>00142       *samples++ = <a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>();
+<a name="l00143"></a>00143   }
+<a name="l00144"></a>00144   <span class="keywordflow">else</span> {
+<a name="l00145"></a>00145     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00146"></a>00146       *samples++ = <a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>();
+<a name="l00147"></a>00147       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00148"></a>00148         *samples++ = lastFrame_[j];
+<a name="l00149"></a>00149     }
+<a name="l00150"></a>00150   }
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152   <span class="keywordflow">return</span> frames;
+<a name="l00153"></a>00153 }
+<a name="l00154"></a>00154 
+<a name="l00155"></a>00155 } <span class="comment">// stk namespace</span>
+<a name="l00156"></a>00156 
+<a name="l00157"></a>00157 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Brass_8h-source.html b/doc/html/Brass_8h-source.html
deleted file mode 100644
index 5c8fdbb..0000000
--- a/doc/html/Brass_8h-source.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Brass.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BRASS_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_BRASS_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayA.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "BiQuad.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "PoleZero.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "ADSR.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="keyword">namespace </span>stk {
-<a name="l00012"></a>00012 
-<a name="l00013"></a>00013 <span class="comment">/***************************************************/</span>
-<a name="l00033"></a>00033 <span class="comment">/***************************************************/</span>
-<a name="l00034"></a>00034 
-<a name="l00035"></a><a class="code" href="classstk_1_1Brass.html">00035</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Brass.html" title="STK simple brass instrument class.">Brass</a>: <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00036"></a>00036 {
-<a name="l00037"></a>00037  <span class="keyword">public</span>:
-<a name="l00039"></a>00039 
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1Brass.html#96b223221f536efdaad4e724db01f11b" title="Class constructor, taking the lowest desired playing frequency.">Brass</a>( StkFloat lowestFrequency );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <a class="code" href="classstk_1_1Brass.html#474528a75bd4fb88cdb9c783d73df8f6" title="Class destructor.">~Brass</a>(  );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Brass.html#64e48334efdc8f2508c29c5ea4281f2d" title="Reset and clear all internal state.">clear</a>(  );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Brass.html#5e99e7fee1b92138566a46c828df93e8" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Brass.html#2e1a150328504050499c5cb9fa0e536f" title="Set the lips frequency.">setLip</a>( StkFloat frequency );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Brass.html#02533e02818e2848fb6480106a54ce94" title="Apply breath pressure to instrument with given amplitude and rate of increase.">startBlowing</a>( StkFloat amplitude, StkFloat rate );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Brass.html#8bf1624aca6283fafb830a3f22546199" title="Decrease breath pressure with given rate of decrease.">stopBlowing</a>( StkFloat rate );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Brass.html#e74eba698f27abd43e66e825f5ce72da" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Brass.html#32e2a6d2c9285bb5cf033d8a6b90e3c9" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Brass.html#4d75ac361d11fcc870a330d393dbad80" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   StkFloat <a class="code" href="classstk_1_1Brass.html#4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074  <span class="keyword">protected</span>:
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>   delayLine_;
-<a name="l00077"></a>00077   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   lipFilter_;
-<a name="l00078"></a>00078   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a> dcBlock_;
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
-<a name="l00080"></a>00080   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00081"></a>00081   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00082"></a>00082   StkFloat lipTarget_;
-<a name="l00083"></a>00083   StkFloat slideTarget_;
-<a name="l00084"></a>00084   StkFloat vibratoGain_;
-<a name="l00085"></a>00085   StkFloat maxPressure_;
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 };
-<a name="l00088"></a>00088 
-<a name="l00089"></a><a class="code" href="classstk_1_1Brass.html#4af1b7c4c1b374b65e04ccaa90886321">00089</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Brass.html#4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">Brass :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00090"></a>00090 {
-<a name="l00091"></a>00091   StkFloat breathPressure = maxPressure_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00092"></a>00092   breathPressure += vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
-<a name="l00093"></a>00093 
-<a name="l00094"></a>00094   StkFloat mouthPressure = 0.3 * breathPressure;
-<a name="l00095"></a>00095   StkFloat borePressure = 0.85 * delayLine_.<a class="code" href="classstk_1_1DelayA.html#4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>();
-<a name="l00096"></a>00096   StkFloat deltaPressure = mouthPressure - borePressure; <span class="comment">// Differential pressure.</span>
-<a name="l00097"></a>00097   deltaPressure = lipFilter_.<a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( deltaPressure );      <span class="comment">// Force - &gt; position.</span>
-<a name="l00098"></a>00098   deltaPressure *= deltaPressure;                        <span class="comment">// Basic position to area mapping.</span>
-<a name="l00099"></a>00099   <span class="keywordflow">if</span> ( deltaPressure &gt; 1.0 ) deltaPressure = 1.0;        <span class="comment">// Non-linear saturation.</span>
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101   <span class="comment">// The following input scattering assumes the mouthPressure = area.</span>
-<a name="l00102"></a>00102   lastFrame_[0] = deltaPressure * mouthPressure + ( 1.0 - deltaPressure) * borePressure;
-<a name="l00103"></a>00103   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( dcBlock_.<a class="code" href="classstk_1_1PoleZero.html#1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( lastFrame_[0] ) );
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00106"></a>00106 }
-<a name="l00107"></a>00107 
-<a name="l00108"></a>00108 } <span class="comment">// stk namespace</span>
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Brass_8h_source.html b/doc/html/Brass_8h_source.html
index 83517a9..3980561 100644
--- a/doc/html/Brass_8h_source.html
+++ b/doc/html/Brass_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Brass.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_BRASS_H</span>
@@ -31,7 +31,7 @@
 <a name="l00036"></a>00036 {
 <a name="l00037"></a>00037  <span class="keyword">public</span>:
 <a name="l00039"></a>00039 
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1Brass.html#a96b223221f536efdaad4e724db01f11b" title="Class constructor, taking the lowest desired playing frequency.">Brass</a>( StkFloat lowestFrequency );
+<a name="l00042"></a>00042   <a class="code" href="classstk_1_1Brass.html#a5bf59263a54250be84c027198c7d2d1d" title="Class constructor, taking the lowest desired playing frequency.">Brass</a>( StkFloat lowestFrequency = 8.0 );
 <a name="l00043"></a>00043 
 <a name="l00045"></a>00045   <a class="code" href="classstk_1_1Brass.html#a474528a75bd4fb88cdb9c783d73df8f6" title="Class destructor.">~Brass</a>(  );
 <a name="l00046"></a>00046 
@@ -53,49 +53,79 @@
 <a name="l00070"></a>00070 
 <a name="l00072"></a>00072   StkFloat <a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00073"></a>00073 
-<a name="l00074"></a>00074  <span class="keyword">protected</span>:
 <a name="l00075"></a>00075 
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>   delayLine_;
-<a name="l00077"></a>00077   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   lipFilter_;
-<a name="l00078"></a>00078   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a> dcBlock_;
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
-<a name="l00080"></a>00080   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00081"></a>00081   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00082"></a>00082   StkFloat lipTarget_;
-<a name="l00083"></a>00083   StkFloat slideTarget_;
-<a name="l00084"></a>00084   StkFloat vibratoGain_;
-<a name="l00085"></a>00085   StkFloat maxPressure_;
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 };
-<a name="l00088"></a>00088 
-<a name="l00089"></a><a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321">00089</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">Brass :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00090"></a>00090 {
-<a name="l00091"></a>00091   StkFloat breathPressure = maxPressure_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00092"></a>00092   breathPressure += vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
-<a name="l00093"></a>00093 
-<a name="l00094"></a>00094   StkFloat mouthPressure = 0.3 * breathPressure;
-<a name="l00095"></a>00095   StkFloat borePressure = 0.85 * delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>();
-<a name="l00096"></a>00096   StkFloat deltaPressure = mouthPressure - borePressure; <span class="comment">// Differential pressure.</span>
-<a name="l00097"></a>00097   deltaPressure = lipFilter_.<a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( deltaPressure );      <span class="comment">// Force - &gt; position.</span>
-<a name="l00098"></a>00098   deltaPressure *= deltaPressure;                        <span class="comment">// Basic position to area mapping.</span>
-<a name="l00099"></a>00099   <span class="keywordflow">if</span> ( deltaPressure &gt; 1.0 ) deltaPressure = 1.0;        <span class="comment">// Non-linear saturation.</span>
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101   <span class="comment">// The following input scattering assumes the mouthPressure = area.</span>
-<a name="l00102"></a>00102   lastFrame_[0] = deltaPressure * mouthPressure + ( 1.0 - deltaPressure) * borePressure;
-<a name="l00103"></a>00103   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( dcBlock_.<a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( lastFrame_[0] ) );
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00106"></a>00106 }
-<a name="l00107"></a>00107 
-<a name="l00108"></a>00108 } <span class="comment">// stk namespace</span>
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 <span class="preprocessor">#endif</span>
+<a name="l00082"></a>00082   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00083"></a>00083 
+<a name="l00084"></a>00084  <span class="keyword">protected</span>:
+<a name="l00085"></a>00085 
+<a name="l00086"></a>00086   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>   delayLine_;
+<a name="l00087"></a>00087   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   lipFilter_;
+<a name="l00088"></a>00088   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a> dcBlock_;
+<a name="l00089"></a>00089   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
+<a name="l00090"></a>00090   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
+<a name="l00091"></a>00091 
+<a name="l00092"></a>00092   StkFloat lipTarget_;
+<a name="l00093"></a>00093   StkFloat slideTarget_;
+<a name="l00094"></a>00094   StkFloat vibratoGain_;
+<a name="l00095"></a>00095   StkFloat maxPressure_;
+<a name="l00096"></a>00096 
+<a name="l00097"></a>00097 };
+<a name="l00098"></a>00098 
+<a name="l00099"></a><a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321">00099</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">Brass :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00100"></a>00100 {
+<a name="l00101"></a>00101   StkFloat breathPressure = maxPressure_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
+<a name="l00102"></a>00102   breathPressure += vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
+<a name="l00103"></a>00103 
+<a name="l00104"></a>00104   StkFloat mouthPressure = 0.3 * breathPressure;
+<a name="l00105"></a>00105   StkFloat borePressure = 0.85 * delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>();
+<a name="l00106"></a>00106   StkFloat deltaPressure = mouthPressure - borePressure; <span class="comment">// Differential pressure.</span>
+<a name="l00107"></a>00107   deltaPressure = lipFilter_.<a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( deltaPressure );      <span class="comment">// Force - &gt; position.</span>
+<a name="l00108"></a>00108   deltaPressure *= deltaPressure;                        <span class="comment">// Basic position to area mapping.</span>
+<a name="l00109"></a>00109   <span class="keywordflow">if</span> ( deltaPressure &gt; 1.0 ) deltaPressure = 1.0;        <span class="comment">// Non-linear saturation.</span>
+<a name="l00110"></a>00110 
+<a name="l00111"></a>00111   <span class="comment">// The following input scattering assumes the mouthPressure = area.</span>
+<a name="l00112"></a>00112   lastFrame_[0] = deltaPressure * mouthPressure + ( 1.0 - deltaPressure) * borePressure;
+<a name="l00113"></a>00113   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( dcBlock_.<a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( lastFrame_[0] ) );
+<a name="l00114"></a>00114 
+<a name="l00115"></a>00115   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00116"></a>00116 }
+<a name="l00117"></a>00117 
+<a name="l00118"></a><a class="code" href="classstk_1_1Brass.html#a10334fc5573b68f2b5c2819bdba786b8">00118</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">Brass :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00119"></a>00119 {
+<a name="l00120"></a>00120   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00121"></a>00121 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00122"></a>00122 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00123"></a>00123     oStream_ &lt;&lt; <span class="stringliteral">&quot;Brass::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00124"></a>00124     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00125"></a>00125   }
+<a name="l00126"></a>00126 <span class="preprocessor">#endif</span>
+<a name="l00127"></a>00127 <span class="preprocessor"></span>
+<a name="l00128"></a>00128   StkFloat *samples = &amp;frames[channel];
+<a name="l00129"></a>00129   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00130"></a>00130   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00131"></a>00131     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00132"></a>00132       *samples++ = <a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">tick</a>();
+<a name="l00133"></a>00133   }
+<a name="l00134"></a>00134   <span class="keywordflow">else</span> {
+<a name="l00135"></a>00135     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00136"></a>00136       *samples++ = <a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">tick</a>();
+<a name="l00137"></a>00137       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00138"></a>00138         *samples++ = lastFrame_[j];
+<a name="l00139"></a>00139     }
+<a name="l00140"></a>00140   }
+<a name="l00141"></a>00141 
+<a name="l00142"></a>00142   <span class="keywordflow">return</span> frames;
+<a name="l00143"></a>00143 }
+<a name="l00144"></a>00144 
+<a name="l00145"></a>00145 } <span class="comment">// stk namespace</span>
+<a name="l00146"></a>00146 
+<a name="l00147"></a>00147 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Chorus_8h-source.html b/doc/html/Chorus_8h-source.html
deleted file mode 100644
index 14ee073..0000000
--- a/doc/html/Chorus_8h-source.html
+++ /dev/null
@@ -1,145 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Chorus.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_CHORUS_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_CHORUS_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Effect.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayL.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 <span class="comment">/***************************************************/</span>
-<a name="l00020"></a>00020 
-<a name="l00021"></a><a class="code" href="classstk_1_1Chorus.html">00021</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Chorus.html" title="STK chorus effect class.">Chorus</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Effect.html" title="STK abstract effects parent class.">Effect</a>
-<a name="l00022"></a>00022 {
-<a name="l00023"></a>00023  <span class="keyword">public</span>:
-<a name="l00025"></a>00025 
-<a name="l00028"></a>00028   <a class="code" href="classstk_1_1Chorus.html#529f668e66188ae5a42e4cc30779059f" title="Class constructor, taking the median desired delay length.">Chorus</a>( StkFloat baseDelay = 6000 );
-<a name="l00029"></a>00029 
-<a name="l00031"></a>00031   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Chorus.html#63acbdd04d13110712c36a5cac5d972d" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00032"></a>00032 
-<a name="l00034"></a><a class="code" href="classstk_1_1Chorus.html#cb3a55518c919dafa6c19698c1ab3389">00034</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Chorus.html#cb3a55518c919dafa6c19698c1ab3389" title="Set modulation depth.">setModDepth</a>( StkFloat depth ) { modDepth_ = depth; };
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Chorus.html#a4372095b8526d62ff9cfbdb03f21c4d" title="Set modulation frequency.">setModFrequency</a>( StkFloat frequency );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040 
-<a name="l00048"></a>00048   StkFloat <a class="code" href="classstk_1_1Chorus.html#abcc110787ec3b443c21845b2f06bb3c" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051 
-<a name="l00058"></a>00058   StkFloat <a class="code" href="classstk_1_1Chorus.html#31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061 
-<a name="l00070"></a>00070   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Chorus.html#31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00071"></a>00071 
-<a name="l00073"></a>00073 
-<a name="l00082"></a>00082   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Chorus.html#31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084  <span class="keyword">protected</span>:
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a> delayLine_[2];
-<a name="l00087"></a>00087   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> mods_[2];
-<a name="l00088"></a>00088   StkFloat baseLength_;
-<a name="l00089"></a>00089   StkFloat modDepth_;
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091 };
-<a name="l00092"></a>00092 
-<a name="l00093"></a><a class="code" href="classstk_1_1Chorus.html#abcc110787ec3b443c21845b2f06bb3c">00093</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Chorus.html#abcc110787ec3b443c21845b2f06bb3c" title="Return the specified channel value of the last computed stereo frame.">Chorus :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00094"></a>00094 {
-<a name="l00095"></a>00095 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00096"></a>00096 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00097"></a>00097     errorString_ &lt;&lt; <span class="stringliteral">"Chorus::lastOut(): channel argument must be less than 2!"</span>;
-<a name="l00098"></a>00098     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00099"></a>00099   }
-<a name="l00100"></a>00100 <span class="preprocessor">#endif</span>
-<a name="l00101"></a>00101 <span class="preprocessor"></span>
-<a name="l00102"></a>00102   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00103"></a>00103 }
-<a name="l00104"></a>00104 
-<a name="l00105"></a><a class="code" href="classstk_1_1Chorus.html#31d5c48d5b4a030040f6bb6b5e2c99cf">00105</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Chorus.html#31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">Chorus :: tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00106"></a>00106 {
-<a name="l00107"></a>00107 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00108"></a>00108 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00109"></a>00109     errorString_ &lt;&lt; <span class="stringliteral">"Chorus::tick(): channel argument must be less than 2!"</span>;
-<a name="l00110"></a>00110     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00111"></a>00111   }
-<a name="l00112"></a>00112 <span class="preprocessor">#endif</span>
-<a name="l00113"></a>00113 <span class="preprocessor"></span>
-<a name="l00114"></a>00114   delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( baseLength_ * 0.707 * ( 1.0 + modDepth_ * mods_[0].<a class="code" href="classstk_1_1Chorus.html#31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
-<a name="l00115"></a>00115   delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( baseLength_  * 0.5 *  ( 1.0 - modDepth_ * mods_[1].<a class="code" href="classstk_1_1Chorus.html#31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
-<a name="l00116"></a>00116   lastFrame_[0] = effectMix_ * ( delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( input ) - input ) + input;
-<a name="l00117"></a>00117   lastFrame_[1] = effectMix_ * ( delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( input ) - input ) + input;
-<a name="l00118"></a>00118   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00119"></a>00119 }
-<a name="l00120"></a>00120 
-<a name="l00121"></a><a class="code" href="classstk_1_1Chorus.html#ef55c6fb93a1d00498ae436868f84501">00121</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Chorus.html#31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">Chorus :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00122"></a>00122 {
-<a name="l00123"></a>00123 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00124"></a>00124 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - 1 ) {
-<a name="l00125"></a>00125     errorString_ &lt;&lt; <span class="stringliteral">"Chorus::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00126"></a>00126     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00127"></a>00127   }
-<a name="l00128"></a>00128 <span class="preprocessor">#endif</span>
-<a name="l00129"></a>00129 <span class="preprocessor"></span>
-<a name="l00130"></a>00130   StkFloat *samples = &amp;frames[channel];
-<a name="l00131"></a>00131   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - 1;
-<a name="l00132"></a>00132   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00133"></a>00133     *samples = effectMix_ * ( delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *samples ) - *samples ) + *samples;
-<a name="l00134"></a>00134     samples++;
-<a name="l00135"></a>00135     *samples = effectMix_ * ( delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *samples ) - *samples ) + *samples;
-<a name="l00136"></a>00136   }
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138   lastFrame_[0] = *(samples-hop);
-<a name="l00139"></a>00139   lastFrame_[1] = *(samples-hop+1);
-<a name="l00140"></a>00140   <span class="keywordflow">return</span> frames;
-<a name="l00141"></a>00141 }
-<a name="l00142"></a>00142 
-<a name="l00143"></a><a class="code" href="classstk_1_1Chorus.html#bdb8802a83f6b89716316399138e3032">00143</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Chorus.html#31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">Chorus :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00144"></a>00144 {
-<a name="l00145"></a>00145 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00146"></a>00146 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - 1 ) {
-<a name="l00147"></a>00147     errorString_ &lt;&lt; <span class="stringliteral">"Chorus::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00148"></a>00148     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00149"></a>00149   }
-<a name="l00150"></a>00150 <span class="preprocessor">#endif</span>
-<a name="l00151"></a>00151 <span class="preprocessor"></span>
-<a name="l00152"></a>00152   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00153"></a>00153   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00154"></a>00154   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00155"></a>00155   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00156"></a>00156     *oSamples++ = effectMix_ * ( delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *iSamples ) - *iSamples ) + *iSamples;
-<a name="l00157"></a>00157     *oSamples = effectMix_ * ( delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *iSamples ) - *iSamples ) + *iSamples;
-<a name="l00158"></a>00158   }
-<a name="l00159"></a>00159 
-<a name="l00160"></a>00160   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00161"></a>00161   lastFrame_[1] = *(oSamples-oHop+1);
-<a name="l00162"></a>00162   <span class="keywordflow">return</span> iFrames;
-<a name="l00163"></a>00163 }
-<a name="l00164"></a>00164 
-<a name="l00165"></a>00165 } <span class="comment">// stk namespace</span>
-<a name="l00166"></a>00166 
-<a name="l00167"></a>00167 <span class="preprocessor">#endif</span>
-<a name="l00168"></a>00168 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Chorus_8h_source.html b/doc/html/Chorus_8h_source.html
index e7ff49d..7f9d63d 100644
--- a/doc/html/Chorus_8h_source.html
+++ b/doc/html/Chorus_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Chorus.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_CHORUS_H</span>
@@ -32,7 +32,7 @@
 <a name="l00029"></a>00029 
 <a name="l00031"></a>00031   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Chorus.html#a63acbdd04d13110712c36a5cac5d972d" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
 <a name="l00032"></a>00032 
-<a name="l00034"></a><a class="code" href="classstk_1_1Chorus.html#acb3a55518c919dafa6c19698c1ab3389">00034</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Chorus.html#acb3a55518c919dafa6c19698c1ab3389" title="Set modulation depth.">setModDepth</a>( StkFloat depth ) { modDepth_ = depth; };
+<a name="l00034"></a>00034   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Chorus.html#acb3a55518c919dafa6c19698c1ab3389" title="Set modulation depth in range 0.0 - 1.0.">setModDepth</a>( StkFloat depth );
 <a name="l00035"></a>00035 
 <a name="l00037"></a>00037   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Chorus.html#aa4372095b8526d62ff9cfbdb03f21c4d" title="Set modulation frequency.">setModFrequency</a>( StkFloat frequency );
 <a name="l00038"></a>00038 
@@ -61,7 +61,7 @@
 <a name="l00094"></a>00094 {
 <a name="l00095"></a>00095 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00096"></a>00096 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00097"></a>00097     errorString_ &lt;&lt; <span class="stringliteral">&quot;Chorus::lastOut(): channel argument must be less than 2!&quot;</span>;
+<a name="l00097"></a>00097     oStream_ &lt;&lt; <span class="stringliteral">&quot;Chorus::lastOut(): channel argument must be less than 2!&quot;</span>;
 <a name="l00098"></a>00098     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00099"></a>00099   }
 <a name="l00100"></a>00100 <span class="preprocessor">#endif</span>
@@ -73,7 +73,7 @@
 <a name="l00106"></a>00106 {
 <a name="l00107"></a>00107 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00108"></a>00108 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00109"></a>00109     errorString_ &lt;&lt; <span class="stringliteral">&quot;Chorus::tick(): channel argument must be less than 2!&quot;</span>;
+<a name="l00109"></a>00109     oStream_ &lt;&lt; <span class="stringliteral">&quot;Chorus::tick(): channel argument must be less than 2!&quot;</span>;
 <a name="l00110"></a>00110     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00111"></a>00111   }
 <a name="l00112"></a>00112 <span class="preprocessor">#endif</span>
@@ -89,7 +89,7 @@
 <a name="l00122"></a>00122 {
 <a name="l00123"></a>00123 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00124"></a>00124 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - 1 ) {
-<a name="l00125"></a>00125     errorString_ &lt;&lt; <span class="stringliteral">&quot;Chorus::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00125"></a>00125     oStream_ &lt;&lt; <span class="stringliteral">&quot;Chorus::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00126"></a>00126     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00127"></a>00127   }
 <a name="l00128"></a>00128 <span class="preprocessor">#endif</span>
@@ -97,48 +97,52 @@
 <a name="l00130"></a>00130   StkFloat *samples = &amp;frames[channel];
 <a name="l00131"></a>00131   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - 1;
 <a name="l00132"></a>00132   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00133"></a>00133     *samples = effectMix_ * ( delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *samples ) - *samples ) + *samples;
-<a name="l00134"></a>00134     samples++;
-<a name="l00135"></a>00135     *samples = effectMix_ * ( delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *samples ) - *samples ) + *samples;
-<a name="l00136"></a>00136   }
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138   lastFrame_[0] = *(samples-hop);
-<a name="l00139"></a>00139   lastFrame_[1] = *(samples-hop+1);
-<a name="l00140"></a>00140   <span class="keywordflow">return</span> frames;
-<a name="l00141"></a>00141 }
-<a name="l00142"></a>00142 
-<a name="l00143"></a><a class="code" href="classstk_1_1Chorus.html#abdb8802a83f6b89716316399138e3032">00143</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">Chorus :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00144"></a>00144 {
-<a name="l00145"></a>00145 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00146"></a>00146 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - 1 ) {
-<a name="l00147"></a>00147     errorString_ &lt;&lt; <span class="stringliteral">&quot;Chorus::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00148"></a>00148     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00149"></a>00149   }
-<a name="l00150"></a>00150 <span class="preprocessor">#endif</span>
-<a name="l00151"></a>00151 <span class="preprocessor"></span>
-<a name="l00152"></a>00152   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00153"></a>00153   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00154"></a>00154   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00155"></a>00155   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00156"></a>00156     *oSamples++ = effectMix_ * ( delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *iSamples ) - *iSamples ) + *iSamples;
-<a name="l00157"></a>00157     *oSamples = effectMix_ * ( delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *iSamples ) - *iSamples ) + *iSamples;
-<a name="l00158"></a>00158   }
-<a name="l00159"></a>00159 
-<a name="l00160"></a>00160   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00161"></a>00161   lastFrame_[1] = *(oSamples-oHop+1);
-<a name="l00162"></a>00162   <span class="keywordflow">return</span> iFrames;
-<a name="l00163"></a>00163 }
-<a name="l00164"></a>00164 
-<a name="l00165"></a>00165 } <span class="comment">// stk namespace</span>
-<a name="l00166"></a>00166 
-<a name="l00167"></a>00167 <span class="preprocessor">#endif</span>
-<a name="l00168"></a>00168 <span class="preprocessor"></span>
+<a name="l00133"></a>00133     delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#a80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( baseLength_ * 0.707 * ( 1.0 + modDepth_ * mods_[0].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
+<a name="l00134"></a>00134     delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#a80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( baseLength_  * 0.5 *  ( 1.0 - modDepth_ * mods_[1].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
+<a name="l00135"></a>00135     *samples = effectMix_ * ( delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *samples ) - *samples ) + *samples;
+<a name="l00136"></a>00136     samples++;
+<a name="l00137"></a>00137     *samples = effectMix_ * ( delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *samples ) - *samples ) + *samples;
+<a name="l00138"></a>00138   }
+<a name="l00139"></a>00139 
+<a name="l00140"></a>00140   lastFrame_[0] = *(samples-hop);
+<a name="l00141"></a>00141   lastFrame_[1] = *(samples-hop+1);
+<a name="l00142"></a>00142   <span class="keywordflow">return</span> frames;
+<a name="l00143"></a>00143 }
+<a name="l00144"></a>00144 
+<a name="l00145"></a><a class="code" href="classstk_1_1Chorus.html#abdb8802a83f6b89716316399138e3032">00145</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">Chorus :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00146"></a>00146 {
+<a name="l00147"></a>00147 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00148"></a>00148 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - 1 ) {
+<a name="l00149"></a>00149     oStream_ &lt;&lt; <span class="stringliteral">&quot;Chorus::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00150"></a>00150     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00151"></a>00151   }
+<a name="l00152"></a>00152 <span class="preprocessor">#endif</span>
+<a name="l00153"></a>00153 <span class="preprocessor"></span>
+<a name="l00154"></a>00154   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00155"></a>00155   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00156"></a>00156   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00157"></a>00157   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00158"></a>00158     delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#a80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( baseLength_ * 0.707 * ( 1.0 + modDepth_ * mods_[0].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
+<a name="l00159"></a>00159     delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#a80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( baseLength_  * 0.5 *  ( 1.0 - modDepth_ * mods_[1].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
+<a name="l00160"></a>00160     *oSamples = effectMix_ * ( delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( *iSamples ) - *iSamples ) + *iSamples;
+<a name="l00161"></a>00161     *(oSamples+1) = effectMix_ * ( delayLine_[1].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( *iSamples ) - *iSamples ) + *iSamples;
+<a name="l00162"></a>00162   }
+<a name="l00163"></a>00163 
+<a name="l00164"></a>00164   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00165"></a>00165   lastFrame_[1] = *(oSamples-oHop+1);
+<a name="l00166"></a>00166   <span class="keywordflow">return</span> iFrames;
+<a name="l00167"></a>00167 }
+<a name="l00168"></a>00168 
+<a name="l00169"></a>00169 } <span class="comment">// stk namespace</span>
+<a name="l00170"></a>00170 
+<a name="l00171"></a>00171 <span class="preprocessor">#endif</span>
+<a name="l00172"></a>00172 <span class="preprocessor"></span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Clarinet_8h-source.html b/doc/html/Clarinet_8h-source.html
deleted file mode 100644
index 030669f..0000000
--- a/doc/html/Clarinet_8h-source.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Clarinet.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_CLARINET_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_CLARINET_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayL.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "ReedTable.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OneZero.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "Envelope.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00010"></a>00010 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="keyword">namespace </span>stk {
-<a name="l00013"></a>00013 
-<a name="l00014"></a>00014 <span class="comment">/***************************************************/</span>
-<a name="l00036"></a>00036 <span class="comment">/***************************************************/</span>
-<a name="l00037"></a>00037 
-<a name="l00038"></a><a class="code" href="classstk_1_1Clarinet.html">00038</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Clarinet.html" title="STK clarinet physical model class.">Clarinet</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00039"></a>00039 {
-<a name="l00040"></a>00040  <span class="keyword">public</span>:
-<a name="l00042"></a>00042 
-<a name="l00045"></a>00045   <a class="code" href="classstk_1_1Clarinet.html#82e32a30e6d9664ac9fe748070bec23c" title="Class constructor, taking the lowest desired playing frequency.">Clarinet</a>( StkFloat lowestFrequency );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <a class="code" href="classstk_1_1Clarinet.html#5166db9f4cf180fa189ba2e135affe34" title="Class destructor.">~Clarinet</a>( <span class="keywordtype">void</span> );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Clarinet.html#7eae4377eb4178067c2dba704032a2d1" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Clarinet.html#f7c1cda6af97908c9b81b1be0c2a896d" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Clarinet.html#0e4d016135c3ee291f4d74e9b030caee" title="Apply breath pressure to instrument with given amplitude and rate of increase.">startBlowing</a>( StkFloat amplitude, StkFloat rate );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Clarinet.html#e33627365f66f30c3685dc72cd7fadce" title="Decrease breath pressure with given rate of decrease.">stopBlowing</a>( StkFloat rate );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Clarinet.html#35f9158176c1b654c74bdf6f1296df67" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Clarinet.html#501413064397d1650e18edac92a98b2e" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Clarinet.html#63582205ab940101f5f9419fc717ff78" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   StkFloat <a class="code" href="classstk_1_1Clarinet.html#4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074  <span class="keyword">protected</span>:
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a> delayLine_;
-<a name="l00077"></a>00077   <a class="code" href="classstk_1_1ReedTable.html" title="STK reed table class.">ReedTable</a> reedTable_;
-<a name="l00078"></a>00078   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> filter_;
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> envelope_;
-<a name="l00080"></a>00080   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise_;
-<a name="l00081"></a>00081   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00082"></a>00082   <span class="keywordtype">long</span> length_;
-<a name="l00083"></a>00083   StkFloat outputGain_;
-<a name="l00084"></a>00084   StkFloat noiseGain_;
-<a name="l00085"></a>00085   StkFloat vibratoGain_;
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 };
-<a name="l00088"></a>00088 
-<a name="l00089"></a><a class="code" href="classstk_1_1Clarinet.html#4cd08bca954ad434bc636eda957ca8d5">00089</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Clarinet.html#4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">Clarinet :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00090"></a>00090 {
-<a name="l00091"></a>00091   StkFloat pressureDiff;
-<a name="l00092"></a>00092   StkFloat breathPressure;
-<a name="l00093"></a>00093 
-<a name="l00094"></a>00094   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
-<a name="l00095"></a>00095   breathPressure = envelope_.<a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>(); 
-<a name="l00096"></a>00096   breathPressure += breathPressure * noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00097"></a>00097   breathPressure += breathPressure * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
-<a name="l00098"></a>00098 
-<a name="l00099"></a>00099   <span class="comment">// Perform commuted loss filtering.</span>
-<a name="l00100"></a>00100   pressureDiff = -0.95 * filter_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delayLine_.<a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="comment">// Calculate pressure difference of reflected and mouthpiece pressures.</span>
-<a name="l00103"></a>00103   pressureDiff = pressureDiff - breathPressure;
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="comment">// Perform non-linear scattering using pressure difference in reed function.</span>
-<a name="l00106"></a>00106   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>(breathPressure + pressureDiff * reedTable_.<a class="code" href="classstk_1_1ReedTable.html#3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>(pressureDiff));
-<a name="l00107"></a>00107 
-<a name="l00108"></a>00108   <span class="comment">// Apply output gain.</span>
-<a name="l00109"></a>00109   lastFrame_[0] *= outputGain_;
-<a name="l00110"></a>00110 
-<a name="l00111"></a>00111   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00112"></a>00112 }
-<a name="l00113"></a>00113 
-<a name="l00114"></a>00114 } <span class="comment">// stk namespace</span>
-<a name="l00115"></a>00115 
-<a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Clarinet_8h_source.html b/doc/html/Clarinet_8h_source.html
index 976bbbd..95002c5 100644
--- a/doc/html/Clarinet_8h_source.html
+++ b/doc/html/Clarinet_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Clarinet.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_CLARINET_H</span>
@@ -32,7 +32,7 @@
 <a name="l00039"></a>00039 {
 <a name="l00040"></a>00040  <span class="keyword">public</span>:
 <a name="l00042"></a>00042 
-<a name="l00045"></a>00045   <a class="code" href="classstk_1_1Clarinet.html#a82e32a30e6d9664ac9fe748070bec23c" title="Class constructor, taking the lowest desired playing frequency.">Clarinet</a>( StkFloat lowestFrequency );
+<a name="l00045"></a>00045   <a class="code" href="classstk_1_1Clarinet.html#aad5cf9fb562ee87f2dc0aed0b4cd6c5b" title="Class constructor, taking the lowest desired playing frequency.">Clarinet</a>( StkFloat lowestFrequency = 8.0 );
 <a name="l00046"></a>00046 
 <a name="l00048"></a>00048   <a class="code" href="classstk_1_1Clarinet.html#a5166db9f4cf180fa189ba2e135affe34" title="Class destructor.">~Clarinet</a>( <span class="keywordtype">void</span> );
 <a name="l00049"></a>00049 
@@ -52,55 +52,84 @@
 <a name="l00070"></a>00070 
 <a name="l00072"></a>00072   StkFloat <a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00073"></a>00073 
-<a name="l00074"></a>00074  <span class="keyword">protected</span>:
 <a name="l00075"></a>00075 
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a> delayLine_;
-<a name="l00077"></a>00077   <a class="code" href="classstk_1_1ReedTable.html" title="STK reed table class.">ReedTable</a> reedTable_;
-<a name="l00078"></a>00078   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> filter_;
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> envelope_;
-<a name="l00080"></a>00080   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise_;
-<a name="l00081"></a>00081   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00082"></a>00082   <span class="keywordtype">long</span> length_;
-<a name="l00083"></a>00083   StkFloat outputGain_;
-<a name="l00084"></a>00084   StkFloat noiseGain_;
-<a name="l00085"></a>00085   StkFloat vibratoGain_;
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 };
-<a name="l00088"></a>00088 
-<a name="l00089"></a><a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5">00089</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">Clarinet :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00090"></a>00090 {
-<a name="l00091"></a>00091   StkFloat pressureDiff;
-<a name="l00092"></a>00092   StkFloat breathPressure;
-<a name="l00093"></a>00093 
-<a name="l00094"></a>00094   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
-<a name="l00095"></a>00095   breathPressure = envelope_.<a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>(); 
-<a name="l00096"></a>00096   breathPressure += breathPressure * noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00097"></a>00097   breathPressure += breathPressure * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
-<a name="l00098"></a>00098 
-<a name="l00099"></a>00099   <span class="comment">// Perform commuted loss filtering.</span>
-<a name="l00100"></a>00100   pressureDiff = -0.95 * filter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delayLine_.<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="comment">// Calculate pressure difference of reflected and mouthpiece pressures.</span>
-<a name="l00103"></a>00103   pressureDiff = pressureDiff - breathPressure;
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="comment">// Perform non-linear scattering using pressure difference in reed function.</span>
-<a name="l00106"></a>00106   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>(breathPressure + pressureDiff * reedTable_.<a class="code" href="classstk_1_1ReedTable.html#a3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>(pressureDiff));
+<a name="l00082"></a>00082   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00083"></a>00083 
+<a name="l00084"></a>00084  <span class="keyword">protected</span>:
+<a name="l00085"></a>00085 
+<a name="l00086"></a>00086   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a> delayLine_;
+<a name="l00087"></a>00087   <a class="code" href="classstk_1_1ReedTable.html" title="STK reed table class.">ReedTable</a> reedTable_;
+<a name="l00088"></a>00088   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> filter_;
+<a name="l00089"></a>00089   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> envelope_;
+<a name="l00090"></a>00090   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise_;
+<a name="l00091"></a>00091   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
+<a name="l00092"></a>00092 
+<a name="l00093"></a>00093   StkFloat outputGain_;
+<a name="l00094"></a>00094   StkFloat noiseGain_;
+<a name="l00095"></a>00095   StkFloat vibratoGain_;
+<a name="l00096"></a>00096 };
+<a name="l00097"></a>00097 
+<a name="l00098"></a><a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5">00098</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">Clarinet :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00099"></a>00099 {
+<a name="l00100"></a>00100   StkFloat pressureDiff;
+<a name="l00101"></a>00101   StkFloat breathPressure;
+<a name="l00102"></a>00102 
+<a name="l00103"></a>00103   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
+<a name="l00104"></a>00104   breathPressure = envelope_.<a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>(); 
+<a name="l00105"></a>00105   breathPressure += breathPressure * noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
+<a name="l00106"></a>00106   breathPressure += breathPressure * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
 <a name="l00107"></a>00107 
-<a name="l00108"></a>00108   <span class="comment">// Apply output gain.</span>
-<a name="l00109"></a>00109   lastFrame_[0] *= outputGain_;
+<a name="l00108"></a>00108   <span class="comment">// Perform commuted loss filtering.</span>
+<a name="l00109"></a>00109   pressureDiff = -0.95 * filter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delayLine_.<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
 <a name="l00110"></a>00110 
-<a name="l00111"></a>00111   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00112"></a>00112 }
+<a name="l00111"></a>00111   <span class="comment">// Calculate pressure difference of reflected and mouthpiece pressures.</span>
+<a name="l00112"></a>00112   pressureDiff = pressureDiff - breathPressure;
 <a name="l00113"></a>00113 
-<a name="l00114"></a>00114 } <span class="comment">// stk namespace</span>
-<a name="l00115"></a>00115 
-<a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
+<a name="l00114"></a>00114   <span class="comment">// Perform non-linear scattering using pressure difference in reed function.</span>
+<a name="l00115"></a>00115   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>(breathPressure + pressureDiff * reedTable_.<a class="code" href="classstk_1_1ReedTable.html#a3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>(pressureDiff));
+<a name="l00116"></a>00116 
+<a name="l00117"></a>00117   <span class="comment">// Apply output gain.</span>
+<a name="l00118"></a>00118   lastFrame_[0] *= outputGain_;
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00121"></a>00121 }
+<a name="l00122"></a>00122 
+<a name="l00123"></a><a class="code" href="classstk_1_1Clarinet.html#a059174eb1ab84e306bfad1d8b5833548">00123</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">Clarinet :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00124"></a>00124 {
+<a name="l00125"></a>00125   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00126"></a>00126 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00127"></a>00127 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00128"></a>00128     oStream_ &lt;&lt; <span class="stringliteral">&quot;Clarinet::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00129"></a>00129     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00130"></a>00130   }
+<a name="l00131"></a>00131 <span class="preprocessor">#endif</span>
+<a name="l00132"></a>00132 <span class="preprocessor"></span>
+<a name="l00133"></a>00133   StkFloat *samples = &amp;frames[channel];
+<a name="l00134"></a>00134   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00135"></a>00135   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00136"></a>00136     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00137"></a>00137       *samples++ = <a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">tick</a>();
+<a name="l00138"></a>00138   }
+<a name="l00139"></a>00139   <span class="keywordflow">else</span> {
+<a name="l00140"></a>00140     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00141"></a>00141       *samples++ = <a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">tick</a>();
+<a name="l00142"></a>00142       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00143"></a>00143         *samples++ = lastFrame_[j];
+<a name="l00144"></a>00144     }
+<a name="l00145"></a>00145   }
+<a name="l00146"></a>00146 
+<a name="l00147"></a>00147   <span class="keywordflow">return</span> frames;
+<a name="l00148"></a>00148 }
+<a name="l00149"></a>00149 
+<a name="l00150"></a>00150 } <span class="comment">// stk namespace</span>
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Cubic_8h_source.html b/doc/html/Cubic_8h_source.html
new file mode 100644
index 0000000..130f0fa
--- /dev/null
+++ b/doc/html/Cubic_8h_source.html
@@ -0,0 +1,122 @@
+<HTML>
+<HEAD>
+<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
+<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+<CENTER>
+<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
+<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
+<HR>
+<!-- Generated by Doxygen 1.6.2 -->
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
+  </div>
+<div class="contents">
+<h1>Cubic.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_CUBIC_H</span>
+<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_CUBIC_H</span>
+<a name="l00003"></a>00003 <span class="preprocessor"></span>
+<a name="l00004"></a>00004 <span class="preprocessor">#include &quot;Function.h&quot;</span>
+<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;cmath&gt;</span>
+<a name="l00006"></a>00006 
+<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
+<a name="l00008"></a>00008 
+<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
+<a name="l00027"></a>00027 <span class="comment">/***************************************************/</span>
+<a name="l00028"></a>00028 
+<a name="l00029"></a><a class="code" href="classstk_1_1Cubic.html">00029</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Cubic.html" title="STK cubic non-linearity class.">Cubic</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Function.html" title="STK abstract function parent class.">Function</a>
+<a name="l00030"></a>00030 {
+<a name="l00031"></a>00031 <span class="keyword">public</span>:
+<a name="l00033"></a><a class="code" href="classstk_1_1Cubic.html#a2059a20146f6d7ec0854dc860ca90895">00033</a>   <a class="code" href="classstk_1_1Cubic.html#a2059a20146f6d7ec0854dc860ca90895" title="Default constructor.">Cubic</a>( <span class="keywordtype">void</span> ) : a1_(0.5), a2_(0.5), a3_(0.5), gain_(1.0), threshold_(1.0) {};
+<a name="l00034"></a>00034 
+<a name="l00036"></a><a class="code" href="classstk_1_1Cubic.html#af4604c69f138415f9b9ee6944d2b54ef">00036</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Cubic.html#af4604c69f138415f9b9ee6944d2b54ef" title="Set the a1 coefficient value.">setA1</a>( StkFloat a1 ) { a1_ = a1; };
+<a name="l00037"></a>00037 
+<a name="l00039"></a><a class="code" href="classstk_1_1Cubic.html#afa16d53e6a720936543d0e0ea778f0eb">00039</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Cubic.html#afa16d53e6a720936543d0e0ea778f0eb" title="Set the a2 coefficient value.">setA2</a>( StkFloat a2 )  { a2_ = a2; };
+<a name="l00040"></a>00040 
+<a name="l00042"></a><a class="code" href="classstk_1_1Cubic.html#add4a05676471c4c09b76f5fe430b80fa">00042</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Cubic.html#add4a05676471c4c09b76f5fe430b80fa" title="Set the a3 coefficient value.">setA3</a>( StkFloat a3 )  { a3_ = a3; };
+<a name="l00043"></a>00043 
+<a name="l00045"></a><a class="code" href="classstk_1_1Cubic.html#a3eca8ac3f81301592476aad7a2e1ec50">00045</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Cubic.html#a3eca8ac3f81301592476aad7a2e1ec50" title="Set the gain value.">setGain</a>( StkFloat gain ) { gain_ = gain; };
+<a name="l00046"></a>00046 
+<a name="l00048"></a><a class="code" href="classstk_1_1Cubic.html#a10ba2b5c858fc2d656d49c676d5561b4">00048</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Cubic.html#a10ba2b5c858fc2d656d49c676d5561b4" title="Set the threshold value.">setThreshold</a>( StkFloat threshold ) { threshold_ = threshold; };
+<a name="l00049"></a>00049 
+<a name="l00051"></a>00051   StkFloat <a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c" title="Input one sample to the function and return one output.">tick</a>( StkFloat input );
+<a name="l00052"></a>00052 
+<a name="l00054"></a>00054 
+<a name="l00062"></a>00062   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c" title="Input one sample to the function and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00063"></a>00063 
+<a name="l00065"></a>00065 
+<a name="l00073"></a>00073   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c" title="Input one sample to the function and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
+<a name="l00074"></a>00074 
+<a name="l00075"></a>00075 <span class="keyword">protected</span>:
+<a name="l00076"></a>00076 
+<a name="l00077"></a>00077   StkFloat a1_;
+<a name="l00078"></a>00078   StkFloat a2_;
+<a name="l00079"></a>00079   StkFloat a3_;
+<a name="l00080"></a>00080   StkFloat gain_; 
+<a name="l00081"></a>00081   StkFloat threshold_;
+<a name="l00082"></a>00082 };
+<a name="l00083"></a>00083 
+<a name="l00084"></a><a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c">00084</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c" title="Input one sample to the function and return one output.">Cubic :: tick</a>( StkFloat input )
+<a name="l00085"></a>00085 {
+<a name="l00086"></a>00086   StkFloat inSquared = input * input;
+<a name="l00087"></a>00087   StkFloat inCubed = inSquared * input;
+<a name="l00088"></a>00088 
+<a name="l00089"></a>00089   lastFrame_[0] = gain_ * (a1_ * input + a2_ * inSquared + a3_ * inCubed);
+<a name="l00090"></a>00090 
+<a name="l00091"></a>00091   <span class="comment">// Apply threshold if we are out of range.</span>
+<a name="l00092"></a>00092   <span class="keywordflow">if</span> ( fabs( lastFrame_[0] ) &gt; threshold_ ) {
+<a name="l00093"></a>00093     lastFrame_[0] = ( lastFrame_[0] &lt; 0 ? -threshold_ : threshold_ );
+<a name="l00094"></a>00094   }
+<a name="l00095"></a>00095 
+<a name="l00096"></a>00096   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00097"></a>00097 }
+<a name="l00098"></a>00098 
+<a name="l00099"></a><a class="code" href="classstk_1_1Cubic.html#af3e8a1d6ffe5e9788d841343bd5722cc">00099</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c" title="Input one sample to the function and return one output.">Cubic :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00100"></a>00100 {
+<a name="l00101"></a>00101 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00102"></a>00102 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00103"></a>00103     oStream_ &lt;&lt; <span class="stringliteral">&quot;Cubic::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00104"></a>00104     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106 <span class="preprocessor">#endif</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span>
+<a name="l00108"></a>00108   StkFloat *samples = &amp;frames[channel];
+<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00110"></a>00110   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00111"></a>00111     *samples = <a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c" title="Input one sample to the function and return one output.">tick</a>( *samples );
+<a name="l00112"></a>00112 
+<a name="l00113"></a>00113   lastFrame_[0] = *(samples-hop);
+<a name="l00114"></a>00114   <span class="keywordflow">return</span> frames;
+<a name="l00115"></a>00115 }
+<a name="l00116"></a>00116 
+<a name="l00117"></a><a class="code" href="classstk_1_1Cubic.html#aef7887fe7e5131ce48c8488a21d295b9">00117</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c" title="Input one sample to the function and return one output.">Cubic :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00118"></a>00118 {
+<a name="l00119"></a>00119 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00120"></a>00120 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00121"></a>00121     oStream_ &lt;&lt; <span class="stringliteral">&quot;Cubic::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00122"></a>00122     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00123"></a>00123   }
+<a name="l00124"></a>00124 <span class="preprocessor">#endif</span>
+<a name="l00125"></a>00125 <span class="preprocessor"></span>
+<a name="l00126"></a>00126   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00127"></a>00127   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00128"></a>00128   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00129"></a>00129   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop )
+<a name="l00130"></a>00130     *oSamples = <a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c" title="Input one sample to the function and return one output.">tick</a>( *iSamples );
+<a name="l00131"></a>00131 
+<a name="l00132"></a>00132   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00133"></a>00133   <span class="keywordflow">return</span> iFrames;
+<a name="l00134"></a>00134 }
+<a name="l00135"></a>00135 
+<a name="l00136"></a>00136 } <span class="comment">// stk namespace</span>
+<a name="l00137"></a>00137 
+<a name="l00138"></a>00138 <span class="preprocessor">#endif</span>
+</pre></div></div>
+<HR>
+
+<table>
+  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+</table>
+
+</BODY>
+</HTML>
diff --git a/doc/html/DelayA_8h-source.html b/doc/html/DelayA_8h-source.html
deleted file mode 100644
index d3074c9..0000000
--- a/doc/html/DelayA_8h-source.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>DelayA.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_DELAYA_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_DELAYA_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00026"></a>00026 <span class="comment">/***************************************************/</span>
-<a name="l00027"></a>00027 
-<a name="l00028"></a><a class="code" href="classstk_1_1DelayA.html">00028</a> <span class="keyword">class </span><a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00029"></a>00029 {
-<a name="l00030"></a>00030 <span class="keyword">public</span>:
-<a name="l00031"></a>00031 
-<a name="l00033"></a>00033 
-<a name="l00038"></a>00038   <a class="code" href="classstk_1_1DelayA.html#9beb31f924bca961df99c1ea7789c42d" title="Default constructor creates a delay-line with maximum length of 4095 samples and...">DelayA</a>( StkFloat delay = 0.5, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> maxDelay = 4095 );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <a class="code" href="classstk_1_1DelayA.html#b6f2ee45d350b4bb3515fcdaf25a986a" title="Class destructor.">~DelayA</a>();
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayA.html#e5e59f497eb84280fd94d60257ffae69" title="Clears all internal states of the delay line.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00045"></a>00045   
-<a name="l00047"></a>00047 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayA.html#b10bb5eb8316ce8b3c6667bdf4c98389" title="Set the maximum delay-line length.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayA.html#83ddc9bdf2f5059159160fdac0e25eda" title="Set the delay-line length.">setDelay</a>( StkFloat delay );
-<a name="l00061"></a>00061 
-<a name="l00063"></a><a class="code" href="classstk_1_1DelayA.html#363d9ccc50acbd1f3bb533aa1ab3d9c7">00063</a>   StkFloat <a class="code" href="classstk_1_1DelayA.html#363d9ccc50acbd1f3bb533aa1ab3d9c7" title="Return the current delay-line length.">getDelay</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> delay_; };
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066 
-<a name="l00071"></a>00071   StkFloat <a class="code" href="classstk_1_1DelayA.html#355422e50c1d2e89385f11aafffd064d" title="Return the value at tapDelay samples from the delay-line input.">contentsAt</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
-<a name="l00072"></a>00072 
-<a name="l00074"></a><a class="code" href="classstk_1_1DelayA.html#4372d0e178af1cb6ca465affddfb1566">00074</a>   StkFloat <a class="code" href="classstk_1_1DelayA.html#4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00075"></a>00075 
-<a name="l00077"></a>00077 
-<a name="l00080"></a>00080   StkFloat <a class="code" href="classstk_1_1DelayA.html#08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>( <span class="keywordtype">void</span> );
-<a name="l00081"></a>00081 
-<a name="l00083"></a>00083   StkFloat <a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00084"></a>00084 
-<a name="l00086"></a>00086 
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00095"></a>00095 
-<a name="l00097"></a>00097 
-<a name="l00105"></a>00105   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00106"></a>00106 
-<a name="l00107"></a>00107 <span class="keyword">protected</span>:  
-<a name="l00108"></a>00108 
-<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> inPoint_;
-<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> outPoint_;
-<a name="l00111"></a>00111   StkFloat delay_;
-<a name="l00112"></a>00112   StkFloat alpha_;
-<a name="l00113"></a>00113   StkFloat coeff_;
-<a name="l00114"></a>00114   StkFloat apInput_;
-<a name="l00115"></a>00115   StkFloat nextOutput_;
-<a name="l00116"></a>00116   <span class="keywordtype">bool</span> doNextOut_;
-<a name="l00117"></a>00117 };
-<a name="l00118"></a>00118 
-<a name="l00119"></a><a class="code" href="classstk_1_1DelayA.html#08c8ade17cea4a54844f90d976b14314">00119</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayA.html#08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">DelayA :: nextOut</a>( <span class="keywordtype">void</span> )
-<a name="l00120"></a>00120 {
-<a name="l00121"></a>00121   <span class="keywordflow">if</span> ( doNextOut_ ) {
-<a name="l00122"></a>00122     <span class="comment">// Do allpass interpolation delay.</span>
-<a name="l00123"></a>00123     nextOutput_ = -coeff_ * lastFrame_[0];
-<a name="l00124"></a>00124     nextOutput_ += apInput_ + ( coeff_ * inputs_[outPoint_] );
-<a name="l00125"></a>00125     doNextOut_ = <span class="keyword">false</span>;
-<a name="l00126"></a>00126   }
-<a name="l00127"></a>00127 
-<a name="l00128"></a>00128   <span class="keywordflow">return</span> nextOutput_;
-<a name="l00129"></a>00129 }
-<a name="l00130"></a>00130 
-<a name="l00131"></a><a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74">00131</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">DelayA :: tick</a>( StkFloat input )
-<a name="l00132"></a>00132 {
-<a name="l00133"></a>00133   inputs_[inPoint_++] = input * gain_;
-<a name="l00134"></a>00134 
-<a name="l00135"></a>00135   <span class="comment">// Increment input pointer modulo length.</span>
-<a name="l00136"></a>00136   <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00137"></a>00137     inPoint_ = 0;
-<a name="l00138"></a>00138 
-<a name="l00139"></a>00139   lastFrame_[0] = <a class="code" href="classstk_1_1DelayA.html#08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00140"></a>00140   doNextOut_ = <span class="keyword">true</span>;
-<a name="l00141"></a>00141 
-<a name="l00142"></a>00142   <span class="comment">// Save the allpass input and increment modulo length.</span>
-<a name="l00143"></a>00143   apInput_ = inputs_[outPoint_++];
-<a name="l00144"></a>00144   <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00145"></a>00145     outPoint_ = 0;
-<a name="l00146"></a>00146 
-<a name="l00147"></a>00147   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00148"></a>00148 }
-<a name="l00149"></a>00149 
-<a name="l00150"></a><a class="code" href="classstk_1_1DelayA.html#57c568d56e5ed35926cfc23f83d48d98">00150</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">DelayA :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00151"></a>00151 {
-<a name="l00152"></a>00152 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00153"></a>00153 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00154"></a>00154     errorString_ &lt;&lt; <span class="stringliteral">"DelayA::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00155"></a>00155     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00156"></a>00156   }
-<a name="l00157"></a>00157 <span class="preprocessor">#endif</span>
-<a name="l00158"></a>00158 <span class="preprocessor"></span>
-<a name="l00159"></a>00159   StkFloat *samples = &amp;frames[channel];
-<a name="l00160"></a>00160   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00161"></a>00161   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00162"></a>00162     inputs_[inPoint_++] = *samples * gain_;
-<a name="l00163"></a>00163     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00164"></a>00164     *samples = <a class="code" href="classstk_1_1DelayA.html#08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00165"></a>00165     lastFrame_[0] = *samples;
-<a name="l00166"></a>00166     doNextOut_ = <span class="keyword">true</span>;
-<a name="l00167"></a>00167     apInput_ = inputs_[outPoint_++];
-<a name="l00168"></a>00168     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00169"></a>00169   }
-<a name="l00170"></a>00170 
-<a name="l00171"></a>00171   <span class="keywordflow">return</span> frames;
-<a name="l00172"></a>00172 }
-<a name="l00173"></a>00173 
-<a name="l00174"></a><a class="code" href="classstk_1_1DelayA.html#94a2998c9b2d1697ed9a747973be0a89">00174</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">DelayA :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00175"></a>00175 {
-<a name="l00176"></a>00176 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00177"></a>00177 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00178"></a>00178     errorString_ &lt;&lt; <span class="stringliteral">"DelayA::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00179"></a>00179     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00180"></a>00180   }
-<a name="l00181"></a>00181 <span class="preprocessor">#endif</span>
-<a name="l00182"></a>00182 <span class="preprocessor"></span>
-<a name="l00183"></a>00183   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00184"></a>00184   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00185"></a>00185   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00186"></a>00186   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00187"></a>00187     inputs_[inPoint_++] = *iSamples * gain_;
-<a name="l00188"></a>00188     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00189"></a>00189     *oSamples = <a class="code" href="classstk_1_1DelayA.html#08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00190"></a>00190     lastFrame_[0] = *oSamples;
-<a name="l00191"></a>00191     doNextOut_ = <span class="keyword">true</span>;
-<a name="l00192"></a>00192     apInput_ = inputs_[outPoint_++];
-<a name="l00193"></a>00193     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00194"></a>00194   }
-<a name="l00195"></a>00195 
-<a name="l00196"></a>00196   <span class="keywordflow">return</span> iFrames;
-<a name="l00197"></a>00197 }
-<a name="l00198"></a>00198 
-<a name="l00199"></a>00199 } <span class="comment">// stk namespace</span>
-<a name="l00200"></a>00200 
-<a name="l00201"></a>00201 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/DelayA_8h_source.html b/doc/html/DelayA_8h_source.html
index 483c214..d2245ae 100644
--- a/doc/html/DelayA_8h_source.html
+++ b/doc/html/DelayA_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>DelayA.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_DELAYA_H</span>
@@ -32,132 +32,136 @@
 <a name="l00041"></a>00041   <a class="code" href="classstk_1_1DelayA.html#ab6f2ee45d350b4bb3515fcdaf25a986a" title="Class destructor.">~DelayA</a>();
 <a name="l00042"></a>00042 
 <a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayA.html#ae5e59f497eb84280fd94d60257ffae69" title="Clears all internal states of the delay line.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00045"></a>00045   
-<a name="l00047"></a>00047 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayA.html#ab10bb5eb8316ce8b3c6667bdf4c98389" title="Set the maximum delay-line length.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayA.html#a83ddc9bdf2f5059159160fdac0e25eda" title="Set the delay-line length.">setDelay</a>( StkFloat delay );
-<a name="l00061"></a>00061 
-<a name="l00063"></a><a class="code" href="classstk_1_1DelayA.html#a363d9ccc50acbd1f3bb533aa1ab3d9c7">00063</a>   StkFloat <a class="code" href="classstk_1_1DelayA.html#a363d9ccc50acbd1f3bb533aa1ab3d9c7" title="Return the current delay-line length.">getDelay</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> delay_; };
+<a name="l00045"></a>00045 
+<a name="l00047"></a><a class="code" href="classstk_1_1DelayA.html#a6ac5c818b6669bf904a4a5a81358bd28">00047</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1DelayA.html#a6ac5c818b6669bf904a4a5a81358bd28" title="Get the maximum delay-line length.">getMaximumDelay</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() - 1; };
+<a name="l00048"></a>00048   
+<a name="l00050"></a>00050 
+<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayA.html#ab10bb5eb8316ce8b3c6667bdf4c98389" title="Set the maximum delay-line length.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
+<a name="l00058"></a>00058 
+<a name="l00060"></a>00060 
+<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayA.html#a83ddc9bdf2f5059159160fdac0e25eda" title="Set the delay-line length.">setDelay</a>( StkFloat delay );
 <a name="l00064"></a>00064 
-<a name="l00066"></a>00066 
-<a name="l00071"></a>00071   StkFloat <a class="code" href="classstk_1_1DelayA.html#a355422e50c1d2e89385f11aafffd064d" title="Return the value at tapDelay samples from the delay-line input.">contentsAt</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
-<a name="l00072"></a>00072 
-<a name="l00074"></a><a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566">00074</a>   StkFloat <a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
+<a name="l00066"></a><a class="code" href="classstk_1_1DelayA.html#a363d9ccc50acbd1f3bb533aa1ab3d9c7">00066</a>   StkFloat <a class="code" href="classstk_1_1DelayA.html#a363d9ccc50acbd1f3bb533aa1ab3d9c7" title="Return the current delay-line length.">getDelay</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> delay_; };
+<a name="l00067"></a>00067 
+<a name="l00069"></a>00069 
+<a name="l00074"></a>00074   StkFloat <a class="code" href="classstk_1_1DelayA.html#aab723097f4634b23b0cd4ba8762271dc" title="Return the value at tapDelay samples from the delay-line input.">tapOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
 <a name="l00075"></a>00075 
-<a name="l00077"></a>00077 
-<a name="l00080"></a>00080   StkFloat <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>( <span class="keywordtype">void</span> );
+<a name="l00077"></a>00077   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayA.html#adf33f950e60d31d355ea865ae3efd44e" title="Set the value at tapDelay samples from the delay-line input.">tapIn</a>( StkFloat value, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
+<a name="l00078"></a>00078 
+<a name="l00080"></a><a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566">00080</a>   StkFloat <a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
 <a name="l00081"></a>00081 
-<a name="l00083"></a>00083   StkFloat <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00084"></a>00084 
-<a name="l00086"></a>00086 
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00095"></a>00095 
-<a name="l00097"></a>00097 
-<a name="l00105"></a>00105   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00106"></a>00106 
-<a name="l00107"></a>00107 <span class="keyword">protected</span>:  
-<a name="l00108"></a>00108 
-<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> inPoint_;
-<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> outPoint_;
-<a name="l00111"></a>00111   StkFloat delay_;
-<a name="l00112"></a>00112   StkFloat alpha_;
-<a name="l00113"></a>00113   StkFloat coeff_;
-<a name="l00114"></a>00114   StkFloat apInput_;
-<a name="l00115"></a>00115   StkFloat nextOutput_;
-<a name="l00116"></a>00116   <span class="keywordtype">bool</span> doNextOut_;
-<a name="l00117"></a>00117 };
-<a name="l00118"></a>00118 
-<a name="l00119"></a><a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314">00119</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">DelayA :: nextOut</a>( <span class="keywordtype">void</span> )
-<a name="l00120"></a>00120 {
-<a name="l00121"></a>00121   <span class="keywordflow">if</span> ( doNextOut_ ) {
-<a name="l00122"></a>00122     <span class="comment">// Do allpass interpolation delay.</span>
-<a name="l00123"></a>00123     nextOutput_ = -coeff_ * lastFrame_[0];
-<a name="l00124"></a>00124     nextOutput_ += apInput_ + ( coeff_ * inputs_[outPoint_] );
-<a name="l00125"></a>00125     doNextOut_ = <span class="keyword">false</span>;
-<a name="l00126"></a>00126   }
-<a name="l00127"></a>00127 
-<a name="l00128"></a>00128   <span class="keywordflow">return</span> nextOutput_;
-<a name="l00129"></a>00129 }
-<a name="l00130"></a>00130 
-<a name="l00131"></a><a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74">00131</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">DelayA :: tick</a>( StkFloat input )
-<a name="l00132"></a>00132 {
-<a name="l00133"></a>00133   inputs_[inPoint_++] = input * gain_;
-<a name="l00134"></a>00134 
-<a name="l00135"></a>00135   <span class="comment">// Increment input pointer modulo length.</span>
-<a name="l00136"></a>00136   <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00137"></a>00137     inPoint_ = 0;
-<a name="l00138"></a>00138 
-<a name="l00139"></a>00139   lastFrame_[0] = <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00140"></a>00140   doNextOut_ = <span class="keyword">true</span>;
-<a name="l00141"></a>00141 
-<a name="l00142"></a>00142   <span class="comment">// Save the allpass input and increment modulo length.</span>
-<a name="l00143"></a>00143   apInput_ = inputs_[outPoint_++];
-<a name="l00144"></a>00144   <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00145"></a>00145     outPoint_ = 0;
-<a name="l00146"></a>00146 
-<a name="l00147"></a>00147   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00148"></a>00148 }
-<a name="l00149"></a>00149 
-<a name="l00150"></a><a class="code" href="classstk_1_1DelayA.html#a57c568d56e5ed35926cfc23f83d48d98">00150</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">DelayA :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00151"></a>00151 {
-<a name="l00152"></a>00152 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00153"></a>00153 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00154"></a>00154     errorString_ &lt;&lt; <span class="stringliteral">&quot;DelayA::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00155"></a>00155     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00156"></a>00156   }
-<a name="l00157"></a>00157 <span class="preprocessor">#endif</span>
-<a name="l00158"></a>00158 <span class="preprocessor"></span>
-<a name="l00159"></a>00159   StkFloat *samples = &amp;frames[channel];
-<a name="l00160"></a>00160   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00161"></a>00161   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00162"></a>00162     inputs_[inPoint_++] = *samples * gain_;
-<a name="l00163"></a>00163     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00164"></a>00164     *samples = <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00165"></a>00165     lastFrame_[0] = *samples;
-<a name="l00166"></a>00166     doNextOut_ = <span class="keyword">true</span>;
-<a name="l00167"></a>00167     apInput_ = inputs_[outPoint_++];
-<a name="l00168"></a>00168     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00169"></a>00169   }
-<a name="l00170"></a>00170 
-<a name="l00171"></a>00171   <span class="keywordflow">return</span> frames;
-<a name="l00172"></a>00172 }
-<a name="l00173"></a>00173 
-<a name="l00174"></a><a class="code" href="classstk_1_1DelayA.html#a94a2998c9b2d1697ed9a747973be0a89">00174</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">DelayA :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00175"></a>00175 {
-<a name="l00176"></a>00176 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00177"></a>00177 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00178"></a>00178     errorString_ &lt;&lt; <span class="stringliteral">&quot;DelayA::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00179"></a>00179     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00180"></a>00180   }
-<a name="l00181"></a>00181 <span class="preprocessor">#endif</span>
-<a name="l00182"></a>00182 <span class="preprocessor"></span>
-<a name="l00183"></a>00183   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00184"></a>00184   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00185"></a>00185   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00186"></a>00186   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00187"></a>00187     inputs_[inPoint_++] = *iSamples * gain_;
-<a name="l00188"></a>00188     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00189"></a>00189     *oSamples = <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00190"></a>00190     lastFrame_[0] = *oSamples;
-<a name="l00191"></a>00191     doNextOut_ = <span class="keyword">true</span>;
-<a name="l00192"></a>00192     apInput_ = inputs_[outPoint_++];
-<a name="l00193"></a>00193     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00194"></a>00194   }
-<a name="l00195"></a>00195 
-<a name="l00196"></a>00196   <span class="keywordflow">return</span> iFrames;
-<a name="l00197"></a>00197 }
-<a name="l00198"></a>00198 
-<a name="l00199"></a>00199 } <span class="comment">// stk namespace</span>
-<a name="l00200"></a>00200 
-<a name="l00201"></a>00201 <span class="preprocessor">#endif</span>
+<a name="l00083"></a>00083 
+<a name="l00086"></a>00086   StkFloat <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>( <span class="keywordtype">void</span> );
+<a name="l00087"></a>00087 
+<a name="l00089"></a>00089   StkFloat <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
+<a name="l00090"></a>00090 
+<a name="l00092"></a>00092 
+<a name="l00100"></a>00100   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00101"></a>00101 
+<a name="l00103"></a>00103 
+<a name="l00111"></a>00111   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
+<a name="l00112"></a>00112 
+<a name="l00113"></a>00113 <span class="keyword">protected</span>:  
+<a name="l00114"></a>00114 
+<a name="l00115"></a>00115   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> inPoint_;
+<a name="l00116"></a>00116   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> outPoint_;
+<a name="l00117"></a>00117   StkFloat delay_;
+<a name="l00118"></a>00118   StkFloat alpha_;
+<a name="l00119"></a>00119   StkFloat coeff_;
+<a name="l00120"></a>00120   StkFloat apInput_;
+<a name="l00121"></a>00121   StkFloat nextOutput_;
+<a name="l00122"></a>00122   <span class="keywordtype">bool</span> doNextOut_;
+<a name="l00123"></a>00123 };
+<a name="l00124"></a>00124 
+<a name="l00125"></a><a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314">00125</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">DelayA :: nextOut</a>( <span class="keywordtype">void</span> )
+<a name="l00126"></a>00126 {
+<a name="l00127"></a>00127   <span class="keywordflow">if</span> ( doNextOut_ ) {
+<a name="l00128"></a>00128     <span class="comment">// Do allpass interpolation delay.</span>
+<a name="l00129"></a>00129     nextOutput_ = -coeff_ * lastFrame_[0];
+<a name="l00130"></a>00130     nextOutput_ += apInput_ + ( coeff_ * inputs_[outPoint_] );
+<a name="l00131"></a>00131     doNextOut_ = <span class="keyword">false</span>;
+<a name="l00132"></a>00132   }
+<a name="l00133"></a>00133 
+<a name="l00134"></a>00134   <span class="keywordflow">return</span> nextOutput_;
+<a name="l00135"></a>00135 }
+<a name="l00136"></a>00136 
+<a name="l00137"></a><a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74">00137</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">DelayA :: tick</a>( StkFloat input )
+<a name="l00138"></a>00138 {
+<a name="l00139"></a>00139   inputs_[inPoint_++] = input * gain_;
+<a name="l00140"></a>00140 
+<a name="l00141"></a>00141   <span class="comment">// Increment input pointer modulo length.</span>
+<a name="l00142"></a>00142   <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
+<a name="l00143"></a>00143     inPoint_ = 0;
+<a name="l00144"></a>00144 
+<a name="l00145"></a>00145   lastFrame_[0] = <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
+<a name="l00146"></a>00146   doNextOut_ = <span class="keyword">true</span>;
+<a name="l00147"></a>00147 
+<a name="l00148"></a>00148   <span class="comment">// Save the allpass input and increment modulo length.</span>
+<a name="l00149"></a>00149   apInput_ = inputs_[outPoint_++];
+<a name="l00150"></a>00150   <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
+<a name="l00151"></a>00151     outPoint_ = 0;
+<a name="l00152"></a>00152 
+<a name="l00153"></a>00153   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00154"></a>00154 }
+<a name="l00155"></a>00155 
+<a name="l00156"></a><a class="code" href="classstk_1_1DelayA.html#a57c568d56e5ed35926cfc23f83d48d98">00156</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">DelayA :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00157"></a>00157 {
+<a name="l00158"></a>00158 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00159"></a>00159 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00160"></a>00160     oStream_ &lt;&lt; <span class="stringliteral">&quot;DelayA::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00161"></a>00161     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00162"></a>00162   }
+<a name="l00163"></a>00163 <span class="preprocessor">#endif</span>
+<a name="l00164"></a>00164 <span class="preprocessor"></span>
+<a name="l00165"></a>00165   StkFloat *samples = &amp;frames[channel];
+<a name="l00166"></a>00166   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00167"></a>00167   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00168"></a>00168     inputs_[inPoint_++] = *samples * gain_;
+<a name="l00169"></a>00169     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
+<a name="l00170"></a>00170     *samples = <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
+<a name="l00171"></a>00171     lastFrame_[0] = *samples;
+<a name="l00172"></a>00172     doNextOut_ = <span class="keyword">true</span>;
+<a name="l00173"></a>00173     apInput_ = inputs_[outPoint_++];
+<a name="l00174"></a>00174     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
+<a name="l00175"></a>00175   }
+<a name="l00176"></a>00176 
+<a name="l00177"></a>00177   <span class="keywordflow">return</span> frames;
+<a name="l00178"></a>00178 }
+<a name="l00179"></a>00179 
+<a name="l00180"></a><a class="code" href="classstk_1_1DelayA.html#a94a2998c9b2d1697ed9a747973be0a89">00180</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">DelayA :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00181"></a>00181 {
+<a name="l00182"></a>00182 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00183"></a>00183 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00184"></a>00184     oStream_ &lt;&lt; <span class="stringliteral">&quot;DelayA::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00185"></a>00185     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00186"></a>00186   }
+<a name="l00187"></a>00187 <span class="preprocessor">#endif</span>
+<a name="l00188"></a>00188 <span class="preprocessor"></span>
+<a name="l00189"></a>00189   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00190"></a>00190   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00191"></a>00191   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00192"></a>00192   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00193"></a>00193     inputs_[inPoint_++] = *iSamples * gain_;
+<a name="l00194"></a>00194     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
+<a name="l00195"></a>00195     *oSamples = <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
+<a name="l00196"></a>00196     lastFrame_[0] = *oSamples;
+<a name="l00197"></a>00197     doNextOut_ = <span class="keyword">true</span>;
+<a name="l00198"></a>00198     apInput_ = inputs_[outPoint_++];
+<a name="l00199"></a>00199     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
+<a name="l00200"></a>00200   }
+<a name="l00201"></a>00201 
+<a name="l00202"></a>00202   <span class="keywordflow">return</span> iFrames;
+<a name="l00203"></a>00203 }
+<a name="l00204"></a>00204 
+<a name="l00205"></a>00205 } <span class="comment">// stk namespace</span>
+<a name="l00206"></a>00206 
+<a name="l00207"></a>00207 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/DelayL_8h-source.html b/doc/html/DelayL_8h-source.html
deleted file mode 100644
index 35786e7..0000000
--- a/doc/html/DelayL_8h-source.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>DelayL.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_DELAYL_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_DELAYL_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Delay.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00025"></a>00025 <span class="comment">/***************************************************/</span>
-<a name="l00026"></a>00026 
-<a name="l00027"></a><a class="code" href="classstk_1_1DelayL.html">00027</a> <span class="keyword">class </span><a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00028"></a>00028 {
-<a name="l00029"></a>00029 <span class="keyword">public</span>:
-<a name="l00030"></a>00030 
-<a name="l00032"></a>00032 
-<a name="l00037"></a>00037   <a class="code" href="classstk_1_1DelayL.html#d60f2222397e19fe524fc3b76b59b846" title="Default constructor creates a delay-line with maximum length of 4095 samples and...">DelayL</a>( StkFloat delay = 0.0, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> maxDelay = 4095 );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1DelayL.html#8f9b49c7b098d9e379baf44b0c345457" title="Class destructor.">~DelayL</a>();
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayL.html#18b40806591654a9c9c32603990fce40" title="Set the maximum delay-line length.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053 
-<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayL.html#80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( StkFloat delay );
-<a name="l00057"></a>00057 
-<a name="l00059"></a><a class="code" href="classstk_1_1DelayL.html#af2d5ef7dba47ff1fb279c327021beb0">00059</a>   StkFloat <a class="code" href="classstk_1_1DelayL.html#af2d5ef7dba47ff1fb279c327021beb0" title="Return the current delay-line length.">getDelay</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> delay_; };
-<a name="l00060"></a>00060 
-<a name="l00062"></a>00062 
-<a name="l00067"></a>00067   StkFloat <a class="code" href="classstk_1_1DelayL.html#7a84a3a188f2de7cc05f81ad06e04874" title="Return the value at tapDelay samples from the delay-line input.">contentsAt</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
-<a name="l00068"></a>00068 
-<a name="l00070"></a><a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9">00070</a>   StkFloat <a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00071"></a>00071 
-<a name="l00073"></a>00073 
-<a name="l00076"></a>00076   StkFloat <a class="code" href="classstk_1_1DelayL.html#bfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>( <span class="keywordtype">void</span> );
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079   StkFloat <a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00080"></a>00080 
-<a name="l00082"></a>00082 
-<a name="l00090"></a>00090   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00091"></a>00091 
-<a name="l00093"></a>00093 
-<a name="l00101"></a>00101   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103  <span class="keyword">protected</span>:
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> inPoint_;
-<a name="l00106"></a>00106   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> outPoint_;
-<a name="l00107"></a>00107   StkFloat delay_;
-<a name="l00108"></a>00108   StkFloat alpha_;
-<a name="l00109"></a>00109   StkFloat omAlpha_;
-<a name="l00110"></a>00110   StkFloat nextOutput_;
-<a name="l00111"></a>00111   <span class="keywordtype">bool</span> doNextOut_;
-<a name="l00112"></a>00112 };
-<a name="l00113"></a>00113 
-<a name="l00114"></a><a class="code" href="classstk_1_1DelayL.html#bfe69d19690fab75b6026dab96870fb8">00114</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayL.html#bfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">DelayL :: nextOut</a>( <span class="keywordtype">void</span> )
-<a name="l00115"></a>00115 {
-<a name="l00116"></a>00116   <span class="keywordflow">if</span> ( doNextOut_ ) {
-<a name="l00117"></a>00117     <span class="comment">// First 1/2 of interpolation</span>
-<a name="l00118"></a>00118     nextOutput_ = inputs_[outPoint_] * omAlpha_;
-<a name="l00119"></a>00119     <span class="comment">// Second 1/2 of interpolation</span>
-<a name="l00120"></a>00120     <span class="keywordflow">if</span> (outPoint_+1 &lt; inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>())
-<a name="l00121"></a>00121       nextOutput_ += inputs_[outPoint_+1] * alpha_;
-<a name="l00122"></a>00122     <span class="keywordflow">else</span>
-<a name="l00123"></a>00123       nextOutput_ += inputs_[0] * alpha_;
-<a name="l00124"></a>00124     doNextOut_ = <span class="keyword">false</span>;
-<a name="l00125"></a>00125   }
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127   <span class="keywordflow">return</span> nextOutput_;
-<a name="l00128"></a>00128 }
-<a name="l00129"></a>00129 
-<a name="l00130"></a><a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f">00130</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">DelayL :: tick</a>( StkFloat input )
-<a name="l00131"></a>00131 {
-<a name="l00132"></a>00132   inputs_[inPoint_++] = input * gain_;
-<a name="l00133"></a>00133 
-<a name="l00134"></a>00134   <span class="comment">// Increment input pointer modulo length.</span>
-<a name="l00135"></a>00135   <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00136"></a>00136     inPoint_ = 0;
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138   lastFrame_[0] = <a class="code" href="classstk_1_1DelayL.html#bfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00139"></a>00139   doNextOut_ = <span class="keyword">true</span>;
-<a name="l00140"></a>00140 
-<a name="l00141"></a>00141   <span class="comment">// Increment output pointer modulo length.</span>
-<a name="l00142"></a>00142   <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00143"></a>00143     outPoint_ = 0;
-<a name="l00144"></a>00144 
-<a name="l00145"></a>00145   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00146"></a>00146 }
-<a name="l00147"></a>00147 
-<a name="l00148"></a><a class="code" href="classstk_1_1DelayL.html#cdc5d41de53c53d9d4b39ee8a46fb96c">00148</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">DelayL :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00149"></a>00149 {
-<a name="l00150"></a>00150 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00151"></a>00151 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00152"></a>00152     errorString_ &lt;&lt; <span class="stringliteral">"DelayL::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00153"></a>00153     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00154"></a>00154   }
-<a name="l00155"></a>00155 <span class="preprocessor">#endif</span>
-<a name="l00156"></a>00156 <span class="preprocessor"></span>
-<a name="l00157"></a>00157   StkFloat *samples = &amp;frames[channel];
-<a name="l00158"></a>00158   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00159"></a>00159   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00160"></a>00160     inputs_[inPoint_++] = *samples * gain_;
-<a name="l00161"></a>00161     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00162"></a>00162     *samples = <a class="code" href="classstk_1_1DelayL.html#bfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00163"></a>00163     doNextOut_ = <span class="keyword">true</span>;
-<a name="l00164"></a>00164     <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00165"></a>00165   }
-<a name="l00166"></a>00166 
-<a name="l00167"></a>00167   lastFrame_[0] = *(samples-hop);
-<a name="l00168"></a>00168   <span class="keywordflow">return</span> frames;
-<a name="l00169"></a>00169 }
-<a name="l00170"></a>00170 
-<a name="l00171"></a><a class="code" href="classstk_1_1DelayL.html#56ee486fb01fbf45d5a3dbad754a838e">00171</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">DelayL :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00172"></a>00172 {
-<a name="l00173"></a>00173 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00174"></a>00174 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00175"></a>00175     errorString_ &lt;&lt; <span class="stringliteral">"DelayL::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00176"></a>00176     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00177"></a>00177   }
-<a name="l00178"></a>00178 <span class="preprocessor">#endif</span>
-<a name="l00179"></a>00179 <span class="preprocessor"></span>
-<a name="l00180"></a>00180   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00181"></a>00181   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00182"></a>00182   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00183"></a>00183   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00184"></a>00184     inputs_[inPoint_++] = *iSamples * gain_;
-<a name="l00185"></a>00185     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00186"></a>00186     *oSamples = <a class="code" href="classstk_1_1DelayL.html#bfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00187"></a>00187     doNextOut_ = <span class="keyword">true</span>;
-<a name="l00188"></a>00188     <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00189"></a>00189   }
-<a name="l00190"></a>00190 
-<a name="l00191"></a>00191   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00192"></a>00192   <span class="keywordflow">return</span> iFrames;
-<a name="l00193"></a>00193 }
-<a name="l00194"></a>00194 
-<a name="l00195"></a>00195 } <span class="comment">// stk namespace</span>
-<a name="l00196"></a>00196 
-<a name="l00197"></a>00197 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/DelayL_8h_source.html b/doc/html/DelayL_8h_source.html
index e42a988..2f0742e 100644
--- a/doc/html/DelayL_8h_source.html
+++ b/doc/html/DelayL_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>DelayL.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_DELAYL_H</span>
@@ -31,131 +31,135 @@
 <a name="l00038"></a>00038 
 <a name="l00040"></a>00040   <a class="code" href="classstk_1_1DelayL.html#a8f9b49c7b098d9e379baf44b0c345457" title="Class destructor.">~DelayL</a>();
 <a name="l00041"></a>00041 
-<a name="l00043"></a>00043 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayL.html#a18b40806591654a9c9c32603990fce40" title="Set the maximum delay-line length.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053 
-<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayL.html#a80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( StkFloat delay );
-<a name="l00057"></a>00057 
-<a name="l00059"></a><a class="code" href="classstk_1_1DelayL.html#aaf2d5ef7dba47ff1fb279c327021beb0">00059</a>   StkFloat <a class="code" href="classstk_1_1DelayL.html#aaf2d5ef7dba47ff1fb279c327021beb0" title="Return the current delay-line length.">getDelay</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> delay_; };
+<a name="l00043"></a><a class="code" href="classstk_1_1DelayL.html#acbcb8326db134a26fdad5f16f1a0ba7e">00043</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1DelayL.html#acbcb8326db134a26fdad5f16f1a0ba7e" title="Get the maximum delay-line length.">getMaximumDelay</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() - 1; };
+<a name="l00044"></a>00044 
+<a name="l00046"></a>00046 
+<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayL.html#a18b40806591654a9c9c32603990fce40" title="Set the maximum delay-line length.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
+<a name="l00054"></a>00054 
+<a name="l00056"></a>00056 
+<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayL.html#a80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( StkFloat delay );
 <a name="l00060"></a>00060 
-<a name="l00062"></a>00062 
-<a name="l00067"></a>00067   StkFloat <a class="code" href="classstk_1_1DelayL.html#a7a84a3a188f2de7cc05f81ad06e04874" title="Return the value at tapDelay samples from the delay-line input.">contentsAt</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
-<a name="l00068"></a>00068 
-<a name="l00070"></a><a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9">00070</a>   StkFloat <a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
+<a name="l00062"></a><a class="code" href="classstk_1_1DelayL.html#aaf2d5ef7dba47ff1fb279c327021beb0">00062</a>   StkFloat <a class="code" href="classstk_1_1DelayL.html#aaf2d5ef7dba47ff1fb279c327021beb0" title="Return the current delay-line length.">getDelay</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> delay_; };
+<a name="l00063"></a>00063 
+<a name="l00065"></a>00065 
+<a name="l00070"></a>00070   StkFloat <a class="code" href="classstk_1_1DelayL.html#ad16a1f176e93a9beb8e685aafa32579e" title="Return the value at tapDelay samples from the delay-line input.">tapOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
 <a name="l00071"></a>00071 
-<a name="l00073"></a>00073 
-<a name="l00076"></a>00076   StkFloat <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>( <span class="keywordtype">void</span> );
+<a name="l00073"></a>00073   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1DelayL.html#a984843567ba3de6543bd13c23457f495" title="Set the value at tapDelay samples from the delay-line input.">tapIn</a>( StkFloat value, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
+<a name="l00074"></a>00074 
+<a name="l00076"></a><a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9">00076</a>   StkFloat <a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
 <a name="l00077"></a>00077 
-<a name="l00079"></a>00079   StkFloat <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00080"></a>00080 
-<a name="l00082"></a>00082 
-<a name="l00090"></a>00090   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00091"></a>00091 
-<a name="l00093"></a>00093 
-<a name="l00101"></a>00101   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103  <span class="keyword">protected</span>:
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> inPoint_;
-<a name="l00106"></a>00106   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> outPoint_;
-<a name="l00107"></a>00107   StkFloat delay_;
-<a name="l00108"></a>00108   StkFloat alpha_;
-<a name="l00109"></a>00109   StkFloat omAlpha_;
-<a name="l00110"></a>00110   StkFloat nextOutput_;
-<a name="l00111"></a>00111   <span class="keywordtype">bool</span> doNextOut_;
-<a name="l00112"></a>00112 };
-<a name="l00113"></a>00113 
-<a name="l00114"></a><a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8">00114</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">DelayL :: nextOut</a>( <span class="keywordtype">void</span> )
-<a name="l00115"></a>00115 {
-<a name="l00116"></a>00116   <span class="keywordflow">if</span> ( doNextOut_ ) {
-<a name="l00117"></a>00117     <span class="comment">// First 1/2 of interpolation</span>
-<a name="l00118"></a>00118     nextOutput_ = inputs_[outPoint_] * omAlpha_;
-<a name="l00119"></a>00119     <span class="comment">// Second 1/2 of interpolation</span>
-<a name="l00120"></a>00120     <span class="keywordflow">if</span> (outPoint_+1 &lt; inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>())
-<a name="l00121"></a>00121       nextOutput_ += inputs_[outPoint_+1] * alpha_;
-<a name="l00122"></a>00122     <span class="keywordflow">else</span>
-<a name="l00123"></a>00123       nextOutput_ += inputs_[0] * alpha_;
-<a name="l00124"></a>00124     doNextOut_ = <span class="keyword">false</span>;
-<a name="l00125"></a>00125   }
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127   <span class="keywordflow">return</span> nextOutput_;
-<a name="l00128"></a>00128 }
-<a name="l00129"></a>00129 
-<a name="l00130"></a><a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f">00130</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">DelayL :: tick</a>( StkFloat input )
-<a name="l00131"></a>00131 {
-<a name="l00132"></a>00132   inputs_[inPoint_++] = input * gain_;
-<a name="l00133"></a>00133 
-<a name="l00134"></a>00134   <span class="comment">// Increment input pointer modulo length.</span>
-<a name="l00135"></a>00135   <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00136"></a>00136     inPoint_ = 0;
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138   lastFrame_[0] = <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00139"></a>00139   doNextOut_ = <span class="keyword">true</span>;
-<a name="l00140"></a>00140 
-<a name="l00141"></a>00141   <span class="comment">// Increment output pointer modulo length.</span>
-<a name="l00142"></a>00142   <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00143"></a>00143     outPoint_ = 0;
-<a name="l00144"></a>00144 
-<a name="l00145"></a>00145   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00146"></a>00146 }
-<a name="l00147"></a>00147 
-<a name="l00148"></a><a class="code" href="classstk_1_1DelayL.html#acdc5d41de53c53d9d4b39ee8a46fb96c">00148</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">DelayL :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00149"></a>00149 {
-<a name="l00150"></a>00150 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00151"></a>00151 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00152"></a>00152     errorString_ &lt;&lt; <span class="stringliteral">&quot;DelayL::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00153"></a>00153     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00154"></a>00154   }
-<a name="l00155"></a>00155 <span class="preprocessor">#endif</span>
-<a name="l00156"></a>00156 <span class="preprocessor"></span>
-<a name="l00157"></a>00157   StkFloat *samples = &amp;frames[channel];
-<a name="l00158"></a>00158   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00159"></a>00159   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00160"></a>00160     inputs_[inPoint_++] = *samples * gain_;
-<a name="l00161"></a>00161     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00162"></a>00162     *samples = <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00163"></a>00163     doNextOut_ = <span class="keyword">true</span>;
-<a name="l00164"></a>00164     <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00165"></a>00165   }
-<a name="l00166"></a>00166 
-<a name="l00167"></a>00167   lastFrame_[0] = *(samples-hop);
-<a name="l00168"></a>00168   <span class="keywordflow">return</span> frames;
-<a name="l00169"></a>00169 }
-<a name="l00170"></a>00170 
-<a name="l00171"></a><a class="code" href="classstk_1_1DelayL.html#a56ee486fb01fbf45d5a3dbad754a838e">00171</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">DelayL :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00172"></a>00172 {
-<a name="l00173"></a>00173 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00174"></a>00174 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00175"></a>00175     errorString_ &lt;&lt; <span class="stringliteral">&quot;DelayL::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00176"></a>00176     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00177"></a>00177   }
-<a name="l00178"></a>00178 <span class="preprocessor">#endif</span>
-<a name="l00179"></a>00179 <span class="preprocessor"></span>
-<a name="l00180"></a>00180   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00181"></a>00181   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00182"></a>00182   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00183"></a>00183   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00184"></a>00184     inputs_[inPoint_++] = *iSamples * gain_;
-<a name="l00185"></a>00185     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00186"></a>00186     *oSamples = <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
-<a name="l00187"></a>00187     doNextOut_ = <span class="keyword">true</span>;
-<a name="l00188"></a>00188     <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00189"></a>00189   }
-<a name="l00190"></a>00190 
-<a name="l00191"></a>00191   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00192"></a>00192   <span class="keywordflow">return</span> iFrames;
-<a name="l00193"></a>00193 }
-<a name="l00194"></a>00194 
-<a name="l00195"></a>00195 } <span class="comment">// stk namespace</span>
+<a name="l00079"></a>00079 
+<a name="l00082"></a>00082   StkFloat <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>( <span class="keywordtype">void</span> );
+<a name="l00083"></a>00083 
+<a name="l00085"></a>00085   StkFloat <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
+<a name="l00086"></a>00086 
+<a name="l00088"></a>00088 
+<a name="l00096"></a>00096   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00097"></a>00097 
+<a name="l00099"></a>00099 
+<a name="l00107"></a>00107   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
+<a name="l00108"></a>00108 
+<a name="l00109"></a>00109  <span class="keyword">protected</span>:
+<a name="l00110"></a>00110 
+<a name="l00111"></a>00111   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> inPoint_;
+<a name="l00112"></a>00112   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> outPoint_;
+<a name="l00113"></a>00113   StkFloat delay_;
+<a name="l00114"></a>00114   StkFloat alpha_;
+<a name="l00115"></a>00115   StkFloat omAlpha_;
+<a name="l00116"></a>00116   StkFloat nextOutput_;
+<a name="l00117"></a>00117   <span class="keywordtype">bool</span> doNextOut_;
+<a name="l00118"></a>00118 };
+<a name="l00119"></a>00119 
+<a name="l00120"></a><a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8">00120</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">DelayL :: nextOut</a>( <span class="keywordtype">void</span> )
+<a name="l00121"></a>00121 {
+<a name="l00122"></a>00122   <span class="keywordflow">if</span> ( doNextOut_ ) {
+<a name="l00123"></a>00123     <span class="comment">// First 1/2 of interpolation</span>
+<a name="l00124"></a>00124     nextOutput_ = inputs_[outPoint_] * omAlpha_;
+<a name="l00125"></a>00125     <span class="comment">// Second 1/2 of interpolation</span>
+<a name="l00126"></a>00126     <span class="keywordflow">if</span> (outPoint_+1 &lt; inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>())
+<a name="l00127"></a>00127       nextOutput_ += inputs_[outPoint_+1] * alpha_;
+<a name="l00128"></a>00128     <span class="keywordflow">else</span>
+<a name="l00129"></a>00129       nextOutput_ += inputs_[0] * alpha_;
+<a name="l00130"></a>00130     doNextOut_ = <span class="keyword">false</span>;
+<a name="l00131"></a>00131   }
+<a name="l00132"></a>00132 
+<a name="l00133"></a>00133   <span class="keywordflow">return</span> nextOutput_;
+<a name="l00134"></a>00134 }
+<a name="l00135"></a>00135 
+<a name="l00136"></a><a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f">00136</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">DelayL :: tick</a>( StkFloat input )
+<a name="l00137"></a>00137 {
+<a name="l00138"></a>00138   inputs_[inPoint_++] = input * gain_;
+<a name="l00139"></a>00139 
+<a name="l00140"></a>00140   <span class="comment">// Increment input pointer modulo length.</span>
+<a name="l00141"></a>00141   <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
+<a name="l00142"></a>00142     inPoint_ = 0;
+<a name="l00143"></a>00143 
+<a name="l00144"></a>00144   lastFrame_[0] = <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
+<a name="l00145"></a>00145   doNextOut_ = <span class="keyword">true</span>;
+<a name="l00146"></a>00146 
+<a name="l00147"></a>00147   <span class="comment">// Increment output pointer modulo length.</span>
+<a name="l00148"></a>00148   <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
+<a name="l00149"></a>00149     outPoint_ = 0;
+<a name="l00150"></a>00150 
+<a name="l00151"></a>00151   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00152"></a>00152 }
+<a name="l00153"></a>00153 
+<a name="l00154"></a><a class="code" href="classstk_1_1DelayL.html#acdc5d41de53c53d9d4b39ee8a46fb96c">00154</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">DelayL :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00155"></a>00155 {
+<a name="l00156"></a>00156 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00157"></a>00157 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00158"></a>00158     oStream_ &lt;&lt; <span class="stringliteral">&quot;DelayL::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00159"></a>00159     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00160"></a>00160   }
+<a name="l00161"></a>00161 <span class="preprocessor">#endif</span>
+<a name="l00162"></a>00162 <span class="preprocessor"></span>
+<a name="l00163"></a>00163   StkFloat *samples = &amp;frames[channel];
+<a name="l00164"></a>00164   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00165"></a>00165   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00166"></a>00166     inputs_[inPoint_++] = *samples * gain_;
+<a name="l00167"></a>00167     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
+<a name="l00168"></a>00168     *samples = <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
+<a name="l00169"></a>00169     doNextOut_ = <span class="keyword">true</span>;
+<a name="l00170"></a>00170     <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
+<a name="l00171"></a>00171   }
+<a name="l00172"></a>00172 
+<a name="l00173"></a>00173   lastFrame_[0] = *(samples-hop);
+<a name="l00174"></a>00174   <span class="keywordflow">return</span> frames;
+<a name="l00175"></a>00175 }
+<a name="l00176"></a>00176 
+<a name="l00177"></a><a class="code" href="classstk_1_1DelayL.html#a56ee486fb01fbf45d5a3dbad754a838e">00177</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">DelayL :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00178"></a>00178 {
+<a name="l00179"></a>00179 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00180"></a>00180 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00181"></a>00181     oStream_ &lt;&lt; <span class="stringliteral">&quot;DelayL::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00182"></a>00182     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00183"></a>00183   }
+<a name="l00184"></a>00184 <span class="preprocessor">#endif</span>
+<a name="l00185"></a>00185 <span class="preprocessor"></span>
+<a name="l00186"></a>00186   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00187"></a>00187   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00188"></a>00188   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00189"></a>00189   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00190"></a>00190     inputs_[inPoint_++] = *iSamples * gain_;
+<a name="l00191"></a>00191     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
+<a name="l00192"></a>00192     *oSamples = <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
+<a name="l00193"></a>00193     doNextOut_ = <span class="keyword">true</span>;
+<a name="l00194"></a>00194     <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
+<a name="l00195"></a>00195   }
 <a name="l00196"></a>00196 
-<a name="l00197"></a>00197 <span class="preprocessor">#endif</span>
+<a name="l00197"></a>00197   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00198"></a>00198   <span class="keywordflow">return</span> iFrames;
+<a name="l00199"></a>00199 }
+<a name="l00200"></a>00200 
+<a name="l00201"></a>00201 } <span class="comment">// stk namespace</span>
+<a name="l00202"></a>00202 
+<a name="l00203"></a>00203 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Delay_8h-source.html b/doc/html/Delay_8h-source.html
deleted file mode 100644
index bc5de71..0000000
--- a/doc/html/Delay_8h-source.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Delay.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_DELAY_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_DELAY_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00022"></a>00022 <span class="comment">/***************************************************/</span>
-<a name="l00023"></a>00023 
-<a name="l00024"></a><a class="code" href="classstk_1_1Delay.html">00024</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00025"></a>00025 {
-<a name="l00026"></a>00026 <span class="keyword">public</span>:
-<a name="l00027"></a>00027 
-<a name="l00029"></a>00029 
-<a name="l00034"></a>00034   <a class="code" href="classstk_1_1Delay.html#9644532bfea44fae046e54f2509cf1ef" title="The default constructor creates a delay-line with maximum length of 4095 samples...">Delay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> maxDelay = 4095 );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037   <a class="code" href="classstk_1_1Delay.html#24b6ed6c7c5fc6d15935ec2a118b6b4f" title="Class destructor.">~Delay</a>();
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Delay.html#0cf4c8da14bd4105eef06e35caaf1532" title="Set the maximum delay-line length.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Delay.html#5eaeed55ea0c7b30ed66fedd6ef52fc2" title="Set the delay-line length.">setDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00054"></a>00054 
-<a name="l00056"></a><a class="code" href="classstk_1_1Delay.html#7ae307dc997ff07ff986ca5c4d287441">00056</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1Delay.html#7ae307dc997ff07ff986ca5c4d287441" title="Return the current delay-line length.">getDelay</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> delay_; };
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059 
-<a name="l00064"></a>00064   StkFloat <a class="code" href="classstk_1_1Delay.html#7d4c9c21e752f860ba683e9849d14665" title="Return the value at tapDelay samples from the delay-line input.">contentsAt</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
-<a name="l00065"></a>00065 
-<a name="l00067"></a><a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2">00067</a>   StkFloat <a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00068"></a>00068 
-<a name="l00070"></a>00070 
-<a name="l00073"></a><a class="code" href="classstk_1_1Delay.html#2433e3246551f4fdf1366884cd2ae426">00073</a>   StkFloat <a class="code" href="classstk_1_1Delay.html#2433e3246551f4fdf1366884cd2ae426" title="Return the value that will be output by the next call to tick().">nextOut</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> inputs_[outPoint_]; };
-<a name="l00074"></a>00074 
-<a name="l00076"></a>00076   StkFloat <a class="code" href="classstk_1_1Delay.html#240830690cd8fa26e0604fd82c65dda1" title="Calculate and return the signal energy in the delay-line.">energy</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span>;
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079   StkFloat <a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00080"></a>00080 
-<a name="l00082"></a>00082 
-<a name="l00090"></a>00090   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00091"></a>00091 
-<a name="l00093"></a>00093 
-<a name="l00101"></a>00101   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103 <span class="keyword">protected</span>:
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> inPoint_;
-<a name="l00106"></a>00106   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> outPoint_;
-<a name="l00107"></a>00107   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay_;
-<a name="l00108"></a>00108 };
-<a name="l00109"></a>00109 
-<a name="l00110"></a><a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9">00110</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">Delay :: tick</a>( StkFloat input )
-<a name="l00111"></a>00111 {
-<a name="l00112"></a>00112   inputs_[inPoint_++] = input * gain_;
-<a name="l00113"></a>00113 
-<a name="l00114"></a>00114   <span class="comment">// Check for end condition</span>
-<a name="l00115"></a>00115   <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00116"></a>00116     inPoint_ = 0;
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   <span class="comment">// Read out next value</span>
-<a name="l00119"></a>00119   lastFrame_[0] = inputs_[outPoint_++];
-<a name="l00120"></a>00120 
-<a name="l00121"></a>00121   <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00122"></a>00122     outPoint_ = 0;
-<a name="l00123"></a>00123 
-<a name="l00124"></a>00124   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00125"></a>00125 }
-<a name="l00126"></a>00126 
-<a name="l00127"></a><a class="code" href="classstk_1_1Delay.html#93fe8e45acb933889be812f35810f977">00127</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">Delay :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00128"></a>00128 {
-<a name="l00129"></a>00129 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00130"></a>00130 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00131"></a>00131     errorString_ &lt;&lt; <span class="stringliteral">"Delay::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00132"></a>00132     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00133"></a>00133   }
-<a name="l00134"></a>00134 <span class="preprocessor">#endif</span>
-<a name="l00135"></a>00135 <span class="preprocessor"></span>
-<a name="l00136"></a>00136   StkFloat *samples = &amp;frames[channel];
-<a name="l00137"></a>00137   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00138"></a>00138   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00139"></a>00139     inputs_[inPoint_++] = *samples * gain_;
-<a name="l00140"></a>00140     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00141"></a>00141     *samples = inputs_[outPoint_++];
-<a name="l00142"></a>00142     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00143"></a>00143   }
-<a name="l00144"></a>00144 
-<a name="l00145"></a>00145   lastFrame_[0] = *(samples-hop);
-<a name="l00146"></a>00146   <span class="keywordflow">return</span> frames;
-<a name="l00147"></a>00147 }
-<a name="l00148"></a>00148 
-<a name="l00149"></a><a class="code" href="classstk_1_1Delay.html#de0d544e45e535fd792fe70a2a22da6f">00149</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">Delay :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00150"></a>00150 {
-<a name="l00151"></a>00151 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00152"></a>00152 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00153"></a>00153     errorString_ &lt;&lt; <span class="stringliteral">"Delay::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00154"></a>00154     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00155"></a>00155   }
-<a name="l00156"></a>00156 <span class="preprocessor">#endif</span>
-<a name="l00157"></a>00157 <span class="preprocessor"></span>
-<a name="l00158"></a>00158   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00159"></a>00159   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00160"></a>00160   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00161"></a>00161   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00162"></a>00162     inputs_[inPoint_++] = *iSamples * gain_;
-<a name="l00163"></a>00163     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00164"></a>00164     *oSamples = inputs_[outPoint_++];
-<a name="l00165"></a>00165     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00166"></a>00166   }
-<a name="l00167"></a>00167 
-<a name="l00168"></a>00168   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00169"></a>00169   <span class="keywordflow">return</span> iFrames;
-<a name="l00170"></a>00170 }
-<a name="l00171"></a>00171 
-<a name="l00172"></a>00172 } <span class="comment">// stk namespace</span>
-<a name="l00173"></a>00173 
-<a name="l00174"></a>00174 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Delay_8h_source.html b/doc/html/Delay_8h_source.html
index 232c414..79d741e 100644
--- a/doc/html/Delay_8h_source.html
+++ b/doc/html/Delay_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Delay.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_DELAY_H</span>
@@ -31,113 +31,117 @@
 <a name="l00035"></a>00035 
 <a name="l00037"></a>00037   <a class="code" href="classstk_1_1Delay.html#a24b6ed6c7c5fc6d15935ec2a118b6b4f" title="Class destructor.">~Delay</a>();
 <a name="l00038"></a>00038 
-<a name="l00040"></a>00040 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Delay.html#a0cf4c8da14bd4105eef06e35caaf1532" title="Set the maximum delay-line length.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Delay.html#a5eaeed55ea0c7b30ed66fedd6ef52fc2" title="Set the delay-line length.">setDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00054"></a>00054 
-<a name="l00056"></a><a class="code" href="classstk_1_1Delay.html#a7ae307dc997ff07ff986ca5c4d287441">00056</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1Delay.html#a7ae307dc997ff07ff986ca5c4d287441" title="Return the current delay-line length.">getDelay</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> delay_; };
+<a name="l00040"></a><a class="code" href="classstk_1_1Delay.html#a31d348fd15e5b6e23f2984b75968a3ec">00040</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1Delay.html#a31d348fd15e5b6e23f2984b75968a3ec" title="Get the maximum delay-line length.">getMaximumDelay</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() - 1; };
+<a name="l00041"></a>00041 
+<a name="l00043"></a>00043 
+<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Delay.html#a0cf4c8da14bd4105eef06e35caaf1532" title="Set the maximum delay-line length.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
+<a name="l00051"></a>00051 
+<a name="l00053"></a>00053 
+<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Delay.html#a5eaeed55ea0c7b30ed66fedd6ef52fc2" title="Set the delay-line length.">setDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
 <a name="l00057"></a>00057 
-<a name="l00059"></a>00059 
-<a name="l00064"></a>00064   StkFloat <a class="code" href="classstk_1_1Delay.html#a7d4c9c21e752f860ba683e9849d14665" title="Return the value at tapDelay samples from the delay-line input.">contentsAt</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067 
-<a name="l00072"></a>00072   StkFloat <a class="code" href="classstk_1_1Delay.html#aea5580dd84ea6982d1f7b92b53314118" title="Sum the provided value into the delay line at tapDelay samples from the input.">addTo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay, StkFloat value );
+<a name="l00059"></a><a class="code" href="classstk_1_1Delay.html#a7ae307dc997ff07ff986ca5c4d287441">00059</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1Delay.html#a7ae307dc997ff07ff986ca5c4d287441" title="Return the current delay-line length.">getDelay</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> delay_; };
+<a name="l00060"></a>00060 
+<a name="l00062"></a>00062 
+<a name="l00067"></a>00067   StkFloat <a class="code" href="classstk_1_1Delay.html#a4d5e5bab50e4fa062bd3f0e9e2fd19db" title="Return the value at tapDelay samples from the delay-line input.">tapOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
+<a name="l00068"></a>00068 
+<a name="l00070"></a>00070   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Delay.html#abd0b93da7a12eca94c1e68ec3b3774f1" title="Set the value at tapDelay samples from the delay-line input.">tapIn</a>( StkFloat value, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
+<a name="l00071"></a>00071 
 <a name="l00073"></a>00073 
-<a name="l00075"></a><a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2">00075</a>   StkFloat <a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00076"></a>00076 
-<a name="l00078"></a>00078 
-<a name="l00081"></a><a class="code" href="classstk_1_1Delay.html#a2433e3246551f4fdf1366884cd2ae426">00081</a>   StkFloat <a class="code" href="classstk_1_1Delay.html#a2433e3246551f4fdf1366884cd2ae426" title="Return the value that will be output by the next call to tick().">nextOut</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> inputs_[outPoint_]; };
+<a name="l00078"></a>00078   StkFloat <a class="code" href="classstk_1_1Delay.html#a80f143ab956c9d3b1721958ece6da65e" title="Sum the provided value into the delay line at tapDelay samples from the input.">addTo</a>( StkFloat value, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> tapDelay );
+<a name="l00079"></a>00079 
+<a name="l00081"></a><a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2">00081</a>   StkFloat <a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
 <a name="l00082"></a>00082 
-<a name="l00084"></a>00084   StkFloat <a class="code" href="classstk_1_1Delay.html#a240830690cd8fa26e0604fd82c65dda1" title="Calculate and return the signal energy in the delay-line.">energy</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span>;
-<a name="l00085"></a>00085 
-<a name="l00087"></a>00087   StkFloat <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
+<a name="l00084"></a>00084 
+<a name="l00087"></a><a class="code" href="classstk_1_1Delay.html#a2433e3246551f4fdf1366884cd2ae426">00087</a>   StkFloat <a class="code" href="classstk_1_1Delay.html#a2433e3246551f4fdf1366884cd2ae426" title="Return the value that will be output by the next call to tick().">nextOut</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> inputs_[outPoint_]; };
 <a name="l00088"></a>00088 
-<a name="l00090"></a>00090 
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00099"></a>00099 
-<a name="l00101"></a>00101 
-<a name="l00109"></a>00109   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00110"></a>00110 
-<a name="l00111"></a>00111 <span class="keyword">protected</span>:
-<a name="l00112"></a>00112 
-<a name="l00113"></a>00113   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> inPoint_;
-<a name="l00114"></a>00114   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> outPoint_;
-<a name="l00115"></a>00115   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay_;
-<a name="l00116"></a>00116 };
-<a name="l00117"></a>00117 
-<a name="l00118"></a><a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9">00118</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">Delay :: tick</a>( StkFloat input )
-<a name="l00119"></a>00119 {
-<a name="l00120"></a>00120   inputs_[inPoint_++] = input * gain_;
-<a name="l00121"></a>00121 
-<a name="l00122"></a>00122   <span class="comment">// Check for end condition</span>
-<a name="l00123"></a>00123   <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00124"></a>00124     inPoint_ = 0;
-<a name="l00125"></a>00125 
-<a name="l00126"></a>00126   <span class="comment">// Read out next value</span>
-<a name="l00127"></a>00127   lastFrame_[0] = inputs_[outPoint_++];
-<a name="l00128"></a>00128 
-<a name="l00129"></a>00129   <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00130"></a>00130     outPoint_ = 0;
+<a name="l00090"></a>00090   StkFloat <a class="code" href="classstk_1_1Delay.html#a240830690cd8fa26e0604fd82c65dda1" title="Calculate and return the signal energy in the delay-line.">energy</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span>;
+<a name="l00091"></a>00091 
+<a name="l00093"></a>00093   StkFloat <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
+<a name="l00094"></a>00094 
+<a name="l00096"></a>00096 
+<a name="l00104"></a>00104   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00105"></a>00105 
+<a name="l00107"></a>00107 
+<a name="l00115"></a>00115   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
+<a name="l00116"></a>00116 
+<a name="l00117"></a>00117 <span class="keyword">protected</span>:
+<a name="l00118"></a>00118 
+<a name="l00119"></a>00119   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> inPoint_;
+<a name="l00120"></a>00120   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> outPoint_;
+<a name="l00121"></a>00121   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay_;
+<a name="l00122"></a>00122 };
+<a name="l00123"></a>00123 
+<a name="l00124"></a><a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9">00124</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">Delay :: tick</a>( StkFloat input )
+<a name="l00125"></a>00125 {
+<a name="l00126"></a>00126   inputs_[inPoint_++] = input * gain_;
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128   <span class="comment">// Check for end condition</span>
+<a name="l00129"></a>00129   <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
+<a name="l00130"></a>00130     inPoint_ = 0;
 <a name="l00131"></a>00131 
-<a name="l00132"></a>00132   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00133"></a>00133 }
+<a name="l00132"></a>00132   <span class="comment">// Read out next value</span>
+<a name="l00133"></a>00133   lastFrame_[0] = inputs_[outPoint_++];
 <a name="l00134"></a>00134 
-<a name="l00135"></a><a class="code" href="classstk_1_1Delay.html#a93fe8e45acb933889be812f35810f977">00135</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">Delay :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00136"></a>00136 {
-<a name="l00137"></a>00137 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00138"></a>00138 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00139"></a>00139     errorString_ &lt;&lt; <span class="stringliteral">&quot;Delay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00140"></a>00140     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00141"></a>00141   }
-<a name="l00142"></a>00142 <span class="preprocessor">#endif</span>
-<a name="l00143"></a>00143 <span class="preprocessor"></span>
-<a name="l00144"></a>00144   StkFloat *samples = &amp;frames[channel];
-<a name="l00145"></a>00145   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00146"></a>00146   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00147"></a>00147     inputs_[inPoint_++] = *samples * gain_;
-<a name="l00148"></a>00148     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00149"></a>00149     *samples = inputs_[outPoint_++];
-<a name="l00150"></a>00150     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00151"></a>00151   }
-<a name="l00152"></a>00152 
-<a name="l00153"></a>00153   lastFrame_[0] = *(samples-hop);
-<a name="l00154"></a>00154   <span class="keywordflow">return</span> frames;
-<a name="l00155"></a>00155 }
-<a name="l00156"></a>00156 
-<a name="l00157"></a><a class="code" href="classstk_1_1Delay.html#ade0d544e45e535fd792fe70a2a22da6f">00157</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">Delay :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00158"></a>00158 {
-<a name="l00159"></a>00159 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00160"></a>00160 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00161"></a>00161     errorString_ &lt;&lt; <span class="stringliteral">&quot;Delay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00162"></a>00162     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00163"></a>00163   }
-<a name="l00164"></a>00164 <span class="preprocessor">#endif</span>
-<a name="l00165"></a>00165 <span class="preprocessor"></span>
-<a name="l00166"></a>00166   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00167"></a>00167   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00168"></a>00168   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00169"></a>00169   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00170"></a>00170     inputs_[inPoint_++] = *iSamples * gain_;
-<a name="l00171"></a>00171     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00172"></a>00172     *oSamples = inputs_[outPoint_++];
-<a name="l00173"></a>00173     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
-<a name="l00174"></a>00174   }
-<a name="l00175"></a>00175 
-<a name="l00176"></a>00176   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00177"></a>00177   <span class="keywordflow">return</span> iFrames;
-<a name="l00178"></a>00178 }
-<a name="l00179"></a>00179 
-<a name="l00180"></a>00180 } <span class="comment">// stk namespace</span>
+<a name="l00135"></a>00135   <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
+<a name="l00136"></a>00136     outPoint_ = 0;
+<a name="l00137"></a>00137 
+<a name="l00138"></a>00138   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00139"></a>00139 }
+<a name="l00140"></a>00140 
+<a name="l00141"></a><a class="code" href="classstk_1_1Delay.html#a93fe8e45acb933889be812f35810f977">00141</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">Delay :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00142"></a>00142 {
+<a name="l00143"></a>00143 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00144"></a>00144 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00145"></a>00145     oStream_ &lt;&lt; <span class="stringliteral">&quot;Delay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00146"></a>00146     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00147"></a>00147   }
+<a name="l00148"></a>00148 <span class="preprocessor">#endif</span>
+<a name="l00149"></a>00149 <span class="preprocessor"></span>
+<a name="l00150"></a>00150   StkFloat *samples = &amp;frames[channel];
+<a name="l00151"></a>00151   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00152"></a>00152   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00153"></a>00153     inputs_[inPoint_++] = *samples * gain_;
+<a name="l00154"></a>00154     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
+<a name="l00155"></a>00155     *samples = inputs_[outPoint_++];
+<a name="l00156"></a>00156     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
+<a name="l00157"></a>00157   }
+<a name="l00158"></a>00158 
+<a name="l00159"></a>00159   lastFrame_[0] = *(samples-hop);
+<a name="l00160"></a>00160   <span class="keywordflow">return</span> frames;
+<a name="l00161"></a>00161 }
+<a name="l00162"></a>00162 
+<a name="l00163"></a><a class="code" href="classstk_1_1Delay.html#ade0d544e45e535fd792fe70a2a22da6f">00163</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">Delay :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00164"></a>00164 {
+<a name="l00165"></a>00165 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00166"></a>00166 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00167"></a>00167     oStream_ &lt;&lt; <span class="stringliteral">&quot;Delay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00168"></a>00168     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00169"></a>00169   }
+<a name="l00170"></a>00170 <span class="preprocessor">#endif</span>
+<a name="l00171"></a>00171 <span class="preprocessor"></span>
+<a name="l00172"></a>00172   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00173"></a>00173   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00174"></a>00174   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00175"></a>00175   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00176"></a>00176     inputs_[inPoint_++] = *iSamples * gain_;
+<a name="l00177"></a>00177     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
+<a name="l00178"></a>00178     *oSamples = inputs_[outPoint_++];
+<a name="l00179"></a>00179     <span class="keywordflow">if</span> ( outPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_ = 0;
+<a name="l00180"></a>00180   }
 <a name="l00181"></a>00181 
-<a name="l00182"></a>00182 <span class="preprocessor">#endif</span>
+<a name="l00182"></a>00182   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00183"></a>00183   <span class="keywordflow">return</span> iFrames;
+<a name="l00184"></a>00184 }
+<a name="l00185"></a>00185 
+<a name="l00186"></a>00186 } <span class="comment">// stk namespace</span>
+<a name="l00187"></a>00187 
+<a name="l00188"></a>00188 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Drummer_8h-source.html b/doc/html/Drummer_8h-source.html
deleted file mode 100644
index 74eb407..0000000
--- a/doc/html/Drummer_8h-source.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Drummer.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_DRUMMER_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_DRUMMER_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "FileWvIn.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
-<a name="l00025"></a>00025 <span class="comment">/***************************************************/</span>
-<a name="l00026"></a>00026 
-<a name="l00027"></a>00027 <span class="keyword">const</span> <span class="keywordtype">int</span> DRUM_NUMWAVES = 11;
-<a name="l00028"></a>00028 <span class="keyword">const</span> <span class="keywordtype">int</span> DRUM_POLYPHONY = 4;
-<a name="l00029"></a>00029 
-<a name="l00030"></a><a class="code" href="classstk_1_1Drummer.html">00030</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Drummer.html" title="STK drum sample player class.">Drummer</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00031"></a>00031 {
-<a name="l00032"></a>00032  <span class="keyword">public</span>:
-<a name="l00034"></a>00034 
-<a name="l00037"></a>00037   <a class="code" href="classstk_1_1Drummer.html#f5262dd2b29ae453323c0a514d79d26a" title="Class constructor.">Drummer</a>( <span class="keywordtype">void</span> );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1Drummer.html#365fb4b2c501129f2efd6edfad1f5453" title="Class destructor.">~Drummer</a>( <span class="keywordtype">void</span> );
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043 
-<a name="l00049"></a>00049   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Drummer.html#5ea03a0ef9a3db02942799b5cbca2ea2" title="Start a note with the given drum type and amplitude.">noteOn</a>( StkFloat instrument, StkFloat amplitude );
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Drummer.html#a735313fbdf7f1201fcb167874ecc7cc" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00053"></a>00053 
-<a name="l00055"></a>00055   StkFloat <a class="code" href="classstk_1_1Drummer.html#d65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00056"></a>00056 
-<a name="l00057"></a>00057  <span class="keyword">protected</span>:
-<a name="l00058"></a>00058 
-<a name="l00059"></a>00059   <a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> waves_[DRUM_POLYPHONY];
-<a name="l00060"></a>00060   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filters_[DRUM_POLYPHONY];
-<a name="l00061"></a>00061   std::vector&lt;int&gt; soundOrder_;
-<a name="l00062"></a>00062   std::vector&lt;int&gt; soundNumber_;
-<a name="l00063"></a>00063   <span class="keywordtype">int</span>      nSounding_;
-<a name="l00064"></a>00064 };
-<a name="l00065"></a>00065 
-<a name="l00066"></a><a class="code" href="classstk_1_1Drummer.html#d65c63bfad0ffac03db7f56cf706e4ba">00066</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Drummer.html#d65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">Drummer :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00067"></a>00067 {
-<a name="l00068"></a>00068   lastFrame_[0] = 0.0;
-<a name="l00069"></a>00069   <span class="keywordflow">if</span> ( nSounding_ == 0 ) <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00070"></a>00070 
-<a name="l00071"></a>00071   <span class="keywordflow">for</span> ( <span class="keywordtype">int</span> i=0; i&lt;DRUM_POLYPHONY; i++ ) {
-<a name="l00072"></a>00072     <span class="keywordflow">if</span> ( soundOrder_[i] &gt;= 0 ) {
-<a name="l00073"></a>00073       <span class="keywordflow">if</span> ( waves_[i].isFinished() ) {
-<a name="l00074"></a>00074         <span class="comment">// Re-order the list.</span>
-<a name="l00075"></a>00075         <span class="keywordflow">for</span> ( <span class="keywordtype">int</span> j=0; j&lt;DRUM_POLYPHONY; j++ ) {
-<a name="l00076"></a>00076           <span class="keywordflow">if</span> ( soundOrder_[j] &gt; soundOrder_[i] )
-<a name="l00077"></a>00077             soundOrder_[j] -= 1;
-<a name="l00078"></a>00078         }
-<a name="l00079"></a>00079         soundOrder_[i] = -1;
-<a name="l00080"></a>00080         nSounding_--;
-<a name="l00081"></a>00081       }
-<a name="l00082"></a>00082       <span class="keywordflow">else</span>
-<a name="l00083"></a>00083         lastFrame_[0] += filters_[i].<a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( waves_[i].<a class="code" href="classstk_1_1Drummer.html#d65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">tick</a>() );
-<a name="l00084"></a>00084     }
-<a name="l00085"></a>00085   }
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00088"></a>00088 }
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 } <span class="comment">// stk namespace</span>
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Drummer_8h_source.html b/doc/html/Drummer_8h_source.html
index 63e7949..101a230 100644
--- a/doc/html/Drummer_8h_source.html
+++ b/doc/html/Drummer_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Drummer.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_DRUMMER_H</span>
@@ -42,48 +42,79 @@
 <a name="l00053"></a>00053 
 <a name="l00055"></a>00055   StkFloat <a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00056"></a>00056 
-<a name="l00057"></a>00057  <span class="keyword">protected</span>:
 <a name="l00058"></a>00058 
-<a name="l00059"></a>00059   <a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> waves_[DRUM_POLYPHONY];
-<a name="l00060"></a>00060   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filters_[DRUM_POLYPHONY];
-<a name="l00061"></a>00061   std::vector&lt;int&gt; soundOrder_;
-<a name="l00062"></a>00062   std::vector&lt;int&gt; soundNumber_;
-<a name="l00063"></a>00063   <span class="keywordtype">int</span>      nSounding_;
-<a name="l00064"></a>00064 };
-<a name="l00065"></a>00065 
-<a name="l00066"></a><a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba">00066</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">Drummer :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00067"></a>00067 {
-<a name="l00068"></a>00068   lastFrame_[0] = 0.0;
-<a name="l00069"></a>00069   <span class="keywordflow">if</span> ( nSounding_ == 0 ) <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00070"></a>00070 
-<a name="l00071"></a>00071   <span class="keywordflow">for</span> ( <span class="keywordtype">int</span> i=0; i&lt;DRUM_POLYPHONY; i++ ) {
-<a name="l00072"></a>00072     <span class="keywordflow">if</span> ( soundOrder_[i] &gt;= 0 ) {
-<a name="l00073"></a>00073       <span class="keywordflow">if</span> ( waves_[i].isFinished() ) {
-<a name="l00074"></a>00074         <span class="comment">// Re-order the list.</span>
-<a name="l00075"></a>00075         <span class="keywordflow">for</span> ( <span class="keywordtype">int</span> j=0; j&lt;DRUM_POLYPHONY; j++ ) {
-<a name="l00076"></a>00076           <span class="keywordflow">if</span> ( soundOrder_[j] &gt; soundOrder_[i] )
-<a name="l00077"></a>00077             soundOrder_[j] -= 1;
-<a name="l00078"></a>00078         }
-<a name="l00079"></a>00079         soundOrder_[i] = -1;
-<a name="l00080"></a>00080         nSounding_--;
-<a name="l00081"></a>00081       }
-<a name="l00082"></a>00082       <span class="keywordflow">else</span>
-<a name="l00083"></a>00083         lastFrame_[0] += filters_[i].<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( waves_[i].<a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">tick</a>() );
-<a name="l00084"></a>00084     }
-<a name="l00085"></a>00085   }
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00088"></a>00088 }
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 } <span class="comment">// stk namespace</span>
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092 <span class="preprocessor">#endif</span>
+<a name="l00065"></a>00065   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00066"></a>00066 
+<a name="l00067"></a>00067  <span class="keyword">protected</span>:
+<a name="l00068"></a>00068 
+<a name="l00069"></a>00069   <a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> waves_[DRUM_POLYPHONY];
+<a name="l00070"></a>00070   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filters_[DRUM_POLYPHONY];
+<a name="l00071"></a>00071   std::vector&lt;int&gt; soundOrder_;
+<a name="l00072"></a>00072   std::vector&lt;int&gt; soundNumber_;
+<a name="l00073"></a>00073   <span class="keywordtype">int</span>      nSounding_;
+<a name="l00074"></a>00074 };
+<a name="l00075"></a>00075 
+<a name="l00076"></a><a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba">00076</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">Drummer :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00077"></a>00077 {
+<a name="l00078"></a>00078   lastFrame_[0] = 0.0;
+<a name="l00079"></a>00079   <span class="keywordflow">if</span> ( nSounding_ == 0 ) <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00080"></a>00080 
+<a name="l00081"></a>00081   <span class="keywordflow">for</span> ( <span class="keywordtype">int</span> i=0; i&lt;DRUM_POLYPHONY; i++ ) {
+<a name="l00082"></a>00082     <span class="keywordflow">if</span> ( soundOrder_[i] &gt;= 0 ) {
+<a name="l00083"></a>00083       <span class="keywordflow">if</span> ( waves_[i].isFinished() ) {
+<a name="l00084"></a>00084         <span class="comment">// Re-order the list.</span>
+<a name="l00085"></a>00085         <span class="keywordflow">for</span> ( <span class="keywordtype">int</span> j=0; j&lt;DRUM_POLYPHONY; j++ ) {
+<a name="l00086"></a>00086           <span class="keywordflow">if</span> ( soundOrder_[j] &gt; soundOrder_[i] )
+<a name="l00087"></a>00087             soundOrder_[j] -= 1;
+<a name="l00088"></a>00088         }
+<a name="l00089"></a>00089         soundOrder_[i] = -1;
+<a name="l00090"></a>00090         nSounding_--;
+<a name="l00091"></a>00091       }
+<a name="l00092"></a>00092       <span class="keywordflow">else</span>
+<a name="l00093"></a>00093         lastFrame_[0] += filters_[i].<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( waves_[i].<a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">tick</a>() );
+<a name="l00094"></a>00094     }
+<a name="l00095"></a>00095   }
+<a name="l00096"></a>00096 
+<a name="l00097"></a>00097   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00098"></a>00098 }
+<a name="l00099"></a>00099 
+<a name="l00100"></a><a class="code" href="classstk_1_1Drummer.html#ad186a954527a518c47467e6caaa2e2f5">00100</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">Drummer :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00101"></a>00101 {
+<a name="l00102"></a>00102   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00103"></a>00103 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00104"></a>00104 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00105"></a>00105     oStream_ &lt;&lt; <span class="stringliteral">&quot;Drummer::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00106"></a>00106     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00107"></a>00107   }
+<a name="l00108"></a>00108 <span class="preprocessor">#endif</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span>
+<a name="l00110"></a>00110   StkFloat *samples = &amp;frames[channel];
+<a name="l00111"></a>00111   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00112"></a>00112   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00113"></a>00113     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00114"></a>00114       *samples++ = <a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">tick</a>();
+<a name="l00115"></a>00115   }
+<a name="l00116"></a>00116   <span class="keywordflow">else</span> {
+<a name="l00117"></a>00117     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00118"></a>00118       *samples++ = <a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">tick</a>();
+<a name="l00119"></a>00119       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00120"></a>00120         *samples++ = lastFrame_[j];
+<a name="l00121"></a>00121     }
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124   <span class="keywordflow">return</span> frames;
+<a name="l00125"></a>00125 }
+<a name="l00126"></a>00126 
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128 } <span class="comment">// stk namespace</span>
+<a name="l00129"></a>00129 
+<a name="l00130"></a>00130 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Echo_8h-source.html b/doc/html/Echo_8h-source.html
deleted file mode 100644
index 2bba7e1..0000000
--- a/doc/html/Echo_8h-source.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Echo.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ECHO_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_ECHO_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Effect.h"</span> 
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Delay.h"</span> 
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00017"></a>00017 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 
-<a name="l00019"></a><a class="code" href="classstk_1_1Echo.html">00019</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Echo.html" title="STK echo effect class.">Echo</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Effect.html" title="STK abstract effects parent class.">Effect</a>
-<a name="l00020"></a>00020 {
-<a name="l00021"></a>00021  <span class="keyword">public</span>:
-<a name="l00023"></a>00023 
-<a name="l00026"></a>00026   <a class="code" href="classstk_1_1Echo.html#5f3320986d5c9b02ad10663ff11b6505" title="Class constructor, taking the longest desired delay length (one second default value)...">Echo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> maximumDelay = (<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span>) <a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() );
-<a name="l00027"></a>00027 
-<a name="l00029"></a>00029   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Echo.html#253e0f8e4c628b431fdfcb6d880548c2" title="Reset and clear all internal state.">clear</a>();
-<a name="l00030"></a>00030 
-<a name="l00032"></a>00032   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Echo.html#421a6f5f06f8e7df09edd179d397da7d" title="Set the maximum delay line length in samples.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00033"></a>00033 
-<a name="l00035"></a>00035   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Echo.html#e58ea12a2864481cb7049c10810867ce" title="Set the delay line length in samples.">setDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00036"></a>00036 
-<a name="l00038"></a><a class="code" href="classstk_1_1Echo.html#00a2a5949133a06680b026db7b21cc51">00038</a>   StkFloat <a class="code" href="classstk_1_1Echo.html#00a2a5949133a06680b026db7b21cc51" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   StkFloat <a class="code" href="classstk_1_1Echo.html#4cfb2c2dd350717cd8151749d3a32f91" title="Input one sample to the effect and return one output.">tick</a>( StkFloat input );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044 
-<a name="l00052"></a>00052   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Echo.html#4cfb2c2dd350717cd8151749d3a32f91" title="Input one sample to the effect and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00053"></a>00053 
-<a name="l00055"></a>00055 
-<a name="l00063"></a>00063   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Echo.html#4cfb2c2dd350717cd8151749d3a32f91" title="Input one sample to the effect and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065  <span class="keyword">protected</span>:
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> delayLine_;
-<a name="l00068"></a>00068   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00069"></a>00069 
-<a name="l00070"></a>00070 };
-<a name="l00071"></a>00071 
-<a name="l00072"></a><a class="code" href="classstk_1_1Echo.html#4cfb2c2dd350717cd8151749d3a32f91">00072</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Echo.html#4cfb2c2dd350717cd8151749d3a32f91" title="Input one sample to the effect and return one output.">Echo :: tick</a>( StkFloat input )
-<a name="l00073"></a>00073 {
-<a name="l00074"></a>00074   lastFrame_[0] = effectMix_ * ( delayLine_.<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( input ) - input ) + input;
-<a name="l00075"></a>00075   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00076"></a>00076 }
-<a name="l00077"></a>00077 
-<a name="l00078"></a><a class="code" href="classstk_1_1Echo.html#efe863b7aa43d6a94c2a56bd31a30e7d">00078</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Echo.html#4cfb2c2dd350717cd8151749d3a32f91" title="Input one sample to the effect and return one output.">Echo :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00079"></a>00079 {
-<a name="l00080"></a>00080 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00081"></a>00081 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00082"></a>00082     errorString_ &lt;&lt; <span class="stringliteral">"Echo::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00083"></a>00083     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00084"></a>00084   }
-<a name="l00085"></a>00085 <span class="preprocessor">#endif</span>
-<a name="l00086"></a>00086 <span class="preprocessor"></span>
-<a name="l00087"></a>00087   StkFloat *samples = &amp;frames[channel];
-<a name="l00088"></a>00088   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00089"></a>00089   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00090"></a>00090     *samples = effectMix_ * ( delayLine_.<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( *samples ) - *samples ) + *samples;
-<a name="l00091"></a>00091   }
-<a name="l00092"></a>00092 
-<a name="l00093"></a>00093   lastFrame_[0] = *(samples-hop);
-<a name="l00094"></a>00094   <span class="keywordflow">return</span> frames;
-<a name="l00095"></a>00095 }
-<a name="l00096"></a>00096 
-<a name="l00097"></a><a class="code" href="classstk_1_1Echo.html#1778a7da06b222afbe9281c886f678d8">00097</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Echo.html#4cfb2c2dd350717cd8151749d3a32f91" title="Input one sample to the effect and return one output.">Echo :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00098"></a>00098 {
-<a name="l00099"></a>00099 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00100"></a>00100 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00101"></a>00101     errorString_ &lt;&lt; <span class="stringliteral">"Echo::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00102"></a>00102     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00103"></a>00103   }
-<a name="l00104"></a>00104 <span class="preprocessor">#endif</span>
-<a name="l00105"></a>00105 <span class="preprocessor"></span>
-<a name="l00106"></a>00106   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00107"></a>00107   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00108"></a>00108   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00109"></a>00109   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00110"></a>00110     *oSamples = effectMix_ * ( delayLine_.<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( *iSamples ) - *iSamples ) + *iSamples;
-<a name="l00111"></a>00111   }
-<a name="l00112"></a>00112 
-<a name="l00113"></a>00113   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00114"></a>00114   <span class="keywordflow">return</span> iFrames;
-<a name="l00115"></a>00115 }
-<a name="l00116"></a>00116 
-<a name="l00117"></a>00117 } <span class="comment">// stk namespace</span>
-<a name="l00118"></a>00118 
-<a name="l00119"></a>00119 <span class="preprocessor">#endif</span>
-<a name="l00120"></a>00120 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Echo_8h_source.html b/doc/html/Echo_8h_source.html
index c783c5f..db60f2d 100644
--- a/doc/html/Echo_8h_source.html
+++ b/doc/html/Echo_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Echo.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ECHO_H</span>
@@ -62,7 +62,7 @@
 <a name="l00079"></a>00079 {
 <a name="l00080"></a>00080 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00081"></a>00081 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00082"></a>00082     errorString_ &lt;&lt; <span class="stringliteral">&quot;Echo::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00082"></a>00082     oStream_ &lt;&lt; <span class="stringliteral">&quot;Echo::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00083"></a>00083     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00084"></a>00084   }
 <a name="l00085"></a>00085 <span class="preprocessor">#endif</span>
@@ -81,7 +81,7 @@
 <a name="l00098"></a>00098 {
 <a name="l00099"></a>00099 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00100"></a>00100 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00101"></a>00101     errorString_ &lt;&lt; <span class="stringliteral">&quot;Echo::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00101"></a>00101     oStream_ &lt;&lt; <span class="stringliteral">&quot;Echo::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00102"></a>00102     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00103"></a>00103   }
 <a name="l00104"></a>00104 <span class="preprocessor">#endif</span>
@@ -106,7 +106,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Effect_8h-source.html b/doc/html/Effect_8h-source.html
deleted file mode 100644
index 4e9b1dc..0000000
--- a/doc/html/Effect_8h-source.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Effect.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_EFFECT_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_EFFECT_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;cmath&gt;</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 <span class="comment">/***************************************************/</span>
-<a name="l00020"></a>00020 
-<a name="l00021"></a><a class="code" href="classstk_1_1Effect.html">00021</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Effect.html" title="STK abstract effects parent class.">Effect</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00022"></a>00022 {
-<a name="l00023"></a>00023  <span class="keyword">public</span>:
-<a name="l00025"></a><a class="code" href="classstk_1_1Effect.html#f6eb27819aed132dd1edf2ce9640893e">00025</a>   <a class="code" href="classstk_1_1Effect.html#f6eb27819aed132dd1edf2ce9640893e" title="Class constructor.">Effect</a>( <span class="keywordtype">void</span> ) { lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( 1, 1, 0.0 ); };
-<a name="l00026"></a>00026 
-<a name="l00028"></a><a class="code" href="classstk_1_1Effect.html#bfdef9ce644c251607acfd183e3d7f7b">00028</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Effect.html#bfdef9ce644c251607acfd183e3d7f7b" title="Return the number of output channels for the class.">channelsOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(); };
-<a name="l00029"></a>00029 
-<a name="l00031"></a><a class="code" href="classstk_1_1Effect.html#3d7e2b8942bf7adcc71dfc6dccbb7aa0">00031</a>   <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Effect.html#3d7e2b8942bf7adcc71dfc6dccbb7aa0" title="Return an StkFrames reference to the last output sample frame.">lastFrame</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_; };
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Effect.html#0598128d1edc97729951310cc5df5171" title="Reset and clear all internal state.">clear</a>() = 0;
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Effect.html#b4facbc9b317f18c139577e52fd69c3d" title="Set the mixture of input and &amp;quot;effected&amp;quot; levels in the output (0.0 = input...">setEffectMix</a>( StkFloat mix );
-<a name="l00038"></a>00038 
-<a name="l00039"></a>00039  <span class="keyword">protected</span>:
-<a name="l00040"></a>00040 
-<a name="l00041"></a>00041   <span class="comment">// Returns true if argument value is prime.</span>
-<a name="l00042"></a>00042   <span class="keywordtype">bool</span> isPrime( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> number );
-<a name="l00043"></a>00043 
-<a name="l00044"></a>00044   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> lastFrame_;
-<a name="l00045"></a>00045   StkFloat effectMix_;
-<a name="l00046"></a>00046 
-<a name="l00047"></a>00047 };
-<a name="l00048"></a>00048 
-<a name="l00049"></a><a class="code" href="classstk_1_1Effect.html#b4facbc9b317f18c139577e52fd69c3d">00049</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Effect.html#b4facbc9b317f18c139577e52fd69c3d" title="Set the mixture of input and &amp;quot;effected&amp;quot; levels in the output (0.0 = input...">Effect :: setEffectMix</a>( StkFloat mix )
-<a name="l00050"></a>00050 {
-<a name="l00051"></a>00051   <span class="keywordflow">if</span> ( mix &lt; 0.0 ) {
-<a name="l00052"></a>00052     errorString_ &lt;&lt; <span class="stringliteral">"Effect::setEffectMix: mix parameter is less than zero ... setting to zero!"</span>;
-<a name="l00053"></a>00053     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
-<a name="l00054"></a>00054     effectMix_ = 0.0;
-<a name="l00055"></a>00055   }
-<a name="l00056"></a>00056   <span class="keywordflow">else</span> <span class="keywordflow">if</span> ( mix &gt; 1.0 ) {
-<a name="l00057"></a>00057     errorString_ &lt;&lt; <span class="stringliteral">"Effect::setEffectMix: mix parameter is greater than 1.0 ... setting to one!"</span>;
-<a name="l00058"></a>00058     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
-<a name="l00059"></a>00059     effectMix_ = 1.0;
-<a name="l00060"></a>00060   }
-<a name="l00061"></a>00061   <span class="keywordflow">else</span>
-<a name="l00062"></a>00062     effectMix_ = mix;
-<a name="l00063"></a>00063 }
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065 <span class="keyword">inline</span> <span class="keywordtype">bool</span> Effect :: isPrime( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> number )
-<a name="l00066"></a>00066 {
-<a name="l00067"></a>00067   <span class="keywordflow">if</span> ( number == 2 ) <span class="keywordflow">return</span> <span class="keyword">true</span>;
-<a name="l00068"></a>00068   <span class="keywordflow">if</span> ( number &amp; 1 ) {
-<a name="l00069"></a>00069            <span class="keywordflow">for</span> ( <span class="keywordtype">int</span> i=3; i&lt;(int)sqrt((<span class="keywordtype">double</span>)number)+1; i+=2 )
-<a name="l00070"></a>00070                     <span class="keywordflow">if</span> ( (number % i) == 0 ) <span class="keywordflow">return</span> <span class="keyword">false</span>;
-<a name="l00071"></a>00071            <span class="keywordflow">return</span> <span class="keyword">true</span>; <span class="comment">// prime</span>
-<a name="l00072"></a>00072          }
-<a name="l00073"></a>00073   <span class="keywordflow">else</span> <span class="keywordflow">return</span> <span class="keyword">false</span>; <span class="comment">// even</span>
-<a name="l00074"></a>00074 }
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076 } <span class="comment">// stk namespace</span>
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078 <span class="preprocessor">#endif</span>
-<a name="l00079"></a>00079 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Effect_8h_source.html b/doc/html/Effect_8h_source.html
index 9236dfb..0c59afb 100644
--- a/doc/html/Effect_8h_source.html
+++ b/doc/html/Effect_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Effect.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_EFFECT_H</span>
@@ -49,12 +49,12 @@
 <a name="l00049"></a><a class="code" href="classstk_1_1Effect.html#ab4facbc9b317f18c139577e52fd69c3d">00049</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Effect.html#ab4facbc9b317f18c139577e52fd69c3d" title="Set the mixture of input and &amp;quot;effected&amp;quot; levels in the output (0.0 = input...">Effect :: setEffectMix</a>( StkFloat mix )
 <a name="l00050"></a>00050 {
 <a name="l00051"></a>00051   <span class="keywordflow">if</span> ( mix &lt; 0.0 ) {
-<a name="l00052"></a>00052     errorString_ &lt;&lt; <span class="stringliteral">&quot;Effect::setEffectMix: mix parameter is less than zero ... setting to zero!&quot;</span>;
+<a name="l00052"></a>00052     oStream_ &lt;&lt; <span class="stringliteral">&quot;Effect::setEffectMix: mix parameter is less than zero ... setting to zero!&quot;</span>;
 <a name="l00053"></a>00053     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
 <a name="l00054"></a>00054     effectMix_ = 0.0;
 <a name="l00055"></a>00055   }
 <a name="l00056"></a>00056   <span class="keywordflow">else</span> <span class="keywordflow">if</span> ( mix &gt; 1.0 ) {
-<a name="l00057"></a>00057     errorString_ &lt;&lt; <span class="stringliteral">&quot;Effect::setEffectMix: mix parameter is greater than 1.0 ... setting to one!&quot;</span>;
+<a name="l00057"></a>00057     oStream_ &lt;&lt; <span class="stringliteral">&quot;Effect::setEffectMix: mix parameter is greater than 1.0 ... setting to one!&quot;</span>;
 <a name="l00058"></a>00058     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
 <a name="l00059"></a>00059     effectMix_ = 1.0;
 <a name="l00060"></a>00060   }
@@ -82,7 +82,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Envelope_8h-source.html b/doc/html/Envelope_8h-source.html
deleted file mode 100644
index ad033ca..0000000
--- a/doc/html/Envelope_8h-source.html
+++ /dev/null
@@ -1,157 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Envelope.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ENVELOPE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_ENVELOPE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Generator.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 <span class="comment">/***************************************************/</span>
-<a name="l00020"></a>00020 
-<a name="l00021"></a><a class="code" href="classstk_1_1Envelope.html">00021</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00022"></a>00022 {
-<a name="l00023"></a>00023  <span class="keyword">public</span>:
-<a name="l00024"></a>00024 
-<a name="l00026"></a>00026   <a class="code" href="classstk_1_1Envelope.html#86ea29237a8d94c109388654703a0039" title="Default constructor.">Envelope</a>( <span class="keywordtype">void</span> );
-<a name="l00027"></a>00027 
-<a name="l00029"></a>00029   <a class="code" href="classstk_1_1Envelope.html#64365d24b6cdd3ea3bdcaa1abcbcb60a" title="Class destructor.">~Envelope</a>( <span class="keywordtype">void</span> );
-<a name="l00030"></a>00030 
-<a name="l00032"></a>00032   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a>&amp; <a class="code" href="classstk_1_1Envelope.html#42a1acf6a4606163056ad7d4122d2281" title="Assignment operator.">operator= </a>( <span class="keyword">const</span> <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a>&amp; e );
-<a name="l00033"></a>00033 
-<a name="l00035"></a><a class="code" href="classstk_1_1Envelope.html#18cf8f21ef70227bd5cd17f53752bd0f">00035</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#18cf8f21ef70227bd5cd17f53752bd0f" title="Set target = 1.">keyOn</a>( <span class="keywordtype">void</span> ) { this-&gt;<a class="code" href="classstk_1_1Envelope.html#5269bc5dc1d56161ab82b677b5462a3e" title="Set the target value.">setTarget</a>( 1.0 ); };
-<a name="l00036"></a>00036 
-<a name="l00038"></a><a class="code" href="classstk_1_1Envelope.html#9dbefb15f8d64aac3969f77d38791774">00038</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#9dbefb15f8d64aac3969f77d38791774" title="Set target = 0.">keyOff</a>( <span class="keywordtype">void</span> ) { this-&gt;<a class="code" href="classstk_1_1Envelope.html#5269bc5dc1d56161ab82b677b5462a3e" title="Set the target value.">setTarget</a>( 0.0 ); };
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#de99b5c7cb974f71f1d2919868d774a0" title="Set the rate.">setRate</a>( StkFloat rate );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#deeb1676f9111980a0c1a48a6780c8f7" title="Set the rate based on a time duration.">setTime</a>( StkFloat time );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#5269bc5dc1d56161ab82b677b5462a3e" title="Set the target value.">setTarget</a>( StkFloat target );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#b8164a90c57616dc8bd55a6e5ba02fb6" title="Set current and target values to value.">setValue</a>( StkFloat value );
-<a name="l00051"></a>00051 
-<a name="l00053"></a><a class="code" href="classstk_1_1Envelope.html#ddb2084add959a65733805bc2c1c39a9">00053</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Envelope.html#ddb2084add959a65733805bc2c1c39a9" title="Return the current envelope state (0 = at target, 1 otherwise).">getState</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> state_; };
-<a name="l00054"></a>00054 
-<a name="l00056"></a><a class="code" href="classstk_1_1Envelope.html#31044eab6eaf668ba7e74ea17bed109d">00056</a>   StkFloat <a class="code" href="classstk_1_1Envelope.html#31044eab6eaf668ba7e74ea17bed109d" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059   StkFloat <a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00060"></a>00060 
-<a name="l00062"></a>00062 
-<a name="l00069"></a>00069   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00070"></a>00070 
-<a name="l00071"></a>00071  <span class="keyword">protected</span>:
-<a name="l00072"></a>00072 
-<a name="l00073"></a>00073   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00074"></a>00074 
-<a name="l00075"></a>00075   StkFloat value_;
-<a name="l00076"></a>00076   StkFloat target_;
-<a name="l00077"></a>00077   StkFloat rate_;
-<a name="l00078"></a>00078   <span class="keywordtype">int</span> state_;
-<a name="l00079"></a>00079 };
-<a name="l00080"></a>00080 
-<a name="l00081"></a><a class="code" href="classstk_1_1Envelope.html#de99b5c7cb974f71f1d2919868d774a0">00081</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#de99b5c7cb974f71f1d2919868d774a0" title="Set the rate.">Envelope :: setRate</a>( StkFloat rate )
-<a name="l00082"></a>00082 {
-<a name="l00083"></a>00083 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00084"></a>00084 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( rate &lt; 0.0 ) {
-<a name="l00085"></a>00085     errorString_ &lt;&lt; <span class="stringliteral">"Envelope::setRate: negative rates not allowed ... correcting!"</span>;
-<a name="l00086"></a>00086     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
-<a name="l00087"></a>00087     rate_ = -rate;
-<a name="l00088"></a>00088   }
-<a name="l00089"></a>00089   <span class="keywordflow">else</span>
-<a name="l00090"></a>00090 <span class="preprocessor">#endif</span>
-<a name="l00091"></a>00091 <span class="preprocessor"></span>    rate_ = rate;
-<a name="l00092"></a>00092 }
-<a name="l00093"></a>00093 
-<a name="l00094"></a><a class="code" href="classstk_1_1Envelope.html#deeb1676f9111980a0c1a48a6780c8f7">00094</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#deeb1676f9111980a0c1a48a6780c8f7" title="Set the rate based on a time duration.">Envelope :: setTime</a>( StkFloat time )
-<a name="l00095"></a>00095 {
-<a name="l00096"></a>00096 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00097"></a>00097 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( time &lt; 0.0 ) {
-<a name="l00098"></a>00098     errorString_ &lt;&lt; <span class="stringliteral">"Envelope::setTime: negative times not allowed ... correcting!"</span>;
-<a name="l00099"></a>00099     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
-<a name="l00100"></a>00100     rate_ = 1.0 / ( -time * <a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() );
-<a name="l00101"></a>00101   }
-<a name="l00102"></a>00102   <span class="keywordflow">else</span>
-<a name="l00103"></a>00103 <span class="preprocessor">#endif</span>
-<a name="l00104"></a>00104 <span class="preprocessor"></span>    rate_ = 1.0 / ( time * <a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() );
-<a name="l00105"></a>00105 }
-<a name="l00106"></a>00106 
-<a name="l00107"></a><a class="code" href="classstk_1_1Envelope.html#5269bc5dc1d56161ab82b677b5462a3e">00107</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#5269bc5dc1d56161ab82b677b5462a3e" title="Set the target value.">Envelope :: setTarget</a>( StkFloat target )
-<a name="l00108"></a>00108 {
-<a name="l00109"></a>00109   target_ = target;
-<a name="l00110"></a>00110   <span class="keywordflow">if</span> ( value_ != target_ ) state_ = 1;
-<a name="l00111"></a>00111 }
-<a name="l00112"></a>00112 
-<a name="l00113"></a><a class="code" href="classstk_1_1Envelope.html#b8164a90c57616dc8bd55a6e5ba02fb6">00113</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#b8164a90c57616dc8bd55a6e5ba02fb6" title="Set current and target values to value.">Envelope :: setValue</a>( StkFloat value )
-<a name="l00114"></a>00114 {
-<a name="l00115"></a>00115   state_ = 0;
-<a name="l00116"></a>00116   target_ = value;
-<a name="l00117"></a>00117   value_ = value;
-<a name="l00118"></a>00118 }
-<a name="l00119"></a>00119 
-<a name="l00120"></a><a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601">00120</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">Envelope :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00121"></a>00121 {
-<a name="l00122"></a>00122   <span class="keywordflow">if</span> ( state_ ) {
-<a name="l00123"></a>00123     <span class="keywordflow">if</span> ( target_ &gt; value_ ) {
-<a name="l00124"></a>00124       value_ += rate_;
-<a name="l00125"></a>00125       <span class="keywordflow">if</span> ( value_ &gt;= target_ ) {
-<a name="l00126"></a>00126         value_ = target_;
-<a name="l00127"></a>00127         state_ = 0;
-<a name="l00128"></a>00128       }
-<a name="l00129"></a>00129     }
-<a name="l00130"></a>00130     <span class="keywordflow">else</span> {
-<a name="l00131"></a>00131       value_ -= rate_;
-<a name="l00132"></a>00132       <span class="keywordflow">if</span> ( value_ &lt;= target_ ) {
-<a name="l00133"></a>00133         value_ = target_;
-<a name="l00134"></a>00134         state_ = 0;
-<a name="l00135"></a>00135       }
-<a name="l00136"></a>00136     }
-<a name="l00137"></a>00137     lastFrame_[0] = value_;
-<a name="l00138"></a>00138   }
-<a name="l00139"></a>00139 
-<a name="l00140"></a>00140   <span class="keywordflow">return</span> value_;
-<a name="l00141"></a>00141 }
-<a name="l00142"></a>00142 
-<a name="l00143"></a><a class="code" href="classstk_1_1Envelope.html#9341c9dea4fd54c360a4a23254319cf7">00143</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">Envelope :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00144"></a>00144 {
-<a name="l00145"></a>00145 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00146"></a>00146 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00147"></a>00147     errorString_ &lt;&lt; <span class="stringliteral">"Envelope::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00148"></a>00148     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00149"></a>00149   }
-<a name="l00150"></a>00150 <span class="preprocessor">#endif</span>
-<a name="l00151"></a>00151 <span class="preprocessor"></span>
-<a name="l00152"></a>00152   StkFloat *samples = &amp;frames[channel];
-<a name="l00153"></a>00153   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00154"></a>00154   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00155"></a>00155     *samples = <a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>();
-<a name="l00156"></a>00156 
-<a name="l00157"></a>00157   <span class="keywordflow">return</span> frames;
-<a name="l00158"></a>00158 }
-<a name="l00159"></a>00159 
-<a name="l00160"></a>00160 } <span class="comment">// stk namespace</span>
-<a name="l00161"></a>00161 
-<a name="l00162"></a>00162 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Envelope_8h_source.html b/doc/html/Envelope_8h_source.html
index 756becd..70d8c43 100644
--- a/doc/html/Envelope_8h_source.html
+++ b/doc/html/Envelope_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Envelope.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ENVELOPE_H</span>
@@ -36,121 +36,84 @@
 <a name="l00036"></a>00036 
 <a name="l00038"></a><a class="code" href="classstk_1_1Envelope.html#a9dbefb15f8d64aac3969f77d38791774">00038</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#a9dbefb15f8d64aac3969f77d38791774" title="Set target = 0.">keyOff</a>( <span class="keywordtype">void</span> ) { this-&gt;<a class="code" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e" title="Set the target value.">setTarget</a>( 0.0 ); };
 <a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#ade99b5c7cb974f71f1d2919868d774a0" title="Set the rate.">setRate</a>( StkFloat rate );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7" title="Set the rate based on a time duration.">setTime</a>( StkFloat time );
+<a name="l00041"></a>00041 
+<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#ade99b5c7cb974f71f1d2919868d774a0" title="Set the rate.">setRate</a>( StkFloat rate );
 <a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e" title="Set the target value.">setTarget</a>( StkFloat target );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#ab8164a90c57616dc8bd55a6e5ba02fb6" title="Set current and target values to value.">setValue</a>( StkFloat value );
-<a name="l00051"></a>00051 
-<a name="l00053"></a><a class="code" href="classstk_1_1Envelope.html#addb2084add959a65733805bc2c1c39a9">00053</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Envelope.html#addb2084add959a65733805bc2c1c39a9" title="Return the current envelope state (0 = at target, 1 otherwise).">getState</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> state_; };
-<a name="l00054"></a>00054 
-<a name="l00056"></a><a class="code" href="classstk_1_1Envelope.html#a31044eab6eaf668ba7e74ea17bed109d">00056</a>   StkFloat <a class="code" href="classstk_1_1Envelope.html#a31044eab6eaf668ba7e74ea17bed109d" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059   StkFloat <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00060"></a>00060 
-<a name="l00062"></a>00062 
-<a name="l00069"></a>00069   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00070"></a>00070 
-<a name="l00071"></a>00071  <span class="keyword">protected</span>:
-<a name="l00072"></a>00072 
-<a name="l00073"></a>00073   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00074"></a>00074 
-<a name="l00075"></a>00075   StkFloat value_;
-<a name="l00076"></a>00076   StkFloat target_;
-<a name="l00077"></a>00077   StkFloat rate_;
-<a name="l00078"></a>00078   <span class="keywordtype">int</span> state_;
-<a name="l00079"></a>00079 };
-<a name="l00080"></a>00080 
-<a name="l00081"></a><a class="code" href="classstk_1_1Envelope.html#ade99b5c7cb974f71f1d2919868d774a0">00081</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#ade99b5c7cb974f71f1d2919868d774a0" title="Set the rate.">Envelope :: setRate</a>( StkFloat rate )
-<a name="l00082"></a>00082 {
-<a name="l00083"></a>00083 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00084"></a>00084 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( rate &lt; 0.0 ) {
-<a name="l00085"></a>00085     errorString_ &lt;&lt; <span class="stringliteral">&quot;Envelope::setRate: negative rates not allowed ... correcting!&quot;</span>;
-<a name="l00086"></a>00086     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
-<a name="l00087"></a>00087     rate_ = -rate;
-<a name="l00088"></a>00088   }
-<a name="l00089"></a>00089   <span class="keywordflow">else</span>
-<a name="l00090"></a>00090 <span class="preprocessor">#endif</span>
-<a name="l00091"></a>00091 <span class="preprocessor"></span>    rate_ = rate;
-<a name="l00092"></a>00092 }
-<a name="l00093"></a>00093 
-<a name="l00094"></a><a class="code" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7">00094</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7" title="Set the rate based on a time duration.">Envelope :: setTime</a>( StkFloat time )
-<a name="l00095"></a>00095 {
-<a name="l00096"></a>00096 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00097"></a>00097 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( time &lt; 0.0 ) {
-<a name="l00098"></a>00098     errorString_ &lt;&lt; <span class="stringliteral">&quot;Envelope::setTime: negative times not allowed ... correcting!&quot;</span>;
-<a name="l00099"></a>00099     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
-<a name="l00100"></a>00100     rate_ = 1.0 / ( -time * <a class="code" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() );
-<a name="l00101"></a>00101   }
-<a name="l00102"></a>00102   <span class="keywordflow">else</span>
-<a name="l00103"></a>00103 <span class="preprocessor">#endif</span>
-<a name="l00104"></a>00104 <span class="preprocessor"></span>    rate_ = 1.0 / ( time * <a class="code" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() );
-<a name="l00105"></a>00105 }
-<a name="l00106"></a>00106 
-<a name="l00107"></a><a class="code" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e">00107</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e" title="Set the target value.">Envelope :: setTarget</a>( StkFloat target )
-<a name="l00108"></a>00108 {
-<a name="l00109"></a>00109   target_ = target;
-<a name="l00110"></a>00110   <span class="keywordflow">if</span> ( value_ != target_ ) state_ = 1;
-<a name="l00111"></a>00111 }
-<a name="l00112"></a>00112 
-<a name="l00113"></a><a class="code" href="classstk_1_1Envelope.html#ab8164a90c57616dc8bd55a6e5ba02fb6">00113</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#ab8164a90c57616dc8bd55a6e5ba02fb6" title="Set current and target values to value.">Envelope :: setValue</a>( StkFloat value )
-<a name="l00114"></a>00114 {
-<a name="l00115"></a>00115   state_ = 0;
-<a name="l00116"></a>00116   target_ = value;
-<a name="l00117"></a>00117   value_ = value;
-<a name="l00118"></a>00118 }
-<a name="l00119"></a>00119 
-<a name="l00120"></a><a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601">00120</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">Envelope :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00121"></a>00121 {
-<a name="l00122"></a>00122   <span class="keywordflow">if</span> ( state_ ) {
-<a name="l00123"></a>00123     <span class="keywordflow">if</span> ( target_ &gt; value_ ) {
-<a name="l00124"></a>00124       value_ += rate_;
-<a name="l00125"></a>00125       <span class="keywordflow">if</span> ( value_ &gt;= target_ ) {
-<a name="l00126"></a>00126         value_ = target_;
-<a name="l00127"></a>00127         state_ = 0;
-<a name="l00128"></a>00128       }
-<a name="l00129"></a>00129     }
-<a name="l00130"></a>00130     <span class="keywordflow">else</span> {
-<a name="l00131"></a>00131       value_ -= rate_;
-<a name="l00132"></a>00132       <span class="keywordflow">if</span> ( value_ &lt;= target_ ) {
-<a name="l00133"></a>00133         value_ = target_;
-<a name="l00134"></a>00134         state_ = 0;
-<a name="l00135"></a>00135       }
-<a name="l00136"></a>00136     }
-<a name="l00137"></a>00137     lastFrame_[0] = value_;
-<a name="l00138"></a>00138   }
-<a name="l00139"></a>00139 
-<a name="l00140"></a>00140   <span class="keywordflow">return</span> value_;
-<a name="l00141"></a>00141 }
-<a name="l00142"></a>00142 
-<a name="l00143"></a><a class="code" href="classstk_1_1Envelope.html#a9341c9dea4fd54c360a4a23254319cf7">00143</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">Envelope :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00144"></a>00144 {
-<a name="l00145"></a>00145 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00146"></a>00146 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00147"></a>00147     errorString_ &lt;&lt; <span class="stringliteral">&quot;Envelope::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00148"></a>00148     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00149"></a>00149   }
-<a name="l00150"></a>00150 <span class="preprocessor">#endif</span>
-<a name="l00151"></a>00151 <span class="preprocessor"></span>
-<a name="l00152"></a>00152   StkFloat *samples = &amp;frames[channel];
-<a name="l00153"></a>00153   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00154"></a>00154   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00155"></a>00155     *samples = <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>();
-<a name="l00156"></a>00156 
-<a name="l00157"></a>00157   <span class="keywordflow">return</span> frames;
-<a name="l00158"></a>00158 }
-<a name="l00159"></a>00159 
-<a name="l00160"></a>00160 } <span class="comment">// stk namespace</span>
-<a name="l00161"></a>00161 
-<a name="l00162"></a>00162 <span class="preprocessor">#endif</span>
+<a name="l00047"></a>00047 
+<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7" title="Set the rate based on a positive time duration (seconds).">setTime</a>( StkFloat time );
+<a name="l00052"></a>00052 
+<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e" title="Set the target value.">setTarget</a>( StkFloat target );
+<a name="l00055"></a>00055 
+<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Envelope.html#ab8164a90c57616dc8bd55a6e5ba02fb6" title="Set current and target values to value.">setValue</a>( StkFloat value );
+<a name="l00058"></a>00058 
+<a name="l00060"></a><a class="code" href="classstk_1_1Envelope.html#addb2084add959a65733805bc2c1c39a9">00060</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Envelope.html#addb2084add959a65733805bc2c1c39a9" title="Return the current envelope state (0 = at target, 1 otherwise).">getState</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> state_; };
+<a name="l00061"></a>00061 
+<a name="l00063"></a><a class="code" href="classstk_1_1Envelope.html#a31044eab6eaf668ba7e74ea17bed109d">00063</a>   StkFloat <a class="code" href="classstk_1_1Envelope.html#a31044eab6eaf668ba7e74ea17bed109d" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
+<a name="l00064"></a>00064 
+<a name="l00066"></a>00066   StkFloat <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
+<a name="l00067"></a>00067 
+<a name="l00069"></a>00069 
+<a name="l00076"></a>00076   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00077"></a>00077 
+<a name="l00078"></a>00078  <span class="keyword">protected</span>:
+<a name="l00079"></a>00079 
+<a name="l00080"></a>00080   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
+<a name="l00081"></a>00081 
+<a name="l00082"></a>00082   StkFloat value_;
+<a name="l00083"></a>00083   StkFloat target_;
+<a name="l00084"></a>00084   StkFloat rate_;
+<a name="l00085"></a>00085   <span class="keywordtype">int</span> state_;
+<a name="l00086"></a>00086 };
+<a name="l00087"></a>00087 
+<a name="l00088"></a><a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601">00088</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">Envelope :: tick</a>( <span class="keywordtype">void</span> )
+<a name="l00089"></a>00089 {
+<a name="l00090"></a>00090   <span class="keywordflow">if</span> ( state_ ) {
+<a name="l00091"></a>00091     <span class="keywordflow">if</span> ( target_ &gt; value_ ) {
+<a name="l00092"></a>00092       value_ += rate_;
+<a name="l00093"></a>00093       <span class="keywordflow">if</span> ( value_ &gt;= target_ ) {
+<a name="l00094"></a>00094         value_ = target_;
+<a name="l00095"></a>00095         state_ = 0;
+<a name="l00096"></a>00096       }
+<a name="l00097"></a>00097     }
+<a name="l00098"></a>00098     <span class="keywordflow">else</span> {
+<a name="l00099"></a>00099       value_ -= rate_;
+<a name="l00100"></a>00100       <span class="keywordflow">if</span> ( value_ &lt;= target_ ) {
+<a name="l00101"></a>00101         value_ = target_;
+<a name="l00102"></a>00102         state_ = 0;
+<a name="l00103"></a>00103       }
+<a name="l00104"></a>00104     }
+<a name="l00105"></a>00105     lastFrame_[0] = value_;
+<a name="l00106"></a>00106   }
+<a name="l00107"></a>00107 
+<a name="l00108"></a>00108   <span class="keywordflow">return</span> value_;
+<a name="l00109"></a>00109 }
+<a name="l00110"></a>00110 
+<a name="l00111"></a><a class="code" href="classstk_1_1Envelope.html#a9341c9dea4fd54c360a4a23254319cf7">00111</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">Envelope :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00112"></a>00112 {
+<a name="l00113"></a>00113 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00114"></a>00114 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00115"></a>00115     oStream_ &lt;&lt; <span class="stringliteral">&quot;Envelope::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00116"></a>00116     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00117"></a>00117   }
+<a name="l00118"></a>00118 <span class="preprocessor">#endif</span>
+<a name="l00119"></a>00119 <span class="preprocessor"></span>
+<a name="l00120"></a>00120   StkFloat *samples = &amp;frames[channel];
+<a name="l00121"></a>00121   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00122"></a>00122   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00123"></a>00123     *samples = <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>();
+<a name="l00124"></a>00124 
+<a name="l00125"></a>00125   <span class="keywordflow">return</span> frames;
+<a name="l00126"></a>00126 }
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128 } <span class="comment">// stk namespace</span>
+<a name="l00129"></a>00129 
+<a name="l00130"></a>00130 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/FMVoices_8h-source.html b/doc/html/FMVoices_8h-source.html
deleted file mode 100644
index d6d662f..0000000
--- a/doc/html/FMVoices_8h-source.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>FMVoices.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FMVOICES_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FMVOICES_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "FM.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00038"></a>00038 <span class="comment">/***************************************************/</span>
-<a name="l00039"></a>00039 
-<a name="l00040"></a><a class="code" href="classstk_1_1FMVoices.html">00040</a> <span class="keyword">class </span><a class="code" href="classstk_1_1FMVoices.html" title="STK singing FM synthesis instrument.">FMVoices</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a>
-<a name="l00041"></a>00041 {
-<a name="l00042"></a>00042  <span class="keyword">public</span>:
-<a name="l00044"></a>00044 
-<a name="l00047"></a>00047   <a class="code" href="classstk_1_1FMVoices.html#27d5570c83cad660a53f04d86d01c888" title="Class constructor.">FMVoices</a>( <span class="keywordtype">void</span> );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <a class="code" href="classstk_1_1FMVoices.html#8ff218d379ec020a38e1bc7203409e37" title="Class destructor.">~FMVoices</a>( <span class="keywordtype">void</span> );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FMVoices.html#f47a92f6892f3a5bef5226d4772fc8cb" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FMVoices.html#f2fd5dd9af61db94ff1cb556e8e5cf4c" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FMVoices.html#24e17888ff4e01edff96d81461d670a8" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00060"></a>00060 
-<a name="l00062"></a>00062   StkFloat <a class="code" href="classstk_1_1FMVoices.html#31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00063"></a>00063 
-<a name="l00064"></a>00064  <span class="keyword">protected</span>:
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066   <span class="keywordtype">int</span> currentVowel_;
-<a name="l00067"></a>00067   StkFloat tilt_[3];
-<a name="l00068"></a>00068   StkFloat mods_[3];
-<a name="l00069"></a>00069 };
-<a name="l00070"></a>00070 
-<a name="l00071"></a><a class="code" href="classstk_1_1FMVoices.html#31111029e36d00230586250df7b4d887">00071</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1FMVoices.html#31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">FMVoices :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00072"></a>00072 {
-<a name="l00073"></a>00073   <span class="keyword">register</span> StkFloat temp, temp2;
-<a name="l00074"></a>00074 
-<a name="l00075"></a>00075   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00076"></a>00076   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_ * 0.1;
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078   waves_[0]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[0]);
-<a name="l00079"></a>00079   waves_[1]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[1]);
-<a name="l00080"></a>00080   waves_[2]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[2]);
-<a name="l00081"></a>00081   waves_[3]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[3]);
-<a name="l00082"></a>00082 
-<a name="l00083"></a>00083   waves_[0]-&gt;addPhaseOffset(temp * mods_[0]);
-<a name="l00084"></a>00084   waves_[1]-&gt;addPhaseOffset(temp * mods_[1]);
-<a name="l00085"></a>00085   waves_[2]-&gt;addPhaseOffset(temp * mods_[2]);
-<a name="l00086"></a>00086   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#e9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00087"></a>00087   twozero_.<a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( temp );
-<a name="l00088"></a>00088   temp =  gains_[0] * tilt_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
-<a name="l00089"></a>00089   temp += gains_[1] * tilt_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00090"></a>00090   temp += gains_[2] * tilt_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092   lastFrame_[0] = temp * 0.33;
-<a name="l00093"></a>00093   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00094"></a>00094 }
-<a name="l00095"></a>00095 
-<a name="l00096"></a>00096 } <span class="comment">// stk namespace</span>
-<a name="l00097"></a>00097 
-<a name="l00098"></a>00098 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/FMVoices_8h_source.html b/doc/html/FMVoices_8h_source.html
index aaa6990..cdf6d45 100644
--- a/doc/html/FMVoices_8h_source.html
+++ b/doc/html/FMVoices_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>FMVoices.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FMVOICES_H</span>
@@ -38,47 +38,77 @@
 <a name="l00060"></a>00060 
 <a name="l00062"></a>00062   StkFloat <a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00063"></a>00063 
-<a name="l00064"></a>00064  <span class="keyword">protected</span>:
 <a name="l00065"></a>00065 
-<a name="l00066"></a>00066   <span class="keywordtype">int</span> currentVowel_;
-<a name="l00067"></a>00067   StkFloat tilt_[3];
-<a name="l00068"></a>00068   StkFloat mods_[3];
-<a name="l00069"></a>00069 };
-<a name="l00070"></a>00070 
-<a name="l00071"></a><a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887">00071</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">FMVoices :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00072"></a>00072 {
-<a name="l00073"></a>00073   <span class="keyword">register</span> StkFloat temp, temp2;
-<a name="l00074"></a>00074 
-<a name="l00075"></a>00075   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00076"></a>00076   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_ * 0.1;
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078   waves_[0]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[0]);
-<a name="l00079"></a>00079   waves_[1]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[1]);
-<a name="l00080"></a>00080   waves_[2]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[2]);
-<a name="l00081"></a>00081   waves_[3]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[3]);
-<a name="l00082"></a>00082 
-<a name="l00083"></a>00083   waves_[0]-&gt;addPhaseOffset(temp * mods_[0]);
-<a name="l00084"></a>00084   waves_[1]-&gt;addPhaseOffset(temp * mods_[1]);
-<a name="l00085"></a>00085   waves_[2]-&gt;addPhaseOffset(temp * mods_[2]);
-<a name="l00086"></a>00086   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00087"></a>00087   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( temp );
-<a name="l00088"></a>00088   temp =  gains_[0] * tilt_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
-<a name="l00089"></a>00089   temp += gains_[1] * tilt_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00090"></a>00090   temp += gains_[2] * tilt_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092   lastFrame_[0] = temp * 0.33;
-<a name="l00093"></a>00093   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00094"></a>00094 }
-<a name="l00095"></a>00095 
-<a name="l00096"></a>00096 } <span class="comment">// stk namespace</span>
-<a name="l00097"></a>00097 
-<a name="l00098"></a>00098 <span class="preprocessor">#endif</span>
+<a name="l00072"></a>00072   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00073"></a>00073 
+<a name="l00074"></a>00074  <span class="keyword">protected</span>:
+<a name="l00075"></a>00075 
+<a name="l00076"></a>00076   <span class="keywordtype">int</span> currentVowel_;
+<a name="l00077"></a>00077   StkFloat tilt_[3];
+<a name="l00078"></a>00078   StkFloat mods_[3];
+<a name="l00079"></a>00079 };
+<a name="l00080"></a>00080 
+<a name="l00081"></a><a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887">00081</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">FMVoices :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00082"></a>00082 {
+<a name="l00083"></a>00083   <span class="keyword">register</span> StkFloat temp, temp2;
+<a name="l00084"></a>00084 
+<a name="l00085"></a>00085   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
+<a name="l00086"></a>00086   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_ * 0.1;
+<a name="l00087"></a>00087 
+<a name="l00088"></a>00088   waves_[0]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[0]);
+<a name="l00089"></a>00089   waves_[1]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[1]);
+<a name="l00090"></a>00090   waves_[2]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[2]);
+<a name="l00091"></a>00091   waves_[3]-&gt;setFrequency(baseFrequency_ * (1.0 + temp2) * ratios_[3]);
+<a name="l00092"></a>00092 
+<a name="l00093"></a>00093   waves_[0]-&gt;addPhaseOffset(temp * mods_[0]);
+<a name="l00094"></a>00094   waves_[1]-&gt;addPhaseOffset(temp * mods_[1]);
+<a name="l00095"></a>00095   waves_[2]-&gt;addPhaseOffset(temp * mods_[2]);
+<a name="l00096"></a>00096   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
+<a name="l00097"></a>00097   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( temp );
+<a name="l00098"></a>00098   temp =  gains_[0] * tilt_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
+<a name="l00099"></a>00099   temp += gains_[1] * tilt_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
+<a name="l00100"></a>00100   temp += gains_[2] * tilt_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
+<a name="l00101"></a>00101 
+<a name="l00102"></a>00102   lastFrame_[0] = temp * 0.33;
+<a name="l00103"></a>00103   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00104"></a>00104 }
+<a name="l00105"></a>00105 
+<a name="l00106"></a><a class="code" href="classstk_1_1FMVoices.html#abad16be89b38d4618a07c5d71ab49e26">00106</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">FMVoices :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00107"></a>00107 {
+<a name="l00108"></a>00108   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00109"></a>00109 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00110"></a>00110 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00111"></a>00111     oStream_ &lt;&lt; <span class="stringliteral">&quot;FMVoices::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00112"></a>00112     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00113"></a>00113   }
+<a name="l00114"></a>00114 <span class="preprocessor">#endif</span>
+<a name="l00115"></a>00115 <span class="preprocessor"></span>
+<a name="l00116"></a>00116   StkFloat *samples = &amp;frames[channel];
+<a name="l00117"></a>00117   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00118"></a>00118   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00119"></a>00119     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00120"></a>00120       *samples++ = <a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">tick</a>();
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122   <span class="keywordflow">else</span> {
+<a name="l00123"></a>00123     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00124"></a>00124       *samples++ = <a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">tick</a>();
+<a name="l00125"></a>00125       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00126"></a>00126         *samples++ = lastFrame_[j];
+<a name="l00127"></a>00127     }
+<a name="l00128"></a>00128   }
+<a name="l00129"></a>00129 
+<a name="l00130"></a>00130   <span class="keywordflow">return</span> frames;
+<a name="l00131"></a>00131 }
+<a name="l00132"></a>00132 
+<a name="l00133"></a>00133 } <span class="comment">// stk namespace</span>
+<a name="l00134"></a>00134 
+<a name="l00135"></a>00135 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/FM_8h-source.html b/doc/html/FM_8h-source.html
deleted file mode 100644
index b37aeae..0000000
--- a/doc/html/FM_8h-source.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>FM.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FM_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FM_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "ADSR.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "FileLoop.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "TwoZero.h"</span>
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="keyword">namespace </span>stk {
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="comment">/***************************************************/</span>
-<a name="l00035"></a>00035 <span class="comment">/***************************************************/</span>
-<a name="l00036"></a>00036 
-<a name="l00037"></a><a class="code" href="classstk_1_1FM.html">00037</a> <span class="keyword">class </span><a class="code" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00038"></a>00038 {
-<a name="l00039"></a>00039  <span class="keyword">public</span>:
-<a name="l00041"></a>00041 
-<a name="l00044"></a>00044   <a class="code" href="classstk_1_1FM.html#f4732c22ce00743e1f751880fa07aa15" title="Class constructor, taking the number of wave/envelope operators to control.">FM</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> operators = 4 );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1FM.html#aba7e8bff02d105e146f8b62b20a27b9" title="Class destructor.">~FM</a>( <span class="keywordtype">void</span> );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#c5697f9929afd43379e8720f2f271b2d" title="Reset and clear all wave and envelope states.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#0a32c8327e842bb71ce945024d583941" title="Load the rawwave filenames in waves.">loadWaves</a>( <span class="keyword">const</span> <span class="keywordtype">char</span> **filenames );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#8182c605d51ec623f90f4e07c2b90891" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#58f0898b677750a259036f628ec1a91b" title="Set the frequency ratio for the specified wave.">setRatio</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> waveIndex, StkFloat ratio );
-<a name="l00060"></a>00060 
-<a name="l00062"></a>00062   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#65a8c54556f0c288871876ffad4d9eef" title="Set the gain for the specified wave.">setGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> waveIndex, StkFloat gain );
-<a name="l00063"></a>00063 
-<a name="l00065"></a><a class="code" href="classstk_1_1FM.html#33e5d60131014a12a435c0ef20d104b6">00065</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#33e5d60131014a12a435c0ef20d104b6" title="Set the modulation speed in Hz.">setModulationSpeed</a>( StkFloat mSpeed ) { vibrato_.<a class="code" href="classstk_1_1SineWave.html#1047a43714bc2e40c7e31e8f7e34adbc" title="Set the data interpolation rate based on a looping frequency.">setFrequency</a>( mSpeed ); };
-<a name="l00066"></a>00066 
-<a name="l00068"></a><a class="code" href="classstk_1_1FM.html#11584256f23153551bc13b59518b415a">00068</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#11584256f23153551bc13b59518b415a" title="Set the modulation depth.">setModulationDepth</a>( StkFloat mDepth ) { modDepth_ = mDepth; };
-<a name="l00069"></a>00069 
-<a name="l00071"></a><a class="code" href="classstk_1_1FM.html#0425269a8fc0cc6bb7471d65b54b8a1a">00071</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#0425269a8fc0cc6bb7471d65b54b8a1a" title="Set the value of control1.">setControl1</a>( StkFloat cVal ) { control1_ = cVal * 2.0; };
-<a name="l00072"></a>00072 
-<a name="l00074"></a><a class="code" href="classstk_1_1FM.html#d7e7d7067c8893040ef3bdf8a1fbe9ca">00074</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#d7e7d7067c8893040ef3bdf8a1fbe9ca" title="Set the value of control1.">setControl2</a>( StkFloat cVal ) { control2_ = cVal * 2.0; };
-<a name="l00075"></a>00075 
-<a name="l00077"></a>00077   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#fc46280177d770404919f20ccf88e4ff" title="Start envelopes toward &amp;quot;on&amp;quot; targets.">keyOn</a>( <span class="keywordtype">void</span> );
-<a name="l00078"></a>00078 
-<a name="l00080"></a>00080   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#7235e94a153df135330a591511269f7c" title="Start envelopes toward &amp;quot;off&amp;quot; targets.">keyOff</a>( <span class="keywordtype">void</span> );
-<a name="l00081"></a>00081 
-<a name="l00083"></a>00083   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#56cc61b1923dba2ff80859df4904d4f9" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00084"></a>00084 
-<a name="l00086"></a>00086   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FM.html#1db9d177363fb7d8dedb20fa0c9104f1" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00087"></a>00087 
-<a name="l00089"></a>00089   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1FM.html#81f351fd8732fd6e686735b7b45a4241" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> ) = 0;
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091  <span class="keyword">protected</span>:
-<a name="l00092"></a>00092 
-<a name="l00093"></a>00093   std::vector&lt;ADSR *&gt; adsr_; 
-<a name="l00094"></a>00094   std::vector&lt;FileLoop *&gt; waves_;
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1TwoZero.html" title="STK two-zero filter class.">TwoZero</a>  twozero_;
-<a name="l00097"></a>00097   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nOperators_;
-<a name="l00098"></a>00098   StkFloat baseFrequency_;
-<a name="l00099"></a>00099   std::vector&lt;StkFloat&gt; ratios_;
-<a name="l00100"></a>00100   std::vector&lt;StkFloat&gt; gains_;
-<a name="l00101"></a>00101   StkFloat modDepth_;
-<a name="l00102"></a>00102   StkFloat control1_;
-<a name="l00103"></a>00103   StkFloat control2_;
-<a name="l00104"></a>00104   StkFloat fmGains_[100];
-<a name="l00105"></a>00105   StkFloat fmSusLevels_[16];
-<a name="l00106"></a>00106   StkFloat fmAttTimes_[32];
-<a name="l00107"></a>00107 
-<a name="l00108"></a>00108 };
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 } <span class="comment">// stk namespace</span>
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/FM_8h_source.html b/doc/html/FM_8h_source.html
index a93b2f6..56945e4 100644
--- a/doc/html/FM_8h_source.html
+++ b/doc/html/FM_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>FM.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FM_H</span>
@@ -62,34 +62,37 @@
 <a name="l00087"></a>00087 
 <a name="l00089"></a>00089   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1FM.html#a81f351fd8732fd6e686735b7b45a4241" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> ) = 0;
 <a name="l00090"></a>00090 
-<a name="l00091"></a>00091  <span class="keyword">protected</span>:
 <a name="l00092"></a>00092 
-<a name="l00093"></a>00093   std::vector&lt;ADSR *&gt; adsr_; 
-<a name="l00094"></a>00094   std::vector&lt;FileLoop *&gt; waves_;
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1TwoZero.html" title="STK two-zero filter class.">TwoZero</a>  twozero_;
-<a name="l00097"></a>00097   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nOperators_;
-<a name="l00098"></a>00098   StkFloat baseFrequency_;
-<a name="l00099"></a>00099   std::vector&lt;StkFloat&gt; ratios_;
-<a name="l00100"></a>00100   std::vector&lt;StkFloat&gt; gains_;
-<a name="l00101"></a>00101   StkFloat modDepth_;
-<a name="l00102"></a>00102   StkFloat control1_;
-<a name="l00103"></a>00103   StkFloat control2_;
-<a name="l00104"></a>00104   StkFloat fmGains_[100];
-<a name="l00105"></a>00105   StkFloat fmSusLevels_[16];
-<a name="l00106"></a>00106   StkFloat fmAttTimes_[32];
-<a name="l00107"></a>00107 
-<a name="l00108"></a>00108 };
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 } <span class="comment">// stk namespace</span>
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112 <span class="preprocessor">#endif</span>
+<a name="l00099"></a>00099   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FM.html#a81f351fd8732fd6e686735b7b45a4241" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
+<a name="l00100"></a>00100 
+<a name="l00101"></a>00101  <span class="keyword">protected</span>:
+<a name="l00102"></a>00102 
+<a name="l00103"></a>00103   std::vector&lt;ADSR *&gt; adsr_; 
+<a name="l00104"></a>00104   std::vector&lt;FileLoop *&gt; waves_;
+<a name="l00105"></a>00105   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
+<a name="l00106"></a>00106   <a class="code" href="classstk_1_1TwoZero.html" title="STK two-zero filter class.">TwoZero</a>  twozero_;
+<a name="l00107"></a>00107   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nOperators_;
+<a name="l00108"></a>00108   StkFloat baseFrequency_;
+<a name="l00109"></a>00109   std::vector&lt;StkFloat&gt; ratios_;
+<a name="l00110"></a>00110   std::vector&lt;StkFloat&gt; gains_;
+<a name="l00111"></a>00111   StkFloat modDepth_;
+<a name="l00112"></a>00112   StkFloat control1_;
+<a name="l00113"></a>00113   StkFloat control2_;
+<a name="l00114"></a>00114   StkFloat fmGains_[100];
+<a name="l00115"></a>00115   StkFloat fmSusLevels_[16];
+<a name="l00116"></a>00116   StkFloat fmAttTimes_[32];
+<a name="l00117"></a>00117 
+<a name="l00118"></a>00118 };
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120 } <span class="comment">// stk namespace</span>
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/FileLoop_8h-source.html b/doc/html/FileLoop_8h-source.html
deleted file mode 100644
index db1e4f8..0000000
--- a/doc/html/FileLoop_8h-source.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>FileLoop.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILELOOP_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FILELOOP_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "FileWvIn.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00024"></a>00024 <span class="comment">/***************************************************/</span>
-<a name="l00025"></a>00025 
-<a name="l00026"></a><a class="code" href="classstk_1_1FileLoop.html">00026</a> <span class="keyword">class </span><a class="code" href="classstk_1_1FileLoop.html" title="STK file looping / oscillator class.">FileLoop</a> : <span class="keyword">protected</span> <a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a>
-<a name="l00027"></a>00027 {
-<a name="l00028"></a>00028  <span class="keyword">public</span>:
-<a name="l00030"></a>00030   <a class="code" href="classstk_1_1FileLoop.html#0d977aae11d75d0327057add00fa7f84" title="Default constructor.">FileLoop</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkThreshold = 1000000, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkSize = 1024 );
-<a name="l00031"></a>00031 
-<a name="l00033"></a>00033   <a class="code" href="classstk_1_1FileLoop.html#0d977aae11d75d0327057add00fa7f84" title="Default constructor.">FileLoop</a>( std::string fileName, <span class="keywordtype">bool</span> raw = <span class="keyword">false</span>, <span class="keywordtype">bool</span> doNormalize = <span class="keyword">true</span>,
-<a name="l00034"></a>00034             <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkThreshold = 1000000, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkSize = 1024 );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037   <a class="code" href="classstk_1_1FileLoop.html#b6f0e0f9a5cc9c99627d0e12db007905" title="Class destructor.">~FileLoop</a>( <span class="keywordtype">void</span> );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040 
-<a name="l00049"></a>00049   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#5905940c0dd046a95ca9c2a1d72983de" title="Open the specified file and load its data.">openFile</a>( std::string fileName, <span class="keywordtype">bool</span> raw = <span class="keyword">false</span>, <span class="keywordtype">bool</span> doNormalize = <span class="keyword">true</span> );
-<a name="l00050"></a>00050 
-<a name="l00052"></a><a class="code" href="classstk_1_1FileLoop.html#51688a9e84b2f9e5a9c4e62588b65c52">00052</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#51688a9e84b2f9e5a9c4e62588b65c52" title="Close a file if one is open.">closeFile</a>( <span class="keywordtype">void</span> ) { <a class="code" href="classstk_1_1FileLoop.html#51688a9e84b2f9e5a9c4e62588b65c52" title="Close a file if one is open.">FileWvIn::closeFile</a>(); };
-<a name="l00053"></a>00053 
-<a name="l00055"></a><a class="code" href="classstk_1_1FileLoop.html#2c539902d697d0b87334ca7dc4f3ce69">00055</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#2c539902d697d0b87334ca7dc4f3ce69" title="Clear outputs and reset time (file) pointer to zero.">reset</a>( <span class="keywordtype">void</span> ) { <a class="code" href="classstk_1_1FileLoop.html#2c539902d697d0b87334ca7dc4f3ce69" title="Clear outputs and reset time (file) pointer to zero.">FileWvIn::reset</a>(); };
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058 
-<a name="l00062"></a><a class="code" href="classstk_1_1FileLoop.html#7c4a3d5c427154bf653f86a53e900b8b">00062</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">normalize</a>( <span class="keywordtype">void</span> ) { <a class="code" href="classstk_1_1FileLoop.html#7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">FileWvIn::normalize</a>( 1.0 ); };
-<a name="l00063"></a>00063 
-<a name="l00065"></a>00065 
-<a name="l00069"></a><a class="code" href="classstk_1_1FileLoop.html#a1ac0c8d19f412f66f5fdb89854e2833">00069</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#a1ac0c8d19f412f66f5fdb89854e2833" title="Normalize data to a maximum of +-peak.">normalize</a>( StkFloat peak ) { <a class="code" href="classstk_1_1FileLoop.html#7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">FileWvIn::normalize</a>( peak ); };
-<a name="l00070"></a>00070 
-<a name="l00072"></a><a class="code" href="classstk_1_1FileLoop.html#d86d4f64c44a6f2488779fef24fc1ee7">00072</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1FileLoop.html#d86d4f64c44a6f2488779fef24fc1ee7" title="Return the file size in sample frames.">getSize</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); };
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075 
-<a name="l00080"></a><a class="code" href="classstk_1_1FileLoop.html#a18006c800c7dac1ddd277c987fe0003">00080</a>   StkFloat <a class="code" href="classstk_1_1FileLoop.html#a18006c800c7dac1ddd277c987fe0003" title="Return the input file sample rate in Hz (not the data read rate).">getFileRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#4dbbcbdc8db39a803e0861976f7f3522" title="Return the sample rate associated with the StkFrames data.">dataRate</a>(); };
-<a name="l00081"></a>00081 
-<a name="l00083"></a>00083 
-<a name="l00086"></a>00086   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#13e1f693bc8a29d9051a400087347a3c" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( StkFloat rate );
-<a name="l00087"></a>00087 
-<a name="l00089"></a>00089 
-<a name="l00095"></a><a class="code" href="classstk_1_1FileLoop.html#ec8f94d8514b266acd83106ed0f24ead">00095</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#ec8f94d8514b266acd83106ed0f24ead" title="Set the data interpolation rate based on a looping frequency.">setFrequency</a>( StkFloat frequency ) { this-&gt;<a class="code" href="classstk_1_1FileLoop.html#13e1f693bc8a29d9051a400087347a3c" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( file_.<a class="code" href="classstk_1_1FileRead.html#6a83d925dd5bd18c4299ea42cc0ea488" title="Return the file size in sample frames.">fileSize</a>() * frequency / <a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() ); };
-<a name="l00096"></a>00096 
-<a name="l00098"></a>00098   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#1986db79fd04b93f4d10b8cdf75bca34" title="Increment the read pointer by time samples, modulo file size.">addTime</a>( StkFloat time );
-<a name="l00099"></a>00099 
-<a name="l00101"></a>00101 
-<a name="l00106"></a>00106   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#8e24d6f9292a9443fbc21e4e8797f482" title="Increment current read pointer by angle, relative to a looping frequency.">addPhase</a>( StkFloat angle );
-<a name="l00107"></a>00107 
-<a name="l00109"></a>00109 
-<a name="l00114"></a>00114   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#fe462794ba202dd879d29c39e76ae111" title="Add a phase offset to the current read pointer.">addPhaseOffset</a>( StkFloat angle );
-<a name="l00115"></a>00115 
-<a name="l00117"></a>00117 
-<a name="l00126"></a><a class="code" href="classstk_1_1FileLoop.html#826b6dd0968c5abd1020a9fe629a4ffd">00126</a>   StkFloat <a class="code" href="classstk_1_1FileLoop.html#826b6dd0968c5abd1020a9fe629a4ffd" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) { <span class="keywordflow">return</span> <a class="code" href="classstk_1_1FileLoop.html#826b6dd0968c5abd1020a9fe629a4ffd" title="Return the specified channel value of the last computed frame.">FileWvIn::lastOut</a>( channel ); };
-<a name="l00127"></a>00127 
-<a name="l00129"></a>00129 
-<a name="l00138"></a>00138   StkFloat <a class="code" href="classstk_1_1FileLoop.html#037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00139"></a>00139 
-<a name="l00141"></a>00141 
-<a name="l00150"></a>00150   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FileLoop.html#037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
-<a name="l00151"></a>00151 
-<a name="l00152"></a>00152  <span class="keyword">protected</span>:
-<a name="l00153"></a>00153 
-<a name="l00154"></a>00154   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> firstFrame_;
-<a name="l00155"></a>00155   StkFloat phaseOffset_;
-<a name="l00156"></a>00156 
-<a name="l00157"></a>00157 };
-<a name="l00158"></a>00158 
-<a name="l00159"></a>00159 } <span class="comment">// stk namespace</span>
-<a name="l00160"></a>00160 
-<a name="l00161"></a>00161 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/FileLoop_8h_source.html b/doc/html/FileLoop_8h_source.html
index e83f91e..2fdd46f 100644
--- a/doc/html/FileLoop_8h_source.html
+++ b/doc/html/FileLoop_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>FileLoop.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILELOOP_H</span>
@@ -39,56 +39,58 @@
 <a name="l00053"></a>00053 
 <a name="l00055"></a><a class="code" href="classstk_1_1FileLoop.html#a2c539902d697d0b87334ca7dc4f3ce69">00055</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#a2c539902d697d0b87334ca7dc4f3ce69" title="Clear outputs and reset time (file) pointer to zero.">reset</a>( <span class="keywordtype">void</span> ) { <a class="code" href="classstk_1_1FileLoop.html#a2c539902d697d0b87334ca7dc4f3ce69" title="Clear outputs and reset time (file) pointer to zero.">FileWvIn::reset</a>(); };
 <a name="l00056"></a>00056 
-<a name="l00058"></a>00058 
-<a name="l00062"></a><a class="code" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b">00062</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">normalize</a>( <span class="keywordtype">void</span> ) { <a class="code" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">FileWvIn::normalize</a>( 1.0 ); };
-<a name="l00063"></a>00063 
-<a name="l00065"></a>00065 
-<a name="l00069"></a><a class="code" href="classstk_1_1FileLoop.html#aa1ac0c8d19f412f66f5fdb89854e2833">00069</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#aa1ac0c8d19f412f66f5fdb89854e2833" title="Normalize data to a maximum of +-peak.">normalize</a>( StkFloat peak ) { <a class="code" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">FileWvIn::normalize</a>( peak ); };
-<a name="l00070"></a>00070 
-<a name="l00072"></a><a class="code" href="classstk_1_1FileLoop.html#ad86d4f64c44a6f2488779fef24fc1ee7">00072</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1FileLoop.html#ad86d4f64c44a6f2488779fef24fc1ee7" title="Return the file size in sample frames.">getSize</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); };
+<a name="l00058"></a><a class="code" href="classstk_1_1FileLoop.html#a9f3c514ce166068197684a21d31c3a76">00058</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1FileLoop.html#a9f3c514ce166068197684a21d31c3a76" title="Return the number of audio channels in the data or stream.">channelsOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(); };
+<a name="l00059"></a>00059 
+<a name="l00061"></a>00061 
+<a name="l00065"></a><a class="code" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b">00065</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">normalize</a>( <span class="keywordtype">void</span> ) { <a class="code" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">FileWvIn::normalize</a>( 1.0 ); };
+<a name="l00066"></a>00066 
+<a name="l00068"></a>00068 
+<a name="l00072"></a><a class="code" href="classstk_1_1FileLoop.html#aa1ac0c8d19f412f66f5fdb89854e2833">00072</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#aa1ac0c8d19f412f66f5fdb89854e2833" title="Normalize data to a maximum of +-peak.">normalize</a>( StkFloat peak ) { <a class="code" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">FileWvIn::normalize</a>( peak ); };
 <a name="l00073"></a>00073 
-<a name="l00075"></a>00075 
-<a name="l00080"></a><a class="code" href="classstk_1_1FileLoop.html#aa18006c800c7dac1ddd277c987fe0003">00080</a>   StkFloat <a class="code" href="classstk_1_1FileLoop.html#aa18006c800c7dac1ddd277c987fe0003" title="Return the input file sample rate in Hz (not the data read rate).">getFileRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#a4dbbcbdc8db39a803e0861976f7f3522" title="Return the sample rate associated with the StkFrames data.">dataRate</a>(); };
-<a name="l00081"></a>00081 
-<a name="l00083"></a>00083 
-<a name="l00086"></a>00086   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#a13e1f693bc8a29d9051a400087347a3c" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( StkFloat rate );
-<a name="l00087"></a>00087 
-<a name="l00089"></a>00089 
-<a name="l00095"></a><a class="code" href="classstk_1_1FileLoop.html#aec8f94d8514b266acd83106ed0f24ead">00095</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#aec8f94d8514b266acd83106ed0f24ead" title="Set the data interpolation rate based on a looping frequency.">setFrequency</a>( StkFloat frequency ) { this-&gt;<a class="code" href="classstk_1_1FileLoop.html#a13e1f693bc8a29d9051a400087347a3c" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( file_.<a class="code" href="classstk_1_1FileRead.html#a6a83d925dd5bd18c4299ea42cc0ea488" title="Return the file size in sample frames.">fileSize</a>() * frequency / <a class="code" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() ); };
-<a name="l00096"></a>00096 
-<a name="l00098"></a>00098   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#a1986db79fd04b93f4d10b8cdf75bca34" title="Increment the read pointer by time samples, modulo file size.">addTime</a>( StkFloat time );
+<a name="l00075"></a><a class="code" href="classstk_1_1FileLoop.html#ad86d4f64c44a6f2488779fef24fc1ee7">00075</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1FileLoop.html#ad86d4f64c44a6f2488779fef24fc1ee7" title="Return the file size in sample frames.">getSize</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); };
+<a name="l00076"></a>00076 
+<a name="l00078"></a>00078 
+<a name="l00083"></a><a class="code" href="classstk_1_1FileLoop.html#aa18006c800c7dac1ddd277c987fe0003">00083</a>   StkFloat <a class="code" href="classstk_1_1FileLoop.html#aa18006c800c7dac1ddd277c987fe0003" title="Return the input file sample rate in Hz (not the data read rate).">getFileRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#a4dbbcbdc8db39a803e0861976f7f3522" title="Return the sample rate associated with the StkFrames data.">dataRate</a>(); };
+<a name="l00084"></a>00084 
+<a name="l00086"></a>00086 
+<a name="l00089"></a>00089   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#a13e1f693bc8a29d9051a400087347a3c" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( StkFloat rate );
+<a name="l00090"></a>00090 
+<a name="l00092"></a>00092 
+<a name="l00098"></a><a class="code" href="classstk_1_1FileLoop.html#aec8f94d8514b266acd83106ed0f24ead">00098</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#aec8f94d8514b266acd83106ed0f24ead" title="Set the data interpolation rate based on a looping frequency.">setFrequency</a>( StkFloat frequency ) { this-&gt;<a class="code" href="classstk_1_1FileLoop.html#a13e1f693bc8a29d9051a400087347a3c" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( file_.<a class="code" href="classstk_1_1FileRead.html#a6a83d925dd5bd18c4299ea42cc0ea488" title="Return the file size in sample frames.">fileSize</a>() * frequency / <a class="code" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() ); };
 <a name="l00099"></a>00099 
-<a name="l00101"></a>00101 
-<a name="l00106"></a>00106   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#a8e24d6f9292a9443fbc21e4e8797f482" title="Increment current read pointer by angle, relative to a looping frequency.">addPhase</a>( StkFloat angle );
-<a name="l00107"></a>00107 
-<a name="l00109"></a>00109 
-<a name="l00114"></a>00114   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#afe462794ba202dd879d29c39e76ae111" title="Add a phase offset to the current read pointer.">addPhaseOffset</a>( StkFloat angle );
-<a name="l00115"></a>00115 
-<a name="l00117"></a>00117 
-<a name="l00126"></a><a class="code" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd">00126</a>   StkFloat <a class="code" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) { <span class="keywordflow">return</span> <a class="code" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd" title="Return the specified channel value of the last computed frame.">FileWvIn::lastOut</a>( channel ); };
-<a name="l00127"></a>00127 
-<a name="l00129"></a>00129 
-<a name="l00138"></a>00138   StkFloat <a class="code" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00139"></a>00139 
-<a name="l00141"></a>00141 
-<a name="l00150"></a>00150   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
-<a name="l00151"></a>00151 
-<a name="l00152"></a>00152  <span class="keyword">protected</span>:
-<a name="l00153"></a>00153 
-<a name="l00154"></a>00154   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> firstFrame_;
-<a name="l00155"></a>00155   StkFloat phaseOffset_;
+<a name="l00101"></a>00101   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#a1986db79fd04b93f4d10b8cdf75bca34" title="Increment the read pointer by time samples, modulo file size.">addTime</a>( StkFloat time );
+<a name="l00102"></a>00102 
+<a name="l00104"></a>00104 
+<a name="l00109"></a>00109   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#a8e24d6f9292a9443fbc21e4e8797f482" title="Increment current read pointer by angle, relative to a looping frequency.">addPhase</a>( StkFloat angle );
+<a name="l00110"></a>00110 
+<a name="l00112"></a>00112 
+<a name="l00117"></a>00117   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileLoop.html#afe462794ba202dd879d29c39e76ae111" title="Add a phase offset to the current read pointer.">addPhaseOffset</a>( StkFloat angle );
+<a name="l00118"></a>00118 
+<a name="l00120"></a>00120 
+<a name="l00129"></a><a class="code" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd">00129</a>   StkFloat <a class="code" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) { <span class="keywordflow">return</span> <a class="code" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd" title="Return the specified channel value of the last computed frame.">FileWvIn::lastOut</a>( channel ); };
+<a name="l00130"></a>00130 
+<a name="l00132"></a>00132 
+<a name="l00141"></a>00141   StkFloat <a class="code" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00142"></a>00142 
+<a name="l00144"></a>00144 
+<a name="l00153"></a>00153   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
+<a name="l00154"></a>00154 
+<a name="l00155"></a>00155  <span class="keyword">protected</span>:
 <a name="l00156"></a>00156 
-<a name="l00157"></a>00157 };
-<a name="l00158"></a>00158 
-<a name="l00159"></a>00159 } <span class="comment">// stk namespace</span>
-<a name="l00160"></a>00160 
-<a name="l00161"></a>00161 <span class="preprocessor">#endif</span>
+<a name="l00157"></a>00157   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> firstFrame_;
+<a name="l00158"></a>00158   StkFloat phaseOffset_;
+<a name="l00159"></a>00159 
+<a name="l00160"></a>00160 };
+<a name="l00161"></a>00161 
+<a name="l00162"></a>00162 } <span class="comment">// stk namespace</span>
+<a name="l00163"></a>00163 
+<a name="l00164"></a>00164 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/FileRead_8h-source.html b/doc/html/FileRead_8h-source.html
deleted file mode 100644
index 4a6ac3b..0000000
--- a/doc/html/FileRead_8h-source.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>FileRead.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILEREAD_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FILEREAD_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00037"></a>00037 <span class="comment">/***************************************************/</span>
-<a name="l00038"></a>00038 
-<a name="l00039"></a><a class="code" href="classstk_1_1FileRead.html">00039</a> <span class="keyword">class </span><a class="code" href="classstk_1_1FileRead.html" title="STK audio file input class.">FileRead</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00040"></a>00040 {
-<a name="l00041"></a>00041 <span class="keyword">public</span>:
-<a name="l00043"></a>00043   <a class="code" href="classstk_1_1FileRead.html#9b8c55af1ca997dd3b808afcc54f3089" title="Default constructor.">FileRead</a>( <span class="keywordtype">void</span> );
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046 
-<a name="l00052"></a>00052   <a class="code" href="classstk_1_1FileRead.html#9b8c55af1ca997dd3b808afcc54f3089" title="Default constructor.">FileRead</a>( std::string fileName, <span class="keywordtype">bool</span> typeRaw = <span class="keyword">false</span>, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1,
-<a name="l00053"></a>00053             StkFormat format = <a class="code" href="classstk_1_1Stk.html#5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a>, StkFloat rate = 22050.0 );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <a class="code" href="classstk_1_1FileRead.html#24802c0e1846ea9f420f40293af4cde4" title="Class destructor.">~FileRead</a>( <span class="keywordtype">void</span> );
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059 
-<a name="l00065"></a>00065   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileRead.html#cc11b53871e05af1b0342e2cc1fc3157" title="Open the specified file and determine its formatting.">open</a>( std::string fileName, <span class="keywordtype">bool</span> typeRaw = <span class="keyword">false</span>, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1,
-<a name="l00066"></a>00066              StkFormat format = <a class="code" href="classstk_1_1Stk.html#5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a>, StkFloat rate = 22050.0 );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileRead.html#56d09169c0cca8623823579c7f80808a" title="If a file is open, close it.">close</a>( <span class="keywordtype">void</span> );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1FileRead.html#3f30ed2a9f45493f0369aa2edbf38f70" title="Returns true if a file is currently open.">isOpen</a>( <span class="keywordtype">void</span> );
-<a name="l00073"></a>00073 
-<a name="l00075"></a><a class="code" href="classstk_1_1FileRead.html#6a83d925dd5bd18c4299ea42cc0ea488">00075</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1FileRead.html#6a83d925dd5bd18c4299ea42cc0ea488" title="Return the file size in sample frames.">fileSize</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> fileSize_; };
-<a name="l00076"></a>00076 
-<a name="l00078"></a><a class="code" href="classstk_1_1FileRead.html#4c0c35f1817a4984b325967f1e7bcd81">00078</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1FileRead.html#4c0c35f1817a4984b325967f1e7bcd81" title="Return the number of audio channels in the file.">channels</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> channels_; };
-<a name="l00079"></a>00079 
-<a name="l00081"></a>00081 
-<a name="l00086"></a><a class="code" href="classstk_1_1FileRead.html#7d6ba525b2f8ae693d953cb7f4b7c199">00086</a>   StkFloat <a class="code" href="classstk_1_1FileRead.html#7d6ba525b2f8ae693d953cb7f4b7c199" title="Return the file sample rate in Hz.">fileRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> fileRate_; };
-<a name="l00087"></a>00087 
-<a name="l00089"></a>00089 
-<a name="l00101"></a>00101   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileRead.html#8eefe5d1479789c02ac2dfa76ba143f8" title="Read sample frames from the file into an StkFrames object.">read</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; buffer, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> startFrame = 0, <span class="keywordtype">bool</span> doNormalize = <span class="keyword">true</span> );
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103 <span class="keyword">protected</span>:
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="comment">// Get STK RAW file information.</span>
-<a name="l00106"></a>00106   <span class="keywordtype">bool</span> getRawInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels,
-<a name="l00107"></a>00107                    StkFormat format, StkFloat rate );
-<a name="l00108"></a>00108 
-<a name="l00109"></a>00109   <span class="comment">// Get WAV file header information.</span>
-<a name="l00110"></a>00110   <span class="keywordtype">bool</span> getWavInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112   <span class="comment">// Get SND (AU) file header information.</span>
-<a name="l00113"></a>00113   <span class="keywordtype">bool</span> getSndInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00114"></a>00114 
-<a name="l00115"></a>00115   <span class="comment">// Get AIFF file header information.</span>
-<a name="l00116"></a>00116   <span class="keywordtype">bool</span> getAifInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   <span class="comment">// Get MAT-file header information.</span>
-<a name="l00119"></a>00119   <span class="keywordtype">bool</span> getMatInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00120"></a>00120 
-<a name="l00121"></a>00121   FILE *fd_;
-<a name="l00122"></a>00122   <span class="keywordtype">bool</span> byteswap_;
-<a name="l00123"></a>00123   <span class="keywordtype">bool</span> wavFile_;
-<a name="l00124"></a>00124   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> fileSize_;
-<a name="l00125"></a>00125   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> dataOffset_;
-<a name="l00126"></a>00126   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels_;
-<a name="l00127"></a>00127   StkFormat dataType_;
-<a name="l00128"></a>00128   StkFloat fileRate_;
-<a name="l00129"></a>00129 };
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131 } <span class="comment">// stk namespace</span>
-<a name="l00132"></a>00132 
-<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/FileRead_8h_source.html b/doc/html/FileRead_8h_source.html
index ea88143..c82d094 100644
--- a/doc/html/FileRead_8h_source.html
+++ b/doc/html/FileRead_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>FileRead.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILEREAD_H</span>
@@ -20,74 +20,79 @@
 <a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
 <a name="l00007"></a>00007 
 <a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00037"></a>00037 <span class="comment">/***************************************************/</span>
-<a name="l00038"></a>00038 
-<a name="l00039"></a><a class="code" href="classstk_1_1FileRead.html">00039</a> <span class="keyword">class </span><a class="code" href="classstk_1_1FileRead.html" title="STK audio file input class.">FileRead</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00040"></a>00040 {
-<a name="l00041"></a>00041 <span class="keyword">public</span>:
-<a name="l00043"></a>00043   <a class="code" href="classstk_1_1FileRead.html#a9b8c55af1ca997dd3b808afcc54f3089" title="Default constructor.">FileRead</a>( <span class="keywordtype">void</span> );
-<a name="l00044"></a>00044 
+<a name="l00039"></a>00039 <span class="comment">/***************************************************/</span>
+<a name="l00040"></a>00040 
+<a name="l00041"></a><a class="code" href="classstk_1_1FileRead.html">00041</a> <span class="keyword">class </span><a class="code" href="classstk_1_1FileRead.html" title="STK audio file input class.">FileRead</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
+<a name="l00042"></a>00042 {
+<a name="l00043"></a>00043 <span class="keyword">public</span>:
+<a name="l00045"></a>00045   <a class="code" href="classstk_1_1FileRead.html#a9b8c55af1ca997dd3b808afcc54f3089" title="Default constructor.">FileRead</a>( <span class="keywordtype">void</span> );
 <a name="l00046"></a>00046 
-<a name="l00052"></a>00052   <a class="code" href="classstk_1_1FileRead.html#a9b8c55af1ca997dd3b808afcc54f3089" title="Default constructor.">FileRead</a>( std::string fileName, <span class="keywordtype">bool</span> typeRaw = <span class="keyword">false</span>, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1,
-<a name="l00053"></a>00053             StkFormat format = <a class="code" href="classstk_1_1Stk.html#a5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a>, StkFloat rate = 22050.0 );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <a class="code" href="classstk_1_1FileRead.html#a24802c0e1846ea9f420f40293af4cde4" title="Class destructor.">~FileRead</a>( <span class="keywordtype">void</span> );
-<a name="l00057"></a>00057 
+<a name="l00048"></a>00048 
+<a name="l00054"></a>00054   <a class="code" href="classstk_1_1FileRead.html#a9b8c55af1ca997dd3b808afcc54f3089" title="Default constructor.">FileRead</a>( std::string fileName, <span class="keywordtype">bool</span> typeRaw = <span class="keyword">false</span>, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1,
+<a name="l00055"></a>00055             StkFormat <a class="code" href="classstk_1_1FileRead.html#a6852b303c34f01967be2a7a69221ef0b" title="Return the data format of the file.">format</a> = <a class="code" href="classstk_1_1Stk.html#a5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a>, StkFloat rate = 22050.0 );
+<a name="l00056"></a>00056 
+<a name="l00058"></a>00058   <a class="code" href="classstk_1_1FileRead.html#a24802c0e1846ea9f420f40293af4cde4" title="Class destructor.">~FileRead</a>( <span class="keywordtype">void</span> );
 <a name="l00059"></a>00059 
-<a name="l00065"></a>00065   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileRead.html#acc11b53871e05af1b0342e2cc1fc3157" title="Open the specified file and determine its formatting.">open</a>( std::string fileName, <span class="keywordtype">bool</span> typeRaw = <span class="keyword">false</span>, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1,
-<a name="l00066"></a>00066              StkFormat format = <a class="code" href="classstk_1_1Stk.html#a5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a>, StkFloat rate = 22050.0 );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileRead.html#a56d09169c0cca8623823579c7f80808a" title="If a file is open, close it.">close</a>( <span class="keywordtype">void</span> );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1FileRead.html#a3f30ed2a9f45493f0369aa2edbf38f70" title="Returns true if a file is currently open.">isOpen</a>( <span class="keywordtype">void</span> );
-<a name="l00073"></a>00073 
-<a name="l00075"></a><a class="code" href="classstk_1_1FileRead.html#a6a83d925dd5bd18c4299ea42cc0ea488">00075</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1FileRead.html#a6a83d925dd5bd18c4299ea42cc0ea488" title="Return the file size in sample frames.">fileSize</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> fileSize_; };
-<a name="l00076"></a>00076 
-<a name="l00078"></a><a class="code" href="classstk_1_1FileRead.html#a4c0c35f1817a4984b325967f1e7bcd81">00078</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1FileRead.html#a4c0c35f1817a4984b325967f1e7bcd81" title="Return the number of audio channels in the file.">channels</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> channels_; };
-<a name="l00079"></a>00079 
+<a name="l00061"></a>00061 
+<a name="l00067"></a>00067   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileRead.html#acc11b53871e05af1b0342e2cc1fc3157" title="Open the specified file and determine its formatting.">open</a>( std::string fileName, <span class="keywordtype">bool</span> typeRaw = <span class="keyword">false</span>, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1,
+<a name="l00068"></a>00068              StkFormat <a class="code" href="classstk_1_1FileRead.html#a6852b303c34f01967be2a7a69221ef0b" title="Return the data format of the file.">format</a> = <a class="code" href="classstk_1_1Stk.html#a5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a>, StkFloat rate = 22050.0 );
+<a name="l00069"></a>00069 
+<a name="l00071"></a>00071   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileRead.html#a56d09169c0cca8623823579c7f80808a" title="If a file is open, close it.">close</a>( <span class="keywordtype">void</span> );
+<a name="l00072"></a>00072 
+<a name="l00074"></a>00074   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1FileRead.html#a3f30ed2a9f45493f0369aa2edbf38f70" title="Returns true if a file is currently open.">isOpen</a>( <span class="keywordtype">void</span> );
+<a name="l00075"></a>00075 
+<a name="l00077"></a><a class="code" href="classstk_1_1FileRead.html#a6a83d925dd5bd18c4299ea42cc0ea488">00077</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1FileRead.html#a6a83d925dd5bd18c4299ea42cc0ea488" title="Return the file size in sample frames.">fileSize</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> fileSize_; };
+<a name="l00078"></a>00078 
+<a name="l00080"></a><a class="code" href="classstk_1_1FileRead.html#a4c0c35f1817a4984b325967f1e7bcd81">00080</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1FileRead.html#a4c0c35f1817a4984b325967f1e7bcd81" title="Return the number of audio channels in the file.">channels</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> channels_; };
 <a name="l00081"></a>00081 
-<a name="l00086"></a><a class="code" href="classstk_1_1FileRead.html#a7d6ba525b2f8ae693d953cb7f4b7c199">00086</a>   StkFloat <a class="code" href="classstk_1_1FileRead.html#a7d6ba525b2f8ae693d953cb7f4b7c199" title="Return the file sample rate in Hz.">fileRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> fileRate_; };
-<a name="l00087"></a>00087 
-<a name="l00089"></a>00089 
-<a name="l00101"></a>00101   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileRead.html#a8eefe5d1479789c02ac2dfa76ba143f8" title="Read sample frames from the file into an StkFrames object.">read</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; buffer, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> startFrame = 0, <span class="keywordtype">bool</span> doNormalize = <span class="keyword">true</span> );
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103 <span class="keyword">protected</span>:
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="comment">// Get STK RAW file information.</span>
-<a name="l00106"></a>00106   <span class="keywordtype">bool</span> getRawInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels,
-<a name="l00107"></a>00107                    StkFormat format, StkFloat rate );
-<a name="l00108"></a>00108 
-<a name="l00109"></a>00109   <span class="comment">// Get WAV file header information.</span>
-<a name="l00110"></a>00110   <span class="keywordtype">bool</span> getWavInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112   <span class="comment">// Get SND (AU) file header information.</span>
-<a name="l00113"></a>00113   <span class="keywordtype">bool</span> getSndInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00114"></a>00114 
-<a name="l00115"></a>00115   <span class="comment">// Get AIFF file header information.</span>
-<a name="l00116"></a>00116   <span class="keywordtype">bool</span> getAifInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   <span class="comment">// Get MAT-file header information.</span>
-<a name="l00119"></a>00119   <span class="keywordtype">bool</span> getMatInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00120"></a>00120 
-<a name="l00121"></a>00121   FILE *fd_;
-<a name="l00122"></a>00122   <span class="keywordtype">bool</span> byteswap_;
-<a name="l00123"></a>00123   <span class="keywordtype">bool</span> wavFile_;
-<a name="l00124"></a>00124   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> fileSize_;
-<a name="l00125"></a>00125   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> dataOffset_;
-<a name="l00126"></a>00126   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels_;
-<a name="l00127"></a>00127   StkFormat dataType_;
-<a name="l00128"></a>00128   StkFloat fileRate_;
-<a name="l00129"></a>00129 };
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131 } <span class="comment">// stk namespace</span>
-<a name="l00132"></a>00132 
-<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
+<a name="l00083"></a><a class="code" href="classstk_1_1FileRead.html#a6852b303c34f01967be2a7a69221ef0b">00083</a>   StkFormat <a class="code" href="classstk_1_1FileRead.html#a6852b303c34f01967be2a7a69221ef0b" title="Return the data format of the file.">format</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> dataType_; };
+<a name="l00084"></a>00084 
+<a name="l00086"></a>00086 
+<a name="l00091"></a><a class="code" href="classstk_1_1FileRead.html#a7d6ba525b2f8ae693d953cb7f4b7c199">00091</a>   StkFloat <a class="code" href="classstk_1_1FileRead.html#a7d6ba525b2f8ae693d953cb7f4b7c199" title="Return the file sample rate in Hz.">fileRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> fileRate_; };
+<a name="l00092"></a>00092 
+<a name="l00094"></a>00094 
+<a name="l00106"></a>00106   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileRead.html#a8eefe5d1479789c02ac2dfa76ba143f8" title="Read sample frames from the file into an StkFrames object.">read</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; buffer, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> startFrame = 0, <span class="keywordtype">bool</span> doNormalize = <span class="keyword">true</span> );
+<a name="l00107"></a>00107 
+<a name="l00108"></a>00108 <span class="keyword">protected</span>:
+<a name="l00109"></a>00109 
+<a name="l00110"></a>00110   <span class="comment">// Get STK RAW file information.</span>
+<a name="l00111"></a>00111   <span class="keywordtype">bool</span> getRawInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels,
+<a name="l00112"></a>00112                    StkFormat <a class="code" href="classstk_1_1FileRead.html#a6852b303c34f01967be2a7a69221ef0b" title="Return the data format of the file.">format</a>, StkFloat rate );
+<a name="l00113"></a>00113 
+<a name="l00114"></a>00114   <span class="comment">// Get WAV file header information.</span>
+<a name="l00115"></a>00115   <span class="keywordtype">bool</span> getWavInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
+<a name="l00116"></a>00116 
+<a name="l00117"></a>00117   <span class="comment">// Get SND (AU) file header information.</span>
+<a name="l00118"></a>00118   <span class="keywordtype">bool</span> getSndInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   <span class="comment">// Get AIFF file header information.</span>
+<a name="l00121"></a>00121   <span class="keywordtype">bool</span> getAifInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
+<a name="l00122"></a>00122 
+<a name="l00123"></a>00123   <span class="comment">// Get MAT-file header information.</span>
+<a name="l00124"></a>00124   <span class="keywordtype">bool</span> getMatInfo( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
+<a name="l00125"></a>00125 
+<a name="l00126"></a>00126   <span class="comment">// Helper function for MAT-file parsing.</span>
+<a name="l00127"></a>00127   <span class="keywordtype">bool</span> findNextMatArray( SINT32 *chunkSize, SINT32 *rows, SINT32 *columns, SINT32 *nametype );
+<a name="l00128"></a>00128 
+<a name="l00129"></a>00129   FILE *fd_;
+<a name="l00130"></a>00130   <span class="keywordtype">bool</span> byteswap_;
+<a name="l00131"></a>00131   <span class="keywordtype">bool</span> wavFile_;
+<a name="l00132"></a>00132   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> fileSize_;
+<a name="l00133"></a>00133   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> dataOffset_;
+<a name="l00134"></a>00134   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels_;
+<a name="l00135"></a>00135   StkFormat dataType_;
+<a name="l00136"></a>00136   StkFloat fileRate_;
+<a name="l00137"></a>00137 };
+<a name="l00138"></a>00138 
+<a name="l00139"></a>00139 } <span class="comment">// stk namespace</span>
+<a name="l00140"></a>00140 
+<a name="l00141"></a>00141 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/FileWrite_8h-source.html b/doc/html/FileWrite_8h-source.html
deleted file mode 100644
index 05fe12f..0000000
--- a/doc/html/FileWrite_8h-source.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>FileWrite.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILEWRITE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FILEWRITE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 
-<a name="l00031"></a><a class="code" href="classstk_1_1FileWrite.html">00031</a> <span class="keyword">class </span><a class="code" href="classstk_1_1FileWrite.html" title="STK audio file output class.">FileWrite</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00032"></a>00032 {
-<a name="l00033"></a>00033  <span class="keyword">public</span>:
-<a name="l00034"></a>00034 
-<a name="l00035"></a>00035   <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> FILE_TYPE;
-<a name="l00036"></a>00036 
-<a name="l00037"></a><a class="code" href="classstk_1_1FileWrite.html#c9e286cfc8037327eef493439e78f31e">00037</a>   <span class="keyword">static</span> <span class="keyword">const</span> FILE_TYPE <a class="code" href="classstk_1_1FileWrite.html#c9e286cfc8037327eef493439e78f31e">FILE_RAW</a>; 
-<a name="l00038"></a><a class="code" href="classstk_1_1FileWrite.html#800875bbcac8f137ed94f5606d55f8c6">00038</a>   <span class="keyword">static</span> <span class="keyword">const</span> FILE_TYPE <a class="code" href="classstk_1_1FileWrite.html#800875bbcac8f137ed94f5606d55f8c6">FILE_WAV</a>; 
-<a name="l00039"></a><a class="code" href="classstk_1_1FileWrite.html#1ae24c549fc9fa2c8ef4a6ff94ccc345">00039</a>   <span class="keyword">static</span> <span class="keyword">const</span> FILE_TYPE <a class="code" href="classstk_1_1FileWrite.html#1ae24c549fc9fa2c8ef4a6ff94ccc345">FILE_SND</a>; 
-<a name="l00040"></a><a class="code" href="classstk_1_1FileWrite.html#678074f8bfa198627ed8ee9f52a42c0e">00040</a>   <span class="keyword">static</span> <span class="keyword">const</span> FILE_TYPE <a class="code" href="classstk_1_1FileWrite.html#678074f8bfa198627ed8ee9f52a42c0e">FILE_AIF</a>; 
-<a name="l00041"></a><a class="code" href="classstk_1_1FileWrite.html#d06e073000f613c43c48707c724d104e">00041</a>   <span class="keyword">static</span> <span class="keyword">const</span> FILE_TYPE <a class="code" href="classstk_1_1FileWrite.html#d06e073000f613c43c48707c724d104e">FILE_MAT</a>; 
-<a name="l00043"></a>00043 
-<a name="l00044"></a>00044   <a class="code" href="classstk_1_1FileWrite.html#b362583b465c41ac0b411722621e9d3d" title="Default constructor.">FileWrite</a>( <span class="keywordtype">void</span> );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047 
-<a name="l00050"></a>00050   <a class="code" href="classstk_1_1FileWrite.html#b362583b465c41ac0b411722621e9d3d" title="Default constructor.">FileWrite</a>( std::string fileName, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1, FILE_TYPE type = <a class="code" href="classstk_1_1FileWrite.html#800875bbcac8f137ed94f5606d55f8c6">FILE_WAV</a>, Stk::StkFormat format = <a class="code" href="classstk_1_1Stk.html#5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a> );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1FileWrite.html#c4da2511c8d0640ec5484f88bd704747" title="Class destructor.">~FileWrite</a>();
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWrite.html#7575ddb275c902207b7b6518bb5a4ed9" title="Create a file of the specified type and name and output samples to it in the given...">open</a>( std::string fileName, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1,
-<a name="l00060"></a>00060              FileWrite::FILE_TYPE type = <a class="code" href="classstk_1_1FileWrite.html#800875bbcac8f137ed94f5606d55f8c6">FILE_WAV</a>, Stk::StkFormat format = <a class="code" href="classstk_1_1Stk.html#5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a> );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWrite.html#99a19988a4dd8d608b74421cfb6cbc69" title="If a file is open, write out samples in the queue and then close it.">close</a>( <span class="keywordtype">void</span> );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1FileWrite.html#636436624aa39eb5ba3401a9279a173e" title="Returns true if a file is currently open.">isOpen</a>( <span class="keywordtype">void</span> );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069 
-<a name="l00074"></a>00074   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWrite.html#d33ca8e729c14296af6dce457445832e" title="Write sample frames from the StkFrames object to the file.">write</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; buffer );
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076  <span class="keyword">protected</span>:
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078   <span class="comment">// Write STK RAW file header.</span>
-<a name="l00079"></a>00079   <span class="keywordtype">bool</span> setRawFile( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081   <span class="comment">// Write WAV file header.</span>
-<a name="l00082"></a>00082   <span class="keywordtype">bool</span> setWavFile( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084   <span class="comment">// Close WAV file, updating the header.</span>
-<a name="l00085"></a>00085   <span class="keywordtype">void</span> closeWavFile( <span class="keywordtype">void</span> );
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087   <span class="comment">// Write SND (AU) file header.</span>
-<a name="l00088"></a>00088   <span class="keywordtype">bool</span> setSndFile( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090   <span class="comment">// Close SND file, updating the header.</span>
-<a name="l00091"></a>00091   <span class="keywordtype">void</span> closeSndFile( <span class="keywordtype">void</span> );
-<a name="l00092"></a>00092 
-<a name="l00093"></a>00093   <span class="comment">// Write AIFF file header.</span>
-<a name="l00094"></a>00094   <span class="keywordtype">bool</span> setAifFile( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00095"></a>00095 
-<a name="l00096"></a>00096   <span class="comment">// Close AIFF file, updating the header.</span>
-<a name="l00097"></a>00097   <span class="keywordtype">void</span> closeAifFile( <span class="keywordtype">void</span> );
-<a name="l00098"></a>00098 
-<a name="l00099"></a>00099   <span class="comment">// Write MAT-file header.</span>
-<a name="l00100"></a>00100   <span class="keywordtype">bool</span> setMatFile( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="comment">// Close MAT-file, updating the header.</span>
-<a name="l00103"></a>00103   <span class="keywordtype">void</span> closeMatFile( <span class="keywordtype">void</span> );
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   FILE *fd_;
-<a name="l00106"></a>00106   FILE_TYPE fileType_;
-<a name="l00107"></a>00107   StkFormat dataType_;
-<a name="l00108"></a>00108   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels_;
-<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> frameCounter_;
-<a name="l00110"></a>00110   <span class="keywordtype">bool</span> byteswap_;
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112 };
-<a name="l00113"></a>00113 
-<a name="l00114"></a>00114 } <span class="comment">// stk namespace</span>
-<a name="l00115"></a>00115 
-<a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/FileWrite_8h_source.html b/doc/html/FileWrite_8h_source.html
index a4d6176..12a5de2 100644
--- a/doc/html/FileWrite_8h_source.html
+++ b/doc/html/FileWrite_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>FileWrite.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILEWRITE_H</span>
@@ -55,28 +55,28 @@
 <a name="l00076"></a>00076  <span class="keyword">protected</span>:
 <a name="l00077"></a>00077 
 <a name="l00078"></a>00078   <span class="comment">// Write STK RAW file header.</span>
-<a name="l00079"></a>00079   <span class="keywordtype">bool</span> setRawFile( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
+<a name="l00079"></a>00079   <span class="keywordtype">bool</span> setRawFile( std::string fileName );
 <a name="l00080"></a>00080 
 <a name="l00081"></a>00081   <span class="comment">// Write WAV file header.</span>
-<a name="l00082"></a>00082   <span class="keywordtype">bool</span> setWavFile( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
+<a name="l00082"></a>00082   <span class="keywordtype">bool</span> setWavFile( std::string fileName );
 <a name="l00083"></a>00083 
 <a name="l00084"></a>00084   <span class="comment">// Close WAV file, updating the header.</span>
 <a name="l00085"></a>00085   <span class="keywordtype">void</span> closeWavFile( <span class="keywordtype">void</span> );
 <a name="l00086"></a>00086 
 <a name="l00087"></a>00087   <span class="comment">// Write SND (AU) file header.</span>
-<a name="l00088"></a>00088   <span class="keywordtype">bool</span> setSndFile( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
+<a name="l00088"></a>00088   <span class="keywordtype">bool</span> setSndFile( std::string fileName );
 <a name="l00089"></a>00089 
 <a name="l00090"></a>00090   <span class="comment">// Close SND file, updating the header.</span>
 <a name="l00091"></a>00091   <span class="keywordtype">void</span> closeSndFile( <span class="keywordtype">void</span> );
 <a name="l00092"></a>00092 
 <a name="l00093"></a>00093   <span class="comment">// Write AIFF file header.</span>
-<a name="l00094"></a>00094   <span class="keywordtype">bool</span> setAifFile( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
+<a name="l00094"></a>00094   <span class="keywordtype">bool</span> setAifFile( std::string fileName );
 <a name="l00095"></a>00095 
 <a name="l00096"></a>00096   <span class="comment">// Close AIFF file, updating the header.</span>
 <a name="l00097"></a>00097   <span class="keywordtype">void</span> closeAifFile( <span class="keywordtype">void</span> );
 <a name="l00098"></a>00098 
 <a name="l00099"></a>00099   <span class="comment">// Write MAT-file header.</span>
-<a name="l00100"></a>00100   <span class="keywordtype">bool</span> setMatFile( <span class="keyword">const</span> <span class="keywordtype">char</span> *fileName );
+<a name="l00100"></a>00100   <span class="keywordtype">bool</span> setMatFile( std::string fileName );
 <a name="l00101"></a>00101 
 <a name="l00102"></a>00102   <span class="comment">// Close MAT-file, updating the header.</span>
 <a name="l00103"></a>00103   <span class="keywordtype">void</span> closeMatFile( <span class="keywordtype">void</span> );
@@ -98,7 +98,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/FileWvIn_8h-source.html b/doc/html/FileWvIn_8h-source.html
deleted file mode 100644
index 867779a..0000000
--- a/doc/html/FileWvIn_8h-source.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>FileWvIn.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILEWVIN_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FILEWVIN_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "WvIn.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "FileRead.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00040"></a>00040 <span class="comment">/***************************************************/</span>
-<a name="l00041"></a>00041 
-<a name="l00042"></a><a class="code" href="classstk_1_1FileWvIn.html">00042</a> <span class="keyword">class </span><a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1WvIn.html" title="STK audio input abstract base class.">WvIn</a>
-<a name="l00043"></a>00043 {
-<a name="l00044"></a>00044 <span class="keyword">public</span>:
-<a name="l00046"></a>00046   <a class="code" href="classstk_1_1FileWvIn.html#0562e85c4cb0d1565d9697da966add94" title="Default constructor.">FileWvIn</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkThreshold = 1000000, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkSize = 1024 );
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049 
-<a name="l00053"></a>00053   <a class="code" href="classstk_1_1FileWvIn.html#0562e85c4cb0d1565d9697da966add94" title="Default constructor.">FileWvIn</a>( std::string fileName, <span class="keywordtype">bool</span> raw = <span class="keyword">false</span>, <span class="keywordtype">bool</span> doNormalize = <span class="keyword">true</span>,
-<a name="l00054"></a>00054             <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkThreshold = 1000000, <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkSize = 1024 );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <a class="code" href="classstk_1_1FileWvIn.html#d63f10df8795ce5cb6348b0bb1ad884e" title="Class destructor.">~FileWvIn</a>( <span class="keywordtype">void</span> );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060 
-<a name="l00069"></a>00069   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#7986664cd986cbacf4fb19e5c77deda1" title="Open the specified file and load its data.">openFile</a>( std::string fileName, <span class="keywordtype">bool</span> raw = <span class="keyword">false</span>, <span class="keywordtype">bool</span> doNormalize = <span class="keyword">true</span> );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#e586a93b45a979881d9bd6fc1cb364cb" title="Close a file if one is open.">closeFile</a>( <span class="keywordtype">void</span> );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#c7dfd47e46a083d434e63c9d1b8c3d28" title="Clear outputs and reset time (file) pointer to zero.">reset</a>( <span class="keywordtype">void</span> );
-<a name="l00076"></a>00076 
-<a name="l00078"></a>00078 
-<a name="l00082"></a>00082   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#aecd1950fca3a5513e0efe4e86754b11" title="Normalize data to a maximum of +-1.0.">normalize</a>( <span class="keywordtype">void</span> );
-<a name="l00083"></a>00083 
-<a name="l00085"></a>00085 
-<a name="l00089"></a>00089   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#aecd1950fca3a5513e0efe4e86754b11" title="Normalize data to a maximum of +-1.0.">normalize</a>( StkFloat peak );
-<a name="l00090"></a>00090 
-<a name="l00092"></a><a class="code" href="classstk_1_1FileWvIn.html#a8ef94c3ed01af0efc9e968f09207a26">00092</a>   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1FileWvIn.html#a8ef94c3ed01af0efc9e968f09207a26" title="Return the file size in sample frames.">getSize</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); };
-<a name="l00093"></a>00093 
-<a name="l00095"></a>00095 
-<a name="l00100"></a><a class="code" href="classstk_1_1FileWvIn.html#867b7b7fdb60e5194e25d7a85a26ec0b">00100</a>   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1FileWvIn.html#867b7b7fdb60e5194e25d7a85a26ec0b" title="Return the input file sample rate in Hz (not the data read rate).">getFileRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#4dbbcbdc8db39a803e0861976f7f3522" title="Return the sample rate associated with the StkFrames data.">dataRate</a>(); };
-<a name="l00101"></a>00101 
-<a name="l00103"></a><a class="code" href="classstk_1_1FileWvIn.html#ca9ad0c12af3323e7bbf877513b0d10b">00103</a>   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1FileWvIn.html#ca9ad0c12af3323e7bbf877513b0d10b" title="Query whether reading is complete.">isFinished</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> finished_; };
-<a name="l00104"></a>00104 
-<a name="l00106"></a>00106 
-<a name="l00109"></a>00109   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#acd97ad5f30f9cdc8201b4244aa69901" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( StkFloat rate );
-<a name="l00110"></a>00110 
-<a name="l00112"></a>00112 
-<a name="l00115"></a>00115   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#b2ccf7cc65c36a1ecfbb3b7d5707ea48" title="Increment the read pointer by time samples.">addTime</a>( StkFloat time );
-<a name="l00116"></a>00116 
-<a name="l00118"></a>00118 
-<a name="l00124"></a><a class="code" href="classstk_1_1FileWvIn.html#129c1e0b51497e6b09ad6aa37ad4d969">00124</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#129c1e0b51497e6b09ad6aa37ad4d969" title="Turn linear interpolation on/off.">setInterpolate</a>( <span class="keywordtype">bool</span> doInterpolate ) { interpolate_ = doInterpolate; };
-<a name="l00125"></a>00125 
-<a name="l00127"></a>00127 
-<a name="l00136"></a>00136   StkFloat <a class="code" href="classstk_1_1FileWvIn.html#d17c12e8d51f90f59f0d0c9f6d626608" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00137"></a>00137 
-<a name="l00139"></a>00139 
-<a name="l00148"></a>00148   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1FileWvIn.html#da668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00149"></a>00149 
-<a name="l00151"></a>00151 
-<a name="l00159"></a>00159   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FileWvIn.html#da668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
-<a name="l00160"></a>00160 
-<a name="l00161"></a>00161 <span class="keyword">protected</span>:
-<a name="l00162"></a>00162 
-<a name="l00163"></a>00163   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00164"></a>00164 
-<a name="l00165"></a>00165   <a class="code" href="classstk_1_1FileRead.html" title="STK audio file input class.">FileRead</a> file_;
-<a name="l00166"></a>00166   <span class="keywordtype">bool</span> finished_;
-<a name="l00167"></a>00167   <span class="keywordtype">bool</span> interpolate_;
-<a name="l00168"></a>00168   <span class="keywordtype">bool</span> normalizing_;
-<a name="l00169"></a>00169   <span class="keywordtype">bool</span> chunking_;
-<a name="l00170"></a>00170   StkFloat time_;
-<a name="l00171"></a>00171   StkFloat rate_;
-<a name="l00172"></a>00172   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkThreshold_;
-<a name="l00173"></a>00173   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkSize_;
-<a name="l00174"></a>00174   <span class="keywordtype">long</span> chunkPointer_;
-<a name="l00175"></a>00175 
-<a name="l00176"></a>00176 };
-<a name="l00177"></a>00177 
-<a name="l00178"></a><a class="code" href="classstk_1_1FileWvIn.html#d17c12e8d51f90f59f0d0c9f6d626608">00178</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1FileWvIn.html#d17c12e8d51f90f59f0d0c9f6d626608" title="Return the specified channel value of the last computed frame.">FileWvIn :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00179"></a>00179 {
-<a name="l00180"></a>00180 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00181"></a>00181 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= data_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00182"></a>00182     errorString_ &lt;&lt; <span class="stringliteral">"FileWvIn::lastOut(): channel argument and soundfile data are incompatible!"</span>;
-<a name="l00183"></a>00183     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00184"></a>00184   }
-<a name="l00185"></a>00185 <span class="preprocessor">#endif</span>
-<a name="l00186"></a>00186 <span class="preprocessor"></span>
-<a name="l00187"></a>00187   <span class="keywordflow">if</span> ( finished_ ) <span class="keywordflow">return</span> 0.0;
-<a name="l00188"></a>00188   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00189"></a>00189 }
-<a name="l00190"></a>00190 
-<a name="l00191"></a>00191 } <span class="comment">// stk namespace</span>
-<a name="l00192"></a>00192 
-<a name="l00193"></a>00193 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/FileWvIn_8h_source.html b/doc/html/FileWvIn_8h_source.html
index 3b0b17d..1249481 100644
--- a/doc/html/FileWvIn_8h_source.html
+++ b/doc/html/FileWvIn_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>FileWvIn.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILEWVIN_H</span>
@@ -52,65 +52,67 @@
 <a name="l00095"></a>00095 
 <a name="l00100"></a><a class="code" href="classstk_1_1FileWvIn.html#a867b7b7fdb60e5194e25d7a85a26ec0b">00100</a>   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1FileWvIn.html#a867b7b7fdb60e5194e25d7a85a26ec0b" title="Return the input file sample rate in Hz (not the data read rate).">getFileRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#a4dbbcbdc8db39a803e0861976f7f3522" title="Return the sample rate associated with the StkFrames data.">dataRate</a>(); };
 <a name="l00101"></a>00101 
-<a name="l00103"></a><a class="code" href="classstk_1_1FileWvIn.html#aca9ad0c12af3323e7bbf877513b0d10b">00103</a>   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1FileWvIn.html#aca9ad0c12af3323e7bbf877513b0d10b" title="Query whether reading is complete.">isFinished</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> finished_; };
+<a name="l00103"></a><a class="code" href="classstk_1_1FileWvIn.html#aa45344366bca49f71c7153ac5b296e91">00103</a>   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1FileWvIn.html#aa45344366bca49f71c7153ac5b296e91" title="Query whether a file is open.">isOpen</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> file_.<a class="code" href="classstk_1_1FileRead.html#a3f30ed2a9f45493f0369aa2edbf38f70" title="Returns true if a file is currently open.">isOpen</a>(); };
 <a name="l00104"></a>00104 
-<a name="l00106"></a>00106 
-<a name="l00109"></a>00109   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#aacd97ad5f30f9cdc8201b4244aa69901" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( StkFloat rate );
-<a name="l00110"></a>00110 
-<a name="l00112"></a>00112 
-<a name="l00115"></a>00115   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#ab2ccf7cc65c36a1ecfbb3b7d5707ea48" title="Increment the read pointer by time samples.">addTime</a>( StkFloat time );
-<a name="l00116"></a>00116 
-<a name="l00118"></a>00118 
-<a name="l00124"></a><a class="code" href="classstk_1_1FileWvIn.html#a129c1e0b51497e6b09ad6aa37ad4d969">00124</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#a129c1e0b51497e6b09ad6aa37ad4d969" title="Turn linear interpolation on/off.">setInterpolate</a>( <span class="keywordtype">bool</span> doInterpolate ) { interpolate_ = doInterpolate; };
-<a name="l00125"></a>00125 
-<a name="l00127"></a>00127 
-<a name="l00136"></a>00136   StkFloat <a class="code" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00137"></a>00137 
-<a name="l00139"></a>00139 
-<a name="l00148"></a>00148   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00149"></a>00149 
-<a name="l00151"></a>00151 
-<a name="l00159"></a>00159   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
-<a name="l00160"></a>00160 
-<a name="l00161"></a>00161 <span class="keyword">protected</span>:
-<a name="l00162"></a>00162 
-<a name="l00163"></a>00163   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00164"></a>00164 
-<a name="l00165"></a>00165   <a class="code" href="classstk_1_1FileRead.html" title="STK audio file input class.">FileRead</a> file_;
-<a name="l00166"></a>00166   <span class="keywordtype">bool</span> finished_;
-<a name="l00167"></a>00167   <span class="keywordtype">bool</span> interpolate_;
-<a name="l00168"></a>00168   <span class="keywordtype">bool</span> normalizing_;
-<a name="l00169"></a>00169   <span class="keywordtype">bool</span> chunking_;
-<a name="l00170"></a>00170   StkFloat time_;
-<a name="l00171"></a>00171   StkFloat rate_;
-<a name="l00172"></a>00172   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkThreshold_;
-<a name="l00173"></a>00173   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkSize_;
-<a name="l00174"></a>00174   <span class="keywordtype">long</span> chunkPointer_;
-<a name="l00175"></a>00175 
-<a name="l00176"></a>00176 };
-<a name="l00177"></a>00177 
-<a name="l00178"></a><a class="code" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608">00178</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608" title="Return the specified channel value of the last computed frame.">FileWvIn :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00179"></a>00179 {
-<a name="l00180"></a>00180 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00181"></a>00181 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= data_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00182"></a>00182     errorString_ &lt;&lt; <span class="stringliteral">&quot;FileWvIn::lastOut(): channel argument and soundfile data are incompatible!&quot;</span>;
-<a name="l00183"></a>00183     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00184"></a>00184   }
-<a name="l00185"></a>00185 <span class="preprocessor">#endif</span>
-<a name="l00186"></a>00186 <span class="preprocessor"></span>
-<a name="l00187"></a>00187   <span class="keywordflow">if</span> ( finished_ ) <span class="keywordflow">return</span> 0.0;
-<a name="l00188"></a>00188   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00189"></a>00189 }
-<a name="l00190"></a>00190 
-<a name="l00191"></a>00191 } <span class="comment">// stk namespace</span>
-<a name="l00192"></a>00192 
-<a name="l00193"></a>00193 <span class="preprocessor">#endif</span>
+<a name="l00106"></a><a class="code" href="classstk_1_1FileWvIn.html#aca9ad0c12af3323e7bbf877513b0d10b">00106</a>   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1FileWvIn.html#aca9ad0c12af3323e7bbf877513b0d10b" title="Query whether reading is complete.">isFinished</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> finished_; };
+<a name="l00107"></a>00107 
+<a name="l00109"></a>00109 
+<a name="l00112"></a>00112   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#aacd97ad5f30f9cdc8201b4244aa69901" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( StkFloat rate );
+<a name="l00113"></a>00113 
+<a name="l00115"></a>00115 
+<a name="l00118"></a>00118   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#ab2ccf7cc65c36a1ecfbb3b7d5707ea48" title="Increment the read pointer by time samples.">addTime</a>( StkFloat time );
+<a name="l00119"></a>00119 
+<a name="l00121"></a>00121 
+<a name="l00127"></a><a class="code" href="classstk_1_1FileWvIn.html#a129c1e0b51497e6b09ad6aa37ad4d969">00127</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvIn.html#a129c1e0b51497e6b09ad6aa37ad4d969" title="Turn linear interpolation on/off.">setInterpolate</a>( <span class="keywordtype">bool</span> doInterpolate ) { interpolate_ = doInterpolate; };
+<a name="l00128"></a>00128 
+<a name="l00130"></a>00130 
+<a name="l00139"></a>00139   StkFloat <a class="code" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00140"></a>00140 
+<a name="l00142"></a>00142 
+<a name="l00151"></a>00151   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00152"></a>00152 
+<a name="l00154"></a>00154 
+<a name="l00162"></a>00162   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
+<a name="l00163"></a>00163 
+<a name="l00164"></a>00164 <span class="keyword">protected</span>:
+<a name="l00165"></a>00165 
+<a name="l00166"></a>00166   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
+<a name="l00167"></a>00167 
+<a name="l00168"></a>00168   <a class="code" href="classstk_1_1FileRead.html" title="STK audio file input class.">FileRead</a> file_;
+<a name="l00169"></a>00169   <span class="keywordtype">bool</span> finished_;
+<a name="l00170"></a>00170   <span class="keywordtype">bool</span> interpolate_;
+<a name="l00171"></a>00171   <span class="keywordtype">bool</span> normalizing_;
+<a name="l00172"></a>00172   <span class="keywordtype">bool</span> chunking_;
+<a name="l00173"></a>00173   StkFloat time_;
+<a name="l00174"></a>00174   StkFloat rate_;
+<a name="l00175"></a>00175   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkThreshold_;
+<a name="l00176"></a>00176   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> chunkSize_;
+<a name="l00177"></a>00177   <span class="keywordtype">long</span> chunkPointer_;
+<a name="l00178"></a>00178 
+<a name="l00179"></a>00179 };
+<a name="l00180"></a>00180 
+<a name="l00181"></a><a class="code" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608">00181</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608" title="Return the specified channel value of the last computed frame.">FileWvIn :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00182"></a>00182 {
+<a name="l00183"></a>00183 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00184"></a>00184 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= data_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00185"></a>00185     oStream_ &lt;&lt; <span class="stringliteral">&quot;FileWvIn::lastOut(): channel argument and soundfile data are incompatible!&quot;</span>;
+<a name="l00186"></a>00186     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00187"></a>00187   }
+<a name="l00188"></a>00188 <span class="preprocessor">#endif</span>
+<a name="l00189"></a>00189 <span class="preprocessor"></span>
+<a name="l00190"></a>00190   <span class="keywordflow">if</span> ( finished_ ) <span class="keywordflow">return</span> 0.0;
+<a name="l00191"></a>00191   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00192"></a>00192 }
+<a name="l00193"></a>00193 
+<a name="l00194"></a>00194 } <span class="comment">// stk namespace</span>
+<a name="l00195"></a>00195 
+<a name="l00196"></a>00196 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/FileWvOut_8h-source.html b/doc/html/FileWvOut_8h-source.html
deleted file mode 100644
index 9ff6047..0000000
--- a/doc/html/FileWvOut_8h-source.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>FileWvOut.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILEWVOUT_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FILEWVOUT_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "WvOut.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "FileWrite.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 <span class="comment">/***************************************************/</span>
-<a name="l00031"></a>00031 
-<a name="l00032"></a><a class="code" href="classstk_1_1FileWvOut.html">00032</a> <span class="keyword">class </span><a class="code" href="classstk_1_1FileWvOut.html" title="STK audio file output class.">FileWvOut</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1WvOut.html" title="STK audio output abstract base class.">WvOut</a>
-<a name="l00033"></a>00033 {
-<a name="l00034"></a>00034  <span class="keyword">public</span>:
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037 
-<a name="l00041"></a>00041   <a class="code" href="classstk_1_1FileWvOut.html#6f0168fca20a3c9d6d5f2baedf03ec1b" title="Default constructor with optional output buffer size argument.">FileWvOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> bufferFrames = 1024 );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044 
-<a name="l00047"></a>00047   <a class="code" href="classstk_1_1FileWvOut.html#6f0168fca20a3c9d6d5f2baedf03ec1b" title="Default constructor with optional output buffer size argument.">FileWvOut</a>( std::string fileName,
-<a name="l00048"></a>00048              <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1,
-<a name="l00049"></a>00049              FileWrite::FILE_TYPE type = <a class="code" href="classstk_1_1FileWrite.html#800875bbcac8f137ed94f5606d55f8c6">FileWrite::FILE_WAV</a>,
-<a name="l00050"></a>00050              Stk::StkFormat format = <a class="code" href="classstk_1_1Stk.html#5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a>,
-<a name="l00051"></a>00051              <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> bufferFrames = 1024 );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1FileWvOut.html#dd13d21d51f639961977b63cb481c36e" title="Class destructor.">~FileWvOut</a>();
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057 
-<a name="l00062"></a>00062   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvOut.html#31dde577d41a65018c3e03001de8d645" title="Open a new file with the specified parameters.">openFile</a>( std::string fileName,
-<a name="l00063"></a>00063                  <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels,
-<a name="l00064"></a>00064                  FileWrite::FILE_TYPE type,
-<a name="l00065"></a>00065                  Stk::StkFormat format );
-<a name="l00066"></a>00066 
-<a name="l00068"></a>00068 
-<a name="l00072"></a>00072   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvOut.html#54cbced5ce278b0d16fa800e8445103c" title="Close a file if one is open.">closeFile</a>( <span class="keywordtype">void</span> );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075 
-<a name="l00078"></a>00078   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvOut.html#9d3505aea3cd3c4d6822f05a2679dc41" title="Output a single sample to all channels in a sample frame.">tick</a>( <span class="keyword">const</span> StkFloat sample );
-<a name="l00079"></a>00079 
-<a name="l00081"></a>00081 
-<a name="l00087"></a>00087   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FileWvOut.html#9d3505aea3cd3c4d6822f05a2679dc41" title="Output a single sample to all channels in a sample frame.">tick</a>( <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089  <span class="keyword">protected</span>:
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091   <span class="keywordtype">void</span> incrementFrame( <span class="keywordtype">void</span> );
-<a name="l00092"></a>00092 
-<a name="l00093"></a>00093   <a class="code" href="classstk_1_1FileWrite.html" title="STK audio file output class.">FileWrite</a> file_;
-<a name="l00094"></a>00094   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> bufferFrames_;
-<a name="l00095"></a>00095   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> bufferIndex_;
-<a name="l00096"></a>00096   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iData_;
-<a name="l00097"></a>00097 
-<a name="l00098"></a>00098 };
-<a name="l00099"></a>00099 
-<a name="l00100"></a>00100 } <span class="comment">// stk namespace</span>
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/FileWvOut_8h_source.html b/doc/html/FileWvOut_8h_source.html
index 1bf1166..4fb8060 100644
--- a/doc/html/FileWvOut_8h_source.html
+++ b/doc/html/FileWvOut_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>FileWvOut.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILEWVOUT_H</span>
@@ -73,7 +73,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Filter_8h-source.html b/doc/html/Filter_8h-source.html
deleted file mode 100644
index 08e8b68..0000000
--- a/doc/html/Filter_8h-source.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Filter.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILTER_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FILTER_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;vector&gt;</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 <span class="comment">/***************************************************/</span>
-<a name="l00020"></a>00020 
-<a name="l00021"></a><a class="code" href="classstk_1_1Filter.html">00021</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00022"></a>00022 {
-<a name="l00023"></a>00023 <span class="keyword">public</span>:
-<a name="l00025"></a><a class="code" href="classstk_1_1Filter.html#fc70117c0133d4a5d9a651ceb691d7c0">00025</a>   <a class="code" href="classstk_1_1Filter.html#fc70117c0133d4a5d9a651ceb691d7c0" title="Class constructor.">Filter</a>( <span class="keywordtype">void</span> ) { gain_ = 1.0; channelsIn_ = 1; lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( 1, 1, 0.0 ); };
-<a name="l00026"></a>00026 
-<a name="l00028"></a><a class="code" href="classstk_1_1Filter.html#48f23ab6613be35e3be8aceaf5adfdd7">00028</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Filter.html#48f23ab6613be35e3be8aceaf5adfdd7" title="Return the number of input channels for the class.">channelsIn</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> channelsIn_; };
-<a name="l00029"></a>00029 
-<a name="l00031"></a><a class="code" href="classstk_1_1Filter.html#4f1ed97c9ad8aef32e54b48da03f5275">00031</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Filter.html#4f1ed97c9ad8aef32e54b48da03f5275" title="Return the number of output channels for the class.">channelsOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(); };
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Filter.html#670b9cc23ac798d3239cb819e801363c" title="Clears all internal states of the filter.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037 
-<a name="l00041"></a><a class="code" href="classstk_1_1Filter.html#827b1bd3a99fa9af408cbd4eb559d212">00041</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Filter.html#827b1bd3a99fa9af408cbd4eb559d212" title="Set the filter gain.">setGain</a>( StkFloat gain ) { gain_ = gain; };
-<a name="l00042"></a>00042 
-<a name="l00044"></a><a class="code" href="classstk_1_1Filter.html#f21e11b72ea59af4585c59600a0980c2">00044</a>   StkFloat <a class="code" href="classstk_1_1Filter.html#f21e11b72ea59af4585c59600a0980c2" title="Return the current filter gain.">getGain</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> gain_; };
-<a name="l00045"></a>00045 
-<a name="l00047"></a><a class="code" href="classstk_1_1Filter.html#b2d944f649693511dced1df249f0abe6">00047</a>   <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Filter.html#b2d944f649693511dced1df249f0abe6" title="Return an StkFrames reference to the last output sample frame.">lastFrame</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_; };
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050 
-<a name="l00058"></a>00058   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Filter.html#3260a238824c4a748ac057b84b7d3f21" title="Take a channel of the StkFrames object as inputs to the filter and replace with corresponding...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
-<a name="l00059"></a>00059 
-<a name="l00060"></a>00060 <span class="keyword">protected</span>:
-<a name="l00061"></a>00061 
-<a name="l00062"></a>00062   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channelsIn_;
-<a name="l00063"></a>00063   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> lastFrame_;
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065   StkFloat gain_;
-<a name="l00066"></a>00066   std::vector&lt;StkFloat&gt; b_;
-<a name="l00067"></a>00067   std::vector&lt;StkFloat&gt; a_;
-<a name="l00068"></a>00068   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> outputs_;
-<a name="l00069"></a>00069   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> inputs_;
-<a name="l00070"></a>00070 
-<a name="l00071"></a>00071 };
-<a name="l00072"></a>00072 
-<a name="l00073"></a><a class="code" href="classstk_1_1Filter.html#670b9cc23ac798d3239cb819e801363c">00073</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Filter.html#670b9cc23ac798d3239cb819e801363c" title="Clears all internal states of the filter.">Filter :: clear</a>( <span class="keywordtype">void</span> )
-<a name="l00074"></a>00074 {
-<a name="l00075"></a>00075   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i;
-<a name="l00076"></a>00076   <span class="keywordflow">for</span> ( i=0; i&lt;inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>(); i++ )
-<a name="l00077"></a>00077     inputs_[i] = 0.0;
-<a name="l00078"></a>00078   <span class="keywordflow">for</span> ( i=0; i&lt;outputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>(); i++ )
-<a name="l00079"></a>00079     outputs_[i] = 0.0;
-<a name="l00080"></a>00080   <span class="keywordflow">for</span> ( i=0; i&lt;lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>(); i++ )
-<a name="l00081"></a>00081     lastFrame_[i] = 0.0;  
-<a name="l00082"></a>00082 }
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084 } <span class="comment">// stk namespace</span>
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Filter_8h_source.html b/doc/html/Filter_8h_source.html
index 890721c..7ff3f78 100644
--- a/doc/html/Filter_8h_source.html
+++ b/doc/html/Filter_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Filter.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FILTER_H</span>
@@ -17,66 +17,99 @@
 <a name="l00003"></a>00003 <span class="preprocessor"></span>
 <a name="l00004"></a>00004 <span class="preprocessor">#include &quot;Stk.h&quot;</span>
 <a name="l00005"></a>00005 <span class="preprocessor">#include &lt;vector&gt;</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 <span class="comment">/***************************************************/</span>
-<a name="l00020"></a>00020 
-<a name="l00021"></a><a class="code" href="classstk_1_1Filter.html">00021</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00022"></a>00022 {
-<a name="l00023"></a>00023 <span class="keyword">public</span>:
-<a name="l00025"></a><a class="code" href="classstk_1_1Filter.html#afc70117c0133d4a5d9a651ceb691d7c0">00025</a>   <a class="code" href="classstk_1_1Filter.html#afc70117c0133d4a5d9a651ceb691d7c0" title="Class constructor.">Filter</a>( <span class="keywordtype">void</span> ) { gain_ = 1.0; channelsIn_ = 1; lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#a386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( 1, 1, 0.0 ); };
-<a name="l00026"></a>00026 
-<a name="l00028"></a><a class="code" href="classstk_1_1Filter.html#a48f23ab6613be35e3be8aceaf5adfdd7">00028</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Filter.html#a48f23ab6613be35e3be8aceaf5adfdd7" title="Return the number of input channels for the class.">channelsIn</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> channelsIn_; };
-<a name="l00029"></a>00029 
-<a name="l00031"></a><a class="code" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275">00031</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275" title="Return the number of output channels for the class.">channelsOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(); };
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c" title="Clears all internal states of the filter.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037 
-<a name="l00041"></a><a class="code" href="classstk_1_1Filter.html#a827b1bd3a99fa9af408cbd4eb559d212">00041</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Filter.html#a827b1bd3a99fa9af408cbd4eb559d212" title="Set the filter gain.">setGain</a>( StkFloat gain ) { gain_ = gain; };
-<a name="l00042"></a>00042 
-<a name="l00044"></a><a class="code" href="classstk_1_1Filter.html#af21e11b72ea59af4585c59600a0980c2">00044</a>   StkFloat <a class="code" href="classstk_1_1Filter.html#af21e11b72ea59af4585c59600a0980c2" title="Return the current filter gain.">getGain</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> gain_; };
-<a name="l00045"></a>00045 
-<a name="l00047"></a><a class="code" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">00047</a>   <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6" title="Return an StkFrames reference to the last output sample frame.">lastFrame</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_; };
+<a name="l00006"></a>00006 <span class="preprocessor">#include &lt;cmath&gt;</span>
+<a name="l00007"></a>00007 
+<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
+<a name="l00009"></a>00009 
+<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
+<a name="l00020"></a>00020 <span class="comment">/***************************************************/</span>
+<a name="l00021"></a>00021 
+<a name="l00022"></a><a class="code" href="classstk_1_1Filter.html">00022</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
+<a name="l00023"></a>00023 {
+<a name="l00024"></a>00024 <span class="keyword">public</span>:
+<a name="l00026"></a><a class="code" href="classstk_1_1Filter.html#afc70117c0133d4a5d9a651ceb691d7c0">00026</a>   <a class="code" href="classstk_1_1Filter.html#afc70117c0133d4a5d9a651ceb691d7c0" title="Class constructor.">Filter</a>( <span class="keywordtype">void</span> ) { gain_ = 1.0; channelsIn_ = 1; lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#a386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( 1, 1, 0.0 ); };
+<a name="l00027"></a>00027 
+<a name="l00029"></a><a class="code" href="classstk_1_1Filter.html#a48f23ab6613be35e3be8aceaf5adfdd7">00029</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Filter.html#a48f23ab6613be35e3be8aceaf5adfdd7" title="Return the number of input channels for the class.">channelsIn</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> channelsIn_; };
+<a name="l00030"></a>00030 
+<a name="l00032"></a><a class="code" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275">00032</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275" title="Return the number of output channels for the class.">channelsOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(); };
+<a name="l00033"></a>00033 
+<a name="l00035"></a>00035   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c" title="Clears all internal states of the filter.">clear</a>( <span class="keywordtype">void</span> );
+<a name="l00036"></a>00036 
+<a name="l00038"></a>00038 
+<a name="l00042"></a><a class="code" href="classstk_1_1Filter.html#a827b1bd3a99fa9af408cbd4eb559d212">00042</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Filter.html#a827b1bd3a99fa9af408cbd4eb559d212" title="Set the filter gain.">setGain</a>( StkFloat gain ) { gain_ = gain; };
+<a name="l00043"></a>00043 
+<a name="l00045"></a><a class="code" href="classstk_1_1Filter.html#af21e11b72ea59af4585c59600a0980c2">00045</a>   StkFloat <a class="code" href="classstk_1_1Filter.html#af21e11b72ea59af4585c59600a0980c2" title="Return the current filter gain.">getGain</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> gain_; };
+<a name="l00046"></a>00046 
 <a name="l00048"></a>00048 
-<a name="l00050"></a>00050 
-<a name="l00058"></a>00058   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21" title="Take a channel of the StkFrames object as inputs to the filter and replace with corresponding...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
+<a name="l00053"></a>00053   StkFloat <a class="code" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220" title="Return the filter phase delay at the specified frequency.">phaseDelay</a>( StkFloat frequency );
+<a name="l00054"></a>00054 
+<a name="l00056"></a><a class="code" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">00056</a>   <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6" title="Return an StkFrames reference to the last output sample frame.">lastFrame</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_; };
+<a name="l00057"></a>00057 
 <a name="l00059"></a>00059 
-<a name="l00060"></a>00060 <span class="keyword">protected</span>:
-<a name="l00061"></a>00061 
-<a name="l00062"></a>00062   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channelsIn_;
-<a name="l00063"></a>00063   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> lastFrame_;
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065   StkFloat gain_;
-<a name="l00066"></a>00066   std::vector&lt;StkFloat&gt; b_;
-<a name="l00067"></a>00067   std::vector&lt;StkFloat&gt; a_;
-<a name="l00068"></a>00068   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> outputs_;
-<a name="l00069"></a>00069   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> inputs_;
+<a name="l00067"></a>00067   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21" title="Take a channel of the StkFrames object as inputs to the filter and replace with corresponding...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
+<a name="l00068"></a>00068 
+<a name="l00069"></a>00069 <span class="keyword">protected</span>:
 <a name="l00070"></a>00070 
-<a name="l00071"></a>00071 };
-<a name="l00072"></a>00072 
-<a name="l00073"></a><a class="code" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c">00073</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c" title="Clears all internal states of the filter.">Filter :: clear</a>( <span class="keywordtype">void</span> )
-<a name="l00074"></a>00074 {
-<a name="l00075"></a>00075   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i;
-<a name="l00076"></a>00076   <span class="keywordflow">for</span> ( i=0; i&lt;inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>(); i++ )
-<a name="l00077"></a>00077     inputs_[i] = 0.0;
-<a name="l00078"></a>00078   <span class="keywordflow">for</span> ( i=0; i&lt;outputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>(); i++ )
-<a name="l00079"></a>00079     outputs_[i] = 0.0;
-<a name="l00080"></a>00080   <span class="keywordflow">for</span> ( i=0; i&lt;lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>(); i++ )
-<a name="l00081"></a>00081     lastFrame_[i] = 0.0;  
-<a name="l00082"></a>00082 }
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084 } <span class="comment">// stk namespace</span>
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086 <span class="preprocessor">#endif</span>
+<a name="l00071"></a>00071   StkFloat gain_;
+<a name="l00072"></a>00072   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channelsIn_;
+<a name="l00073"></a>00073   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> lastFrame_;
+<a name="l00074"></a>00074 
+<a name="l00075"></a>00075   std::vector&lt;StkFloat&gt; b_;
+<a name="l00076"></a>00076   std::vector&lt;StkFloat&gt; a_;
+<a name="l00077"></a>00077   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> outputs_;
+<a name="l00078"></a>00078   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> inputs_;
+<a name="l00079"></a>00079 
+<a name="l00080"></a>00080 };
+<a name="l00081"></a>00081 
+<a name="l00082"></a><a class="code" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c">00082</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c" title="Clears all internal states of the filter.">Filter :: clear</a>( <span class="keywordtype">void</span> )
+<a name="l00083"></a>00083 {
+<a name="l00084"></a>00084   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i;
+<a name="l00085"></a>00085   <span class="keywordflow">for</span> ( i=0; i&lt;inputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>(); i++ )
+<a name="l00086"></a>00086     inputs_[i] = 0.0;
+<a name="l00087"></a>00087   <span class="keywordflow">for</span> ( i=0; i&lt;outputs_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>(); i++ )
+<a name="l00088"></a>00088     outputs_[i] = 0.0;
+<a name="l00089"></a>00089   <span class="keywordflow">for</span> ( i=0; i&lt;lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>(); i++ )
+<a name="l00090"></a>00090     lastFrame_[i] = 0.0;  
+<a name="l00091"></a>00091 }
+<a name="l00092"></a>00092 
+<a name="l00093"></a><a class="code" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">00093</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220" title="Return the filter phase delay at the specified frequency.">Filter :: phaseDelay</a>( StkFloat frequency )
+<a name="l00094"></a>00094 {
+<a name="l00095"></a>00095   <span class="keywordflow">if</span> ( frequency &lt;= 0.0 || frequency &gt; 0.5 * <a class="code" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() ) {
+<a name="l00096"></a>00096     oStream_ &lt;&lt; <span class="stringliteral">&quot;Filter::phaseDelay: argument (&quot;</span> &lt;&lt; frequency &lt;&lt; <span class="stringliteral">&quot;) is out of range!&quot;</span>;
+<a name="l00097"></a>00097     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING ); <span class="keywordflow">return</span> 0.0;
+<a name="l00098"></a>00098   }
+<a name="l00099"></a>00099 
+<a name="l00100"></a>00100   StkFloat omegaT = 2 * M_PI * frequency / <a class="code" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>();
+<a name="l00101"></a>00101   StkFloat real = 0.0, imag = 0.0;
+<a name="l00102"></a>00102   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;b_.size(); i++ ) {
+<a name="l00103"></a>00103     real += b_[i] * std::cos( i * omegaT );
+<a name="l00104"></a>00104     imag -= b_[i] * std::sin( i * omegaT );
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106   real *= gain_;
+<a name="l00107"></a>00107   imag *= gain_;
+<a name="l00108"></a>00108 
+<a name="l00109"></a>00109   StkFloat phase = atan2( imag, real );
+<a name="l00110"></a>00110 
+<a name="l00111"></a>00111   real = 0.0, imag = 0.0;
+<a name="l00112"></a>00112   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;a_.size(); i++ ) {
+<a name="l00113"></a>00113     real += a_[i] * std::cos( i * omegaT );
+<a name="l00114"></a>00114     imag -= a_[i] * std::sin( i * omegaT );
+<a name="l00115"></a>00115   }
+<a name="l00116"></a>00116 
+<a name="l00117"></a>00117   phase -= std::atan2( imag, real );
+<a name="l00118"></a>00118   phase = std::fmod( -phase, 2 * M_PI );
+<a name="l00119"></a>00119   <span class="keywordflow">return</span> phase / omegaT;
+<a name="l00120"></a>00120 }
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122 } <span class="comment">// stk namespace</span>
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Fir_8h-source.html b/doc/html/Fir_8h-source.html
deleted file mode 100644
index ba1e957..0000000
--- a/doc/html/Fir_8h-source.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Fir.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FIR_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FIR_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00028"></a>00028 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 
-<a name="l00030"></a><a class="code" href="classstk_1_1Fir.html">00030</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Fir.html" title="STK general finite impulse response filter class.">Fir</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00031"></a>00031 {
-<a name="l00032"></a>00032 <span class="keyword">public</span>:
-<a name="l00034"></a>00034   <a class="code" href="classstk_1_1Fir.html#4ad986b7f644d3e22e75b0744b2f948a" title="Default constructor creates a zero-order pass-through &amp;quot;filter&amp;quot;.">Fir</a>( <span class="keywordtype">void</span> );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037 
-<a name="l00041"></a>00041   <a class="code" href="classstk_1_1Fir.html#4ad986b7f644d3e22e75b0744b2f948a" title="Default constructor creates a zero-order pass-through &amp;quot;filter&amp;quot;.">Fir</a>( std::vector&lt;StkFloat&gt; &amp;coefficients );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <a class="code" href="classstk_1_1Fir.html#2a9db698672fcac97a77d95f3891b68f" title="Class destructor.">~Fir</a>( <span class="keywordtype">void</span> );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047 
-<a name="l00052"></a>00052   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Fir.html#a3f72042fb8b13e9dcc31acbff4e1672" title="Set filter coefficients.">setCoefficients</a>( std::vector&lt;StkFloat&gt; &amp;coefficients, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
-<a name="l00053"></a>00053 
-<a name="l00055"></a><a class="code" href="classstk_1_1Fir.html#5182288d564977bf172439f6ecaf2377">00055</a>   StkFloat <a class="code" href="classstk_1_1Fir.html#5182288d564977bf172439f6ecaf2377" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058   StkFloat <a class="code" href="classstk_1_1Fir.html#fc5fd95f6bf72edaf4ee3060ca947793" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061 
-<a name="l00069"></a>00069   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Fir.html#fc5fd95f6bf72edaf4ee3060ca947793" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072 
-<a name="l00080"></a>00080   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Fir.html#fc5fd95f6bf72edaf4ee3060ca947793" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00081"></a>00081 
-<a name="l00082"></a>00082 <span class="keyword">protected</span>:
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084 };
-<a name="l00085"></a>00085 
-<a name="l00086"></a><a class="code" href="classstk_1_1Fir.html#fc5fd95f6bf72edaf4ee3060ca947793">00086</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Fir.html#fc5fd95f6bf72edaf4ee3060ca947793" title="Input one sample to the filter and return one output.">Fir :: tick</a>( StkFloat input )
-<a name="l00087"></a>00087 {
-<a name="l00088"></a>00088   lastFrame_[0] = 0.0;
-<a name="l00089"></a>00089   inputs_[0] = gain_ * input;
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=b_.size()-1; i&gt;0; i-- ) {
-<a name="l00092"></a>00092     lastFrame_[0] += b_[i] * inputs_[i];
-<a name="l00093"></a>00093     inputs_[i] = inputs_[i-1];
-<a name="l00094"></a>00094   }
-<a name="l00095"></a>00095   lastFrame_[0] += b_[0] * inputs_[0];
-<a name="l00096"></a>00096 
-<a name="l00097"></a>00097   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00098"></a>00098 }
-<a name="l00099"></a>00099 
-<a name="l00100"></a><a class="code" href="classstk_1_1Fir.html#602e5ce0cd93f5103796ffd50ed8c988">00100</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Fir.html#fc5fd95f6bf72edaf4ee3060ca947793" title="Input one sample to the filter and return one output.">Fir :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00101"></a>00101 {
-<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00104"></a>00104     errorString_ &lt;&lt; <span class="stringliteral">"Fir::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00106"></a>00106   }
-<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
-<a name="l00108"></a>00108 <span class="preprocessor"></span>
-<a name="l00109"></a>00109   StkFloat *samples = &amp;frames[channel];
-<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00111"></a>00111   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j=0; j&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); j++, samples += hop ) {
-<a name="l00112"></a>00112     inputs_[0] = gain_ * *samples;
-<a name="l00113"></a>00113     *samples = 0.0;
-<a name="l00114"></a>00114 
-<a name="l00115"></a>00115     <span class="keywordflow">for</span> ( i=b_.size()-1; i&gt;0; i-- ) {
-<a name="l00116"></a>00116       *samples += b_[i] * inputs_[i];
-<a name="l00117"></a>00117       inputs_[i] = inputs_[i-1];
-<a name="l00118"></a>00118     }
-<a name="l00119"></a>00119     *samples += b_[0] * inputs_[0];
-<a name="l00120"></a>00120   }
-<a name="l00121"></a>00121 
-<a name="l00122"></a>00122   lastFrame_[0] = *(samples-hop);
-<a name="l00123"></a>00123   <span class="keywordflow">return</span> frames;
-<a name="l00124"></a>00124 }
-<a name="l00125"></a>00125 
-<a name="l00126"></a><a class="code" href="classstk_1_1Fir.html#53bcdfc2e9ad757d2ec549529b7a9738">00126</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Fir.html#fc5fd95f6bf72edaf4ee3060ca947793" title="Input one sample to the filter and return one output.">Fir :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00127"></a>00127 {
-<a name="l00128"></a>00128 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00129"></a>00129 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00130"></a>00130     errorString_ &lt;&lt; <span class="stringliteral">"Fir::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00131"></a>00131     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00132"></a>00132   }
-<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
-<a name="l00134"></a>00134 <span class="preprocessor"></span>
-<a name="l00135"></a>00135   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00136"></a>00136   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00137"></a>00137   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i, iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00138"></a>00138   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j=0; j&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); j++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00139"></a>00139     inputs_[0] = gain_ * *iSamples;
-<a name="l00140"></a>00140     *oSamples = 0.0;
-<a name="l00141"></a>00141 
-<a name="l00142"></a>00142     <span class="keywordflow">for</span> ( i=b_.size()-1; i&gt;0; i-- ) {
-<a name="l00143"></a>00143       *oSamples += b_[i] * inputs_[i];
-<a name="l00144"></a>00144       inputs_[i] = inputs_[i-1];
-<a name="l00145"></a>00145     }
-<a name="l00146"></a>00146     *oSamples += b_[0] * inputs_[0];
-<a name="l00147"></a>00147   }
-<a name="l00148"></a>00148 
-<a name="l00149"></a>00149   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00150"></a>00150   <span class="keywordflow">return</span> iFrames;
-<a name="l00151"></a>00151 }
-<a name="l00152"></a>00152 
-<a name="l00153"></a>00153 } <span class="comment">// stk namespace</span>
-<a name="l00154"></a>00154 
-<a name="l00155"></a>00155 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Fir_8h_source.html b/doc/html/Fir_8h_source.html
index bba3e44..9b89be6 100644
--- a/doc/html/Fir_8h_source.html
+++ b/doc/html/Fir_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Fir.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FIR_H</span>
@@ -67,7 +67,7 @@
 <a name="l00101"></a>00101 {
 <a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00104"></a>00104     errorString_ &lt;&lt; <span class="stringliteral">&quot;Fir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00104"></a>00104     oStream_ &lt;&lt; <span class="stringliteral">&quot;Fir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00106"></a>00106   }
 <a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
@@ -93,7 +93,7 @@
 <a name="l00127"></a>00127 {
 <a name="l00128"></a>00128 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00129"></a>00129 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00130"></a>00130     errorString_ &lt;&lt; <span class="stringliteral">&quot;Fir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00130"></a>00130     oStream_ &lt;&lt; <span class="stringliteral">&quot;Fir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00131"></a>00131     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00132"></a>00132   }
 <a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
@@ -124,7 +124,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Flute_8h-source.html b/doc/html/Flute_8h-source.html
deleted file mode 100644
index 5e1616d..0000000
--- a/doc/html/Flute_8h-source.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Flute.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FLUTE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FLUTE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "JetTable.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "DelayL.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "PoleZero.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00010"></a>00010 <span class="preprocessor">#include "ADSR.h"</span>
-<a name="l00011"></a>00011 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00012"></a>00012 
-<a name="l00013"></a>00013 <span class="keyword">namespace </span>stk {
-<a name="l00014"></a>00014 
-<a name="l00015"></a>00015 <span class="comment">/***************************************************/</span>
-<a name="l00037"></a>00037 <span class="comment">/***************************************************/</span>
-<a name="l00038"></a>00038 
-<a name="l00039"></a><a class="code" href="classstk_1_1Flute.html">00039</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Flute.html" title="STK flute physical model class.">Flute</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00040"></a>00040 {
-<a name="l00041"></a>00041  <span class="keyword">public</span>:
-<a name="l00043"></a>00043 
-<a name="l00046"></a>00046   <a class="code" href="classstk_1_1Flute.html#9769eef3340651acc31b4997e9985e57" title="Class constructor, taking the lowest desired playing frequency.">Flute</a>( StkFloat lowestFrequency );
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049   <a class="code" href="classstk_1_1Flute.html#76120aedfc0bab94416917d173f8a74e" title="Class destructor.">~Flute</a>( <span class="keywordtype">void</span> );
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#4554fc4feffd469b83d02dd4e5471ffa" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00053"></a>00053 
-<a name="l00055"></a>00055   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#ea66780681552de9d12af6bb91f297da" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#0732403c66b3667f5f6a8c80e90046e0" title="Set the reflection coefficient for the jet delay (-1.0 - 1.0).">setJetReflection</a>( StkFloat coefficient );
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#7c0ef95a3170dafde08b65ee47102969" title="Set the reflection coefficient for the air column delay (-1.0 - 1.0).">setEndReflection</a>( StkFloat coefficient );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#d37a862df945987f91e3164813ce911b" title="Set the length of the jet delay in terms of a ratio of jet delay to air column delay...">setJetDelay</a>( StkFloat aRatio );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#33b58e80c6ebbd5bd45f90a7a1c6a025" title="Apply breath velocity to instrument with given amplitude and rate of increase.">startBlowing</a>( StkFloat amplitude, StkFloat rate );
-<a name="l00068"></a>00068 
-<a name="l00070"></a>00070   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#65b8e74b1a99bc8bada4e80ebd512058" title="Decrease breath velocity with given rate of decrease.">stopBlowing</a>( StkFloat rate );
-<a name="l00071"></a>00071 
-<a name="l00073"></a>00073   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#f76a46645fd6ed5d3c15dc4bcde3d928" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00074"></a>00074 
-<a name="l00076"></a>00076   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#e371e0d2366ef9fae8d12898204e7b31" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#968b3799338e39df35dcf94fe7ee90a2" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00080"></a>00080 
-<a name="l00082"></a>00082   StkFloat <a class="code" href="classstk_1_1Flute.html#b8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084  <span class="keyword">protected</span>:
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   jetDelay_;
-<a name="l00087"></a>00087   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   boreDelay_;
-<a name="l00088"></a>00088   <a class="code" href="classstk_1_1JetTable.html" title="STK jet table class.">JetTable</a> jetTable_;
-<a name="l00089"></a>00089   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filter_;
-<a name="l00090"></a>00090   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a> dcBlock_;
-<a name="l00091"></a>00091   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
-<a name="l00092"></a>00092   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
-<a name="l00093"></a>00093   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00094"></a>00094   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00095"></a>00095   StkFloat lastFrequency_;
-<a name="l00096"></a>00096   StkFloat maxPressure_;
-<a name="l00097"></a>00097   StkFloat jetReflection_;
-<a name="l00098"></a>00098   StkFloat endReflection_;
-<a name="l00099"></a>00099   StkFloat noiseGain_;
-<a name="l00100"></a>00100   StkFloat vibratoGain_;
-<a name="l00101"></a>00101   StkFloat outputGain_;
-<a name="l00102"></a>00102   StkFloat jetRatio_;
-<a name="l00103"></a>00103 
-<a name="l00104"></a>00104 };
-<a name="l00105"></a>00105 
-<a name="l00106"></a><a class="code" href="classstk_1_1Flute.html#b8f307f9a26ef2756ec4c0ea05f3acbe">00106</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Flute.html#b8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">Flute :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00107"></a>00107 {
-<a name="l00108"></a>00108   StkFloat pressureDiff;
-<a name="l00109"></a>00109   StkFloat breathPressure;
-<a name="l00110"></a>00110 
-<a name="l00111"></a>00111   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
-<a name="l00112"></a>00112   breathPressure = maxPressure_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00113"></a>00113   breathPressure += breathPressure * ( noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>() + vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() );
-<a name="l00114"></a>00114 
-<a name="l00115"></a>00115   StkFloat temp = filter_.<a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( boreDelay_.<a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00116"></a>00116   temp = dcBlock_.<a class="code" href="classstk_1_1PoleZero.html#1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( temp ); <span class="comment">// Block DC on reflection.</span>
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   pressureDiff = breathPressure - (jetReflection_ * temp);
-<a name="l00119"></a>00119   pressureDiff = jetDelay_.<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( pressureDiff );
-<a name="l00120"></a>00120   pressureDiff = jetTable_.<a class="code" href="classstk_1_1JetTable.html#3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">tick</a>( pressureDiff ) + (endReflection_ * temp);
-<a name="l00121"></a>00121   lastFrame_[0] = (StkFloat) 0.3 * boreDelay_.<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( pressureDiff );
-<a name="l00122"></a>00122 
-<a name="l00123"></a>00123   lastFrame_[0] *= outputGain_;
-<a name="l00124"></a>00124   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00125"></a>00125 }
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127 } <span class="comment">// stk namespace</span>
-<a name="l00128"></a>00128 
-<a name="l00129"></a>00129 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Flute_8h_source.html b/doc/html/Flute_8h_source.html
index 6154bfc..0a2e061 100644
--- a/doc/html/Flute_8h_source.html
+++ b/doc/html/Flute_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Flute.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FLUTE_H</span>
@@ -41,9 +41,9 @@
 <a name="l00053"></a>00053 
 <a name="l00055"></a>00055   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#aea66780681552de9d12af6bb91f297da" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
 <a name="l00056"></a>00056 
-<a name="l00058"></a>00058   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#a0732403c66b3667f5f6a8c80e90046e0" title="Set the reflection coefficient for the jet delay (-1.0 - 1.0).">setJetReflection</a>( StkFloat coefficient );
+<a name="l00058"></a><a class="code" href="classstk_1_1Flute.html#a0732403c66b3667f5f6a8c80e90046e0">00058</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#a0732403c66b3667f5f6a8c80e90046e0" title="Set the reflection coefficient for the jet delay (-1.0 - 1.0).">setJetReflection</a>( StkFloat coefficient ) { jetReflection_ = coefficient; };
 <a name="l00059"></a>00059 
-<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#a7c0ef95a3170dafde08b65ee47102969" title="Set the reflection coefficient for the air column delay (-1.0 - 1.0).">setEndReflection</a>( StkFloat coefficient );
+<a name="l00061"></a><a class="code" href="classstk_1_1Flute.html#a7c0ef95a3170dafde08b65ee47102969">00061</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#a7c0ef95a3170dafde08b65ee47102969" title="Set the reflection coefficient for the air column delay (-1.0 - 1.0).">setEndReflection</a>( StkFloat coefficient ) { endReflection_ = coefficient; };
 <a name="l00062"></a>00062 
 <a name="l00064"></a>00064   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Flute.html#ad37a862df945987f91e3164813ce911b" title="Set the length of the jet delay in terms of a ratio of jet delay to air column delay...">setJetDelay</a>( StkFloat aRatio );
 <a name="l00065"></a>00065 
@@ -59,58 +59,88 @@
 <a name="l00080"></a>00080 
 <a name="l00082"></a>00082   StkFloat <a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00083"></a>00083 
-<a name="l00084"></a>00084  <span class="keyword">protected</span>:
 <a name="l00085"></a>00085 
-<a name="l00086"></a>00086   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   jetDelay_;
-<a name="l00087"></a>00087   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   boreDelay_;
-<a name="l00088"></a>00088   <a class="code" href="classstk_1_1JetTable.html" title="STK jet table class.">JetTable</a> jetTable_;
-<a name="l00089"></a>00089   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filter_;
-<a name="l00090"></a>00090   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a> dcBlock_;
-<a name="l00091"></a>00091   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
-<a name="l00092"></a>00092   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
-<a name="l00093"></a>00093   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00094"></a>00094   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00095"></a>00095   StkFloat lastFrequency_;
-<a name="l00096"></a>00096   StkFloat maxPressure_;
-<a name="l00097"></a>00097   StkFloat jetReflection_;
-<a name="l00098"></a>00098   StkFloat endReflection_;
-<a name="l00099"></a>00099   StkFloat noiseGain_;
-<a name="l00100"></a>00100   StkFloat vibratoGain_;
-<a name="l00101"></a>00101   StkFloat outputGain_;
-<a name="l00102"></a>00102   StkFloat jetRatio_;
-<a name="l00103"></a>00103 
-<a name="l00104"></a>00104 };
-<a name="l00105"></a>00105 
-<a name="l00106"></a><a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe">00106</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">Flute :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00107"></a>00107 {
-<a name="l00108"></a>00108   StkFloat pressureDiff;
-<a name="l00109"></a>00109   StkFloat breathPressure;
-<a name="l00110"></a>00110 
-<a name="l00111"></a>00111   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
-<a name="l00112"></a>00112   breathPressure = maxPressure_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00113"></a>00113   breathPressure += breathPressure * ( noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>() + vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() );
-<a name="l00114"></a>00114 
-<a name="l00115"></a>00115   StkFloat temp = filter_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( boreDelay_.<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00116"></a>00116   temp = dcBlock_.<a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( temp ); <span class="comment">// Block DC on reflection.</span>
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   pressureDiff = breathPressure - (jetReflection_ * temp);
-<a name="l00119"></a>00119   pressureDiff = jetDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( pressureDiff );
-<a name="l00120"></a>00120   pressureDiff = jetTable_.<a class="code" href="classstk_1_1JetTable.html#a3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">tick</a>( pressureDiff ) + (endReflection_ * temp);
-<a name="l00121"></a>00121   lastFrame_[0] = (StkFloat) 0.3 * boreDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( pressureDiff );
-<a name="l00122"></a>00122 
-<a name="l00123"></a>00123   lastFrame_[0] *= outputGain_;
-<a name="l00124"></a>00124   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00125"></a>00125 }
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127 } <span class="comment">// stk namespace</span>
-<a name="l00128"></a>00128 
-<a name="l00129"></a>00129 <span class="preprocessor">#endif</span>
+<a name="l00092"></a>00092   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00093"></a>00093 
+<a name="l00094"></a>00094  <span class="keyword">protected</span>:
+<a name="l00095"></a>00095 
+<a name="l00096"></a>00096   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   jetDelay_;
+<a name="l00097"></a>00097   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   boreDelay_;
+<a name="l00098"></a>00098   <a class="code" href="classstk_1_1JetTable.html" title="STK jet table class.">JetTable</a> jetTable_;
+<a name="l00099"></a>00099   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filter_;
+<a name="l00100"></a>00100   <a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a> dcBlock_;
+<a name="l00101"></a>00101   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
+<a name="l00102"></a>00102   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
+<a name="l00103"></a>00103   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
+<a name="l00104"></a>00104 
+<a name="l00105"></a>00105   StkFloat lastFrequency_;
+<a name="l00106"></a>00106   StkFloat maxPressure_;
+<a name="l00107"></a>00107   StkFloat jetReflection_;
+<a name="l00108"></a>00108   StkFloat endReflection_;
+<a name="l00109"></a>00109   StkFloat noiseGain_;
+<a name="l00110"></a>00110   StkFloat vibratoGain_;
+<a name="l00111"></a>00111   StkFloat outputGain_;
+<a name="l00112"></a>00112   StkFloat jetRatio_;
+<a name="l00113"></a>00113 
+<a name="l00114"></a>00114 };
+<a name="l00115"></a>00115 
+<a name="l00116"></a><a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe">00116</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">Flute :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00117"></a>00117 {
+<a name="l00118"></a>00118   StkFloat pressureDiff;
+<a name="l00119"></a>00119   StkFloat breathPressure;
+<a name="l00120"></a>00120 
+<a name="l00121"></a>00121   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
+<a name="l00122"></a>00122   breathPressure = maxPressure_ * adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
+<a name="l00123"></a>00123   breathPressure += breathPressure * ( noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>() + vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() );
+<a name="l00124"></a>00124 
+<a name="l00125"></a>00125   StkFloat temp = -filter_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( boreDelay_.<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>() );
+<a name="l00126"></a>00126   temp = dcBlock_.<a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( temp ); <span class="comment">// Block DC on reflection.</span>
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128   pressureDiff = breathPressure - (jetReflection_ * temp);
+<a name="l00129"></a>00129   pressureDiff = jetDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( pressureDiff );
+<a name="l00130"></a>00130   pressureDiff = jetTable_.<a class="code" href="classstk_1_1JetTable.html#a3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">tick</a>( pressureDiff ) + (endReflection_ * temp);
+<a name="l00131"></a>00131   lastFrame_[0] = (StkFloat) 0.3 * boreDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( pressureDiff );
+<a name="l00132"></a>00132 
+<a name="l00133"></a>00133   lastFrame_[0] *= outputGain_;
+<a name="l00134"></a>00134   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00135"></a>00135 }
+<a name="l00136"></a>00136 
+<a name="l00137"></a><a class="code" href="classstk_1_1Flute.html#a86640ddfacea6fd9385bc4e197fe1a28">00137</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">Flute :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00138"></a>00138 {
+<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00140"></a>00140 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00141"></a>00141 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00142"></a>00142     oStream_ &lt;&lt; <span class="stringliteral">&quot;Flute::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00143"></a>00143     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00144"></a>00144   }
+<a name="l00145"></a>00145 <span class="preprocessor">#endif</span>
+<a name="l00146"></a>00146 <span class="preprocessor"></span>
+<a name="l00147"></a>00147   StkFloat *samples = &amp;frames[channel];
+<a name="l00148"></a>00148   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00149"></a>00149   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00150"></a>00150     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00151"></a>00151       *samples++ = <a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">tick</a>();
+<a name="l00152"></a>00152   }
+<a name="l00153"></a>00153   <span class="keywordflow">else</span> {
+<a name="l00154"></a>00154     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00155"></a>00155       *samples++ = <a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">tick</a>();
+<a name="l00156"></a>00156       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00157"></a>00157         *samples++ = lastFrame_[j];
+<a name="l00158"></a>00158     }
+<a name="l00159"></a>00159   }
+<a name="l00160"></a>00160 
+<a name="l00161"></a>00161   <span class="keywordflow">return</span> frames;
+<a name="l00162"></a>00162 }
+<a name="l00163"></a>00163 
+<a name="l00164"></a>00164 } <span class="comment">// stk namespace</span>
+<a name="l00165"></a>00165 
+<a name="l00166"></a>00166 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/FormSwep_8h-source.html b/doc/html/FormSwep_8h-source.html
deleted file mode 100644
index 9949559..0000000
--- a/doc/html/FormSwep_8h-source.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>FormSwep.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FORMSWEP_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FORMSWEP_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1FormSwep.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1FormSwep.html" title="STK sweepable formant filter class.">FormSwep</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022  <span class="keyword">public</span>:
-<a name="l00023"></a>00023 
-<a name="l00025"></a>00025   <a class="code" href="classstk_1_1FormSwep.html#eb0093d5962acf4b5d582730e8c8bab9" title="Default constructor creates a second-order pass-through filter.">FormSwep</a>( <span class="keywordtype">void</span> );
-<a name="l00026"></a>00026 
-<a name="l00028"></a>00028   <a class="code" href="classstk_1_1FormSwep.html#c02cd2882f67e8ed9c315dfbf10b05a9" title="Class destructor.">~FormSwep</a>();
-<a name="l00029"></a>00029 
-<a name="l00031"></a><a class="code" href="classstk_1_1FormSwep.html#91096ebd684df25fc36a759f642b2200">00031</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#91096ebd684df25fc36a759f642b2200" title="A function to enable/disable the automatic updating of class data when the STK sample...">ignoreSampleRateChange</a>( <span class="keywordtype">bool</span> ignore = <span class="keyword">true</span> ) { ignoreSampleRateChange_ = ignore; };
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#a6fe339cc937260c46e8c169a58d8529" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>( StkFloat frequency, StkFloat radius );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#3aede7b088dbe2ca98b3398a5f953ae7" title="Set both the current and target resonance parameters.">setStates</a>( StkFloat frequency, StkFloat radius, StkFloat gain = 1.0 );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#2f00d2edf80fbf8f74a284c68caf07d6" title="Set target resonance parameters.">setTargets</a>( StkFloat frequency, StkFloat radius, StkFloat gain = 1.0 );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054 
-<a name="l00062"></a>00062   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#27ba31acdbe8334da1830e14872fd226" title="Set the sweep rate (between 0.0 - 1.0).">setSweepRate</a>( StkFloat rate );
-<a name="l00063"></a>00063 
-<a name="l00065"></a>00065 
-<a name="l00070"></a>00070   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#242edcbe2a6f88393357b5a5ccec43e8" title="Set the sweep rate in terms of a time value in seconds.">setSweepTime</a>( StkFloat time );
-<a name="l00071"></a>00071 
-<a name="l00073"></a><a class="code" href="classstk_1_1FormSwep.html#3d8405c24e8539b389daf86fccfe5d70">00073</a>   StkFloat <a class="code" href="classstk_1_1FormSwep.html#3d8405c24e8539b389daf86fccfe5d70" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00074"></a>00074 
-<a name="l00076"></a>00076   StkFloat <a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( StkFloat input );
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079 
-<a name="l00087"></a>00087   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00088"></a>00088 
-<a name="l00090"></a>00090 
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00099"></a>00099 
-<a name="l00100"></a>00100  <span class="keyword">protected</span>:
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="keyword">virtual</span> <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00103"></a>00103 
-<a name="l00104"></a>00104   <span class="keywordtype">bool</span> dirty_;
-<a name="l00105"></a>00105   StkFloat frequency_;
-<a name="l00106"></a>00106   StkFloat radius_;
-<a name="l00107"></a>00107   StkFloat startFrequency_;
-<a name="l00108"></a>00108   StkFloat startRadius_;
-<a name="l00109"></a>00109   StkFloat startGain_;
-<a name="l00110"></a>00110   StkFloat targetFrequency_;
-<a name="l00111"></a>00111   StkFloat targetRadius_;
-<a name="l00112"></a>00112   StkFloat targetGain_;
-<a name="l00113"></a>00113   StkFloat deltaFrequency_;
-<a name="l00114"></a>00114   StkFloat deltaRadius_;
-<a name="l00115"></a>00115   StkFloat deltaGain_;
-<a name="l00116"></a>00116   StkFloat sweepState_;
-<a name="l00117"></a>00117   StkFloat sweepRate_;
-<a name="l00118"></a>00118 
-<a name="l00119"></a>00119 };
-<a name="l00120"></a>00120 
-<a name="l00121"></a><a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774">00121</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">FormSwep :: tick</a>( StkFloat input )
-<a name="l00122"></a>00122 {                                     
-<a name="l00123"></a>00123   <span class="keywordflow">if</span> ( dirty_ )  {
-<a name="l00124"></a>00124     sweepState_ += sweepRate_;
-<a name="l00125"></a>00125     <span class="keywordflow">if</span> ( sweepState_ &gt;= 1.0 )   {
-<a name="l00126"></a>00126       sweepState_ = 1.0;
-<a name="l00127"></a>00127       dirty_ = <span class="keyword">false</span>;
-<a name="l00128"></a>00128       radius_ = targetRadius_;
-<a name="l00129"></a>00129       frequency_ = targetFrequency_;
-<a name="l00130"></a>00130       gain_ = targetGain_;
-<a name="l00131"></a>00131     }
-<a name="l00132"></a>00132     <span class="keywordflow">else</span> {
-<a name="l00133"></a>00133       radius_ = startRadius_ + (deltaRadius_ * sweepState_);
-<a name="l00134"></a>00134       frequency_ = startFrequency_ + (deltaFrequency_ * sweepState_);
-<a name="l00135"></a>00135       gain_ = startGain_ + (deltaGain_ * sweepState_);
-<a name="l00136"></a>00136     }
-<a name="l00137"></a>00137     this-&gt;<a class="code" href="classstk_1_1FormSwep.html#a6fe339cc937260c46e8c169a58d8529" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>( frequency_, radius_ );
-<a name="l00138"></a>00138   }
-<a name="l00139"></a>00139 
-<a name="l00140"></a>00140   inputs_[0] = gain_ * input;
-<a name="l00141"></a>00141   lastFrame_[0] = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
-<a name="l00142"></a>00142   lastFrame_[0] -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
-<a name="l00143"></a>00143   inputs_[2] = inputs_[1];
-<a name="l00144"></a>00144   inputs_[1] = inputs_[0];
-<a name="l00145"></a>00145   outputs_[2] = outputs_[1];
-<a name="l00146"></a>00146   outputs_[1] = lastFrame_[0];
-<a name="l00147"></a>00147 
-<a name="l00148"></a>00148   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00149"></a>00149 }
-<a name="l00150"></a>00150 
-<a name="l00151"></a><a class="code" href="classstk_1_1FormSwep.html#27f68dc2bb3fa41322ae49cf59cc9884">00151</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">FormSwep :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00152"></a>00152 {
-<a name="l00153"></a>00153 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00154"></a>00154 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00155"></a>00155     errorString_ &lt;&lt; <span class="stringliteral">"FormSwep::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00156"></a>00156     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00157"></a>00157   }
-<a name="l00158"></a>00158 <span class="preprocessor">#endif</span>
-<a name="l00159"></a>00159 <span class="preprocessor"></span>
-<a name="l00160"></a>00160   StkFloat *samples = &amp;frames[channel];
-<a name="l00161"></a>00161   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00162"></a>00162   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00163"></a>00163     *samples = <a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( *samples );
-<a name="l00164"></a>00164 
-<a name="l00165"></a>00165   <span class="keywordflow">return</span> frames;
-<a name="l00166"></a>00166 }
-<a name="l00167"></a>00167 
-<a name="l00168"></a><a class="code" href="classstk_1_1FormSwep.html#8a16af2b4e169946cedb8fec2bb1417a">00168</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">FormSwep :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00169"></a>00169 {
-<a name="l00170"></a>00170 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00171"></a>00171 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00172"></a>00172     errorString_ &lt;&lt; <span class="stringliteral">"FormSwep::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00173"></a>00173     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00174"></a>00174   }
-<a name="l00175"></a>00175 <span class="preprocessor">#endif</span>
-<a name="l00176"></a>00176 <span class="preprocessor"></span>
-<a name="l00177"></a>00177   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00178"></a>00178   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00179"></a>00179   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00180"></a>00180   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop )
-<a name="l00181"></a>00181     *oSamples = <a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( *iSamples );
-<a name="l00182"></a>00182 
-<a name="l00183"></a>00183   <span class="keywordflow">return</span> iFrames;
-<a name="l00184"></a>00184 }
-<a name="l00185"></a>00185 
-<a name="l00186"></a>00186 } <span class="comment">// stk namespace</span>
-<a name="l00187"></a>00187 
-<a name="l00188"></a>00188 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/FormSwep_8h_source.html b/doc/html/FormSwep_8h_source.html
index 282eb76..8d43115 100644
--- a/doc/html/FormSwep_8h_source.html
+++ b/doc/html/FormSwep_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>FormSwep.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FORMSWEP_H</span>
@@ -33,123 +33,123 @@
 <a name="l00031"></a><a class="code" href="classstk_1_1FormSwep.html#a91096ebd684df25fc36a759f642b2200">00031</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#a91096ebd684df25fc36a759f642b2200" title="A function to enable/disable the automatic updating of class data when the STK sample...">ignoreSampleRateChange</a>( <span class="keywordtype">bool</span> ignore = <span class="keyword">true</span> ) { ignoreSampleRateChange_ = ignore; };
 <a name="l00032"></a>00032 
 <a name="l00034"></a>00034 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#aa6fe339cc937260c46e8c169a58d8529" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>( StkFloat frequency, StkFloat radius );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#a3aede7b088dbe2ca98b3398a5f953ae7" title="Set both the current and target resonance parameters.">setStates</a>( StkFloat frequency, StkFloat radius, StkFloat gain = 1.0 );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#a2f00d2edf80fbf8f74a284c68caf07d6" title="Set target resonance parameters.">setTargets</a>( StkFloat frequency, StkFloat radius, StkFloat gain = 1.0 );
-<a name="l00052"></a>00052 
+<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#aa6fe339cc937260c46e8c169a58d8529" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>( StkFloat frequency, StkFloat radius );
+<a name="l00048"></a>00048 
+<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#a3aede7b088dbe2ca98b3398a5f953ae7" title="Set both the current and target resonance parameters.">setStates</a>( StkFloat frequency, StkFloat radius, StkFloat gain = 1.0 );
+<a name="l00051"></a>00051 
+<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#a2f00d2edf80fbf8f74a284c68caf07d6" title="Set target resonance parameters.">setTargets</a>( StkFloat frequency, StkFloat radius, StkFloat gain = 1.0 );
 <a name="l00054"></a>00054 
-<a name="l00062"></a>00062   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#a27ba31acdbe8334da1830e14872fd226" title="Set the sweep rate (between 0.0 - 1.0).">setSweepRate</a>( StkFloat rate );
-<a name="l00063"></a>00063 
+<a name="l00056"></a>00056 
+<a name="l00064"></a>00064   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#a27ba31acdbe8334da1830e14872fd226" title="Set the sweep rate (between 0.0 - 1.0).">setSweepRate</a>( StkFloat rate );
 <a name="l00065"></a>00065 
-<a name="l00070"></a>00070   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#a242edcbe2a6f88393357b5a5ccec43e8" title="Set the sweep rate in terms of a time value in seconds.">setSweepTime</a>( StkFloat time );
-<a name="l00071"></a>00071 
-<a name="l00073"></a><a class="code" href="classstk_1_1FormSwep.html#a3d8405c24e8539b389daf86fccfe5d70">00073</a>   StkFloat <a class="code" href="classstk_1_1FormSwep.html#a3d8405c24e8539b389daf86fccfe5d70" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00074"></a>00074 
-<a name="l00076"></a>00076   StkFloat <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( StkFloat input );
-<a name="l00077"></a>00077 
+<a name="l00067"></a>00067 
+<a name="l00072"></a>00072   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1FormSwep.html#a242edcbe2a6f88393357b5a5ccec43e8" title="Set the sweep rate in terms of a time value in seconds.">setSweepTime</a>( StkFloat time );
+<a name="l00073"></a>00073 
+<a name="l00075"></a><a class="code" href="classstk_1_1FormSwep.html#a3d8405c24e8539b389daf86fccfe5d70">00075</a>   StkFloat <a class="code" href="classstk_1_1FormSwep.html#a3d8405c24e8539b389daf86fccfe5d70" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
+<a name="l00076"></a>00076 
+<a name="l00078"></a>00078   StkFloat <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( StkFloat input );
 <a name="l00079"></a>00079 
-<a name="l00087"></a>00087   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00088"></a>00088 
+<a name="l00081"></a>00081 
+<a name="l00089"></a>00089   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00090"></a>00090 
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00099"></a>00099 
-<a name="l00100"></a>00100  <span class="keyword">protected</span>:
+<a name="l00092"></a>00092 
+<a name="l00100"></a>00100   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
 <a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="keyword">virtual</span> <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
+<a name="l00102"></a>00102  <span class="keyword">protected</span>:
 <a name="l00103"></a>00103 
-<a name="l00104"></a>00104   <span class="keywordtype">bool</span> dirty_;
-<a name="l00105"></a>00105   StkFloat frequency_;
-<a name="l00106"></a>00106   StkFloat radius_;
-<a name="l00107"></a>00107   StkFloat startFrequency_;
-<a name="l00108"></a>00108   StkFloat startRadius_;
-<a name="l00109"></a>00109   StkFloat startGain_;
-<a name="l00110"></a>00110   StkFloat targetFrequency_;
-<a name="l00111"></a>00111   StkFloat targetRadius_;
-<a name="l00112"></a>00112   StkFloat targetGain_;
-<a name="l00113"></a>00113   StkFloat deltaFrequency_;
-<a name="l00114"></a>00114   StkFloat deltaRadius_;
-<a name="l00115"></a>00115   StkFloat deltaGain_;
-<a name="l00116"></a>00116   StkFloat sweepState_;
-<a name="l00117"></a>00117   StkFloat sweepRate_;
-<a name="l00118"></a>00118 
-<a name="l00119"></a>00119 };
+<a name="l00104"></a>00104   <span class="keyword">virtual</span> <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
+<a name="l00105"></a>00105 
+<a name="l00106"></a>00106   <span class="keywordtype">bool</span> dirty_;
+<a name="l00107"></a>00107   StkFloat frequency_;
+<a name="l00108"></a>00108   StkFloat radius_;
+<a name="l00109"></a>00109   StkFloat startFrequency_;
+<a name="l00110"></a>00110   StkFloat startRadius_;
+<a name="l00111"></a>00111   StkFloat startGain_;
+<a name="l00112"></a>00112   StkFloat targetFrequency_;
+<a name="l00113"></a>00113   StkFloat targetRadius_;
+<a name="l00114"></a>00114   StkFloat targetGain_;
+<a name="l00115"></a>00115   StkFloat deltaFrequency_;
+<a name="l00116"></a>00116   StkFloat deltaRadius_;
+<a name="l00117"></a>00117   StkFloat deltaGain_;
+<a name="l00118"></a>00118   StkFloat sweepState_;
+<a name="l00119"></a>00119   StkFloat sweepRate_;
 <a name="l00120"></a>00120 
-<a name="l00121"></a><a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774">00121</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">FormSwep :: tick</a>( StkFloat input )
-<a name="l00122"></a>00122 {                                     
-<a name="l00123"></a>00123   <span class="keywordflow">if</span> ( dirty_ )  {
-<a name="l00124"></a>00124     sweepState_ += sweepRate_;
-<a name="l00125"></a>00125     <span class="keywordflow">if</span> ( sweepState_ &gt;= 1.0 )   {
-<a name="l00126"></a>00126       sweepState_ = 1.0;
-<a name="l00127"></a>00127       dirty_ = <span class="keyword">false</span>;
-<a name="l00128"></a>00128       radius_ = targetRadius_;
-<a name="l00129"></a>00129       frequency_ = targetFrequency_;
-<a name="l00130"></a>00130       gain_ = targetGain_;
-<a name="l00131"></a>00131     }
-<a name="l00132"></a>00132     <span class="keywordflow">else</span> {
-<a name="l00133"></a>00133       radius_ = startRadius_ + (deltaRadius_ * sweepState_);
-<a name="l00134"></a>00134       frequency_ = startFrequency_ + (deltaFrequency_ * sweepState_);
-<a name="l00135"></a>00135       gain_ = startGain_ + (deltaGain_ * sweepState_);
-<a name="l00136"></a>00136     }
-<a name="l00137"></a>00137     this-&gt;<a class="code" href="classstk_1_1FormSwep.html#aa6fe339cc937260c46e8c169a58d8529" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>( frequency_, radius_ );
-<a name="l00138"></a>00138   }
-<a name="l00139"></a>00139 
-<a name="l00140"></a>00140   inputs_[0] = gain_ * input;
-<a name="l00141"></a>00141   lastFrame_[0] = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
-<a name="l00142"></a>00142   lastFrame_[0] -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
-<a name="l00143"></a>00143   inputs_[2] = inputs_[1];
-<a name="l00144"></a>00144   inputs_[1] = inputs_[0];
-<a name="l00145"></a>00145   outputs_[2] = outputs_[1];
-<a name="l00146"></a>00146   outputs_[1] = lastFrame_[0];
-<a name="l00147"></a>00147 
-<a name="l00148"></a>00148   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00149"></a>00149 }
-<a name="l00150"></a>00150 
-<a name="l00151"></a><a class="code" href="classstk_1_1FormSwep.html#a27f68dc2bb3fa41322ae49cf59cc9884">00151</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">FormSwep :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00152"></a>00152 {
-<a name="l00153"></a>00153 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00154"></a>00154 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00155"></a>00155     errorString_ &lt;&lt; <span class="stringliteral">&quot;FormSwep::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00156"></a>00156     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00157"></a>00157   }
-<a name="l00158"></a>00158 <span class="preprocessor">#endif</span>
-<a name="l00159"></a>00159 <span class="preprocessor"></span>
-<a name="l00160"></a>00160   StkFloat *samples = &amp;frames[channel];
-<a name="l00161"></a>00161   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00162"></a>00162   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00163"></a>00163     *samples = <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( *samples );
-<a name="l00164"></a>00164 
-<a name="l00165"></a>00165   <span class="keywordflow">return</span> frames;
-<a name="l00166"></a>00166 }
-<a name="l00167"></a>00167 
-<a name="l00168"></a><a class="code" href="classstk_1_1FormSwep.html#a8a16af2b4e169946cedb8fec2bb1417a">00168</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">FormSwep :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00169"></a>00169 {
-<a name="l00170"></a>00170 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00171"></a>00171 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00172"></a>00172     errorString_ &lt;&lt; <span class="stringliteral">&quot;FormSwep::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00173"></a>00173     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00174"></a>00174   }
-<a name="l00175"></a>00175 <span class="preprocessor">#endif</span>
-<a name="l00176"></a>00176 <span class="preprocessor"></span>
-<a name="l00177"></a>00177   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00178"></a>00178   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00179"></a>00179   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00180"></a>00180   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop )
-<a name="l00181"></a>00181     *oSamples = <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( *iSamples );
-<a name="l00182"></a>00182 
-<a name="l00183"></a>00183   <span class="keywordflow">return</span> iFrames;
-<a name="l00184"></a>00184 }
-<a name="l00185"></a>00185 
-<a name="l00186"></a>00186 } <span class="comment">// stk namespace</span>
+<a name="l00121"></a>00121 };
+<a name="l00122"></a>00122 
+<a name="l00123"></a><a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774">00123</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">FormSwep :: tick</a>( StkFloat input )
+<a name="l00124"></a>00124 {                                     
+<a name="l00125"></a>00125   <span class="keywordflow">if</span> ( dirty_ )  {
+<a name="l00126"></a>00126     sweepState_ += sweepRate_;
+<a name="l00127"></a>00127     <span class="keywordflow">if</span> ( sweepState_ &gt;= 1.0 )   {
+<a name="l00128"></a>00128       sweepState_ = 1.0;
+<a name="l00129"></a>00129       dirty_ = <span class="keyword">false</span>;
+<a name="l00130"></a>00130       radius_ = targetRadius_;
+<a name="l00131"></a>00131       frequency_ = targetFrequency_;
+<a name="l00132"></a>00132       gain_ = targetGain_;
+<a name="l00133"></a>00133     }
+<a name="l00134"></a>00134     <span class="keywordflow">else</span> {
+<a name="l00135"></a>00135       radius_ = startRadius_ + (deltaRadius_ * sweepState_);
+<a name="l00136"></a>00136       frequency_ = startFrequency_ + (deltaFrequency_ * sweepState_);
+<a name="l00137"></a>00137       gain_ = startGain_ + (deltaGain_ * sweepState_);
+<a name="l00138"></a>00138     }
+<a name="l00139"></a>00139     this-&gt;<a class="code" href="classstk_1_1FormSwep.html#aa6fe339cc937260c46e8c169a58d8529" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>( frequency_, radius_ );
+<a name="l00140"></a>00140   }
+<a name="l00141"></a>00141 
+<a name="l00142"></a>00142   inputs_[0] = gain_ * input;
+<a name="l00143"></a>00143   lastFrame_[0] = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
+<a name="l00144"></a>00144   lastFrame_[0] -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
+<a name="l00145"></a>00145   inputs_[2] = inputs_[1];
+<a name="l00146"></a>00146   inputs_[1] = inputs_[0];
+<a name="l00147"></a>00147   outputs_[2] = outputs_[1];
+<a name="l00148"></a>00148   outputs_[1] = lastFrame_[0];
+<a name="l00149"></a>00149 
+<a name="l00150"></a>00150   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00151"></a>00151 }
+<a name="l00152"></a>00152 
+<a name="l00153"></a><a class="code" href="classstk_1_1FormSwep.html#a27f68dc2bb3fa41322ae49cf59cc9884">00153</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">FormSwep :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00154"></a>00154 {
+<a name="l00155"></a>00155 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00156"></a>00156 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00157"></a>00157     oStream_ &lt;&lt; <span class="stringliteral">&quot;FormSwep::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00158"></a>00158     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00159"></a>00159   }
+<a name="l00160"></a>00160 <span class="preprocessor">#endif</span>
+<a name="l00161"></a>00161 <span class="preprocessor"></span>
+<a name="l00162"></a>00162   StkFloat *samples = &amp;frames[channel];
+<a name="l00163"></a>00163   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00164"></a>00164   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00165"></a>00165     *samples = <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( *samples );
+<a name="l00166"></a>00166 
+<a name="l00167"></a>00167   <span class="keywordflow">return</span> frames;
+<a name="l00168"></a>00168 }
+<a name="l00169"></a>00169 
+<a name="l00170"></a><a class="code" href="classstk_1_1FormSwep.html#a8a16af2b4e169946cedb8fec2bb1417a">00170</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">FormSwep :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00171"></a>00171 {
+<a name="l00172"></a>00172 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00173"></a>00173 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00174"></a>00174     oStream_ &lt;&lt; <span class="stringliteral">&quot;FormSwep::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00175"></a>00175     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00176"></a>00176   }
+<a name="l00177"></a>00177 <span class="preprocessor">#endif</span>
+<a name="l00178"></a>00178 <span class="preprocessor"></span>
+<a name="l00179"></a>00179   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00180"></a>00180   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00181"></a>00181   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00182"></a>00182   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop )
+<a name="l00183"></a>00183     *oSamples = <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( *iSamples );
+<a name="l00184"></a>00184 
+<a name="l00185"></a>00185   <span class="keywordflow">return</span> iFrames;
+<a name="l00186"></a>00186 }
 <a name="l00187"></a>00187 
-<a name="l00188"></a>00188 <span class="preprocessor">#endif</span>
+<a name="l00188"></a>00188 } <span class="comment">// stk namespace</span>
+<a name="l00189"></a>00189 
+<a name="l00190"></a>00190 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Function_8h-source.html b/doc/html/Function_8h-source.html
deleted file mode 100644
index 0e9aea9..0000000
--- a/doc/html/Function_8h-source.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Function.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FUNCTION_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_FUNCTION_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1Function.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Function.html" title="STK abstract function parent class.">Function</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022  <span class="keyword">public</span>:
-<a name="l00024"></a><a class="code" href="classstk_1_1Function.html#21648ab236a66f3f0155bdb911f9f3c3">00024</a>   <a class="code" href="classstk_1_1Function.html#21648ab236a66f3f0155bdb911f9f3c3" title="Class constructor.">Function</a>( <span class="keywordtype">void</span> ) { lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( 1, 1, 0.0 ); };
-<a name="l00025"></a>00025 
-<a name="l00027"></a><a class="code" href="classstk_1_1Function.html#e79bd6d0c9f53693b4ca28948d94fc25">00027</a>   StkFloat <a class="code" href="classstk_1_1Function.html#e79bd6d0c9f53693b4ca28948d94fc25" title="Return the last computed output sample.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00028"></a>00028 
-<a name="l00030"></a>00030   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1Function.html#2545fede83a8afcbe11b3bcf3e4d9f42" title="Take one sample input and compute one sample of output.">tick</a>( StkFloat input ) = 0;
-<a name="l00031"></a>00031 
-<a name="l00032"></a>00032  <span class="keyword">protected</span>:
-<a name="l00033"></a>00033 
-<a name="l00034"></a>00034   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> lastFrame_;
-<a name="l00035"></a>00035 
-<a name="l00036"></a>00036 };
-<a name="l00037"></a>00037 
-<a name="l00038"></a>00038 } <span class="comment">// stk namespace</span>
-<a name="l00039"></a>00039 
-<a name="l00040"></a>00040 <span class="preprocessor">#endif</span>
-<a name="l00041"></a>00041 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Function_8h_source.html b/doc/html/Function_8h_source.html
index a1fa7bd..5d153c7 100644
--- a/doc/html/Function_8h_source.html
+++ b/doc/html/Function_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Function.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_FUNCTION_H</span>
@@ -46,7 +46,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Generator_8h-source.html b/doc/html/Generator_8h-source.html
deleted file mode 100644
index 87aeae1..0000000
--- a/doc/html/Generator_8h-source.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Generator.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_GENERATOR_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_GENERATOR_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1Generator.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022  <span class="keyword">public</span>:
-<a name="l00023"></a>00023 
-<a name="l00025"></a><a class="code" href="classstk_1_1Generator.html#c7f11d287fb903b04985c2f81dbf9a5d">00025</a>   <a class="code" href="classstk_1_1Generator.html#c7f11d287fb903b04985c2f81dbf9a5d" title="Class constructor.">Generator</a>( <span class="keywordtype">void</span> ) { lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( 1, 1, 0.0 ); };
-<a name="l00026"></a>00026 
-<a name="l00028"></a><a class="code" href="classstk_1_1Generator.html#9f9de4c495217ef8490a9d2d1fdabe11">00028</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Generator.html#9f9de4c495217ef8490a9d2d1fdabe11" title="Return the number of output channels for the class.">channelsOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(); };
-<a name="l00029"></a>00029 
-<a name="l00031"></a><a class="code" href="classstk_1_1Generator.html#499ad65aa6d939983863ffb922008654">00031</a>   <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Generator.html#499ad65aa6d939983863ffb922008654" title="Return an StkFrames reference to the last output sample frame.">lastFrame</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_; };
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034 
-<a name="l00041"></a>00041   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Generator.html#86bb0421223cf27e25704d5f27b97425" title="Fill the StkFrames object with computed sample frames, starting at the specified...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
-<a name="l00042"></a>00042 
-<a name="l00043"></a>00043   <span class="keyword">protected</span>:
-<a name="l00044"></a>00044 
-<a name="l00045"></a>00045   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> lastFrame_;
-<a name="l00046"></a>00046 };
-<a name="l00047"></a>00047 
-<a name="l00048"></a>00048 } <span class="comment">// stk namespace</span>
-<a name="l00049"></a>00049 
-<a name="l00050"></a>00050 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Generator_8h_source.html b/doc/html/Generator_8h_source.html
index cf9a009..ba56a5c 100644
--- a/doc/html/Generator_8h_source.html
+++ b/doc/html/Generator_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Generator.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_GENERATOR_H</span>
@@ -48,7 +48,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Granulate_8h-source.html b/doc/html/Granulate_8h-source.html
deleted file mode 100644
index 8e65799..0000000
--- a/doc/html/Granulate_8h-source.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Granulate.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_GRANULATE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_GRANULATE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include &lt;vector&gt;</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Generator.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "Envelope.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="keyword">namespace </span>stk {
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="comment">/***************************************************/</span>
-<a name="l00026"></a>00026 <span class="comment">/***************************************************/</span>
-<a name="l00027"></a>00027 
-<a name="l00028"></a><a class="code" href="classstk_1_1Granulate.html">00028</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Granulate.html" title="STK granular synthesis class.">Granulate</a>: <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00029"></a>00029 {
-<a name="l00030"></a>00030  <span class="keyword">public</span>:
-<a name="l00032"></a>00032   <a class="code" href="classstk_1_1Granulate.html#78af615a331de9b643dfabb8e106883f" title="Default constructor.">Granulate</a>( <span class="keywordtype">void</span> );
-<a name="l00033"></a>00033 
-<a name="l00035"></a>00035   <a class="code" href="classstk_1_1Granulate.html#78af615a331de9b643dfabb8e106883f" title="Default constructor.">Granulate</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nVoices, std::string fileName, <span class="keywordtype">bool</span> typeRaw = <span class="keyword">false</span> );
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038   <a class="code" href="classstk_1_1Granulate.html#42eb1f39bd88eb8d4ca55972e7711313" title="Class destructor.">~Granulate</a>( <span class="keywordtype">void</span> );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Granulate.html#6227f127a77b4fc581028033cd7658d8" title="Load a monophonic soundfile to be &amp;quot;granulated&amp;quot;.">openFile</a>( std::string fileName, <span class="keywordtype">bool</span> typeRaw = <span class="keyword">false</span> );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048 
-<a name="l00052"></a>00052   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Granulate.html#9b7b17ae856f3a9ece6ec462285f456c" title="Reset the file pointer and all existing grains to the file start.">reset</a>( <span class="keywordtype">void</span> );
-<a name="l00053"></a>00053 
-<a name="l00055"></a>00055 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Granulate.html#735f3ebe8fa2cacfba2c4722a56fd417" title="Set the number of simultaneous grain &amp;quot;voices&amp;quot; to use.">setVoices</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nVoices = 1 );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063 
-<a name="l00069"></a>00069   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Granulate.html#abd711f2b71bbcd28412d5cb73c085d6" title="Set the stretch factor used for grain playback (1 - 1000).">setStretch</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> stretchFactor = 1 );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072 
-<a name="l00087"></a>00087   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Granulate.html#9b7c15080256f920646d36bfa0ed3734" title="Set global grain parameters used to determine individual grain settings.">setGrainParameters</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> duration = 30, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> rampPercent = 50,
-<a name="l00088"></a>00088                            <span class="keywordtype">int</span> offset = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> delay = 0 );
-<a name="l00089"></a>00089 
-<a name="l00091"></a>00091 
-<a name="l00099"></a>00099   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Granulate.html#02b7b85f21999d4b350beff6a925bd25" title="This factor is used when setting individual grain parameters (0.0 - 1.0).">setRandomFactor</a>( StkFloat randomness = 0.1 );
-<a name="l00100"></a>00100 
-<a name="l00102"></a>00102 
-<a name="l00110"></a>00110   StkFloat <a class="code" href="classstk_1_1Granulate.html#60db060a365fc32fe789cb9bcd042dd3" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00111"></a>00111 
-<a name="l00113"></a>00113   StkFloat <a class="code" href="classstk_1_1Granulate.html#0f8b162c9c309b3cbec3802138a53c24" title="Compute one sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00114"></a>00114 
-<a name="l00116"></a>00116 
-<a name="l00123"></a>00123   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Granulate.html#0f8b162c9c309b3cbec3802138a53c24" title="Compute one sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00124"></a>00124 
-<a name="l00125"></a>00125   <span class="keyword">enum</span> GrainState {
-<a name="l00126"></a>00126     GRAIN_STOPPED,
-<a name="l00127"></a>00127     GRAIN_FADEIN,
-<a name="l00128"></a>00128     GRAIN_SUSTAIN,
-<a name="l00129"></a>00129     GRAIN_FADEOUT
-<a name="l00130"></a>00130   };
-<a name="l00131"></a>00131 
-<a name="l00132"></a>00132  <span class="keyword">protected</span>:
-<a name="l00133"></a>00133 
-<a name="l00134"></a>00134   <span class="keyword">struct </span>Grain {
-<a name="l00135"></a>00135     StkFloat eScaler;
-<a name="l00136"></a>00136     StkFloat eRate;
-<a name="l00137"></a>00137     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> attackCount;
-<a name="l00138"></a>00138     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> sustainCount;
-<a name="l00139"></a>00139     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> decayCount;
-<a name="l00140"></a>00140     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delayCount;
-<a name="l00141"></a>00141     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> counter;
-<a name="l00142"></a>00142     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> pointer;
-<a name="l00143"></a>00143     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> startPointer;
-<a name="l00144"></a>00144     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> repeats;
-<a name="l00145"></a>00145     GrainState state;
-<a name="l00146"></a>00146 
-<a name="l00147"></a>00147     <span class="comment">// Default constructor.</span>
-<a name="l00148"></a>00148     Grain()
-<a name="l00149"></a>00149       :eScaler(0.0), eRate(0.0), attackCount(0), sustainCount(0), decayCount(0),
-<a name="l00150"></a>00150        delayCount(0), counter(0), pointer(0), startPointer(0), repeats(0), state(GRAIN_STOPPED) {}
-<a name="l00151"></a>00151   };
-<a name="l00152"></a>00152 
-<a name="l00153"></a>00153   <span class="keywordtype">void</span> calculateGrain( Granulate::Grain&amp; grain );
-<a name="l00154"></a>00154 
-<a name="l00155"></a>00155   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> data_;
-<a name="l00156"></a>00156   std::vector&lt;Grain&gt; grains_;
-<a name="l00157"></a>00157   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise;
-<a name="l00158"></a>00158   <span class="keywordtype">long</span> gPointer_;
-<a name="l00159"></a>00159 
-<a name="l00160"></a>00160   <span class="comment">// Global grain parameters.</span>
-<a name="l00161"></a>00161   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> gDuration_;
-<a name="l00162"></a>00162   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> gRampPercent_;
-<a name="l00163"></a>00163   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> gDelay_;
-<a name="l00164"></a>00164   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> gStretch_;
-<a name="l00165"></a>00165   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> stretchCounter_;
-<a name="l00166"></a>00166   <span class="keywordtype">int</span> gOffset_;
-<a name="l00167"></a>00167   StkFloat gRandomFactor_;
-<a name="l00168"></a>00168   StkFloat gain_;
-<a name="l00169"></a>00169 
-<a name="l00170"></a>00170 };
-<a name="l00171"></a>00171 
-<a name="l00172"></a><a class="code" href="classstk_1_1Granulate.html#60db060a365fc32fe789cb9bcd042dd3">00172</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Granulate.html#60db060a365fc32fe789cb9bcd042dd3" title="Return the specified channel value of the last computed frame.">Granulate :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00173"></a>00173 {
-<a name="l00174"></a>00174 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00175"></a>00175 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00176"></a>00176     errorString_ &lt;&lt; <span class="stringliteral">"Granulate::lastOut(): channel argument is invalid!"</span>;
-<a name="l00177"></a>00177     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00178"></a>00178   }
-<a name="l00179"></a>00179 <span class="preprocessor">#endif</span>
-<a name="l00180"></a>00180 <span class="preprocessor"></span>
-<a name="l00181"></a>00181   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00182"></a>00182 }
-<a name="l00183"></a>00183 
-<a name="l00184"></a><a class="code" href="classstk_1_1Granulate.html#a9cc119b1515c5596a95d72f4b65b0c0">00184</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Granulate.html#0f8b162c9c309b3cbec3802138a53c24" title="Compute one sample frame and return the specified channel value.">Granulate :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00185"></a>00185 {
-<a name="l00186"></a>00186   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00187"></a>00187 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00188"></a>00188 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
-<a name="l00189"></a>00189     errorString_ &lt;&lt; <span class="stringliteral">"Granulate::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00190"></a>00190     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00191"></a>00191   }
-<a name="l00192"></a>00192 <span class="preprocessor">#endif</span>
-<a name="l00193"></a>00193 <span class="preprocessor"></span>
-<a name="l00194"></a>00194   StkFloat *samples = &amp;frames[channel];
-<a name="l00195"></a>00195   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
-<a name="l00196"></a>00196   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00197"></a>00197     *samples++ = <a class="code" href="classstk_1_1Granulate.html#0f8b162c9c309b3cbec3802138a53c24" title="Compute one sample frame and return the specified channel value.">tick</a>();
-<a name="l00198"></a>00198     <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
-<a name="l00199"></a>00199       *samples++ = lastFrame_[j];
-<a name="l00200"></a>00200   }
-<a name="l00201"></a>00201 
-<a name="l00202"></a>00202   <span class="keywordflow">return</span> frames;
-<a name="l00203"></a>00203 }
-<a name="l00204"></a>00204 
-<a name="l00205"></a>00205 } <span class="comment">// stk namespace</span>
-<a name="l00206"></a>00206 
-<a name="l00207"></a>00207 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Granulate_8h_source.html b/doc/html/Granulate_8h_source.html
index 8fdf1d4..1a52fc9 100644
--- a/doc/html/Granulate_8h_source.html
+++ b/doc/html/Granulate_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Granulate.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_GRANULATE_H</span>
@@ -114,7 +114,7 @@
 <a name="l00175"></a>00175 {
 <a name="l00176"></a>00176 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00177"></a>00177 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00178"></a>00178     errorString_ &lt;&lt; <span class="stringliteral">&quot;Granulate::lastOut(): channel argument is invalid!&quot;</span>;
+<a name="l00178"></a>00178     oStream_ &lt;&lt; <span class="stringliteral">&quot;Granulate::lastOut(): channel argument is invalid!&quot;</span>;
 <a name="l00179"></a>00179     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00180"></a>00180   }
 <a name="l00181"></a>00181 <span class="preprocessor">#endif</span>
@@ -127,7 +127,7 @@
 <a name="l00188"></a>00188   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
 <a name="l00189"></a>00189 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00190"></a>00190 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
-<a name="l00191"></a>00191     errorString_ &lt;&lt; <span class="stringliteral">&quot;Granulate::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00191"></a>00191     oStream_ &lt;&lt; <span class="stringliteral">&quot;Granulate::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00192"></a>00192     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00193"></a>00193   }
 <a name="l00194"></a>00194 <span class="preprocessor">#endif</span>
@@ -151,7 +151,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/HevyMetl_8h-source.html b/doc/html/HevyMetl_8h-source.html
deleted file mode 100644
index eae039a..0000000
--- a/doc/html/HevyMetl_8h-source.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>HevyMetl.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_HEVYMETL_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_HEVYMETL_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "FM.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00036"></a>00036 <span class="comment">/***************************************************/</span>
-<a name="l00037"></a>00037 
-<a name="l00038"></a><a class="code" href="classstk_1_1HevyMetl.html">00038</a> <span class="keyword">class </span><a class="code" href="classstk_1_1HevyMetl.html" title="STK heavy metal FM synthesis instrument.">HevyMetl</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a>
-<a name="l00039"></a>00039 {
-<a name="l00040"></a>00040  <span class="keyword">public</span>:
-<a name="l00042"></a>00042 
-<a name="l00045"></a>00045   <a class="code" href="classstk_1_1HevyMetl.html#61e000b4c2a8ba021e43e8074be44390" title="Class constructor.">HevyMetl</a>( <span class="keywordtype">void</span> );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <a class="code" href="classstk_1_1HevyMetl.html#03b76a27541928bf9e7d156f9709a8f0" title="Class destructor.">~HevyMetl</a>( <span class="keywordtype">void</span> );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1HevyMetl.html#a7401a5cb44a69edaad304aac41b6eda" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   StkFloat <a class="code" href="classstk_1_1HevyMetl.html#0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00055"></a>00055 
-<a name="l00056"></a>00056  <span class="keyword">protected</span>:
-<a name="l00057"></a>00057 
-<a name="l00058"></a>00058 };
-<a name="l00059"></a>00059 
-<a name="l00060"></a><a class="code" href="classstk_1_1HevyMetl.html#0261504b82845034be67ac573d564ff7">00060</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1HevyMetl.html#0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">HevyMetl :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00061"></a>00061 {
-<a name="l00062"></a>00062   <span class="keyword">register</span> StkFloat temp;
-<a name="l00063"></a>00063 
-<a name="l00064"></a>00064   temp = vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_ * 0.2;    
-<a name="l00065"></a>00065   waves_[0]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[0]);
-<a name="l00066"></a>00066   waves_[1]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[1]);
-<a name="l00067"></a>00067   waves_[2]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[2]);
-<a name="l00068"></a>00068   waves_[3]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[3]);
-<a name="l00069"></a>00069     
-<a name="l00070"></a>00070   temp = gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00071"></a>00071   waves_[1]-&gt;addPhaseOffset( temp );
-<a name="l00072"></a>00072     
-<a name="l00073"></a>00073   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#e9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00074"></a>00074   temp = (1.0 - (control2_ * 0.5)) * gains_[3] * adsr_[3]-&gt;<a class="code" href="classstk_1_1HevyMetl.html#0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">tick</a>() * waves_[3]-&gt;tick();
-<a name="l00075"></a>00075   twozero_.<a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00076"></a>00076     
-<a name="l00077"></a>00077   temp += control2_ * 0.5 * gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00078"></a>00078   temp = temp * control1_;
-<a name="l00079"></a>00079     
-<a name="l00080"></a>00080   waves_[0]-&gt;addPhaseOffset( temp );
-<a name="l00081"></a>00081   temp = gains_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
-<a name="l00082"></a>00082     
-<a name="l00083"></a>00083   lastFrame_[0] = temp * 0.5;
-<a name="l00084"></a>00084   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00085"></a>00085 }
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 } <span class="comment">// stk namespace</span>
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/HevyMetl_8h_source.html b/doc/html/HevyMetl_8h_source.html
index 9c6dc55..86e4ea9 100644
--- a/doc/html/HevyMetl_8h_source.html
+++ b/doc/html/HevyMetl_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>HevyMetl.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_HEVYMETL_H</span>
@@ -34,46 +34,76 @@
 <a name="l00052"></a>00052 
 <a name="l00054"></a>00054   StkFloat <a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00055"></a>00055 
-<a name="l00056"></a>00056  <span class="keyword">protected</span>:
 <a name="l00057"></a>00057 
-<a name="l00058"></a>00058 };
-<a name="l00059"></a>00059 
-<a name="l00060"></a><a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7">00060</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">HevyMetl :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00061"></a>00061 {
-<a name="l00062"></a>00062   <span class="keyword">register</span> StkFloat temp;
-<a name="l00063"></a>00063 
-<a name="l00064"></a>00064   temp = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_ * 0.2;    
-<a name="l00065"></a>00065   waves_[0]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[0]);
-<a name="l00066"></a>00066   waves_[1]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[1]);
-<a name="l00067"></a>00067   waves_[2]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[2]);
-<a name="l00068"></a>00068   waves_[3]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[3]);
-<a name="l00069"></a>00069     
-<a name="l00070"></a>00070   temp = gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00071"></a>00071   waves_[1]-&gt;addPhaseOffset( temp );
-<a name="l00072"></a>00072     
-<a name="l00073"></a>00073   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00074"></a>00074   temp = (1.0 - (control2_ * 0.5)) * gains_[3] * adsr_[3]-&gt;<a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">tick</a>() * waves_[3]-&gt;tick();
-<a name="l00075"></a>00075   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00076"></a>00076     
-<a name="l00077"></a>00077   temp += control2_ * 0.5 * gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00078"></a>00078   temp = temp * control1_;
+<a name="l00064"></a>00064   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00065"></a>00065 
+<a name="l00066"></a>00066  <span class="keyword">protected</span>:
+<a name="l00067"></a>00067 
+<a name="l00068"></a>00068 };
+<a name="l00069"></a>00069 
+<a name="l00070"></a><a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7">00070</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">HevyMetl :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00071"></a>00071 {
+<a name="l00072"></a>00072   <span class="keyword">register</span> StkFloat temp;
+<a name="l00073"></a>00073 
+<a name="l00074"></a>00074   temp = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_ * 0.2;    
+<a name="l00075"></a>00075   waves_[0]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[0]);
+<a name="l00076"></a>00076   waves_[1]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[1]);
+<a name="l00077"></a>00077   waves_[2]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[2]);
+<a name="l00078"></a>00078   waves_[3]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[3]);
 <a name="l00079"></a>00079     
-<a name="l00080"></a>00080   waves_[0]-&gt;addPhaseOffset( temp );
-<a name="l00081"></a>00081   temp = gains_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
+<a name="l00080"></a>00080   temp = gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
+<a name="l00081"></a>00081   waves_[1]-&gt;addPhaseOffset( temp );
 <a name="l00082"></a>00082     
-<a name="l00083"></a>00083   lastFrame_[0] = temp * 0.5;
-<a name="l00084"></a>00084   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00085"></a>00085 }
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 } <span class="comment">// stk namespace</span>
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 <span class="preprocessor">#endif</span>
+<a name="l00083"></a>00083   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
+<a name="l00084"></a>00084   temp = (1.0 - (control2_ * 0.5)) * gains_[3] * adsr_[3]-&gt;<a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">tick</a>() * waves_[3]-&gt;tick();
+<a name="l00085"></a>00085   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
+<a name="l00086"></a>00086     
+<a name="l00087"></a>00087   temp += control2_ * 0.5 * gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
+<a name="l00088"></a>00088   temp = temp * control1_;
+<a name="l00089"></a>00089     
+<a name="l00090"></a>00090   waves_[0]-&gt;addPhaseOffset( temp );
+<a name="l00091"></a>00091   temp = gains_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
+<a name="l00092"></a>00092     
+<a name="l00093"></a>00093   lastFrame_[0] = temp * 0.5;
+<a name="l00094"></a>00094   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00095"></a>00095 }
+<a name="l00096"></a>00096 
+<a name="l00097"></a><a class="code" href="classstk_1_1HevyMetl.html#a555f3bf9322fd11150b00bb99476769a">00097</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">HevyMetl :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00098"></a>00098 {
+<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00100"></a>00100 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00101"></a>00101 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00102"></a>00102     oStream_ &lt;&lt; <span class="stringliteral">&quot;HevyMetl::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00103"></a>00103     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00104"></a>00104   }
+<a name="l00105"></a>00105 <span class="preprocessor">#endif</span>
+<a name="l00106"></a>00106 <span class="preprocessor"></span>
+<a name="l00107"></a>00107   StkFloat *samples = &amp;frames[channel];
+<a name="l00108"></a>00108   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00109"></a>00109   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00110"></a>00110     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00111"></a>00111       *samples++ = <a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">tick</a>();
+<a name="l00112"></a>00112   }
+<a name="l00113"></a>00113   <span class="keywordflow">else</span> {
+<a name="l00114"></a>00114     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00115"></a>00115       *samples++ = <a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">tick</a>();
+<a name="l00116"></a>00116       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00117"></a>00117         *samples++ = lastFrame_[j];
+<a name="l00118"></a>00118     }
+<a name="l00119"></a>00119   }
+<a name="l00120"></a>00120 
+<a name="l00121"></a>00121   <span class="keywordflow">return</span> frames;
+<a name="l00122"></a>00122 }
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124 } <span class="comment">// stk namespace</span>
+<a name="l00125"></a>00125 
+<a name="l00126"></a>00126 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Iir_8h-source.html b/doc/html/Iir_8h-source.html
deleted file mode 100644
index 5203197..0000000
--- a/doc/html/Iir_8h-source.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Iir.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_IIR_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_IIR_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00032"></a>00032 <span class="comment">/***************************************************/</span>
-<a name="l00033"></a>00033 
-<a name="l00034"></a><a class="code" href="classstk_1_1Iir.html">00034</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Iir.html" title="STK general infinite impulse response filter class.">Iir</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00035"></a>00035 {
-<a name="l00036"></a>00036 <span class="keyword">public</span>:
-<a name="l00038"></a>00038   <a class="code" href="classstk_1_1Iir.html#1d63797b4caf775de8d351ec0c15a4c0" title="Default constructor creates a zero-order pass-through &amp;quot;filter&amp;quot;.">Iir</a>( <span class="keywordtype">void</span> );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041 
-<a name="l00045"></a>00045   <a class="code" href="classstk_1_1Iir.html#1d63797b4caf775de8d351ec0c15a4c0" title="Default constructor creates a zero-order pass-through &amp;quot;filter&amp;quot;.">Iir</a>( std::vector&lt;StkFloat&gt; &amp;bCoefficients, std::vector&lt;StkFloat&gt; &amp;aCoefficients );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <a class="code" href="classstk_1_1Iir.html#c15361cbfa19e6e4f73a155abc1459a8" title="Class destructor.">~Iir</a>( <span class="keywordtype">void</span> );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051 
-<a name="l00058"></a>00058   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Iir.html#a0249b92dcec86ae83688debedb8d95b" title="Set filter coefficients.">setCoefficients</a>( std::vector&lt;StkFloat&gt; &amp;bCoefficients, std::vector&lt;StkFloat&gt; &amp;aCoefficients, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061 
-<a name="l00068"></a>00068   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Iir.html#7a1473446857a14cdbb33cb5afde076c" title="Set numerator coefficients.">setNumerator</a>( std::vector&lt;StkFloat&gt; &amp;bCoefficients, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
-<a name="l00069"></a>00069 
-<a name="l00071"></a>00071 
-<a name="l00080"></a>00080   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Iir.html#e67cc04a452edfbd80f1a27097ea0187" title="Set denominator coefficients.">setDenominator</a>( std::vector&lt;StkFloat&gt; &amp;aCoefficients, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
-<a name="l00081"></a>00081 
-<a name="l00083"></a><a class="code" href="classstk_1_1Iir.html#5dcae9330f2c52d2bfa1647e6b250a14">00083</a>   StkFloat <a class="code" href="classstk_1_1Iir.html#5dcae9330f2c52d2bfa1647e6b250a14" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00084"></a>00084 
-<a name="l00086"></a>00086   StkFloat <a class="code" href="classstk_1_1Iir.html#9b79bb8ba512052a4b90444c9d2d0d84" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00087"></a>00087 
-<a name="l00089"></a>00089 
-<a name="l00097"></a>00097   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Iir.html#9b79bb8ba512052a4b90444c9d2d0d84" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00098"></a>00098 
-<a name="l00100"></a>00100 
-<a name="l00108"></a>00108   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Iir.html#9b79bb8ba512052a4b90444c9d2d0d84" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 <span class="keyword">protected</span>:
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112 };
-<a name="l00113"></a>00113 
-<a name="l00114"></a><a class="code" href="classstk_1_1Iir.html#9b79bb8ba512052a4b90444c9d2d0d84">00114</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Iir.html#9b79bb8ba512052a4b90444c9d2d0d84" title="Input one sample to the filter and return one output.">Iir :: tick</a>( StkFloat input )
-<a name="l00115"></a>00115 {
-<a name="l00116"></a>00116   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i;
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   outputs_[0] = 0.0;
-<a name="l00119"></a>00119   inputs_[0] = gain_ * input;
-<a name="l00120"></a>00120   <span class="keywordflow">for</span> ( i=b_.size()-1; i&gt;0; i-- ) {
-<a name="l00121"></a>00121     outputs_[0] += b_[i] * inputs_[i];
-<a name="l00122"></a>00122     inputs_[i] = inputs_[i-1];
-<a name="l00123"></a>00123   }
-<a name="l00124"></a>00124   outputs_[0] += b_[0] * inputs_[0];
-<a name="l00125"></a>00125 
-<a name="l00126"></a>00126   <span class="keywordflow">for</span> ( i=a_.size()-1; i&gt;0; i-- ) {
-<a name="l00127"></a>00127     outputs_[0] += -a_[i] * outputs_[i];
-<a name="l00128"></a>00128     outputs_[i] = outputs_[i-1];
-<a name="l00129"></a>00129   }
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131   lastFrame_[0] = outputs_[0];
-<a name="l00132"></a>00132   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00133"></a>00133 }
-<a name="l00134"></a>00134 
-<a name="l00135"></a><a class="code" href="classstk_1_1Iir.html#d03f40e022b2adfe942d30908ec34793">00135</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Iir.html#9b79bb8ba512052a4b90444c9d2d0d84" title="Input one sample to the filter and return one output.">Iir :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00136"></a>00136 {
-<a name="l00137"></a>00137 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00138"></a>00138 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00139"></a>00139     errorString_ &lt;&lt; <span class="stringliteral">"Iir::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00140"></a>00140     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00141"></a>00141   }
-<a name="l00142"></a>00142 <span class="preprocessor">#endif</span>
-<a name="l00143"></a>00143 <span class="preprocessor"></span>
-<a name="l00144"></a>00144   StkFloat *samples = &amp;frames[channel];
-<a name="l00145"></a>00145   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00146"></a>00146   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j=0; j&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); j++, samples += hop ) {
-<a name="l00147"></a>00147     outputs_[0] = 0.0;
-<a name="l00148"></a>00148     inputs_[0] = gain_ * *samples;
-<a name="l00149"></a>00149     <span class="keywordflow">for</span> ( i=b_.size()-1; i&gt;0; i-- ) {
-<a name="l00150"></a>00150       outputs_[0] += b_[i] * inputs_[i];
-<a name="l00151"></a>00151       inputs_[i] = inputs_[i-1];
-<a name="l00152"></a>00152     }
-<a name="l00153"></a>00153     outputs_[0] += b_[0] * inputs_[0];
-<a name="l00154"></a>00154 
-<a name="l00155"></a>00155     <span class="keywordflow">for</span> ( i=a_.size()-1; i&gt;0; i-- ) {
-<a name="l00156"></a>00156       outputs_[0] += -a_[i] * outputs_[i];
-<a name="l00157"></a>00157       outputs_[i] = outputs_[i-1];
-<a name="l00158"></a>00158     }
-<a name="l00159"></a>00159 
-<a name="l00160"></a>00160     *samples = outputs_[0];
-<a name="l00161"></a>00161   }
-<a name="l00162"></a>00162 
-<a name="l00163"></a>00163   lastFrame_[0] = *(samples-hop);
-<a name="l00164"></a>00164   <span class="keywordflow">return</span> frames;
-<a name="l00165"></a>00165 }
-<a name="l00166"></a>00166 
-<a name="l00167"></a><a class="code" href="classstk_1_1Iir.html#60919d8e000bf83613bdd5e002d750f1">00167</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Iir.html#9b79bb8ba512052a4b90444c9d2d0d84" title="Input one sample to the filter and return one output.">Iir :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00168"></a>00168 {
-<a name="l00169"></a>00169 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00170"></a>00170 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00171"></a>00171     errorString_ &lt;&lt; <span class="stringliteral">"Iir::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00172"></a>00172     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00173"></a>00173   }
-<a name="l00174"></a>00174 <span class="preprocessor">#endif</span>
-<a name="l00175"></a>00175 <span class="preprocessor"></span>
-<a name="l00176"></a>00176   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00177"></a>00177   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00178"></a>00178   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i, iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00179"></a>00179   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j=0; j&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); j++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00180"></a>00180     outputs_[0] = 0.0;
-<a name="l00181"></a>00181     inputs_[0] = gain_ * *iSamples;
-<a name="l00182"></a>00182     <span class="keywordflow">for</span> ( i=b_.size()-1; i&gt;0; i-- ) {
-<a name="l00183"></a>00183       outputs_[0] += b_[i] * inputs_[i];
-<a name="l00184"></a>00184       inputs_[i] = inputs_[i-1];
-<a name="l00185"></a>00185     }
-<a name="l00186"></a>00186     outputs_[0] += b_[0] * inputs_[0];
-<a name="l00187"></a>00187 
-<a name="l00188"></a>00188     <span class="keywordflow">for</span> ( i=a_.size()-1; i&gt;0; i-- ) {
-<a name="l00189"></a>00189       outputs_[0] += -a_[i] * outputs_[i];
-<a name="l00190"></a>00190       outputs_[i] = outputs_[i-1];
-<a name="l00191"></a>00191     }
-<a name="l00192"></a>00192 
-<a name="l00193"></a>00193     *oSamples = outputs_[0];
-<a name="l00194"></a>00194   }
-<a name="l00195"></a>00195 
-<a name="l00196"></a>00196   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00197"></a>00197   <span class="keywordflow">return</span> iFrames;
-<a name="l00198"></a>00198 }
-<a name="l00199"></a>00199 
-<a name="l00200"></a>00200 } <span class="comment">// stk namespace</span>
-<a name="l00201"></a>00201 
-<a name="l00202"></a>00202 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Iir_8h_source.html b/doc/html/Iir_8h_source.html
index 8b3d3b0..576f979 100644
--- a/doc/html/Iir_8h_source.html
+++ b/doc/html/Iir_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Iir.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_IIR_H</span>
@@ -80,7 +80,7 @@
 <a name="l00136"></a>00136 {
 <a name="l00137"></a>00137 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00138"></a>00138 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00139"></a>00139     errorString_ &lt;&lt; <span class="stringliteral">&quot;Iir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00139"></a>00139     oStream_ &lt;&lt; <span class="stringliteral">&quot;Iir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00140"></a>00140     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00141"></a>00141   }
 <a name="l00142"></a>00142 <span class="preprocessor">#endif</span>
@@ -112,7 +112,7 @@
 <a name="l00168"></a>00168 {
 <a name="l00169"></a>00169 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00170"></a>00170 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00171"></a>00171     errorString_ &lt;&lt; <span class="stringliteral">&quot;Iir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00171"></a>00171     oStream_ &lt;&lt; <span class="stringliteral">&quot;Iir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00172"></a>00172     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00173"></a>00173   }
 <a name="l00174"></a>00174 <span class="preprocessor">#endif</span>
@@ -149,7 +149,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/InetWvIn_8h-source.html b/doc/html/InetWvIn_8h-source.html
deleted file mode 100644
index 29da8f2..0000000
--- a/doc/html/InetWvIn_8h-source.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>InetWvIn.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_INETWVIN_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_INETWVIN_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "WvIn.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "TcpServer.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "UdpSocket.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "Thread.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "Mutex.h"</span>
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="keyword">namespace </span>stk {
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="comment">/***************************************************/</span>
-<a name="l00036"></a>00036 <span class="comment">/***************************************************/</span>
-<a name="l00037"></a>00037 
-<a name="l00038"></a>00038 <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-<a name="l00039"></a>00039   <span class="keywordtype">bool</span> finished;
-<a name="l00040"></a>00040   <span class="keywordtype">void</span> *object;
-<a name="l00041"></a>00041 } ThreadInfo;
-<a name="l00042"></a>00042 
-<a name="l00043"></a><a class="code" href="classstk_1_1InetWvIn.html">00043</a> <span class="keyword">class </span><a class="code" href="classstk_1_1InetWvIn.html" title="STK internet streaming input class.">InetWvIn</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1WvIn.html" title="STK audio input abstract base class.">WvIn</a>
-<a name="l00044"></a>00044 {
-<a name="l00045"></a>00045 <span class="keyword">public</span>:
-<a name="l00047"></a>00047 
-<a name="l00050"></a>00050   <a class="code" href="classstk_1_1InetWvIn.html#d97edafdfb9db2aee77b11d3086113a4" title="Default constructor.">InetWvIn</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bufferFrames = 1024, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nBuffers = 8 );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <a class="code" href="classstk_1_1InetWvIn.html#760628dfbbca0a11142d28ff5cabd8b5" title="Class destructor.">~InetWvIn</a>();
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1InetWvIn.html#f36ff382737f0fb84bc38046c01b4ce8" title="Wait for a (new) socket connection with specified protocol, port, data channels and...">listen</a>( <span class="keywordtype">int</span> port = 2006, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1,
-<a name="l00064"></a>00064                Stk::StkFormat format = <a class="code" href="classstk_1_1Stk.html#5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a>,
-<a name="l00065"></a>00065                Socket::ProtocolType protocol = Socket::PROTO_TCP );
-<a name="l00066"></a>00066 
-<a name="l00068"></a>00068 
-<a name="l00072"></a>00072   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1InetWvIn.html#8b54226eabcd0c58d93fcc0792fa7e02" title="Returns true is an input connection exists or input data remains in the queue.">isConnected</a>( <span class="keywordtype">void</span> );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075 
-<a name="l00084"></a>00084   StkFloat <a class="code" href="classstk_1_1InetWvIn.html#cfd578027b2bbcbe4ceefa11e49e8cd2" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00085"></a>00085 
-<a name="l00087"></a>00087 
-<a name="l00097"></a>00097   StkFloat <a class="code" href="classstk_1_1InetWvIn.html#2109090620c80013ef3ae68cb975fb17" title="Compute a sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00098"></a>00098 
-<a name="l00100"></a>00100 
-<a name="l00109"></a>00109   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1InetWvIn.html#2109090620c80013ef3ae68cb975fb17" title="Compute a sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
-<a name="l00110"></a>00110 
-<a name="l00111"></a>00111   <span class="comment">// Called by the thread routine to receive data via the socket connection</span>
-<a name="l00112"></a>00112   <span class="comment">// and fill the socket buffer.  This is not intended for general use but</span>
-<a name="l00113"></a>00113   <span class="comment">// must be public for access from the thread.</span>
-<a name="l00114"></a>00114   <span class="keywordtype">void</span> receive( <span class="keywordtype">void</span> );
-<a name="l00115"></a>00115 
-<a name="l00116"></a>00116 <span class="keyword">protected</span>:
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   <span class="comment">// Read buffered socket data into the data buffer ... will block if none available.</span>
-<a name="l00119"></a>00119   <span class="keywordtype">int</span> readData( <span class="keywordtype">void</span> );
-<a name="l00120"></a>00120 
-<a name="l00121"></a>00121   <a class="code" href="classstk_1_1Socket.html" title="STK internet socket abstract base class.">Socket</a> *soket_;
-<a name="l00122"></a>00122   <a class="code" href="classstk_1_1Thread.html" title="STK thread class.">Thread</a> thread_;
-<a name="l00123"></a>00123   <a class="code" href="classstk_1_1Mutex.html" title="STK mutex class.">Mutex</a> mutex_;
-<a name="l00124"></a>00124   <span class="keywordtype">char</span> *buffer_;
-<a name="l00125"></a>00125   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bufferFrames_;
-<a name="l00126"></a>00126   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bufferBytes_;
-<a name="l00127"></a>00127   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bytesFilled_;
-<a name="l00128"></a>00128   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nBuffers_;
-<a name="l00129"></a>00129   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> writePoint_;
-<a name="l00130"></a>00130   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> readPoint_;
-<a name="l00131"></a>00131   <span class="keywordtype">long</span> bufferCounter_;
-<a name="l00132"></a>00132   <span class="keywordtype">int</span> dataBytes_;
-<a name="l00133"></a>00133   <span class="keywordtype">bool</span> connected_;
-<a name="l00134"></a>00134   <span class="keywordtype">int</span> fd_;
-<a name="l00135"></a>00135   ThreadInfo threadInfo_;
-<a name="l00136"></a>00136   Stk::StkFormat dataType_;
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138 };
-<a name="l00139"></a>00139 
-<a name="l00140"></a><a class="code" href="classstk_1_1InetWvIn.html#cfd578027b2bbcbe4ceefa11e49e8cd2">00140</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1InetWvIn.html#cfd578027b2bbcbe4ceefa11e49e8cd2" title="Return the specified channel value of the last computed frame.">InetWvIn :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00141"></a>00141 {
-<a name="l00142"></a>00142 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00143"></a>00143 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= data_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00144"></a>00144     errorString_ &lt;&lt; <span class="stringliteral">"InetWvIn::lastOut(): channel argument and data stream are incompatible!"</span>;
-<a name="l00145"></a>00145     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00146"></a>00146   }
-<a name="l00147"></a>00147 <span class="preprocessor">#endif</span>
-<a name="l00148"></a>00148 <span class="preprocessor"></span>
-<a name="l00149"></a>00149   <span class="comment">// If no connection and we've output all samples in the queue, return.</span>
-<a name="l00150"></a>00150   <span class="keywordflow">if</span> ( !connected_ &amp;&amp; bytesFilled_ == 0 &amp;&amp; bufferCounter_ == 0 ) <span class="keywordflow">return</span> 0.0;
-<a name="l00151"></a>00151 
-<a name="l00152"></a>00152   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00153"></a>00153 }
-<a name="l00154"></a>00154 
-<a name="l00155"></a>00155 } <span class="comment">// stk namespace</span>
-<a name="l00156"></a>00156 
-<a name="l00157"></a>00157 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/InetWvIn_8h_source.html b/doc/html/InetWvIn_8h_source.html
index 90043e2..c42e0e7 100644
--- a/doc/html/InetWvIn_8h_source.html
+++ b/doc/html/InetWvIn_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>InetWvIn.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_INETWVIN_H</span>
@@ -89,7 +89,7 @@
 <a name="l00141"></a>00141 {
 <a name="l00142"></a>00142 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00143"></a>00143 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= data_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00144"></a>00144     errorString_ &lt;&lt; <span class="stringliteral">&quot;InetWvIn::lastOut(): channel argument and data stream are incompatible!&quot;</span>;
+<a name="l00144"></a>00144     oStream_ &lt;&lt; <span class="stringliteral">&quot;InetWvIn::lastOut(): channel argument and data stream are incompatible!&quot;</span>;
 <a name="l00145"></a>00145     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00146"></a>00146   }
 <a name="l00147"></a>00147 <span class="preprocessor">#endif</span>
@@ -108,7 +108,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/InetWvOut_8h-source.html b/doc/html/InetWvOut_8h-source.html
deleted file mode 100644
index ae1e0d5..0000000
--- a/doc/html/InetWvOut_8h-source.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>InetWvOut.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_INETWVOUT_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_INETWVOUT_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "WvOut.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Socket.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 <span class="comment">/***************************************************/</span>
-<a name="l00031"></a>00031 
-<a name="l00032"></a><a class="code" href="classstk_1_1InetWvOut.html">00032</a> <span class="keyword">class </span><a class="code" href="classstk_1_1InetWvOut.html" title="STK internet streaming output class.">InetWvOut</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1WvOut.html" title="STK audio output abstract base class.">WvOut</a>
-<a name="l00033"></a>00033 {
-<a name="l00034"></a>00034  <span class="keyword">public</span>:
-<a name="l00036"></a>00036   <a class="code" href="classstk_1_1InetWvOut.html#cc7c0b00c68cb76d1b15e7187d67a966" title="Default constructor ... the socket is not instantiated.">InetWvOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> packetFrames = 1024 );
-<a name="l00037"></a>00037 
-<a name="l00039"></a>00039 
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1InetWvOut.html#cc7c0b00c68cb76d1b15e7187d67a966" title="Default constructor ... the socket is not instantiated.">InetWvOut</a>( <span class="keywordtype">int</span> port, Socket::ProtocolType protocol = Socket::PROTO_TCP,
-<a name="l00043"></a>00043              std::string hostname = <span class="stringliteral">"localhost"</span>, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1, Stk::StkFormat format = <a class="code" href="classstk_1_1Stk.html#5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a>,
-<a name="l00044"></a>00044              <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> packetFrames = 1024 );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <a class="code" href="classstk_1_1InetWvOut.html#e58f286de491788df700479f88b3c625" title="Class destructor.">~InetWvOut</a>();
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1InetWvOut.html#4c8b6fb25c6d751b7929bec9a2d04a53" title="Connect to the specified host and port and prepare to stream nChannels of data in...">connect</a>( <span class="keywordtype">int</span> port, Socket::ProtocolType protocol = Socket::PROTO_TCP,
-<a name="l00054"></a>00054                 std::string hostname = <span class="stringliteral">"localhost"</span>, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1, Stk::StkFormat format = <a class="code" href="classstk_1_1Stk.html#5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a> );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1InetWvOut.html#2314d2e2d005c5b08aa24d21075af638" title="If a connection is open, write out remaining samples in the queue and then disconnect...">disconnect</a>( <span class="keywordtype">void</span> );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060 
-<a name="l00065"></a>00065   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1InetWvOut.html#800f77228d851a2d276fae6a24bcdc9a" title="Output a single sample to all channels in a sample frame.">tick</a>( <span class="keyword">const</span> StkFloat sample );
-<a name="l00066"></a>00066 
-<a name="l00068"></a>00068 
-<a name="l00077"></a>00077   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1InetWvOut.html#800f77228d851a2d276fae6a24bcdc9a" title="Output a single sample to all channels in a sample frame.">tick</a>( <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
-<a name="l00078"></a>00078 
-<a name="l00079"></a>00079  <span class="keyword">protected</span>:
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081   <span class="keywordtype">void</span> incrementFrame( <span class="keywordtype">void</span> );
-<a name="l00082"></a>00082 
-<a name="l00083"></a>00083   <span class="comment">// Write a buffer of length frames via the socket connection.</span>
-<a name="l00084"></a>00084   <span class="keywordtype">void</span> writeData( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> frames );
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086   <span class="keywordtype">char</span> *buffer_;
-<a name="l00087"></a>00087   <a class="code" href="classstk_1_1Socket.html" title="STK internet socket abstract base class.">Socket</a> *soket_;
-<a name="l00088"></a>00088   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bufferFrames_;
-<a name="l00089"></a>00089   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bufferBytes_;
-<a name="l00090"></a>00090   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> bufferIndex_;
-<a name="l00091"></a>00091   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> iData_;
-<a name="l00092"></a>00092   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> dataBytes_;
-<a name="l00093"></a>00093   Stk::StkFormat dataType_;
-<a name="l00094"></a>00094 };
-<a name="l00095"></a>00095 
-<a name="l00096"></a>00096 } <span class="comment">// stk namespace</span>
-<a name="l00097"></a>00097 
-<a name="l00098"></a>00098 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/InetWvOut_8h_source.html b/doc/html/InetWvOut_8h_source.html
index 122d232..2b98d3e 100644
--- a/doc/html/InetWvOut_8h_source.html
+++ b/doc/html/InetWvOut_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>InetWvOut.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_INETWVOUT_H</span>
@@ -72,7 +72,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Instrmnt_8h-source.html b/doc/html/Instrmnt_8h-source.html
deleted file mode 100644
index 34af760..0000000
--- a/doc/html/Instrmnt_8h-source.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Instrmnt.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_INSTRMNT_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_INSTRMNT_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00017"></a>00017 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 
-<a name="l00019"></a><a class="code" href="classstk_1_1Instrmnt.html">00019</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00020"></a>00020 {
-<a name="l00021"></a>00021  <span class="keyword">public</span>:
-<a name="l00023"></a><a class="code" href="classstk_1_1Instrmnt.html#6f3c4dc01e0484f0ca4a3b14f1b7caf0">00023</a>   <a class="code" href="classstk_1_1Instrmnt.html#6f3c4dc01e0484f0ca4a3b14f1b7caf0" title="Class constructor.">Instrmnt</a>( <span class="keywordtype">void</span> ) { lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( 1, 1, 0.0 ); };
-<a name="l00024"></a>00024 
-<a name="l00026"></a>00026   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Instrmnt.html#0736ccd253b446660938d51909a32f44" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude ) = 0;
-<a name="l00027"></a>00027 
-<a name="l00029"></a>00029   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Instrmnt.html#582c77e71cd2c5cb46ba6f78fa0ac6a2" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude ) = 0;
-<a name="l00030"></a>00030 
-<a name="l00032"></a>00032   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Instrmnt.html#597efc508ad367a308fa11b8cbdc96a7" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00033"></a>00033 
-<a name="l00035"></a>00035   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Instrmnt.html#5aecf9f4d4dcecdbef8271c7fe62b2cf" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>(<span class="keywordtype">int</span> number, StkFloat value);
-<a name="l00036"></a>00036 
-<a name="l00038"></a><a class="code" href="classstk_1_1Instrmnt.html#32564b611598653fce5e708821b3fcb4">00038</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Instrmnt.html#32564b611598653fce5e708821b3fcb4" title="Return the number of output channels for the class.">channelsOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(); };
-<a name="l00039"></a>00039 
-<a name="l00041"></a><a class="code" href="classstk_1_1Instrmnt.html#277ac5149ec22c33d794dfd462a82d2b">00041</a>   <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Instrmnt.html#277ac5149ec22c33d794dfd462a82d2b" title="Return an StkFrames reference to the last output sample frame.">lastFrame</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_; };
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044 
-<a name="l00052"></a>00052   StkFloat <a class="code" href="classstk_1_1Instrmnt.html#aa6bd5e4a5be7f9b0be967daf012872e" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00053"></a>00053 
-<a name="l00055"></a>00055 
-<a name="l00058"></a>00058   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1Instrmnt.html#d5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061 
-<a name="l00068"></a>00068   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Instrmnt.html#d5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00069"></a>00069 
-<a name="l00070"></a>00070  <span class="keyword">protected</span>:
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> lastFrame_;
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074 };
-<a name="l00075"></a>00075 
-<a name="l00076"></a><a class="code" href="classstk_1_1Instrmnt.html#597efc508ad367a308fa11b8cbdc96a7">00076</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Instrmnt.html#597efc508ad367a308fa11b8cbdc96a7" title="Set instrument parameters for a particular frequency.">Instrmnt :: setFrequency</a>(StkFloat frequency)
-<a name="l00077"></a>00077 {
-<a name="l00078"></a>00078   errorString_ &lt;&lt; <span class="stringliteral">"Instrmnt::setFrequency: virtual setFrequency function call!"</span>;
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
-<a name="l00080"></a>00080 }
-<a name="l00081"></a>00081 
-<a name="l00082"></a><a class="code" href="classstk_1_1Instrmnt.html#aa6bd5e4a5be7f9b0be967daf012872e">00082</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Instrmnt.html#aa6bd5e4a5be7f9b0be967daf012872e" title="Return the specified channel value of the last computed frame.">Instrmnt :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00083"></a>00083 {
-<a name="l00084"></a>00084 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00085"></a>00085 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00086"></a>00086     errorString_ &lt;&lt; <span class="stringliteral">"Instrmnt::lastOut(): channel argument is invalid!"</span>;
-<a name="l00087"></a>00087     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00088"></a>00088   }
-<a name="l00089"></a>00089 <span class="preprocessor">#endif</span>
-<a name="l00090"></a>00090 <span class="preprocessor"></span>
-<a name="l00091"></a>00091   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00092"></a>00092 }
-<a name="l00093"></a>00093 
-<a name="l00094"></a><a class="code" href="classstk_1_1Instrmnt.html#4abfe94b5fc8d87b47729fe317222eb9">00094</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Instrmnt.html#d5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">Instrmnt :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00095"></a>00095 {
-<a name="l00096"></a>00096   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00097"></a>00097 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00098"></a>00098 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
-<a name="l00099"></a>00099     errorString_ &lt;&lt; <span class="stringliteral">"Instrmnt::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00100"></a>00100     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00101"></a>00101   }
-<a name="l00102"></a>00102 <span class="preprocessor">#endif</span>
-<a name="l00103"></a>00103 <span class="preprocessor"></span>
-<a name="l00104"></a>00104   StkFloat *samples = &amp;frames[channel];
-<a name="l00105"></a>00105   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
-<a name="l00106"></a>00106   <span class="keywordflow">if</span> ( nChannels == 1 ) {
-<a name="l00107"></a>00107     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00108"></a>00108       *samples++ = <a class="code" href="classstk_1_1Instrmnt.html#d5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">tick</a>();
-<a name="l00109"></a>00109   }
-<a name="l00110"></a>00110   <span class="keywordflow">else</span> {
-<a name="l00111"></a>00111     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00112"></a>00112       *samples++ = <a class="code" href="classstk_1_1Instrmnt.html#d5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">tick</a>();
-<a name="l00113"></a>00113       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
-<a name="l00114"></a>00114         *samples++ = lastFrame_[j];
-<a name="l00115"></a>00115     }
-<a name="l00116"></a>00116   }
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   <span class="keywordflow">return</span> frames;
-<a name="l00119"></a>00119 }
-<a name="l00120"></a>00120 
-<a name="l00121"></a><a class="code" href="classstk_1_1Instrmnt.html#5aecf9f4d4dcecdbef8271c7fe62b2cf">00121</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Instrmnt.html#5aecf9f4d4dcecdbef8271c7fe62b2cf" title="Perform the control change specified by number and value (0.0 - 128.0).">Instrmnt :: controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value )
-<a name="l00122"></a>00122 {
-<a name="l00123"></a>00123   errorString_ &lt;&lt; <span class="stringliteral">"Instrmnt::controlChange: virtual function call!"</span>;
-<a name="l00124"></a>00124   <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
-<a name="l00125"></a>00125 }
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127 } <span class="comment">// stk namespace</span>
-<a name="l00128"></a>00128 
-<a name="l00129"></a>00129 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Instrmnt_8h_source.html b/doc/html/Instrmnt_8h_source.html
index c1013d2..943cc87 100644
--- a/doc/html/Instrmnt_8h_source.html
+++ b/doc/html/Instrmnt_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Instrmnt.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_INSTRMNT_H</span>
@@ -46,7 +46,7 @@
 <a name="l00058"></a>00058   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1Instrmnt.html#ad5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
 <a name="l00059"></a>00059 
 <a name="l00061"></a>00061 
-<a name="l00068"></a>00068   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Instrmnt.html#ad5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00068"></a>00068   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Instrmnt.html#ad5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
 <a name="l00069"></a>00069 
 <a name="l00070"></a>00070  <span class="keyword">protected</span>:
 <a name="l00071"></a>00071 
@@ -54,9 +54,9 @@
 <a name="l00073"></a>00073 
 <a name="l00074"></a>00074 };
 <a name="l00075"></a>00075 
-<a name="l00076"></a><a class="code" href="classstk_1_1Instrmnt.html#a597efc508ad367a308fa11b8cbdc96a7">00076</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Instrmnt.html#a597efc508ad367a308fa11b8cbdc96a7" title="Set instrument parameters for a particular frequency.">Instrmnt :: setFrequency</a>(StkFloat frequency)
+<a name="l00076"></a><a class="code" href="classstk_1_1Instrmnt.html#a597efc508ad367a308fa11b8cbdc96a7">00076</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Instrmnt.html#a597efc508ad367a308fa11b8cbdc96a7" title="Set instrument parameters for a particular frequency.">Instrmnt :: setFrequency</a>( StkFloat frequency )
 <a name="l00077"></a>00077 {
-<a name="l00078"></a>00078   errorString_ &lt;&lt; <span class="stringliteral">&quot;Instrmnt::setFrequency: virtual setFrequency function call!&quot;</span>;
+<a name="l00078"></a>00078   oStream_ &lt;&lt; <span class="stringliteral">&quot;Instrmnt::setFrequency: virtual setFrequency function call!&quot;</span>;
 <a name="l00079"></a>00079   <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
 <a name="l00080"></a>00080 }
 <a name="l00081"></a>00081 
@@ -64,7 +64,7 @@
 <a name="l00083"></a>00083 {
 <a name="l00084"></a>00084 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00085"></a>00085 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00086"></a>00086     errorString_ &lt;&lt; <span class="stringliteral">&quot;Instrmnt::lastOut(): channel argument is invalid!&quot;</span>;
+<a name="l00086"></a>00086     oStream_ &lt;&lt; <span class="stringliteral">&quot;Instrmnt::lastOut(): channel argument is invalid!&quot;</span>;
 <a name="l00087"></a>00087     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00088"></a>00088   }
 <a name="l00089"></a>00089 <span class="preprocessor">#endif</span>
@@ -72,48 +72,21 @@
 <a name="l00091"></a>00091   <span class="keywordflow">return</span> lastFrame_[channel];
 <a name="l00092"></a>00092 }
 <a name="l00093"></a>00093 
-<a name="l00094"></a><a class="code" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">00094</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Instrmnt.html#ad5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">Instrmnt :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00094"></a><a class="code" href="classstk_1_1Instrmnt.html#a5aecf9f4d4dcecdbef8271c7fe62b2cf">00094</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Instrmnt.html#a5aecf9f4d4dcecdbef8271c7fe62b2cf" title="Perform the control change specified by number and value (0.0 - 128.0).">Instrmnt :: controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value )
 <a name="l00095"></a>00095 {
-<a name="l00096"></a>00096   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00097"></a>00097 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00098"></a>00098 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
-<a name="l00099"></a>00099     errorString_ &lt;&lt; <span class="stringliteral">&quot;Instrmnt::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00100"></a>00100     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00101"></a>00101   }
+<a name="l00096"></a>00096   oStream_ &lt;&lt; <span class="stringliteral">&quot;Instrmnt::controlChange: virtual function call!&quot;</span>;
+<a name="l00097"></a>00097   <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
+<a name="l00098"></a>00098 }
+<a name="l00099"></a>00099 
+<a name="l00100"></a>00100 } <span class="comment">// stk namespace</span>
+<a name="l00101"></a>00101 
 <a name="l00102"></a>00102 <span class="preprocessor">#endif</span>
-<a name="l00103"></a>00103 <span class="preprocessor"></span>
-<a name="l00104"></a>00104   StkFloat *samples = &amp;frames[channel];
-<a name="l00105"></a>00105   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
-<a name="l00106"></a>00106   <span class="keywordflow">if</span> ( nChannels == 1 ) {
-<a name="l00107"></a>00107     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00108"></a>00108       *samples++ = <a class="code" href="classstk_1_1Instrmnt.html#ad5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">tick</a>();
-<a name="l00109"></a>00109   }
-<a name="l00110"></a>00110   <span class="keywordflow">else</span> {
-<a name="l00111"></a>00111     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00112"></a>00112       *samples++ = <a class="code" href="classstk_1_1Instrmnt.html#ad5d070c1fc6f93124dfed2a27b8e3cf1" title="Compute one sample frame and return the specified channel value.">tick</a>();
-<a name="l00113"></a>00113       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
-<a name="l00114"></a>00114         *samples++ = lastFrame_[j];
-<a name="l00115"></a>00115     }
-<a name="l00116"></a>00116   }
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   <span class="keywordflow">return</span> frames;
-<a name="l00119"></a>00119 }
-<a name="l00120"></a>00120 
-<a name="l00121"></a><a class="code" href="classstk_1_1Instrmnt.html#a5aecf9f4d4dcecdbef8271c7fe62b2cf">00121</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Instrmnt.html#a5aecf9f4d4dcecdbef8271c7fe62b2cf" title="Perform the control change specified by number and value (0.0 - 128.0).">Instrmnt :: controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value )
-<a name="l00122"></a>00122 {
-<a name="l00123"></a>00123   errorString_ &lt;&lt; <span class="stringliteral">&quot;Instrmnt::controlChange: virtual function call!&quot;</span>;
-<a name="l00124"></a>00124   <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
-<a name="l00125"></a>00125 }
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127 } <span class="comment">// stk namespace</span>
-<a name="l00128"></a>00128 
-<a name="l00129"></a>00129 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/JCRev_8h-source.html b/doc/html/JCRev_8h-source.html
deleted file mode 100644
index e222c0a..0000000
--- a/doc/html/JCRev_8h-source.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>JCRev.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_JCREV_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_JCREV_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Effect.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Delay.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00022"></a>00022 <span class="comment">/***************************************************/</span>
-<a name="l00023"></a>00023 
-<a name="l00024"></a><a class="code" href="classstk_1_1JCRev.html">00024</a> <span class="keyword">class </span><a class="code" href="classstk_1_1JCRev.html" title="John Chowning&amp;#39;s reverberator class.">JCRev</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Effect.html" title="STK abstract effects parent class.">Effect</a>
-<a name="l00025"></a>00025 {
-<a name="l00026"></a>00026  <span class="keyword">public</span>:
-<a name="l00028"></a>00028   <a class="code" href="classstk_1_1JCRev.html#5b9f0e2b7acc1fcb94a663353f1253dd" title="Class constructor taking a T60 decay time argument (one second default value).">JCRev</a>( StkFloat T60 = 1.0 );
-<a name="l00029"></a>00029 
-<a name="l00031"></a>00031   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1JCRev.html#bf92e9783e4a738b6d3a3350bfae986e" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1JCRev.html#8f4caa6de1e662c76b853ebab814a2eb" title="Set the reverberation T60 decay time.">setT60</a>( StkFloat T60 );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037 
-<a name="l00045"></a>00045   StkFloat <a class="code" href="classstk_1_1JCRev.html#599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048 
-<a name="l00055"></a>00055   StkFloat <a class="code" href="classstk_1_1JCRev.html#d667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058 
-<a name="l00067"></a>00067   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1JCRev.html#d667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00068"></a>00068 
-<a name="l00070"></a>00070 
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1JCRev.html#d667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081  <span class="keyword">protected</span>:
-<a name="l00082"></a>00082 
-<a name="l00083"></a>00083   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> allpassDelays_[3];
-<a name="l00084"></a>00084   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> combDelays_[4];
-<a name="l00085"></a>00085   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> outLeftDelay_;
-<a name="l00086"></a>00086   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> outRightDelay_;
-<a name="l00087"></a>00087   StkFloat allpassCoefficient_;
-<a name="l00088"></a>00088   StkFloat combCoefficient_[4];
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 };
-<a name="l00091"></a>00091 
-<a name="l00092"></a><a class="code" href="classstk_1_1JCRev.html#599e46bcfbc2b4b9a30a30d67580412b">00092</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1JCRev.html#599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">JCRev :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00093"></a>00093 {
-<a name="l00094"></a>00094 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00095"></a>00095 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00096"></a>00096     errorString_ &lt;&lt; <span class="stringliteral">"JCRev::lastOut(): channel argument must be less than 2!"</span>;
-<a name="l00097"></a>00097     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00098"></a>00098   }
-<a name="l00099"></a>00099 <span class="preprocessor">#endif</span>
-<a name="l00100"></a>00100 <span class="preprocessor"></span>
-<a name="l00101"></a>00101   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00102"></a>00102 }
-<a name="l00103"></a>00103 
-<a name="l00104"></a><a class="code" href="classstk_1_1JCRev.html#d667b48a6dbd663f2d7c49e201325f00">00104</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1JCRev.html#d667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">JCRev :: tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00105"></a>00105 {
-<a name="l00106"></a>00106 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00107"></a>00107 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00108"></a>00108     errorString_ &lt;&lt; <span class="stringliteral">"JCRev::tick(): channel argument must be less than 2!"</span>;
-<a name="l00109"></a>00109     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00110"></a>00110   }
-<a name="l00111"></a>00111 <span class="preprocessor">#endif</span>
-<a name="l00112"></a>00112 <span class="preprocessor"></span>
-<a name="l00113"></a>00113   StkFloat temp, temp0, temp1, temp2, temp3, temp4, temp5, temp6;
-<a name="l00114"></a>00114   StkFloat filtout;
-<a name="l00115"></a>00115 
-<a name="l00116"></a>00116   temp = allpassDelays_[0].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00117"></a>00117   temp0 = allpassCoefficient_ * temp;
-<a name="l00118"></a>00118   temp0 += input;
-<a name="l00119"></a>00119   allpassDelays_[0].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp0);
-<a name="l00120"></a>00120   temp0 = -(allpassCoefficient_ * temp0) + temp;
-<a name="l00121"></a>00121     
-<a name="l00122"></a>00122   temp = allpassDelays_[1].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00123"></a>00123   temp1 = allpassCoefficient_ * temp;
-<a name="l00124"></a>00124   temp1 += temp0;
-<a name="l00125"></a>00125   allpassDelays_[1].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp1);
-<a name="l00126"></a>00126   temp1 = -(allpassCoefficient_ * temp1) + temp;
-<a name="l00127"></a>00127     
-<a name="l00128"></a>00128   temp = allpassDelays_[2].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00129"></a>00129   temp2 = allpassCoefficient_ * temp;
-<a name="l00130"></a>00130   temp2 += temp1;
-<a name="l00131"></a>00131   allpassDelays_[2].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp2);
-<a name="l00132"></a>00132   temp2 = -(allpassCoefficient_ * temp2) + temp;
-<a name="l00133"></a>00133     
-<a name="l00134"></a>00134   temp3 = temp2 + (combCoefficient_[0] * combDelays_[0].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00135"></a>00135   temp4 = temp2 + (combCoefficient_[1] * combDelays_[1].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00136"></a>00136   temp5 = temp2 + (combCoefficient_[2] * combDelays_[2].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00137"></a>00137   temp6 = temp2 + (combCoefficient_[3] * combDelays_[3].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00138"></a>00138 
-<a name="l00139"></a>00139   combDelays_[0].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp3);
-<a name="l00140"></a>00140   combDelays_[1].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp4);
-<a name="l00141"></a>00141   combDelays_[2].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp5);
-<a name="l00142"></a>00142   combDelays_[3].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp6);
-<a name="l00143"></a>00143 
-<a name="l00144"></a>00144   filtout = temp3 + temp4 + temp5 + temp6;
-<a name="l00145"></a>00145 
-<a name="l00146"></a>00146   lastFrame_[0] = effectMix_ * (outLeftDelay_.<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(filtout));
-<a name="l00147"></a>00147   lastFrame_[1] = effectMix_ * (outRightDelay_.<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(filtout));
-<a name="l00148"></a>00148   temp = (1.0 - effectMix_) * input;
-<a name="l00149"></a>00149   lastFrame_[0] += temp;
-<a name="l00150"></a>00150   lastFrame_[1] += temp;
-<a name="l00151"></a>00151     
-<a name="l00152"></a>00152   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00153"></a>00153 }
-<a name="l00154"></a>00154 
-<a name="l00155"></a>00155 } <span class="comment">// stk namespace</span>
-<a name="l00156"></a>00156 
-<a name="l00157"></a>00157 <span class="preprocessor">#endif</span>
-<a name="l00158"></a>00158 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/JCRev_8h_source.html b/doc/html/JCRev_8h_source.html
index cc8b67d..d6554de 100644
--- a/doc/html/JCRev_8h_source.html
+++ b/doc/html/JCRev_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>JCRev.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_JCREV_H</span>
@@ -17,117 +17,119 @@
 <a name="l00003"></a>00003 <span class="preprocessor"></span>
 <a name="l00004"></a>00004 <span class="preprocessor">#include &quot;Effect.h&quot;</span>
 <a name="l00005"></a>00005 <span class="preprocessor">#include &quot;Delay.h&quot;</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00022"></a>00022 <span class="comment">/***************************************************/</span>
-<a name="l00023"></a>00023 
-<a name="l00024"></a><a class="code" href="classstk_1_1JCRev.html">00024</a> <span class="keyword">class </span><a class="code" href="classstk_1_1JCRev.html" title="John Chowning&amp;#39;s reverberator class.">JCRev</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Effect.html" title="STK abstract effects parent class.">Effect</a>
-<a name="l00025"></a>00025 {
-<a name="l00026"></a>00026  <span class="keyword">public</span>:
-<a name="l00028"></a>00028   <a class="code" href="classstk_1_1JCRev.html#a5b9f0e2b7acc1fcb94a663353f1253dd" title="Class constructor taking a T60 decay time argument (one second default value).">JCRev</a>( StkFloat T60 = 1.0 );
-<a name="l00029"></a>00029 
-<a name="l00031"></a>00031   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1JCRev.html#abf92e9783e4a738b6d3a3350bfae986e" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1JCRev.html#a8f4caa6de1e662c76b853ebab814a2eb" title="Set the reverberation T60 decay time.">setT60</a>( StkFloat T60 );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037 
-<a name="l00045"></a>00045   StkFloat <a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048 
-<a name="l00055"></a>00055   StkFloat <a class="code" href="classstk_1_1JCRev.html#ad667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058 
-<a name="l00067"></a>00067   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1JCRev.html#ad667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00068"></a>00068 
-<a name="l00070"></a>00070 
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1JCRev.html#ad667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081  <span class="keyword">protected</span>:
-<a name="l00082"></a>00082 
-<a name="l00083"></a>00083   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> allpassDelays_[3];
-<a name="l00084"></a>00084   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> combDelays_[4];
-<a name="l00085"></a>00085   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> outLeftDelay_;
-<a name="l00086"></a>00086   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> outRightDelay_;
-<a name="l00087"></a>00087   StkFloat allpassCoefficient_;
-<a name="l00088"></a>00088   StkFloat combCoefficient_[4];
+<a name="l00006"></a>00006 <span class="preprocessor">#include &quot;OnePole.h&quot;</span>
+<a name="l00007"></a>00007 
+<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
+<a name="l00009"></a>00009 
+<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
+<a name="l00029"></a>00029 <span class="comment">/***************************************************/</span>
+<a name="l00030"></a>00030 
+<a name="l00031"></a><a class="code" href="classstk_1_1JCRev.html">00031</a> <span class="keyword">class </span><a class="code" href="classstk_1_1JCRev.html" title="John Chowning&amp;#39;s reverberator class.">JCRev</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Effect.html" title="STK abstract effects parent class.">Effect</a>
+<a name="l00032"></a>00032 {
+<a name="l00033"></a>00033  <span class="keyword">public</span>:
+<a name="l00035"></a>00035   <a class="code" href="classstk_1_1JCRev.html#a5b9f0e2b7acc1fcb94a663353f1253dd" title="Class constructor taking a T60 decay time argument (one second default value).">JCRev</a>( StkFloat T60 = 1.0 );
+<a name="l00036"></a>00036 
+<a name="l00038"></a>00038   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1JCRev.html#abf92e9783e4a738b6d3a3350bfae986e" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
+<a name="l00039"></a>00039 
+<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1JCRev.html#a8f4caa6de1e662c76b853ebab814a2eb" title="Set the reverberation T60 decay time.">setT60</a>( StkFloat T60 );
+<a name="l00042"></a>00042 
+<a name="l00044"></a>00044 
+<a name="l00052"></a>00052   StkFloat <a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00053"></a>00053 
+<a name="l00055"></a>00055 
+<a name="l00062"></a>00062   StkFloat <a class="code" href="classstk_1_1JCRev.html#ad667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00063"></a>00063 
+<a name="l00065"></a>00065 
+<a name="l00074"></a>00074   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1JCRev.html#ad667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00075"></a>00075 
+<a name="l00077"></a>00077 
+<a name="l00086"></a>00086   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1JCRev.html#ad667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
+<a name="l00087"></a>00087 
+<a name="l00088"></a>00088  <span class="keyword">protected</span>:
 <a name="l00089"></a>00089 
-<a name="l00090"></a>00090 };
-<a name="l00091"></a>00091 
-<a name="l00092"></a><a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b">00092</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">JCRev :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00093"></a>00093 {
-<a name="l00094"></a>00094 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00095"></a>00095 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00096"></a>00096     errorString_ &lt;&lt; <span class="stringliteral">&quot;JCRev::lastOut(): channel argument must be less than 2!&quot;</span>;
-<a name="l00097"></a>00097     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00098"></a>00098   }
-<a name="l00099"></a>00099 <span class="preprocessor">#endif</span>
-<a name="l00100"></a>00100 <span class="preprocessor"></span>
-<a name="l00101"></a>00101   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00102"></a>00102 }
-<a name="l00103"></a>00103 
-<a name="l00104"></a><a class="code" href="classstk_1_1JCRev.html#ad667b48a6dbd663f2d7c49e201325f00">00104</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1JCRev.html#ad667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">JCRev :: tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00105"></a>00105 {
-<a name="l00106"></a>00106 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00107"></a>00107 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00108"></a>00108     errorString_ &lt;&lt; <span class="stringliteral">&quot;JCRev::tick(): channel argument must be less than 2!&quot;</span>;
-<a name="l00109"></a>00109     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00110"></a>00110   }
-<a name="l00111"></a>00111 <span class="preprocessor">#endif</span>
-<a name="l00112"></a>00112 <span class="preprocessor"></span>
-<a name="l00113"></a>00113   StkFloat temp, temp0, temp1, temp2, temp3, temp4, temp5, temp6;
-<a name="l00114"></a>00114   StkFloat filtout;
-<a name="l00115"></a>00115 
-<a name="l00116"></a>00116   temp = allpassDelays_[0].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00117"></a>00117   temp0 = allpassCoefficient_ * temp;
-<a name="l00118"></a>00118   temp0 += input;
-<a name="l00119"></a>00119   allpassDelays_[0].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp0);
-<a name="l00120"></a>00120   temp0 = -(allpassCoefficient_ * temp0) + temp;
-<a name="l00121"></a>00121     
-<a name="l00122"></a>00122   temp = allpassDelays_[1].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00123"></a>00123   temp1 = allpassCoefficient_ * temp;
-<a name="l00124"></a>00124   temp1 += temp0;
-<a name="l00125"></a>00125   allpassDelays_[1].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp1);
-<a name="l00126"></a>00126   temp1 = -(allpassCoefficient_ * temp1) + temp;
-<a name="l00127"></a>00127     
-<a name="l00128"></a>00128   temp = allpassDelays_[2].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00129"></a>00129   temp2 = allpassCoefficient_ * temp;
-<a name="l00130"></a>00130   temp2 += temp1;
-<a name="l00131"></a>00131   allpassDelays_[2].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp2);
-<a name="l00132"></a>00132   temp2 = -(allpassCoefficient_ * temp2) + temp;
-<a name="l00133"></a>00133     
-<a name="l00134"></a>00134   temp3 = temp2 + (combCoefficient_[0] * combDelays_[0].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00135"></a>00135   temp4 = temp2 + (combCoefficient_[1] * combDelays_[1].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00136"></a>00136   temp5 = temp2 + (combCoefficient_[2] * combDelays_[2].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00137"></a>00137   temp6 = temp2 + (combCoefficient_[3] * combDelays_[3].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00138"></a>00138 
-<a name="l00139"></a>00139   combDelays_[0].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp3);
-<a name="l00140"></a>00140   combDelays_[1].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp4);
-<a name="l00141"></a>00141   combDelays_[2].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp5);
-<a name="l00142"></a>00142   combDelays_[3].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp6);
-<a name="l00143"></a>00143 
-<a name="l00144"></a>00144   filtout = temp3 + temp4 + temp5 + temp6;
-<a name="l00145"></a>00145 
-<a name="l00146"></a>00146   lastFrame_[0] = effectMix_ * (outLeftDelay_.<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(filtout));
-<a name="l00147"></a>00147   lastFrame_[1] = effectMix_ * (outRightDelay_.<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(filtout));
-<a name="l00148"></a>00148   temp = (1.0 - effectMix_) * input;
-<a name="l00149"></a>00149   lastFrame_[0] += temp;
-<a name="l00150"></a>00150   lastFrame_[1] += temp;
-<a name="l00151"></a>00151     
-<a name="l00152"></a>00152   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00153"></a>00153 }
-<a name="l00154"></a>00154 
-<a name="l00155"></a>00155 } <span class="comment">// stk namespace</span>
-<a name="l00156"></a>00156 
-<a name="l00157"></a>00157 <span class="preprocessor">#endif</span>
-<a name="l00158"></a>00158 <span class="preprocessor"></span>
+<a name="l00090"></a>00090   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> allpassDelays_[3];
+<a name="l00091"></a>00091   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> combDelays_[4];
+<a name="l00092"></a>00092   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a> combFilters_[4];
+<a name="l00093"></a>00093   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> outLeftDelay_;
+<a name="l00094"></a>00094   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> outRightDelay_;
+<a name="l00095"></a>00095   StkFloat allpassCoefficient_;
+<a name="l00096"></a>00096   StkFloat combCoefficient_[4];
+<a name="l00097"></a>00097 
+<a name="l00098"></a>00098 };
+<a name="l00099"></a>00099 
+<a name="l00100"></a><a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b">00100</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">JCRev :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00101"></a>00101 {
+<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
+<a name="l00104"></a>00104     oStream_ &lt;&lt; <span class="stringliteral">&quot;JCRev::lastOut(): channel argument must be less than 2!&quot;</span>;
+<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00106"></a>00106   }
+<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span>
+<a name="l00109"></a>00109   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00110"></a>00110 }
+<a name="l00111"></a>00111 
+<a name="l00112"></a><a class="code" href="classstk_1_1JCRev.html#ad667b48a6dbd663f2d7c49e201325f00">00112</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1JCRev.html#ad667b48a6dbd663f2d7c49e201325f00" title="Input one sample to the effect and return the specified channel value of the computed...">JCRev :: tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00113"></a>00113 {
+<a name="l00114"></a>00114 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00115"></a>00115 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
+<a name="l00116"></a>00116     oStream_ &lt;&lt; <span class="stringliteral">&quot;JCRev::tick(): channel argument must be less than 2!&quot;</span>;
+<a name="l00117"></a>00117     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00118"></a>00118   }
+<a name="l00119"></a>00119 <span class="preprocessor">#endif</span>
+<a name="l00120"></a>00120 <span class="preprocessor"></span>
+<a name="l00121"></a>00121   StkFloat temp, temp0, temp1, temp2, temp3, temp4, temp5, temp6;
+<a name="l00122"></a>00122   StkFloat filtout;
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124   temp = allpassDelays_[0].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
+<a name="l00125"></a>00125   temp0 = allpassCoefficient_ * temp;
+<a name="l00126"></a>00126   temp0 += input;
+<a name="l00127"></a>00127   allpassDelays_[0].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp0);
+<a name="l00128"></a>00128   temp0 = -(allpassCoefficient_ * temp0) + temp;
+<a name="l00129"></a>00129     
+<a name="l00130"></a>00130   temp = allpassDelays_[1].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
+<a name="l00131"></a>00131   temp1 = allpassCoefficient_ * temp;
+<a name="l00132"></a>00132   temp1 += temp0;
+<a name="l00133"></a>00133   allpassDelays_[1].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp1);
+<a name="l00134"></a>00134   temp1 = -(allpassCoefficient_ * temp1) + temp;
+<a name="l00135"></a>00135     
+<a name="l00136"></a>00136   temp = allpassDelays_[2].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
+<a name="l00137"></a>00137   temp2 = allpassCoefficient_ * temp;
+<a name="l00138"></a>00138   temp2 += temp1;
+<a name="l00139"></a>00139   allpassDelays_[2].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp2);
+<a name="l00140"></a>00140   temp2 = -(allpassCoefficient_ * temp2) + temp;
+<a name="l00141"></a>00141     
+<a name="l00142"></a>00142   temp3 = temp2 + ( combFilters_[0].<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( combCoefficient_[0] * combDelays_[0].<a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>() ) );
+<a name="l00143"></a>00143   temp4 = temp2 + ( combFilters_[1].<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( combCoefficient_[1] * combDelays_[1].<a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>() ) );
+<a name="l00144"></a>00144   temp5 = temp2 + ( combFilters_[2].<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( combCoefficient_[2] * combDelays_[2].<a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>() ) );
+<a name="l00145"></a>00145   temp6 = temp2 + ( combFilters_[3].<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( combCoefficient_[3] * combDelays_[3].<a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>() ) );
+<a name="l00146"></a>00146 
+<a name="l00147"></a>00147   combDelays_[0].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp3);
+<a name="l00148"></a>00148   combDelays_[1].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp4);
+<a name="l00149"></a>00149   combDelays_[2].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp5);
+<a name="l00150"></a>00150   combDelays_[3].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp6);
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152   filtout = temp3 + temp4 + temp5 + temp6;
+<a name="l00153"></a>00153 
+<a name="l00154"></a>00154   lastFrame_[0] = effectMix_ * (outLeftDelay_.<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(filtout));
+<a name="l00155"></a>00155   lastFrame_[1] = effectMix_ * (outRightDelay_.<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(filtout));
+<a name="l00156"></a>00156   temp = (1.0 - effectMix_) * input;
+<a name="l00157"></a>00157   lastFrame_[0] += temp;
+<a name="l00158"></a>00158   lastFrame_[1] += temp;
+<a name="l00159"></a>00159     
+<a name="l00160"></a>00160   <span class="keywordflow">return</span> 0.7 * lastFrame_[channel];
+<a name="l00161"></a>00161 }
+<a name="l00162"></a>00162 
+<a name="l00163"></a>00163 } <span class="comment">// stk namespace</span>
+<a name="l00164"></a>00164 
+<a name="l00165"></a>00165 <span class="preprocessor">#endif</span>
+<a name="l00166"></a>00166 <span class="preprocessor"></span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/JetTable_8h-source.html b/doc/html/JetTable_8h-source.html
deleted file mode 100644
index 35f9c08..0000000
--- a/doc/html/JetTable_8h-source.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>JetTable.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_JETTABL_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_JETTABL_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Function.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00021"></a>00021 <span class="comment">/***************************************************/</span>
-<a name="l00022"></a>00022 
-<a name="l00023"></a><a class="code" href="classstk_1_1JetTable.html">00023</a> <span class="keyword">class </span><a class="code" href="classstk_1_1JetTable.html" title="STK jet table class.">JetTable</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Function.html" title="STK abstract function parent class.">Function</a>
-<a name="l00024"></a>00024 {
-<a name="l00025"></a>00025 <span class="keyword">public</span>:
-<a name="l00026"></a>00026 
-<a name="l00028"></a>00028   StkFloat <a class="code" href="classstk_1_1JetTable.html#3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">tick</a>( StkFloat input );
-<a name="l00029"></a>00029 
-<a name="l00031"></a>00031 
-<a name="l00039"></a>00039   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1JetTable.html#3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042 
-<a name="l00050"></a>00050   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1JetTable.html#3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00051"></a>00051 
-<a name="l00052"></a>00052 };
-<a name="l00053"></a>00053 
-<a name="l00054"></a><a class="code" href="classstk_1_1JetTable.html#3fb5333e6305abdeee7cd83a10ef76b6">00054</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1JetTable.html#3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">JetTable :: tick</a>( StkFloat input )
-<a name="l00055"></a>00055 {
-<a name="l00056"></a>00056   <span class="comment">// Perform "table lookup" using a polynomial</span>
-<a name="l00057"></a>00057   <span class="comment">// calculation (x^3 - x), which approximates</span>
-<a name="l00058"></a>00058   <span class="comment">// the jet sigmoid behavior.</span>
-<a name="l00059"></a>00059   lastFrame_[0] = input * (input * input - 1.0);
-<a name="l00060"></a>00060 
-<a name="l00061"></a>00061   <span class="comment">// Saturate at +/- 1.0.</span>
-<a name="l00062"></a>00062   <span class="keywordflow">if</span> ( lastFrame_[0] &gt; 1.0 ) lastFrame_[0] = 1.0;
-<a name="l00063"></a>00063   <span class="keywordflow">if</span> ( lastFrame_[0] &lt; -1.0 ) lastFrame_[0] = -1.0; 
-<a name="l00064"></a>00064   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00065"></a>00065 }
-<a name="l00066"></a>00066 
-<a name="l00067"></a><a class="code" href="classstk_1_1JetTable.html#e17ee82b1ed7b185713b4ae0b7c2b0cd">00067</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1JetTable.html#3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">JetTable :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00068"></a>00068 {
-<a name="l00069"></a>00069 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00070"></a>00070 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00071"></a>00071     errorString_ &lt;&lt; <span class="stringliteral">"JetTable::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00072"></a>00072     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00073"></a>00073   }
-<a name="l00074"></a>00074 <span class="preprocessor">#endif</span>
-<a name="l00075"></a>00075 <span class="preprocessor"></span>
-<a name="l00076"></a>00076   StkFloat *samples = &amp;frames[channel];
-<a name="l00077"></a>00077   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00078"></a>00078   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00079"></a>00079     *samples = *samples * (*samples * *samples - 1.0);
-<a name="l00080"></a>00080     <span class="keywordflow">if</span> ( *samples &gt; 1.0) *samples = 1.0;
-<a name="l00081"></a>00081     <span class="keywordflow">if</span> ( *samples &lt; -1.0) *samples = -1.0;
-<a name="l00082"></a>00082   }
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084   lastFrame_[0] = *(samples-hop);
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> frames;
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a><a class="code" href="classstk_1_1JetTable.html#7b261fd07b2325348ef14e3f0ebf8429">00088</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1JetTable.html#3fb5333e6305abdeee7cd83a10ef76b6" title="Take one sample input and map to one sample of output.">JetTable :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00089"></a>00089 {
-<a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00092"></a>00092     errorString_ &lt;&lt; <span class="stringliteral">"JetTable::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00094"></a>00094   }
-<a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
-<a name="l00096"></a>00096 <span class="preprocessor"></span>
-<a name="l00097"></a>00097   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00098"></a>00098   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00100"></a>00100   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00101"></a>00101     *oSamples = *oSamples * (*oSamples * *oSamples - 1.0);
-<a name="l00102"></a>00102     <span class="keywordflow">if</span> ( *oSamples &gt; 1.0) *oSamples = 1.0;
-<a name="l00103"></a>00103     <span class="keywordflow">if</span> ( *oSamples &lt; -1.0) *oSamples = -1.0;
-<a name="l00104"></a>00104   }
-<a name="l00105"></a>00105 
-<a name="l00106"></a>00106   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00107"></a>00107   <span class="keywordflow">return</span> iFrames;
-<a name="l00108"></a>00108 }
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 } <span class="comment">// stk namespace</span>
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/JetTable_8h_source.html b/doc/html/JetTable_8h_source.html
index e5e019b..35f8f87 100644
--- a/doc/html/JetTable_8h_source.html
+++ b/doc/html/JetTable_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>JetTable.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_JETTABL_H</span>
@@ -53,7 +53,7 @@
 <a name="l00068"></a>00068 {
 <a name="l00069"></a>00069 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00070"></a>00070 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00071"></a>00071     errorString_ &lt;&lt; <span class="stringliteral">&quot;JetTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00071"></a>00071     oStream_ &lt;&lt; <span class="stringliteral">&quot;JetTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00072"></a>00072     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00073"></a>00073   }
 <a name="l00074"></a>00074 <span class="preprocessor">#endif</span>
@@ -74,7 +74,7 @@
 <a name="l00089"></a>00089 {
 <a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00092"></a>00092     errorString_ &lt;&lt; <span class="stringliteral">&quot;JetTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00092"></a>00092     oStream_ &lt;&lt; <span class="stringliteral">&quot;JetTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00094"></a>00094   }
 <a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
@@ -100,7 +100,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/LentPitShift_8h_source.html b/doc/html/LentPitShift_8h_source.html
index fabef93..b9e97a2 100644
--- a/doc/html/LentPitShift_8h_source.html
+++ b/doc/html/LentPitShift_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>LentPitShift.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_LENLentPitShift_H</span>
@@ -116,7 +116,7 @@
 <a name="l00134"></a>00134   <span class="keywordflow">for</span> ( n=0; n&lt;inputFrames.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>(); n++ ) {
 <a name="l00135"></a>00135     x_t = inputLine_.<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( inputFrames[ n ] );
 <a name="l00136"></a>00136     <span class="keywordflow">for</span> ( delay_=1; delay_&lt;= tMax_; delay_++ ) {
-<a name="l00137"></a>00137       x_t_T = inputLine_.<a class="code" href="classstk_1_1Delay.html#a7d4c9c21e752f860ba683e9849d14665" title="Return the value at tapDelay samples from the delay-line input.">contentsAt</a>( delay_ );
+<a name="l00137"></a>00137       x_t_T = inputLine_.<a class="code" href="classstk_1_1Delay.html#a4d5e5bab50e4fa062bd3f0e9e2fd19db" title="Return the value at tapDelay samples from the delay-line input.">tapOut</a>( delay_ );
 <a name="l00138"></a>00138       coeff = x_t - x_t_T;
 <a name="l00139"></a>00139       dt[delay_] += coeff * coeff;
 <a name="l00140"></a>00140     }
@@ -175,10 +175,10 @@
 <a name="l00193"></a>00193       M = tMax_ - inputPtr + lastPeriod_ - 1; <span class="comment">// New reading pointer</span>
 <a name="l00194"></a>00194       N = 2*tMax_ - (<span class="keywordtype">unsigned</span> long)floor(outputPtr + tMax_) + lastPeriod_ - 1; <span class="comment">// New writing pointer</span>
 <a name="l00195"></a>00195       <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j=0; j&lt;2*lastPeriod_; j++,M--,N-- ) {
-<a name="l00196"></a>00196         sample = inputLine_.<a class="code" href="classstk_1_1Delay.html#a7d4c9c21e752f860ba683e9849d14665" title="Return the value at tapDelay samples from the delay-line input.">contentsAt</a>(M) * window[j] / 2.;
+<a name="l00196"></a>00196         sample = inputLine_.<a class="code" href="classstk_1_1Delay.html#a4d5e5bab50e4fa062bd3f0e9e2fd19db" title="Return the value at tapDelay samples from the delay-line input.">tapOut</a>(M) * window[j] / 2.;
 <a name="l00197"></a>00197         <span class="comment">// Linear interpolation</span>
-<a name="l00198"></a>00198         outputLine_.<a class="code" href="classstk_1_1Delay.html#aea5580dd84ea6982d1f7b92b53314118" title="Sum the provided value into the delay line at tapDelay samples from the input.">addTo</a>(N, env[0] * sample);
-<a name="l00199"></a>00199         outputLine_.<a class="code" href="classstk_1_1Delay.html#aea5580dd84ea6982d1f7b92b53314118" title="Sum the provided value into the delay line at tapDelay samples from the input.">addTo</a>(N-1, env[1] * sample);
+<a name="l00198"></a>00198         outputLine_.<a class="code" href="classstk_1_1Delay.html#a80f143ab956c9d3b1721958ece6da65e" title="Sum the provided value into the delay line at tapDelay samples from the input.">addTo</a>(N, env[0] * sample);
+<a name="l00199"></a>00199         outputLine_.<a class="code" href="classstk_1_1Delay.html#a80f143ab956c9d3b1721958ece6da65e" title="Sum the provided value into the delay line at tapDelay samples from the input.">addTo</a>(N-1, env[1] * sample);
 <a name="l00200"></a>00200       }
 <a name="l00201"></a>00201       outputPtr = outputPtr + lastPeriod_ * periodRatio_; <span class="comment">// new output pointer</span>
 <a name="l00202"></a>00202     }
@@ -210,7 +210,7 @@
 <a name="l00228"></a>00228 {
 <a name="l00229"></a>00229 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00230"></a>00230 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00231"></a>00231     errorString_ &lt;&lt; <span class="stringliteral">&quot;LentPitShift::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00231"></a>00231     oStream_ &lt;&lt; <span class="stringliteral">&quot;LentPitShift::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00232"></a>00232     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00233"></a>00233   }
 <a name="l00234"></a>00234 <span class="preprocessor">#endif</span>
@@ -228,7 +228,7 @@
 <a name="l00246"></a>00246 {
 <a name="l00247"></a>00247 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00248"></a>00248 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00249"></a>00249     errorString_ &lt;&lt; <span class="stringliteral">&quot;LentPitShift::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00249"></a>00249     oStream_ &lt;&lt; <span class="stringliteral">&quot;LentPitShift::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00250"></a>00250     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00251"></a>00251   }
 <a name="l00252"></a>00252 <span class="preprocessor">#endif</span>
@@ -252,7 +252,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Mandolin_8h-source.html b/doc/html/Mandolin_8h-source.html
deleted file mode 100644
index 79d4b08..0000000
--- a/doc/html/Mandolin_8h-source.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Mandolin.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MANDOLIN_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_MANDOLIN_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "PluckTwo.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "FileWvIn.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00036"></a>00036 <span class="comment">/***************************************************/</span>
-<a name="l00037"></a>00037 
-<a name="l00038"></a><a class="code" href="classstk_1_1Mandolin.html">00038</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Mandolin.html" title="STK mandolin instrument model class.">Mandolin</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1PluckTwo.html" title="STK enhanced plucked string model class.">PluckTwo</a>
-<a name="l00039"></a>00039 {
-<a name="l00040"></a>00040  <span class="keyword">public</span>:
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1Mandolin.html#5b2aaaf5697cbe57df62b568982f6300" title="Class constructor, taking the lowest desired playing frequency.">Mandolin</a>( StkFloat lowestFrequency );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <a class="code" href="classstk_1_1Mandolin.html#92d50a0f0c1c974683bf4685cfc6ff86" title="Class destructor.">~Mandolin</a>( <span class="keywordtype">void</span> );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#3a2398d39b72e1c330f81f6545ac0f5c" title="Pluck the strings with the given amplitude (0.0 - 1.0) using the current frequency...">pluck</a>( StkFloat amplitude );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#3a2398d39b72e1c330f81f6545ac0f5c" title="Pluck the strings with the given amplitude (0.0 - 1.0) using the current frequency...">pluck</a>( StkFloat amplitude,StkFloat position );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#8b60733652e54f1d6c93d63c915c9ca7" title="Start a note with the given frequency and amplitude (0.0 - 1.0).">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#21a5b0669b013cfd9c7142174530f629" title="Set the body size (a value of 1.0 produces the &amp;quot;default&amp;quot; size).">setBodySize</a>( StkFloat size );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#bf341aa5e7d751012178ff7b853b73a1" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   StkFloat <a class="code" href="classstk_1_1Mandolin.html#99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065   <span class="keyword">protected</span>:
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067   <a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> *soundfile_[12];
-<a name="l00068"></a>00068   <span class="keywordtype">int</span> mic_;
-<a name="l00069"></a>00069   <span class="keywordtype">long</span> dampTime_;
-<a name="l00070"></a>00070   <span class="keywordtype">bool</span> waveDone_;
-<a name="l00071"></a>00071 };
-<a name="l00072"></a>00072 
-<a name="l00073"></a><a class="code" href="classstk_1_1Mandolin.html#99f5b51e76c97299dd8c58f27a6d0e62">00073</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Mandolin.html#99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">Mandolin :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00074"></a>00074 {
-<a name="l00075"></a>00075   StkFloat temp = 0.0;
-<a name="l00076"></a>00076   <span class="keywordflow">if</span> ( !waveDone_ ) {
-<a name="l00077"></a>00077     <span class="comment">// Scale the pluck excitation with comb</span>
-<a name="l00078"></a>00078     <span class="comment">// filtering for the duration of the file.</span>
-<a name="l00079"></a>00079     temp = soundfile_[mic_]-&gt;<a class="code" href="classstk_1_1FileWvIn.html#da668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>() * pluckAmplitude_;
-<a name="l00080"></a>00080     temp = temp - combDelay_.<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00081"></a>00081     waveDone_ = soundfile_[mic_]-&gt;<a class="code" href="classstk_1_1FileWvIn.html#ca9ad0c12af3323e7bbf877513b0d10b" title="Query whether reading is complete.">isFinished</a>();
-<a name="l00082"></a>00082   }
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084   <span class="comment">// Damping hack to help avoid overflow on re-plucking.</span>
-<a name="l00085"></a>00085   <span class="keywordflow">if</span> ( dampTime_ &gt;=0 ) {
-<a name="l00086"></a>00086     dampTime_ -= 1;
-<a name="l00087"></a>00087     <span class="comment">// Calculate 1st delay filtered reflection plus pluck excitation.</span>
-<a name="l00088"></a>00088     lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( filter_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( temp + (delayLine_.<a class="code" href="classstk_1_1DelayA.html#4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * 0.7) ) );
-<a name="l00089"></a>00089     <span class="comment">// Calculate 2nd delay just like the 1st.</span>
-<a name="l00090"></a>00090     lastFrame_[0] += delayLine2_.<a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( filter2_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( temp + (delayLine2_.<a class="code" href="classstk_1_1DelayA.html#4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * 0.7) ) );
-<a name="l00091"></a>00091   }
-<a name="l00092"></a>00092   <span class="keywordflow">else</span> { <span class="comment">// No damping hack after 1 period.</span>
-<a name="l00093"></a>00093     <span class="comment">// Calculate 1st delay filtered reflection plus pluck excitation.</span>
-<a name="l00094"></a>00094     lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( filter_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( temp + (delayLine_.<a class="code" href="classstk_1_1DelayA.html#4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_) ) );
-<a name="l00095"></a>00095     <span class="comment">// Calculate 2nd delay just like the 1st.</span>
-<a name="l00096"></a>00096     lastFrame_[0] += delayLine2_.<a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( filter2_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( temp + (delayLine2_.<a class="code" href="classstk_1_1DelayA.html#4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_) ) );
-<a name="l00097"></a>00097   }
-<a name="l00098"></a>00098 
-<a name="l00099"></a>00099   lastFrame_[0] *= 0.3;
-<a name="l00100"></a>00100   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00101"></a>00101 }
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103 } <span class="comment">// stk namespace</span>
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Mandolin_8h_source.html b/doc/html/Mandolin_8h_source.html
index a6e5190..be12cc0 100644
--- a/doc/html/Mandolin_8h_source.html
+++ b/doc/html/Mandolin_8h_source.html
@@ -9,86 +9,113 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Mandolin.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MANDOLIN_H</span>
 <a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_MANDOLIN_H</span>
 <a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include &quot;PluckTwo.h&quot;</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &quot;FileWvIn.h&quot;</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
+<a name="l00004"></a>00004 <span class="preprocessor">#include &quot;Instrmnt.h&quot;</span>
+<a name="l00005"></a>00005 <span class="preprocessor">#include &quot;Twang.h&quot;</span>
+<a name="l00006"></a>00006 <span class="preprocessor">#include &quot;FileWvIn.h&quot;</span>
+<a name="l00007"></a>00007 
+<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
+<a name="l00009"></a>00009 
+<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
 <a name="l00036"></a>00036 <span class="comment">/***************************************************/</span>
 <a name="l00037"></a>00037 
-<a name="l00038"></a><a class="code" href="classstk_1_1Mandolin.html">00038</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Mandolin.html" title="STK mandolin instrument model class.">Mandolin</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1PluckTwo.html" title="STK enhanced plucked string model class.">PluckTwo</a>
+<a name="l00038"></a><a class="code" href="classstk_1_1Mandolin.html">00038</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Mandolin.html" title="STK mandolin instrument model class.">Mandolin</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
 <a name="l00039"></a>00039 {
 <a name="l00040"></a>00040  <span class="keyword">public</span>:
 <a name="l00042"></a>00042   <a class="code" href="classstk_1_1Mandolin.html#a5b2aaaf5697cbe57df62b568982f6300" title="Class constructor, taking the lowest desired playing frequency.">Mandolin</a>( StkFloat lowestFrequency );
 <a name="l00043"></a>00043 
 <a name="l00045"></a>00045   <a class="code" href="classstk_1_1Mandolin.html#a92d50a0f0c1c974683bf4685cfc6ff86" title="Class destructor.">~Mandolin</a>( <span class="keywordtype">void</span> );
 <a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a3a2398d39b72e1c330f81f6545ac0f5c" title="Pluck the strings with the given amplitude (0.0 - 1.0) using the current frequency...">pluck</a>( StkFloat amplitude );
+<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a2caec477ed0fe9479ed6d1fbdb45d827" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
 <a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a3a2398d39b72e1c330f81f6545ac0f5c" title="Pluck the strings with the given amplitude (0.0 - 1.0) using the current frequency...">pluck</a>( StkFloat amplitude,StkFloat position );
+<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#af46367787cd0a21a04655be82d18df08" title="Detune the two strings by the given factor. A value of 1.0 produces unison strings...">setDetune</a>( StkFloat detune );
 <a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a8b60733652e54f1d6c93d63c915c9ca7" title="Start a note with the given frequency and amplitude (0.0 - 1.0).">noteOn</a>( StkFloat frequency, StkFloat amplitude );
+<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a21a5b0669b013cfd9c7142174530f629" title="Set the body size (a value of 1.0 produces the &amp;quot;default&amp;quot; size).">setBodySize</a>( StkFloat size );
 <a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a21a5b0669b013cfd9c7142174530f629" title="Set the body size (a value of 1.0 produces the &amp;quot;default&amp;quot; size).">setBodySize</a>( StkFloat size );
+<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a8a0df47cccec5225e26d3b0e702a7c02" title="Set the pluck or &amp;quot;excitation&amp;quot; position along the string (0.0 - 1.0).">setPluckPosition</a>( StkFloat position );
 <a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#abf341aa5e7d751012178ff7b853b73a1" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
+<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#af5beeafcdfef7b71a5dda14e0c30c7fb" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
 <a name="l00061"></a>00061 
-<a name="l00063"></a>00063   StkFloat <a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a3a2398d39b72e1c330f81f6545ac0f5c" title="Pluck the strings with the given amplitude (0.0 - 1.0) using the current frequency...">pluck</a>( StkFloat amplitude );
 <a name="l00064"></a>00064 
-<a name="l00065"></a>00065   <span class="keyword">protected</span>:
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067   <a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> *soundfile_[12];
-<a name="l00068"></a>00068   <span class="keywordtype">int</span> mic_;
-<a name="l00069"></a>00069   <span class="keywordtype">long</span> dampTime_;
-<a name="l00070"></a>00070   <span class="keywordtype">bool</span> waveDone_;
-<a name="l00071"></a>00071 };
-<a name="l00072"></a>00072 
-<a name="l00073"></a><a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62">00073</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">Mandolin :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00074"></a>00074 {
-<a name="l00075"></a>00075   StkFloat temp = 0.0;
-<a name="l00076"></a>00076   <span class="keywordflow">if</span> ( !waveDone_ ) {
-<a name="l00077"></a>00077     <span class="comment">// Scale the pluck excitation with comb</span>
-<a name="l00078"></a>00078     <span class="comment">// filtering for the duration of the file.</span>
-<a name="l00079"></a>00079     temp = soundfile_[mic_]-&gt;<a class="code" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>() * pluckAmplitude_;
-<a name="l00080"></a>00080     temp = temp - combDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00081"></a>00081     waveDone_ = soundfile_[mic_]-&gt;<a class="code" href="classstk_1_1FileWvIn.html#aca9ad0c12af3323e7bbf877513b0d10b" title="Query whether reading is complete.">isFinished</a>();
-<a name="l00082"></a>00082   }
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084   <span class="comment">// Damping hack to help avoid overflow on re-plucking.</span>
-<a name="l00085"></a>00085   <span class="keywordflow">if</span> ( dampTime_ &gt;=0 ) {
-<a name="l00086"></a>00086     dampTime_ -= 1;
-<a name="l00087"></a>00087     <span class="comment">// Calculate 1st delay filtered reflection plus pluck excitation.</span>
-<a name="l00088"></a>00088     lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( filter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( temp + (delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * 0.7) ) );
-<a name="l00089"></a>00089     <span class="comment">// Calculate 2nd delay just like the 1st.</span>
-<a name="l00090"></a>00090     lastFrame_[0] += delayLine2_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( filter2_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( temp + (delayLine2_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * 0.7) ) );
-<a name="l00091"></a>00091   }
-<a name="l00092"></a>00092   <span class="keywordflow">else</span> { <span class="comment">// No damping hack after 1 period.</span>
-<a name="l00093"></a>00093     <span class="comment">// Calculate 1st delay filtered reflection plus pluck excitation.</span>
-<a name="l00094"></a>00094     lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( filter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( temp + (delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_) ) );
-<a name="l00095"></a>00095     <span class="comment">// Calculate 2nd delay just like the 1st.</span>
-<a name="l00096"></a>00096     lastFrame_[0] += delayLine2_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( filter2_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( temp + (delayLine2_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_) ) );
-<a name="l00097"></a>00097   }
-<a name="l00098"></a>00098 
-<a name="l00099"></a>00099   lastFrame_[0] *= 0.3;
-<a name="l00100"></a>00100   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00101"></a>00101 }
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103 } <span class="comment">// stk namespace</span>
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105 <span class="preprocessor">#endif</span>
+<a name="l00066"></a>00066   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a3a2398d39b72e1c330f81f6545ac0f5c" title="Pluck the strings with the given amplitude (0.0 - 1.0) using the current frequency...">pluck</a>( StkFloat amplitude,StkFloat position );
+<a name="l00067"></a>00067 
+<a name="l00069"></a>00069   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a8b60733652e54f1d6c93d63c915c9ca7" title="Start a note with the given frequency and amplitude (0.0 - 1.0).">noteOn</a>( StkFloat frequency, StkFloat amplitude );
+<a name="l00070"></a>00070 
+<a name="l00072"></a>00072   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#a569de60008c218f0939ab9aedd038776" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
+<a name="l00073"></a>00073 
+<a name="l00075"></a>00075   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mandolin.html#abf341aa5e7d751012178ff7b853b73a1" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
+<a name="l00076"></a>00076 
+<a name="l00078"></a>00078   StkFloat <a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00079"></a>00079 
+<a name="l00081"></a>00081 
+<a name="l00088"></a>00088   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00089"></a>00089 
+<a name="l00090"></a>00090   <span class="keyword">protected</span>:
+<a name="l00091"></a>00091 
+<a name="l00092"></a>00092   <a class="code" href="classstk_1_1Twang.html" title="STK enhanced plucked string class.">Twang</a> strings_[2];
+<a name="l00093"></a>00093   <a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> soundfile_[12];
+<a name="l00094"></a>00094 
+<a name="l00095"></a>00095   <span class="keywordtype">int</span> mic_;
+<a name="l00096"></a>00096   StkFloat detuning_;
+<a name="l00097"></a>00097   StkFloat frequency_;
+<a name="l00098"></a>00098   StkFloat pluckAmplitude_;
+<a name="l00099"></a>00099 };
+<a name="l00100"></a>00100 
+<a name="l00101"></a><a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62">00101</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">Mandolin :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00102"></a>00102 {
+<a name="l00103"></a>00103   StkFloat temp = 0.0;
+<a name="l00104"></a>00104   <span class="keywordflow">if</span> ( !soundfile_[mic_].isFinished() )
+<a name="l00105"></a>00105     temp = soundfile_[mic_].<a class="code" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>() * pluckAmplitude_;
+<a name="l00106"></a>00106 
+<a name="l00107"></a>00107   lastFrame_[0] = strings_[0].<a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">tick</a>( temp );
+<a name="l00108"></a>00108   lastFrame_[0] += strings_[1].<a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">tick</a>( temp );
+<a name="l00109"></a>00109   lastFrame_[0] *= 0.2;
+<a name="l00110"></a>00110 
+<a name="l00111"></a>00111   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00112"></a>00112 }
+<a name="l00113"></a>00113 
+<a name="l00114"></a><a class="code" href="classstk_1_1Mandolin.html#a37134f89e73e3e62ad5dfcfb0300a12d">00114</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">Mandolin :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00115"></a>00115 {
+<a name="l00116"></a>00116   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00117"></a>00117 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00118"></a>00118 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00119"></a>00119     oStream_ &lt;&lt; <span class="stringliteral">&quot;Mandolin::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00120"></a>00120     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122 <span class="preprocessor">#endif</span>
+<a name="l00123"></a>00123 <span class="preprocessor"></span>
+<a name="l00124"></a>00124   StkFloat *samples = &amp;frames[channel];
+<a name="l00125"></a>00125   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00126"></a>00126   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00127"></a>00127     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00128"></a>00128       *samples++ = <a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">tick</a>();
+<a name="l00129"></a>00129   }
+<a name="l00130"></a>00130   <span class="keywordflow">else</span> {
+<a name="l00131"></a>00131     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00132"></a>00132       *samples++ = <a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">tick</a>();
+<a name="l00133"></a>00133       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00134"></a>00134         *samples++ = lastFrame_[j];
+<a name="l00135"></a>00135     }
+<a name="l00136"></a>00136   }
+<a name="l00137"></a>00137 
+<a name="l00138"></a>00138   <span class="keywordflow">return</span> frames;
+<a name="l00139"></a>00139 }
+<a name="l00140"></a>00140 
+<a name="l00141"></a>00141 } <span class="comment">// stk namespace</span>
+<a name="l00142"></a>00142 
+<a name="l00143"></a>00143 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Mesh2D_8h-source.html b/doc/html/Mesh2D_8h-source.html
deleted file mode 100644
index 088f204..0000000
--- a/doc/html/Mesh2D_8h-source.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Mesh2D.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MESH2D_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_MESH2D_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00033"></a>00033 <span class="comment">/***************************************************/</span>
-<a name="l00034"></a>00034 
-<a name="l00035"></a>00035 <span class="keyword">const</span> <span class="keywordtype">short</span> NXMAX = 12;
-<a name="l00036"></a>00036 <span class="keyword">const</span> <span class="keywordtype">short</span> NYMAX = 12;
-<a name="l00037"></a>00037 
-<a name="l00038"></a><a class="code" href="classstk_1_1Mesh2D.html">00038</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Mesh2D.html" title="Two-dimensional rectilinear waveguide mesh class.">Mesh2D</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00039"></a>00039 {
-<a name="l00040"></a>00040  <span class="keyword">public</span>:
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1Mesh2D.html#156fdff6515dbcd4b493ce0ef051a174" title="Class constructor, taking the x and y dimensions in samples.">Mesh2D</a>( <span class="keywordtype">short</span> nX, <span class="keywordtype">short</span> nY );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <a class="code" href="classstk_1_1Mesh2D.html#c4abd6b5190587d69c7c2b13870fb646" title="Class destructor.">~Mesh2D</a>( <span class="keywordtype">void</span> );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#49f56b4865dc041ae874fbc1b80e967b" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#ccbad29fd6364f7c2d439bcf837590ec" title="Set the x dimension size in samples.">setNX</a>( <span class="keywordtype">short</span> lenX );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#4c4c54ad29fcee5654bd2ebaed29d916" title="Set the y dimension size in samples.">setNY</a>( <span class="keywordtype">short</span> lenY );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#9cdfa80ecccf3f12dc184003458ba3a3" title="Set the x, y input position on a 0.0 - 1.0 scale.">setInputPosition</a>( StkFloat xFactor, StkFloat yFactor );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#b7b3d950e40308e7060e5ff9a62a8b8d" title="Set the loss filters gains (0.0 - 1.0).">setDecay</a>( StkFloat decayFactor );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#7915dae1032ace5960c85790a7b93e0f" title="Impulse the mesh with the given amplitude (frequency ignored).">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#0580962b3cc0dbac092581d0fc15127b" title="Stop a note with the given amplitude (speed of decay) ... currently ignored.">noteOff</a>( StkFloat amplitude );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069   StkFloat <a class="code" href="classstk_1_1Mesh2D.html#52d9552b67edea0fc6ff3e949d6331a0" title="Calculate and return the signal energy stored in the mesh.">energy</a>( <span class="keywordtype">void</span> );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   StkFloat <a class="code" href="classstk_1_1Mesh2D.html#688bed8725ef2d8bf4c6465251bd8b86" title="Input a sample to the mesh and compute one output sample.">inputTick</a>( StkFloat input );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#cc618a91b288305785644d852cfdaf83" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00076"></a>00076 
-<a name="l00078"></a>00078   StkFloat <a class="code" href="classstk_1_1Mesh2D.html#e8a7e86e4774d8738098c79ab0d5e00a" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00079"></a>00079 
-<a name="l00080"></a>00080  <span class="keyword">protected</span>:
-<a name="l00081"></a>00081 
-<a name="l00082"></a>00082   StkFloat tick0();
-<a name="l00083"></a>00083   StkFloat tick1();
-<a name="l00084"></a>00084   <span class="keywordtype">void</span> clearMesh();
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086   <span class="keywordtype">short</span> NX_, NY_;
-<a name="l00087"></a>00087   <span class="keywordtype">short</span> xInput_, yInput_;
-<a name="l00088"></a>00088   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filterX_[NXMAX];
-<a name="l00089"></a>00089   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filterY_[NYMAX];
-<a name="l00090"></a>00090   StkFloat v_[NXMAX-1][NYMAX-1]; <span class="comment">// junction velocities</span>
-<a name="l00091"></a>00091   StkFloat vxp_[NXMAX][NYMAX];   <span class="comment">// positive-x velocity wave</span>
-<a name="l00092"></a>00092   StkFloat vxm_[NXMAX][NYMAX];   <span class="comment">// negative-x velocity wave</span>
-<a name="l00093"></a>00093   StkFloat vyp_[NXMAX][NYMAX];   <span class="comment">// positive-y velocity wave</span>
-<a name="l00094"></a>00094   StkFloat vym_[NXMAX][NYMAX];   <span class="comment">// negative-y velocity wave</span>
-<a name="l00095"></a>00095 
-<a name="l00096"></a>00096   <span class="comment">// Alternate buffers</span>
-<a name="l00097"></a>00097   StkFloat vxp1_[NXMAX][NYMAX];  <span class="comment">// positive-x velocity wave</span>
-<a name="l00098"></a>00098   StkFloat vxm1_[NXMAX][NYMAX];  <span class="comment">// negative-x velocity wave</span>
-<a name="l00099"></a>00099   StkFloat vyp1_[NXMAX][NYMAX];  <span class="comment">// positive-y velocity wave</span>
-<a name="l00100"></a>00100   StkFloat vym1_[NXMAX][NYMAX];  <span class="comment">// negative-y velocity wave</span>
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="keywordtype">int</span> counter_; <span class="comment">// time in samples</span>
-<a name="l00103"></a>00103 };
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105 } <span class="comment">// stk namespace</span>
-<a name="l00106"></a>00106 
-<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Mesh2D_8h_source.html b/doc/html/Mesh2D_8h_source.html
index a79120f..6cbb161 100644
--- a/doc/html/Mesh2D_8h_source.html
+++ b/doc/html/Mesh2D_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Mesh2D.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MESH2D_H</span>
@@ -23,21 +23,21 @@
 <a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
 <a name="l00033"></a>00033 <span class="comment">/***************************************************/</span>
 <a name="l00034"></a>00034 
-<a name="l00035"></a>00035 <span class="keyword">const</span> <span class="keywordtype">short</span> NXMAX = 12;
-<a name="l00036"></a>00036 <span class="keyword">const</span> <span class="keywordtype">short</span> NYMAX = 12;
+<a name="l00035"></a>00035 <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> NXMAX = 12;
+<a name="l00036"></a>00036 <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> NYMAX = 12;
 <a name="l00037"></a>00037 
 <a name="l00038"></a><a class="code" href="classstk_1_1Mesh2D.html">00038</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Mesh2D.html" title="Two-dimensional rectilinear waveguide mesh class.">Mesh2D</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
 <a name="l00039"></a>00039 {
 <a name="l00040"></a>00040  <span class="keyword">public</span>:
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1Mesh2D.html#a156fdff6515dbcd4b493ce0ef051a174" title="Class constructor, taking the x and y dimensions in samples.">Mesh2D</a>( <span class="keywordtype">short</span> nX, <span class="keywordtype">short</span> nY );
+<a name="l00042"></a>00042   <a class="code" href="classstk_1_1Mesh2D.html#aef48c3c65901f62a8dbdbe606763203e" title="Class constructor, taking the x and y dimensions in samples.">Mesh2D</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> nX, <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> nY );
 <a name="l00043"></a>00043 
 <a name="l00045"></a>00045   <a class="code" href="classstk_1_1Mesh2D.html#ac4abd6b5190587d69c7c2b13870fb646" title="Class destructor.">~Mesh2D</a>( <span class="keywordtype">void</span> );
 <a name="l00046"></a>00046 
 <a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#a49f56b4865dc041ae874fbc1b80e967b" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
 <a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#accbad29fd6364f7c2d439bcf837590ec" title="Set the x dimension size in samples.">setNX</a>( <span class="keywordtype">short</span> lenX );
+<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#a6834a52f03b072e18387b799f804527b" title="Set the x dimension size in samples.">setNX</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> lenX );
 <a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#a4c4c54ad29fcee5654bd2ebaed29d916" title="Set the y dimension size in samples.">setNY</a>( <span class="keywordtype">short</span> lenY );
+<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#a2be2badaccfeb57e52e548f1b7515fbe" title="Set the y dimension size in samples.">setNY</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> lenY );
 <a name="l00055"></a>00055 
 <a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mesh2D.html#a9cdfa80ecccf3f12dc184003458ba3a3" title="Set the x, y input position on a 0.0 - 1.0 scale.">setInputPosition</a>( StkFloat xFactor, StkFloat yFactor );
 <a name="l00058"></a>00058 
@@ -55,40 +55,70 @@
 <a name="l00076"></a>00076 
 <a name="l00078"></a>00078   StkFloat <a class="code" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00079"></a>00079 
-<a name="l00080"></a>00080  <span class="keyword">protected</span>:
 <a name="l00081"></a>00081 
-<a name="l00082"></a>00082   StkFloat tick0();
-<a name="l00083"></a>00083   StkFloat tick1();
-<a name="l00084"></a>00084   <span class="keywordtype">void</span> clearMesh();
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086   <span class="keywordtype">short</span> NX_, NY_;
-<a name="l00087"></a>00087   <span class="keywordtype">short</span> xInput_, yInput_;
-<a name="l00088"></a>00088   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filterX_[NXMAX];
-<a name="l00089"></a>00089   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filterY_[NYMAX];
-<a name="l00090"></a>00090   StkFloat v_[NXMAX-1][NYMAX-1]; <span class="comment">// junction velocities</span>
-<a name="l00091"></a>00091   StkFloat vxp_[NXMAX][NYMAX];   <span class="comment">// positive-x velocity wave</span>
-<a name="l00092"></a>00092   StkFloat vxm_[NXMAX][NYMAX];   <span class="comment">// negative-x velocity wave</span>
-<a name="l00093"></a>00093   StkFloat vyp_[NXMAX][NYMAX];   <span class="comment">// positive-y velocity wave</span>
-<a name="l00094"></a>00094   StkFloat vym_[NXMAX][NYMAX];   <span class="comment">// negative-y velocity wave</span>
+<a name="l00088"></a>00088   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00089"></a>00089 
+<a name="l00090"></a>00090  <span class="keyword">protected</span>:
+<a name="l00091"></a>00091 
+<a name="l00092"></a>00092   StkFloat tick0();
+<a name="l00093"></a>00093   StkFloat tick1();
+<a name="l00094"></a>00094   <span class="keywordtype">void</span> clearMesh();
 <a name="l00095"></a>00095 
-<a name="l00096"></a>00096   <span class="comment">// Alternate buffers</span>
-<a name="l00097"></a>00097   StkFloat vxp1_[NXMAX][NYMAX];  <span class="comment">// positive-x velocity wave</span>
-<a name="l00098"></a>00098   StkFloat vxm1_[NXMAX][NYMAX];  <span class="comment">// negative-x velocity wave</span>
-<a name="l00099"></a>00099   StkFloat vyp1_[NXMAX][NYMAX];  <span class="comment">// positive-y velocity wave</span>
-<a name="l00100"></a>00100   StkFloat vym1_[NXMAX][NYMAX];  <span class="comment">// negative-y velocity wave</span>
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   <span class="keywordtype">int</span> counter_; <span class="comment">// time in samples</span>
-<a name="l00103"></a>00103 };
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105 } <span class="comment">// stk namespace</span>
-<a name="l00106"></a>00106 
-<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00096"></a>00096   <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> NX_, NY_;
+<a name="l00097"></a>00097   <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> xInput_, yInput_;
+<a name="l00098"></a>00098   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filterX_[NXMAX];
+<a name="l00099"></a>00099   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filterY_[NYMAX];
+<a name="l00100"></a>00100   StkFloat v_[NXMAX-1][NYMAX-1]; <span class="comment">// junction velocities</span>
+<a name="l00101"></a>00101   StkFloat vxp_[NXMAX][NYMAX];   <span class="comment">// positive-x velocity wave</span>
+<a name="l00102"></a>00102   StkFloat vxm_[NXMAX][NYMAX];   <span class="comment">// negative-x velocity wave</span>
+<a name="l00103"></a>00103   StkFloat vyp_[NXMAX][NYMAX];   <span class="comment">// positive-y velocity wave</span>
+<a name="l00104"></a>00104   StkFloat vym_[NXMAX][NYMAX];   <span class="comment">// negative-y velocity wave</span>
+<a name="l00105"></a>00105 
+<a name="l00106"></a>00106   <span class="comment">// Alternate buffers</span>
+<a name="l00107"></a>00107   StkFloat vxp1_[NXMAX][NYMAX];  <span class="comment">// positive-x velocity wave</span>
+<a name="l00108"></a>00108   StkFloat vxm1_[NXMAX][NYMAX];  <span class="comment">// negative-x velocity wave</span>
+<a name="l00109"></a>00109   StkFloat vyp1_[NXMAX][NYMAX];  <span class="comment">// positive-y velocity wave</span>
+<a name="l00110"></a>00110   StkFloat vym1_[NXMAX][NYMAX];  <span class="comment">// negative-y velocity wave</span>
+<a name="l00111"></a>00111 
+<a name="l00112"></a>00112   <span class="keywordtype">int</span> counter_; <span class="comment">// time in samples</span>
+<a name="l00113"></a>00113 };
+<a name="l00114"></a>00114 
+<a name="l00115"></a><a class="code" href="classstk_1_1Mesh2D.html#a0bfe62f0ab05859963571f4a9a569bd8">00115</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a" title="Compute and return one output sample.">Mesh2D :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00116"></a>00116 {
+<a name="l00117"></a>00117   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00118"></a>00118 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00119"></a>00119 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00120"></a>00120     oStream_ &lt;&lt; <span class="stringliteral">&quot;Mesh2D::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00121"></a>00121     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 <span class="preprocessor">#endif</span>
+<a name="l00124"></a>00124 <span class="preprocessor"></span>
+<a name="l00125"></a>00125   StkFloat *samples = &amp;frames[channel];
+<a name="l00126"></a>00126   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00127"></a>00127   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00128"></a>00128     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00129"></a>00129       *samples++ = <a class="code" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a" title="Compute and return one output sample.">tick</a>();
+<a name="l00130"></a>00130   }
+<a name="l00131"></a>00131   <span class="keywordflow">else</span> {
+<a name="l00132"></a>00132     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00133"></a>00133       *samples++ = <a class="code" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a" title="Compute and return one output sample.">tick</a>();
+<a name="l00134"></a>00134       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00135"></a>00135         *samples++ = lastFrame_[j];
+<a name="l00136"></a>00136     }
+<a name="l00137"></a>00137   }
+<a name="l00138"></a>00138 
+<a name="l00139"></a>00139   <span class="keywordflow">return</span> frames;
+<a name="l00140"></a>00140 }
+<a name="l00141"></a>00141 
+<a name="l00142"></a>00142 } <span class="comment">// stk namespace</span>
+<a name="l00143"></a>00143 
+<a name="l00144"></a>00144 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Messager_8h-source.html b/doc/html/Messager_8h-source.html
deleted file mode 100644
index fcfc822..0000000
--- a/doc/html/Messager_8h-source.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Messager.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MESSAGER_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_MESSAGER_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Skini.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include &lt;queue&gt;</span>
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="preprocessor">#if defined(__STK_REALTIME__)</span>
-<a name="l00009"></a>00009 <span class="preprocessor"></span>
-<a name="l00010"></a>00010 <span class="preprocessor">#include "Mutex.h"</span>
-<a name="l00011"></a>00011 <span class="preprocessor">#include "Thread.h"</span>
-<a name="l00012"></a>00012 <span class="preprocessor">#include "TcpServer.h"</span>
-<a name="l00013"></a>00013 <span class="preprocessor">#include "RtMidi.h"</span>
-<a name="l00014"></a>00014 
-<a name="l00015"></a>00015 <span class="preprocessor">#endif // __STK_REALTIME__</span>
-<a name="l00016"></a>00016 <span class="preprocessor"></span>
-<a name="l00017"></a>00017 <span class="keyword">namespace </span>stk {
-<a name="l00018"></a>00018 
-<a name="l00019"></a>00019 <span class="comment">/***************************************************/</span>
-<a name="l00051"></a>00051 <span class="comment">/***************************************************/</span>
-<a name="l00052"></a>00052 
-<a name="l00053"></a>00053 <span class="keyword">const</span> <span class="keywordtype">int</span> DEFAULT_QUEUE_LIMIT = 200;
-<a name="l00054"></a>00054 
-<a name="l00055"></a><a class="code" href="classstk_1_1Messager.html">00055</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Messager.html" title="STK input control message parser.">Messager</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00056"></a>00056 {
-<a name="l00057"></a>00057  <span class="keyword">public</span>:
-<a name="l00058"></a>00058 
-<a name="l00059"></a>00059   <span class="comment">// This structure is used to share data among the various realtime</span>
-<a name="l00060"></a>00060   <span class="comment">// messager threads.  It must be public.</span>
-<a name="l00061"></a>00061   <span class="keyword">struct </span>MessagerData {
-<a name="l00062"></a>00062     <a class="code" href="classstk_1_1Skini.html" title="STK SKINI parsing class.">Skini</a> skini;
-<a name="l00063"></a>00063     std::queue&lt;Skini::Message&gt; queue;
-<a name="l00064"></a>00064     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> queueLimit;
-<a name="l00065"></a>00065     <span class="keywordtype">int</span> sources;
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067 <span class="preprocessor">#if defined(__STK_REALTIME__)</span>
-<a name="l00068"></a>00068 <span class="preprocessor"></span>    <a class="code" href="classstk_1_1Mutex.html" title="STK mutex class.">Mutex</a> mutex;
-<a name="l00069"></a>00069     <a class="code" href="classRtMidiIn.html" title="A realtime MIDI input class.">RtMidiIn</a> *midi;
-<a name="l00070"></a>00070     <a class="code" href="classstk_1_1TcpServer.html" title="STK TCP socket server class.">TcpServer</a> *socket;
-<a name="l00071"></a>00071     std::vector&lt;int&gt; fd;
-<a name="l00072"></a>00072     fd_set mask;
-<a name="l00073"></a>00073 <span class="preprocessor">#endif</span>
-<a name="l00074"></a>00074 <span class="preprocessor"></span>
-<a name="l00075"></a>00075     <span class="comment">// Default constructor.</span>
-<a name="l00076"></a>00076     MessagerData()
-<a name="l00077"></a>00077       :queueLimit(0), sources(0) {}
-<a name="l00078"></a>00078   };
-<a name="l00079"></a>00079 
-<a name="l00081"></a>00081   <a class="code" href="classstk_1_1Messager.html#a4c8f3396345157ccd19395258a253a9" title="Default constructor.">Messager</a>();
-<a name="l00082"></a>00082 
-<a name="l00084"></a>00084   <a class="code" href="classstk_1_1Messager.html#8300dba83620cc86388780b5fa4080e0" title="Class destructor.">~Messager</a>();
-<a name="l00085"></a>00085 
-<a name="l00087"></a>00087 
-<a name="l00093"></a>00093   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Messager.html#18525952880382c25322e57353a34372" title="Pop the next message from the queue and write it to the referenced message structure...">popMessage</a>( <a class="code" href="structstk_1_1Skini_1_1Message.html" title="A message structure to store and pass parsed SKINI messages.">Skini::Message</a>&amp; message );
-<a name="l00094"></a>00094 
-<a name="l00096"></a>00096   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Messager.html#e8b09328c103bffd180456bf57ee64b3" title="Push the referenced message onto the message stack.">pushMessage</a>( <a class="code" href="structstk_1_1Skini_1_1Message.html" title="A message structure to store and pass parsed SKINI messages.">Skini::Message</a>&amp; message );
-<a name="l00097"></a>00097 
-<a name="l00099"></a>00099 
-<a name="l00107"></a>00107   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1Messager.html#172cf26bfebc8b4b12943e2bd76d5f72" title="Specify a SKINI formatted scorefile from which messages should be read.">setScoreFile</a>( <span class="keyword">const</span> <span class="keywordtype">char</span>* filename );
-<a name="l00108"></a>00108 
-<a name="l00109"></a>00109 <span class="preprocessor">#if defined(__STK_REALTIME__)</span>
-<a name="l00111"></a>00111 <span class="preprocessor"></span>
-<a name="l00120"></a>00120 <span class="preprocessor">  bool startStdInput();</span>
-<a name="l00121"></a>00121 <span class="preprocessor"></span>
-<a name="l00123"></a>00123 
-<a name="l00134"></a>00134   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1Messager.html#180fd45d109a2058ecbd6a629b979cb7" title="Start a socket server, accept connections, and read &amp;quot;realtime&amp;quot; control...">startSocketInput</a>( <span class="keywordtype">int</span> port=2001 );
-<a name="l00135"></a>00135 
-<a name="l00137"></a>00137 
-<a name="l00149"></a>00149   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1Messager.html#49877209a4ee08e684de82a73f2d9df9" title="Start MIDI input, with optional device and port identifiers.">startMidiInput</a>( <span class="keywordtype">int</span> port=0 );
-<a name="l00150"></a>00150 
-<a name="l00151"></a>00151 <span class="preprocessor">#endif</span>
-<a name="l00152"></a>00152 <span class="preprocessor"></span>
-<a name="l00153"></a>00153  <span class="keyword">protected</span>:
-<a name="l00154"></a>00154 
-<a name="l00155"></a>00155   MessagerData data_;
-<a name="l00156"></a>00156 
-<a name="l00157"></a>00157 <span class="preprocessor">#if defined(__STK_REALTIME__)</span>
-<a name="l00158"></a>00158 <span class="preprocessor"></span>  <a class="code" href="classstk_1_1Thread.html" title="STK thread class.">Thread</a> stdinThread_;
-<a name="l00159"></a>00159   <a class="code" href="classstk_1_1Thread.html" title="STK thread class.">Thread</a> socketThread_;
-<a name="l00160"></a>00160 <span class="preprocessor">#endif</span>
-<a name="l00161"></a>00161 <span class="preprocessor"></span>
-<a name="l00162"></a>00162 };
-<a name="l00163"></a>00163 
-<a name="l00164"></a>00164 } <span class="comment">// stk namespace</span>
-<a name="l00165"></a>00165 
-<a name="l00166"></a>00166 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Messager_8h_source.html b/doc/html/Messager_8h_source.html
index c4424a2..aa1e71d 100644
--- a/doc/html/Messager_8h_source.html
+++ b/doc/html/Messager_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Messager.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MESSAGER_H</span>
@@ -103,7 +103,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/MidiFileIn_8h-source.html b/doc/html/MidiFileIn_8h-source.html
deleted file mode 100644
index 690269f..0000000
--- a/doc/html/MidiFileIn_8h-source.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>MidiFileIn.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MIDIFILEIN_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_MIDIFILEIN_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;string&gt;</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include &lt;vector&gt;</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include &lt;fstream&gt;</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include &lt;sstream&gt;</span>
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="keyword">namespace </span>stk {
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="comment">/**********************************************************************/</span>
-<a name="l00027"></a>00027 <span class="comment">/**********************************************************************/</span>
-<a name="l00028"></a>00028 
-<a name="l00029"></a><a class="code" href="classstk_1_1MidiFileIn.html">00029</a> <span class="keyword">class </span><a class="code" href="classstk_1_1MidiFileIn.html" title="A standard MIDI file reading/parsing class.">MidiFileIn</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00030"></a>00030 {
-<a name="l00031"></a>00031  <span class="keyword">public</span>:
-<a name="l00033"></a>00033 
-<a name="l00037"></a>00037   <a class="code" href="classstk_1_1MidiFileIn.html#d273dc7c13d4c4a4ced893af93d9176e" title="Default constructor.">MidiFileIn</a>( std::string fileName );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1MidiFileIn.html#857246dbaf234cc9d68709afea6d0141" title="Class destructor.">~MidiFileIn</a>();
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1MidiFileIn.html#c93b16c4de0ed3d98d31a2edb92bc105" title="Return the MIDI file format (0, 1, or 2).">getFileFormat</a>() <span class="keyword">const</span>;
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1MidiFileIn.html#7db7e6b2f6c1aedfbb78045106d36b17" title="Return the number of tracks in the MIDI file.">getNumberOfTracks</a>() <span class="keyword">const</span>;
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049 
-<a name="l00054"></a>00054   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1MidiFileIn.html#43bc34a26e72f3311b855139a1408f78" title="Return the MIDI file division value from the file header.">getDivision</a>() <span class="keyword">const</span>;
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057 
-<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1MidiFileIn.html#3bd547e3ee5bb8ad780274d7a09f12ff" title="Move the specified track event reader to the beginning of its track.">rewindTrack</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> track = 0 );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064 
-<a name="l00071"></a>00071   <span class="keywordtype">double</span> <a class="code" href="classstk_1_1MidiFileIn.html#92508a5847e45a05a3ff05de3e5d3efe" title="Get the current value, in seconds, of delta-time ticks for the specified track.">getTickSeconds</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> track = 0 );
-<a name="l00072"></a>00072 
-<a name="l00074"></a>00074 
-<a name="l00086"></a>00086   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1MidiFileIn.html#117dd19afbc42d6c769d959588f9176b" title="Fill the user-provided vector with the next event in the specified track and return...">getNextEvent</a>( std::vector&lt;unsigned char&gt; *event, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> track = 0 );
-<a name="l00087"></a>00087 
-<a name="l00089"></a>00089 
-<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1MidiFileIn.html#b10ea0e225484fa2d31796f505d4e582" title="Fill the user-provided vector with the next MIDI channel event in the specified track...">getNextMidiEvent</a>( std::vector&lt;unsigned char&gt; *midiEvent, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> track = 0 );
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101  <span class="keyword">protected</span>:
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103   <span class="comment">// This protected class function is used for reading variable-length</span>
-<a name="l00104"></a>00104   <span class="comment">// MIDI file values. It is assumed that this function is called with</span>
-<a name="l00105"></a>00105   <span class="comment">// the file read pointer positioned at the start of a</span>
-<a name="l00106"></a>00106   <span class="comment">// variable-length value.  The function returns true if the value is</span>
-<a name="l00107"></a>00107   <span class="comment">// successfully parsed.  Otherwise, it returns false.</span>
-<a name="l00108"></a>00108   <span class="keywordtype">bool</span> readVariableLength( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> *value );
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110   std::ifstream file_;
-<a name="l00111"></a>00111   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nTracks_;
-<a name="l00112"></a>00112   <span class="keywordtype">int</span> format_;
-<a name="l00113"></a>00113   <span class="keywordtype">int</span> division_;
-<a name="l00114"></a>00114   <span class="keywordtype">bool</span> usingTimeCode_;
-<a name="l00115"></a>00115   std::vector&lt;double&gt; tickSeconds_;
-<a name="l00116"></a>00116   std::vector&lt;long&gt; trackPointers_;
-<a name="l00117"></a>00117   std::vector&lt;long&gt; trackOffsets_;
-<a name="l00118"></a>00118   std::vector&lt;long&gt; trackLengths_;
-<a name="l00119"></a>00119   std::vector&lt;char&gt; trackStatus_;
-<a name="l00120"></a>00120 
-<a name="l00121"></a>00121   <span class="comment">// This structure and the following variables are used to save and</span>
-<a name="l00122"></a>00122   <span class="comment">// keep track of a format 1 tempo map (and the initial tickSeconds</span>
-<a name="l00123"></a>00123   <span class="comment">// parameter for formats 0 and 2).</span>
-<a name="l00124"></a>00124   <span class="keyword">struct </span>TempoChange { 
-<a name="l00125"></a>00125     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> count;
-<a name="l00126"></a>00126     <span class="keywordtype">double</span> tickSeconds;
-<a name="l00127"></a>00127   };
-<a name="l00128"></a>00128   std::vector&lt;TempoChange&gt; tempoEvents_;
-<a name="l00129"></a>00129   std::vector&lt;unsigned long&gt; trackCounters_;
-<a name="l00130"></a>00130   std::vector&lt;unsigned int&gt; trackTempoIndex_;
-<a name="l00131"></a>00131 };
-<a name="l00132"></a>00132 
-<a name="l00133"></a>00133 } <span class="comment">// stk namespace</span>
-<a name="l00134"></a>00134 
-<a name="l00135"></a>00135 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/MidiFileIn_8h_source.html b/doc/html/MidiFileIn_8h_source.html
index 4d092ad..097d042 100644
--- a/doc/html/MidiFileIn_8h_source.html
+++ b/doc/html/MidiFileIn_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>MidiFileIn.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MIDIFILEIN_H</span>
@@ -34,12 +34,12 @@
 <a name="l00038"></a>00038 
 <a name="l00040"></a>00040   <a class="code" href="classstk_1_1MidiFileIn.html#a857246dbaf234cc9d68709afea6d0141" title="Class destructor.">~MidiFileIn</a>();
 <a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1MidiFileIn.html#ac93b16c4de0ed3d98d31a2edb92bc105" title="Return the MIDI file format (0, 1, or 2).">getFileFormat</a>() <span class="keyword">const</span>;
+<a name="l00043"></a><a class="code" href="classstk_1_1MidiFileIn.html#ac93b16c4de0ed3d98d31a2edb92bc105">00043</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1MidiFileIn.html#ac93b16c4de0ed3d98d31a2edb92bc105" title="Return the MIDI file format (0, 1, or 2).">getFileFormat</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> format_; };
 <a name="l00044"></a>00044 
-<a name="l00046"></a>00046   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1MidiFileIn.html#a7db7e6b2f6c1aedfbb78045106d36b17" title="Return the number of tracks in the MIDI file.">getNumberOfTracks</a>() <span class="keyword">const</span>;
+<a name="l00046"></a><a class="code" href="classstk_1_1MidiFileIn.html#a7db7e6b2f6c1aedfbb78045106d36b17">00046</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1MidiFileIn.html#a7db7e6b2f6c1aedfbb78045106d36b17" title="Return the number of tracks in the MIDI file.">getNumberOfTracks</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> nTracks_; };
 <a name="l00047"></a>00047 
 <a name="l00049"></a>00049 
-<a name="l00054"></a>00054   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1MidiFileIn.html#a43bc34a26e72f3311b855139a1408f78" title="Return the MIDI file division value from the file header.">getDivision</a>() <span class="keyword">const</span>;
+<a name="l00054"></a><a class="code" href="classstk_1_1MidiFileIn.html#a43bc34a26e72f3311b855139a1408f78">00054</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1MidiFileIn.html#a43bc34a26e72f3311b855139a1408f78" title="Return the MIDI file division value from the file header.">getDivision</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> division_; };
 <a name="l00055"></a>00055 
 <a name="l00057"></a>00057 
 <a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1MidiFileIn.html#a3bd547e3ee5bb8ad780274d7a09f12ff" title="Move the specified track event reader to the beginning of its track.">rewindTrack</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> track = 0 );
@@ -93,7 +93,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/ModalBar_8h-source.html b/doc/html/ModalBar_8h-source.html
deleted file mode 100644
index 62ddcd8..0000000
--- a/doc/html/ModalBar_8h-source.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>ModalBar.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MODALBAR_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_MODALBAR_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Modal.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00036"></a>00036 <span class="comment">/***************************************************/</span>
-<a name="l00037"></a>00037 
-<a name="l00038"></a><a class="code" href="classstk_1_1ModalBar.html">00038</a> <span class="keyword">class </span><a class="code" href="classstk_1_1ModalBar.html" title="STK resonant bar instrument class.">ModalBar</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Modal.html" title="STK resonance model abstract base class.">Modal</a>
-<a name="l00039"></a>00039 {
-<a name="l00040"></a>00040 <span class="keyword">public</span>:
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1ModalBar.html#28577ea9c8c474eca560134d7991855d" title="Class constructor.">ModalBar</a>( <span class="keywordtype">void</span> );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <a class="code" href="classstk_1_1ModalBar.html#b804e801a2d0b8e8c3552162152d6f3b" title="Class destructor.">~ModalBar</a>( <span class="keywordtype">void</span> );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ModalBar.html#d4fbd1f97cd8c8c0782827969b0b4acf" title="Set stick hardness (0.0 - 1.0).">setStickHardness</a>( StkFloat hardness );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ModalBar.html#5f0c4d254cb7efb87603a9732a072b38" title="Set stick position (0.0 - 1.0).">setStrikePosition</a>( StkFloat position );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ModalBar.html#3a09a114ccd420ab549b8565eb4928af" title="Select a bar preset (currently modulo 9).">setPreset</a>( <span class="keywordtype">int</span> preset );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ModalBar.html#e67fe1187b2e2018fd147c7e6293cde2" title="Set the modulation (vibrato) depth.">setModulationDepth</a>( StkFloat mDepth );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ModalBar.html#84e5b9963b74f0e4657f79d5dea013cb" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00061"></a>00061 };
-<a name="l00062"></a>00062 
-<a name="l00063"></a>00063 } <span class="comment">// stk namespace</span>
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/ModalBar_8h_source.html b/doc/html/ModalBar_8h_source.html
index b551179..5c925ca 100644
--- a/doc/html/ModalBar_8h_source.html
+++ b/doc/html/ModalBar_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>ModalBar.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MODALBAR_H</span>
@@ -48,7 +48,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Modal_8h-source.html b/doc/html/Modal_8h-source.html
deleted file mode 100644
index 2792c04..0000000
--- a/doc/html/Modal_8h-source.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Modal.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MODAL_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_MODAL_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Envelope.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "FileLoop.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "BiQuad.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="keyword">namespace </span>stk {
-<a name="l00012"></a>00012 
-<a name="l00013"></a>00013 <span class="comment">/***************************************************/</span>
-<a name="l00024"></a>00024 <span class="comment">/***************************************************/</span>
-<a name="l00025"></a>00025 
-<a name="l00026"></a><a class="code" href="classstk_1_1Modal.html">00026</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Modal.html" title="STK resonance model abstract base class.">Modal</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00027"></a>00027 {
-<a name="l00028"></a>00028 <span class="keyword">public</span>:
-<a name="l00030"></a>00030 
-<a name="l00033"></a>00033   <a class="code" href="classstk_1_1Modal.html#f6bfea135e80abb5537e62cf099c989a" title="Class constructor, taking the desired number of modes to create.">Modal</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> modes = 4 );
-<a name="l00034"></a>00034 
-<a name="l00036"></a>00036   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1Modal.html#7f45379ae10495b7a864cade0063705a" title="Class destructor.">~Modal</a>( <span class="keywordtype">void</span> );
-<a name="l00037"></a>00037 
-<a name="l00039"></a>00039   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#f064dc6ee4290fd51b4a6dc8a1f0909d" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#503092926e66667227bb46312a82a264" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#7e4f9a875e60485d07d50386ff63117f" title="Set the ratio and radius for a specified mode filter.">setRatioAndRadius</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> modeIndex, StkFloat ratio, StkFloat radius );
-<a name="l00046"></a>00046 
-<a name="l00048"></a><a class="code" href="classstk_1_1Modal.html#6e8d79358a5024b2e9a6c6f7c69a43c1">00048</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#6e8d79358a5024b2e9a6c6f7c69a43c1" title="Set the master gain.">setMasterGain</a>( StkFloat aGain ) { masterGain_ = aGain; };
-<a name="l00049"></a>00049 
-<a name="l00051"></a><a class="code" href="classstk_1_1Modal.html#70006135da2ecdc46eff4156504d94e1">00051</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#70006135da2ecdc46eff4156504d94e1" title="Set the direct gain.">setDirectGain</a>( StkFloat aGain ) { directGain_ = aGain; };
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#08bdfedf10d00dcf19e82809926eab2f" title="Set the gain for a specified mode filter.">setModeGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> modeIndex, StkFloat gain );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#b3bac00a47fa6fef70cf3ea442e9b121" title="Initiate a strike with the given amplitude (0.0 - 1.0).">strike</a>( StkFloat amplitude );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#1884c49b76ec8b902f22d50e26a7e365" title="Damp modes with a given decay factor (0.0 - 1.0).">damp</a>( StkFloat amplitude );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#44ce41e8e24e591f382914d00a259c7f" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#3483dafe33fa37e98781279810ea808f" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modal.html#9fab49ec164852c381758f5d333f8891" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value ) = 0;
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   StkFloat <a class="code" href="classstk_1_1Modal.html#c1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074 <span class="keyword">protected</span>:
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> envelope_; 
-<a name="l00077"></a>00077   <a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> *wave_;
-<a name="l00078"></a>00078   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> **filters_;
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  onepole_;
-<a name="l00080"></a>00080   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00081"></a>00081 
-<a name="l00082"></a>00082   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nModes_;
-<a name="l00083"></a>00083   std::vector&lt;StkFloat&gt; ratios_;
-<a name="l00084"></a>00084   std::vector&lt;StkFloat&gt; radii_;
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086   StkFloat vibratoGain_;
-<a name="l00087"></a>00087   StkFloat masterGain_;
-<a name="l00088"></a>00088   StkFloat directGain_;
-<a name="l00089"></a>00089   StkFloat stickHardness_;
-<a name="l00090"></a>00090   StkFloat strikePosition_;
-<a name="l00091"></a>00091   StkFloat baseFrequency_;
-<a name="l00092"></a>00092 };
-<a name="l00093"></a>00093 
-<a name="l00094"></a><a class="code" href="classstk_1_1Modal.html#c1fd3f5dcb9b5cbb8bed0bff330c3890">00094</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Modal.html#c1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">Modal :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00095"></a>00095 {
-<a name="l00096"></a>00096   StkFloat temp = masterGain_ * onepole_.<a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( wave_-&gt;<a class="code" href="classstk_1_1FileWvIn.html#da668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>() * envelope_.<a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>() );
-<a name="l00097"></a>00097 
-<a name="l00098"></a>00098   StkFloat temp2 = 0.0;
-<a name="l00099"></a>00099   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;nModes_; i++ )
-<a name="l00100"></a>00100     temp2 += filters_[i]-&gt;<a class="code" href="classstk_1_1Modal.html#c1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">tick</a>(temp);
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   temp2  -= temp2 * directGain_;
-<a name="l00103"></a>00103   temp2 += directGain_ * temp;
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="keywordflow">if</span> ( vibratoGain_ != 0.0 ) {
-<a name="l00106"></a>00106     <span class="comment">// Calculate AM and apply to master out</span>
-<a name="l00107"></a>00107     temp = 1.0 + ( vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * vibratoGain_ );
-<a name="l00108"></a>00108     temp2 = temp * temp2;
-<a name="l00109"></a>00109   }
-<a name="l00110"></a>00110     
-<a name="l00111"></a>00111   lastFrame_[0] = temp2;
-<a name="l00112"></a>00112   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00113"></a>00113 }
-<a name="l00114"></a>00114 
-<a name="l00115"></a>00115 } <span class="comment">// stk namespace</span>
-<a name="l00116"></a>00116 
-<a name="l00117"></a>00117 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Modal_8h_source.html b/doc/html/Modal_8h_source.html
index ced61a9..6f1b858 100644
--- a/doc/html/Modal_8h_source.html
+++ b/doc/html/Modal_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Modal.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MODAL_H</span>
@@ -59,56 +59,86 @@
 <a name="l00070"></a>00070 
 <a name="l00072"></a>00072   StkFloat <a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00073"></a>00073 
-<a name="l00074"></a>00074 <span class="keyword">protected</span>:
 <a name="l00075"></a>00075 
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> envelope_; 
-<a name="l00077"></a>00077   <a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> *wave_;
-<a name="l00078"></a>00078   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> **filters_;
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  onepole_;
-<a name="l00080"></a>00080   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00081"></a>00081 
-<a name="l00082"></a>00082   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nModes_;
-<a name="l00083"></a>00083   std::vector&lt;StkFloat&gt; ratios_;
-<a name="l00084"></a>00084   std::vector&lt;StkFloat&gt; radii_;
+<a name="l00082"></a>00082   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00083"></a>00083 
+<a name="l00084"></a>00084 <span class="keyword">protected</span>:
 <a name="l00085"></a>00085 
-<a name="l00086"></a>00086   StkFloat vibratoGain_;
-<a name="l00087"></a>00087   StkFloat masterGain_;
-<a name="l00088"></a>00088   StkFloat directGain_;
-<a name="l00089"></a>00089   StkFloat stickHardness_;
-<a name="l00090"></a>00090   StkFloat strikePosition_;
-<a name="l00091"></a>00091   StkFloat baseFrequency_;
-<a name="l00092"></a>00092 };
-<a name="l00093"></a>00093 
-<a name="l00094"></a><a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890">00094</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">Modal :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00095"></a>00095 {
-<a name="l00096"></a>00096   StkFloat temp = masterGain_ * onepole_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( wave_-&gt;<a class="code" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>() * envelope_.<a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>() );
-<a name="l00097"></a>00097 
-<a name="l00098"></a>00098   StkFloat temp2 = 0.0;
-<a name="l00099"></a>00099   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;nModes_; i++ )
-<a name="l00100"></a>00100     temp2 += filters_[i]-&gt;<a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">tick</a>(temp);
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102   temp2  -= temp2 * directGain_;
-<a name="l00103"></a>00103   temp2 += directGain_ * temp;
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   <span class="keywordflow">if</span> ( vibratoGain_ != 0.0 ) {
-<a name="l00106"></a>00106     <span class="comment">// Calculate AM and apply to master out</span>
-<a name="l00107"></a>00107     temp = 1.0 + ( vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * vibratoGain_ );
-<a name="l00108"></a>00108     temp2 = temp * temp2;
-<a name="l00109"></a>00109   }
-<a name="l00110"></a>00110     
-<a name="l00111"></a>00111   lastFrame_[0] = temp2;
-<a name="l00112"></a>00112   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00113"></a>00113 }
+<a name="l00086"></a>00086   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> envelope_; 
+<a name="l00087"></a>00087   <a class="code" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> *wave_;
+<a name="l00088"></a>00088   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> **filters_;
+<a name="l00089"></a>00089   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  onepole_;
+<a name="l00090"></a>00090   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
+<a name="l00091"></a>00091 
+<a name="l00092"></a>00092   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nModes_;
+<a name="l00093"></a>00093   std::vector&lt;StkFloat&gt; ratios_;
+<a name="l00094"></a>00094   std::vector&lt;StkFloat&gt; radii_;
+<a name="l00095"></a>00095 
+<a name="l00096"></a>00096   StkFloat vibratoGain_;
+<a name="l00097"></a>00097   StkFloat masterGain_;
+<a name="l00098"></a>00098   StkFloat directGain_;
+<a name="l00099"></a>00099   StkFloat stickHardness_;
+<a name="l00100"></a>00100   StkFloat strikePosition_;
+<a name="l00101"></a>00101   StkFloat baseFrequency_;
+<a name="l00102"></a>00102 };
+<a name="l00103"></a>00103 
+<a name="l00104"></a><a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890">00104</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">Modal :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00105"></a>00105 {
+<a name="l00106"></a>00106   StkFloat temp = masterGain_ * onepole_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( wave_-&gt;<a class="code" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick</a>() * envelope_.<a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>() );
+<a name="l00107"></a>00107 
+<a name="l00108"></a>00108   StkFloat temp2 = 0.0;
+<a name="l00109"></a>00109   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;nModes_; i++ )
+<a name="l00110"></a>00110     temp2 += filters_[i]-&gt;<a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">tick</a>(temp);
+<a name="l00111"></a>00111 
+<a name="l00112"></a>00112   temp2  -= temp2 * directGain_;
+<a name="l00113"></a>00113   temp2 += directGain_ * temp;
 <a name="l00114"></a>00114 
-<a name="l00115"></a>00115 } <span class="comment">// stk namespace</span>
-<a name="l00116"></a>00116 
-<a name="l00117"></a>00117 <span class="preprocessor">#endif</span>
+<a name="l00115"></a>00115   <span class="keywordflow">if</span> ( vibratoGain_ != 0.0 ) {
+<a name="l00116"></a>00116     <span class="comment">// Calculate AM and apply to master out</span>
+<a name="l00117"></a>00117     temp = 1.0 + ( vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * vibratoGain_ );
+<a name="l00118"></a>00118     temp2 = temp * temp2;
+<a name="l00119"></a>00119   }
+<a name="l00120"></a>00120     
+<a name="l00121"></a>00121   lastFrame_[0] = temp2;
+<a name="l00122"></a>00122   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00123"></a>00123 }
+<a name="l00124"></a>00124 
+<a name="l00125"></a><a class="code" href="classstk_1_1Modal.html#ad2a28e7bd5fdae7d2a6d9fb79bbfb7b0">00125</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">Modal :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00126"></a>00126 {
+<a name="l00127"></a>00127   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00128"></a>00128 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00129"></a>00129 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00130"></a>00130     oStream_ &lt;&lt; <span class="stringliteral">&quot;Modal::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00131"></a>00131     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00132"></a>00132   }
+<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
+<a name="l00134"></a>00134 <span class="preprocessor"></span>
+<a name="l00135"></a>00135   StkFloat *samples = &amp;frames[channel];
+<a name="l00136"></a>00136   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00137"></a>00137   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00138"></a>00138     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00139"></a>00139       *samples++ = <a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">tick</a>();
+<a name="l00140"></a>00140   }
+<a name="l00141"></a>00141   <span class="keywordflow">else</span> {
+<a name="l00142"></a>00142     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00143"></a>00143       *samples++ = <a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">tick</a>();
+<a name="l00144"></a>00144       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00145"></a>00145         *samples++ = lastFrame_[j];
+<a name="l00146"></a>00146     }
+<a name="l00147"></a>00147   }
+<a name="l00148"></a>00148 
+<a name="l00149"></a>00149   <span class="keywordflow">return</span> frames;
+<a name="l00150"></a>00150 }
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152 } <span class="comment">// stk namespace</span>
+<a name="l00153"></a>00153 
+<a name="l00154"></a>00154 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Modulate_8h-source.html b/doc/html/Modulate_8h-source.html
deleted file mode 100644
index a62797a..0000000
--- a/doc/html/Modulate_8h-source.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Modulate.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MODULATE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_MODULATE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Generator.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="keyword">namespace </span>stk {
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="comment">/***************************************************/</span>
-<a name="l00021"></a>00021 <span class="comment">/***************************************************/</span>
-<a name="l00022"></a>00022 
-<a name="l00023"></a><a class="code" href="classstk_1_1Modulate.html">00023</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Modulate.html" title="STK periodic/random modulator.">Modulate</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00024"></a>00024 {
-<a name="l00025"></a>00025  <span class="keyword">public</span>:
-<a name="l00027"></a>00027 
-<a name="l00030"></a>00030   <a class="code" href="classstk_1_1Modulate.html#96812173415bfb086f5d8d738f4d0c2e" title="Class constructor.">Modulate</a>( <span class="keywordtype">void</span> );
-<a name="l00031"></a>00031 
-<a name="l00033"></a>00033   <a class="code" href="classstk_1_1Modulate.html#dd541ec0d037a21bd236b5790878d060" title="Class destructor.">~Modulate</a>( <span class="keywordtype">void</span> );
-<a name="l00034"></a>00034 
-<a name="l00036"></a><a class="code" href="classstk_1_1Modulate.html#6cb78fe2dec3bebf2586764421556706">00036</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modulate.html#6cb78fe2dec3bebf2586764421556706" title="Reset internal state.">reset</a>( <span class="keywordtype">void</span> ) { lastFrame_[0] = 0.0; };
-<a name="l00037"></a>00037 
-<a name="l00039"></a><a class="code" href="classstk_1_1Modulate.html#298b25f4b7cc56f2dffae5474a05999d">00039</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modulate.html#298b25f4b7cc56f2dffae5474a05999d" title="Set the periodic (vibrato) rate or frequency in Hz.">setVibratoRate</a>( StkFloat rate ) { vibrato_.<a class="code" href="classstk_1_1SineWave.html#1047a43714bc2e40c7e31e8f7e34adbc" title="Set the data interpolation rate based on a looping frequency.">setFrequency</a>( rate ); };
-<a name="l00040"></a>00040 
-<a name="l00042"></a><a class="code" href="classstk_1_1Modulate.html#08f2d489a3fba3a10d1f301aed869ed4">00042</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modulate.html#08f2d489a3fba3a10d1f301aed869ed4" title="Set the periodic (vibrato) gain.">setVibratoGain</a>( StkFloat gain ) { vibratoGain_ = gain; };
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Modulate.html#c6e7a02378facf59916f2460ed5c2fa5" title="Set the random modulation gain.">setRandomGain</a>( StkFloat gain );
-<a name="l00046"></a>00046 
-<a name="l00048"></a><a class="code" href="classstk_1_1Modulate.html#ddf73f58590ab082f106c9745c5bedc9">00048</a>   StkFloat <a class="code" href="classstk_1_1Modulate.html#ddf73f58590ab082f106c9745c5bedc9" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   StkFloat <a class="code" href="classstk_1_1Modulate.html#237b96dd553d65253abbf00a186e293d" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054 
-<a name="l00061"></a>00061   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Modulate.html#237b96dd553d65253abbf00a186e293d" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00062"></a>00062 
-<a name="l00063"></a>00063  <span class="keyword">protected</span>:
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00068"></a>00068   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise_;
-<a name="l00069"></a>00069   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  filter_;
-<a name="l00070"></a>00070   StkFloat vibratoGain_;
-<a name="l00071"></a>00071   StkFloat randomGain_;
-<a name="l00072"></a>00072   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> noiseRate_;
-<a name="l00073"></a>00073   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> noiseCounter_;
-<a name="l00074"></a>00074 
-<a name="l00075"></a>00075 };
-<a name="l00076"></a>00076 
-<a name="l00077"></a><a class="code" href="classstk_1_1Modulate.html#237b96dd553d65253abbf00a186e293d">00077</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Modulate.html#237b96dd553d65253abbf00a186e293d" title="Compute and return one output sample.">Modulate :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00078"></a>00078 {
-<a name="l00079"></a>00079   <span class="comment">// Compute periodic and random modulations.</span>
-<a name="l00080"></a>00080   lastFrame_[0] = vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
-<a name="l00081"></a>00081   <span class="keywordflow">if</span> ( noiseCounter_++ &gt;= noiseRate_ ) {
-<a name="l00082"></a>00082     noise_.<a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00083"></a>00083     noiseCounter_ = 0;
-<a name="l00084"></a>00084   }
-<a name="l00085"></a>00085   lastFrame_[0] += filter_.<a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( noise_.<a class="code" href="classstk_1_1Noise.html#1d6c8ed80425cd0cea014bd2e328c823" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00086"></a>00086   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00087"></a>00087 }
-<a name="l00088"></a>00088 
-<a name="l00089"></a><a class="code" href="classstk_1_1Modulate.html#942eee1bb78318e1b59afeb311748b2d">00089</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Modulate.html#237b96dd553d65253abbf00a186e293d" title="Compute and return one output sample.">Modulate :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00090"></a>00090 {
-<a name="l00091"></a>00091 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00092"></a>00092 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00093"></a>00093     errorString_ &lt;&lt; <span class="stringliteral">"Modulate::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00094"></a>00094     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00095"></a>00095   }
-<a name="l00096"></a>00096 <span class="preprocessor">#endif</span>
-<a name="l00097"></a>00097 <span class="preprocessor"></span>
-<a name="l00098"></a>00098   StkFloat *samples = &amp;frames[channel];
-<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00100"></a>00100   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00101"></a>00101     *samples = <a class="code" href="classstk_1_1Modulate.html#237b96dd553d65253abbf00a186e293d" title="Compute and return one output sample.">Modulate::tick</a>();
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103   <span class="keywordflow">return</span> frames;
-<a name="l00104"></a>00104 }
-<a name="l00105"></a>00105 
-<a name="l00106"></a>00106 } <span class="comment">// stk namespace</span>
-<a name="l00107"></a>00107 
-<a name="l00108"></a>00108 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Modulate_8h_source.html b/doc/html/Modulate_8h_source.html
index ba76ec2..0e23aba 100644
--- a/doc/html/Modulate_8h_source.html
+++ b/doc/html/Modulate_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Modulate.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MODULATE_H</span>
@@ -78,7 +78,7 @@
 <a name="l00090"></a>00090 {
 <a name="l00091"></a>00091 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00092"></a>00092 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00093"></a>00093     errorString_ &lt;&lt; <span class="stringliteral">&quot;Modulate::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00093"></a>00093     oStream_ &lt;&lt; <span class="stringliteral">&quot;Modulate::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00094"></a>00094     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00095"></a>00095   }
 <a name="l00096"></a>00096 <span class="preprocessor">#endif</span>
@@ -99,7 +99,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Moog_8h-source.html b/doc/html/Moog_8h-source.html
deleted file mode 100644
index 342c0fd..0000000
--- a/doc/html/Moog_8h-source.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Moog.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MOOG_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_MOOG_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Sampler.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "FormSwep.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00027"></a>00027 <span class="comment">/***************************************************/</span>
-<a name="l00028"></a>00028 
-<a name="l00029"></a><a class="code" href="classstk_1_1Moog.html">00029</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Moog.html" title="STK moog-like swept filter sampling synthesis class.">Moog</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Sampler.html" title="STK sampling synthesis abstract base class.">Sampler</a>
-<a name="l00030"></a>00030 {
-<a name="l00031"></a>00031  <span class="keyword">public</span>:
-<a name="l00033"></a>00033 
-<a name="l00036"></a>00036   <a class="code" href="classstk_1_1Moog.html#07c8d02638711d5f08a3b320b7274156" title="Class constructor.">Moog</a>( <span class="keywordtype">void</span> );
-<a name="l00037"></a>00037 
-<a name="l00039"></a>00039   <a class="code" href="classstk_1_1Moog.html#c05815f49aab07e01ff0d4e5e8c4edba" title="Class destructor.">~Moog</a>( <span class="keywordtype">void</span> );
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Moog.html#b0d66174dd734d55ef7224d6d8f2cb06" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Moog.html#899bc1c5c76fb29875d4df4ce594d44e" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00046"></a>00046 
-<a name="l00048"></a><a class="code" href="classstk_1_1Moog.html#feb63bf762f07851db22ae5bf18f0a81">00048</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Moog.html#feb63bf762f07851db22ae5bf18f0a81" title="Set the modulation (vibrato) speed in Hz.">setModulationSpeed</a>( StkFloat mSpeed ) { loops_[1]-&gt;setFrequency( mSpeed ); };
-<a name="l00049"></a>00049 
-<a name="l00051"></a><a class="code" href="classstk_1_1Moog.html#32e5ee083d5d92494bbe9fac43c2070f">00051</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Moog.html#32e5ee083d5d92494bbe9fac43c2070f" title="Set the modulation (vibrato) depth.">setModulationDepth</a>( StkFloat mDepth ) { modDepth_ = mDepth * 0.5; };
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Moog.html#cadb54eccab35e3b18b62ffd96c18ac4" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   StkFloat <a class="code" href="classstk_1_1Moog.html#b9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00058"></a>00058 
-<a name="l00059"></a>00059  <span class="keyword">protected</span>:
-<a name="l00060"></a>00060 
-<a name="l00061"></a>00061   <a class="code" href="classstk_1_1FormSwep.html" title="STK sweepable formant filter class.">FormSwep</a> filters_[2];
-<a name="l00062"></a>00062   StkFloat modDepth_;
-<a name="l00063"></a>00063   StkFloat filterQ_;
-<a name="l00064"></a>00064   StkFloat filterRate_;
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066 };
-<a name="l00067"></a>00067 
-<a name="l00068"></a><a class="code" href="classstk_1_1Moog.html#b9635044198c12a5c1b5dbb94245ab5a">00068</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Moog.html#b9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">Moog :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00069"></a>00069 {
-<a name="l00070"></a>00070   StkFloat temp;
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072   <span class="keywordflow">if</span> ( modDepth_ != 0.0 ) {
-<a name="l00073"></a>00073     temp = loops_[1]-&gt;tick() * modDepth_;    
-<a name="l00074"></a>00074     loops_[0]-&gt;setFrequency( baseFrequency_ * (1.0 + temp) );
-<a name="l00075"></a>00075   }
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077   temp = attackGain_ * attacks_[0]-&gt;tick();
-<a name="l00078"></a>00078   temp += loopGain_ * loops_[0]-&gt;tick();
-<a name="l00079"></a>00079   temp = filter_.<a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( temp );
-<a name="l00080"></a>00080   temp *= adsr_.<a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00081"></a>00081   temp = filters_[0].<a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( temp );
-<a name="l00082"></a>00082   lastFrame_[0] = filters_[1].<a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( temp );
-<a name="l00083"></a>00083   <span class="keywordflow">return</span> lastFrame_[0] * 6.0;
-<a name="l00084"></a>00084 }
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086 } <span class="comment">// stk namespace</span>
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Moog_8h_source.html b/doc/html/Moog_8h_source.html
index bd4fc4d..40dc3aa 100644
--- a/doc/html/Moog_8h_source.html
+++ b/doc/html/Moog_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Moog.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MOOG_H</span>
@@ -43,42 +43,72 @@
 <a name="l00055"></a>00055 
 <a name="l00057"></a>00057   StkFloat <a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00058"></a>00058 
-<a name="l00059"></a>00059  <span class="keyword">protected</span>:
 <a name="l00060"></a>00060 
-<a name="l00061"></a>00061   <a class="code" href="classstk_1_1FormSwep.html" title="STK sweepable formant filter class.">FormSwep</a> filters_[2];
-<a name="l00062"></a>00062   StkFloat modDepth_;
-<a name="l00063"></a>00063   StkFloat filterQ_;
-<a name="l00064"></a>00064   StkFloat filterRate_;
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066 };
-<a name="l00067"></a>00067 
-<a name="l00068"></a><a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a">00068</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">Moog :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00069"></a>00069 {
-<a name="l00070"></a>00070   StkFloat temp;
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072   <span class="keywordflow">if</span> ( modDepth_ != 0.0 ) {
-<a name="l00073"></a>00073     temp = loops_[1]-&gt;tick() * modDepth_;    
-<a name="l00074"></a>00074     loops_[0]-&gt;setFrequency( baseFrequency_ * (1.0 + temp) );
-<a name="l00075"></a>00075   }
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077   temp = attackGain_ * attacks_[0]-&gt;tick();
-<a name="l00078"></a>00078   temp += loopGain_ * loops_[0]-&gt;tick();
-<a name="l00079"></a>00079   temp = filter_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( temp );
-<a name="l00080"></a>00080   temp *= adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00081"></a>00081   temp = filters_[0].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( temp );
-<a name="l00082"></a>00082   lastFrame_[0] = filters_[1].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( temp );
-<a name="l00083"></a>00083   <span class="keywordflow">return</span> lastFrame_[0] * 6.0;
-<a name="l00084"></a>00084 }
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086 } <span class="comment">// stk namespace</span>
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088 <span class="preprocessor">#endif</span>
+<a name="l00067"></a>00067   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00068"></a>00068 
+<a name="l00069"></a>00069  <span class="keyword">protected</span>:
+<a name="l00070"></a>00070 
+<a name="l00071"></a>00071   <a class="code" href="classstk_1_1FormSwep.html" title="STK sweepable formant filter class.">FormSwep</a> filters_[2];
+<a name="l00072"></a>00072   StkFloat modDepth_;
+<a name="l00073"></a>00073   StkFloat filterQ_;
+<a name="l00074"></a>00074   StkFloat filterRate_;
+<a name="l00075"></a>00075 
+<a name="l00076"></a>00076 };
+<a name="l00077"></a>00077 
+<a name="l00078"></a><a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a">00078</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">Moog :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00079"></a>00079 {
+<a name="l00080"></a>00080   StkFloat temp;
+<a name="l00081"></a>00081 
+<a name="l00082"></a>00082   <span class="keywordflow">if</span> ( modDepth_ != 0.0 ) {
+<a name="l00083"></a>00083     temp = loops_[1]-&gt;tick() * modDepth_;    
+<a name="l00084"></a>00084     loops_[0]-&gt;setFrequency( baseFrequency_ * (1.0 + temp) );
+<a name="l00085"></a>00085   }
+<a name="l00086"></a>00086 
+<a name="l00087"></a>00087   temp = attackGain_ * attacks_[0]-&gt;tick();
+<a name="l00088"></a>00088   temp += loopGain_ * loops_[0]-&gt;tick();
+<a name="l00089"></a>00089   temp = filter_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( temp );
+<a name="l00090"></a>00090   temp *= adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
+<a name="l00091"></a>00091   temp = filters_[0].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( temp );
+<a name="l00092"></a>00092   lastFrame_[0] = filters_[1].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( temp );
+<a name="l00093"></a>00093   <span class="keywordflow">return</span> lastFrame_[0] * 6.0;
+<a name="l00094"></a>00094 }
+<a name="l00095"></a>00095 
+<a name="l00096"></a><a class="code" href="classstk_1_1Moog.html#aee6aa6373c424e941f963b2709310f4e">00096</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">Moog :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00097"></a>00097 {
+<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00099"></a>00099 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00100"></a>00100 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00101"></a>00101     oStream_ &lt;&lt; <span class="stringliteral">&quot;Moog::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00102"></a>00102     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00103"></a>00103   }
+<a name="l00104"></a>00104 <span class="preprocessor">#endif</span>
+<a name="l00105"></a>00105 <span class="preprocessor"></span>
+<a name="l00106"></a>00106   StkFloat *samples = &amp;frames[channel];
+<a name="l00107"></a>00107   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00108"></a>00108   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00109"></a>00109     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00110"></a>00110       *samples++ = <a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">tick</a>();
+<a name="l00111"></a>00111   }
+<a name="l00112"></a>00112   <span class="keywordflow">else</span> {
+<a name="l00113"></a>00113     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00114"></a>00114       *samples++ = <a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">tick</a>();
+<a name="l00115"></a>00115       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00116"></a>00116         *samples++ = lastFrame_[j];
+<a name="l00117"></a>00117     }
+<a name="l00118"></a>00118   }
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   <span class="keywordflow">return</span> frames;
+<a name="l00121"></a>00121 }
+<a name="l00122"></a>00122 
+<a name="l00123"></a>00123 } <span class="comment">// stk namespace</span>
+<a name="l00124"></a>00124 
+<a name="l00125"></a>00125 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Mutex_8h-source.html b/doc/html/Mutex_8h-source.html
deleted file mode 100644
index db9e681..0000000
--- a/doc/html/Mutex_8h-source.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Mutex.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MUTEX_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_MUTEX_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="preprocessor">#if (defined(__OS_IRIX__) || defined(__OS_LINUX__) || defined(__OS_MACOSX__))</span>
-<a name="l00007"></a>00007 <span class="preprocessor"></span>
-<a name="l00008"></a>00008 <span class="preprocessor">  #include &lt;pthread.h&gt;</span>
-<a name="l00009"></a>00009   <span class="keyword">typedef</span> pthread_mutex_t MUTEX;
-<a name="l00010"></a>00010   <span class="keyword">typedef</span> pthread_cond_t CONDITION;
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="preprocessor">#elif defined(__OS_WINDOWS__)</span>
-<a name="l00013"></a>00013 <span class="preprocessor"></span>
-<a name="l00014"></a>00014 <span class="preprocessor">  #include &lt;windows.h&gt;</span>
-<a name="l00015"></a>00015 <span class="preprocessor">  #include &lt;process.h&gt;</span>
-<a name="l00016"></a>00016   <span class="keyword">typedef</span> CRITICAL_SECTION MUTEX;
-<a name="l00017"></a>00017   <span class="keyword">typedef</span> HANDLE CONDITION;
-<a name="l00018"></a>00018 
-<a name="l00019"></a>00019 <span class="preprocessor">#endif</span>
-<a name="l00020"></a>00020 <span class="preprocessor"></span>
-<a name="l00021"></a>00021 <span class="keyword">namespace </span>stk {
-<a name="l00022"></a>00022 
-<a name="l00023"></a>00023 <span class="comment">/***************************************************/</span>
-<a name="l00034"></a>00034 <span class="comment">/***************************************************/</span>
-<a name="l00035"></a>00035 
-<a name="l00036"></a><a class="code" href="classstk_1_1Mutex.html">00036</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Mutex.html" title="STK mutex class.">Mutex</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00037"></a>00037 {
-<a name="l00038"></a>00038  <span class="keyword">public</span>:
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1Mutex.html#869b23f40be55c01cc381290de1d1375" title="Default constructor.">Mutex</a>();
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <a class="code" href="classstk_1_1Mutex.html#63df62eabfb7976e34951145d7a7ced3" title="Class destructor.">~Mutex</a>();
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mutex.html#f2bb62c13745502b58644189d1db5b35" title="Lock the mutex.">lock</a>(<span class="keywordtype">void</span>);
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mutex.html#e518f6d3177dd8c2138eccb8944591ee" title="Unlock the mutex.">unlock</a>(<span class="keywordtype">void</span>);
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052 
-<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mutex.html#fa637fae8940d6c3ad42384439962bbe" title="Wait indefinitely on the mutex condition variable.">wait</a>(<span class="keywordtype">void</span>);
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Mutex.html#c3e3e69efa1587cb1f65fb645a8d43db" title="Signal the condition variable.">signal</a>(<span class="keywordtype">void</span>);
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065  <span class="keyword">protected</span>:
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067   MUTEX mutex_;
-<a name="l00068"></a>00068   CONDITION condition_;
-<a name="l00069"></a>00069 
-<a name="l00070"></a>00070 };
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072 } <span class="comment">// stk namespace</span>
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Mutex_8h_source.html b/doc/html/Mutex_8h_source.html
index e989686..5d3184e 100644
--- a/doc/html/Mutex_8h_source.html
+++ b/doc/html/Mutex_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Mutex.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_MUTEX_H</span>
@@ -69,7 +69,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/NRev_8h-source.html b/doc/html/NRev_8h-source.html
deleted file mode 100644
index 8cd6559..0000000
--- a/doc/html/NRev_8h-source.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>NRev.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_NREV_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_NREV_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Effect.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Delay.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00023"></a>00023 <span class="comment">/***************************************************/</span>
-<a name="l00024"></a>00024 
-<a name="l00025"></a><a class="code" href="classstk_1_1NRev.html">00025</a> <span class="keyword">class </span><a class="code" href="classstk_1_1NRev.html" title="CCRMA&amp;#39;s NRev reverberator class.">NRev</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Effect.html" title="STK abstract effects parent class.">Effect</a>
-<a name="l00026"></a>00026 {
-<a name="l00027"></a>00027  <span class="keyword">public</span>:
-<a name="l00029"></a>00029   <a class="code" href="classstk_1_1NRev.html#68757d7a44e960acfd18cb94b465c727" title="Class constructor taking a T60 decay time argument (one second default value).">NRev</a>( StkFloat T60 = 1.0 );
-<a name="l00030"></a>00030 
-<a name="l00032"></a>00032   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1NRev.html#4097b11b38dd00d084ae4a94bc18f02c" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00033"></a>00033 
-<a name="l00035"></a>00035   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1NRev.html#9c0d41a2b9ce7fb9edb2d620ba005e3c" title="Set the reverberation T60 decay time.">setT60</a>( StkFloat T60 );
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038 
-<a name="l00046"></a>00046   StkFloat <a class="code" href="classstk_1_1NRev.html#9f9faa6542271163680c1925309ed788" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049 
-<a name="l00056"></a>00056   StkFloat <a class="code" href="classstk_1_1NRev.html#cfb629e4822fc5bffcf39b8f3ed9cfa1" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059 
-<a name="l00068"></a>00068   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1NRev.html#cfb629e4822fc5bffcf39b8f3ed9cfa1" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00069"></a>00069 
-<a name="l00071"></a>00071 
-<a name="l00080"></a>00080   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1NRev.html#cfb629e4822fc5bffcf39b8f3ed9cfa1" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00081"></a>00081 
-<a name="l00082"></a>00082  <span class="keyword">protected</span>:
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> allpassDelays_[8];
-<a name="l00085"></a>00085   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> combDelays_[6];
-<a name="l00086"></a>00086   StkFloat allpassCoefficient_;
-<a name="l00087"></a>00087   StkFloat combCoefficient_[6];
-<a name="l00088"></a>00088          StkFloat lowpassState_;
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 };
-<a name="l00091"></a>00091 
-<a name="l00092"></a><a class="code" href="classstk_1_1NRev.html#9f9faa6542271163680c1925309ed788">00092</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1NRev.html#9f9faa6542271163680c1925309ed788" title="Return the specified channel value of the last computed stereo frame.">NRev :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00093"></a>00093 {
-<a name="l00094"></a>00094 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00095"></a>00095 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00096"></a>00096     errorString_ &lt;&lt; <span class="stringliteral">"NRev::lastOut(): channel argument must be less than 2!"</span>;
-<a name="l00097"></a>00097     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00098"></a>00098   }
-<a name="l00099"></a>00099 <span class="preprocessor">#endif</span>
-<a name="l00100"></a>00100 <span class="preprocessor"></span>
-<a name="l00101"></a>00101   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00102"></a>00102 }
-<a name="l00103"></a>00103 
-<a name="l00104"></a><a class="code" href="classstk_1_1NRev.html#cfb629e4822fc5bffcf39b8f3ed9cfa1">00104</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1NRev.html#cfb629e4822fc5bffcf39b8f3ed9cfa1" title="Input one sample to the effect and return the specified channel value of the computed...">NRev :: tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00105"></a>00105 {
-<a name="l00106"></a>00106 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00107"></a>00107 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00108"></a>00108     errorString_ &lt;&lt; <span class="stringliteral">"NRev::tick(): channel argument must be less than 2!"</span>;
-<a name="l00109"></a>00109     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00110"></a>00110   }
-<a name="l00111"></a>00111 <span class="preprocessor">#endif</span>
-<a name="l00112"></a>00112 <span class="preprocessor"></span>
-<a name="l00113"></a>00113   StkFloat temp, temp0, temp1, temp2, temp3;
-<a name="l00114"></a>00114   <span class="keywordtype">int</span> i;
-<a name="l00115"></a>00115 
-<a name="l00116"></a>00116   temp0 = 0.0;
-<a name="l00117"></a>00117   <span class="keywordflow">for</span> ( i=0; i&lt;6; i++ ) {
-<a name="l00118"></a>00118     temp = input + (combCoefficient_[i] * combDelays_[i].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00119"></a>00119     temp0 += combDelays_[i].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00120"></a>00120   }
-<a name="l00121"></a>00121 
-<a name="l00122"></a>00122   <span class="keywordflow">for</span> ( i=0; i&lt;3; i++ )    {
-<a name="l00123"></a>00123     temp = allpassDelays_[i].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00124"></a>00124     temp1 = allpassCoefficient_ * temp;
-<a name="l00125"></a>00125     temp1 += temp0;
-<a name="l00126"></a>00126     allpassDelays_[i].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp1);
-<a name="l00127"></a>00127     temp0 = -(allpassCoefficient_ * temp1) + temp;
-<a name="l00128"></a>00128   }
-<a name="l00129"></a>00129 
-<a name="l00130"></a>00130          <span class="comment">// One-pole lowpass filter.</span>
-<a name="l00131"></a>00131   lowpassState_ = 0.7 * lowpassState_ + 0.3 * temp0;
-<a name="l00132"></a>00132   temp = allpassDelays_[3].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00133"></a>00133   temp1 = allpassCoefficient_ * temp;
-<a name="l00134"></a>00134   temp1 += lowpassState_;
-<a name="l00135"></a>00135   allpassDelays_[3].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( temp1 );
-<a name="l00136"></a>00136   temp1 = -( allpassCoefficient_ * temp1 ) + temp;
-<a name="l00137"></a>00137     
-<a name="l00138"></a>00138   temp = allpassDelays_[4].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00139"></a>00139   temp2 = allpassCoefficient_ * temp;
-<a name="l00140"></a>00140   temp2 += temp1;
-<a name="l00141"></a>00141   allpassDelays_[4].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( temp2 );
-<a name="l00142"></a>00142   lastFrame_[0] = effectMix_*( -( allpassCoefficient_ * temp2 ) + temp );
-<a name="l00143"></a>00143     
-<a name="l00144"></a>00144   temp = allpassDelays_[5].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00145"></a>00145   temp3 = allpassCoefficient_ * temp;
-<a name="l00146"></a>00146   temp3 += temp1;
-<a name="l00147"></a>00147   allpassDelays_[5].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>( temp3 );
-<a name="l00148"></a>00148   lastFrame_[1] = effectMix_*( - ( allpassCoefficient_ * temp3 ) + temp );
-<a name="l00149"></a>00149 
-<a name="l00150"></a>00150   temp = ( 1.0 - effectMix_ ) * input;
-<a name="l00151"></a>00151   lastFrame_[0] += temp;
-<a name="l00152"></a>00152   lastFrame_[1] += temp;
-<a name="l00153"></a>00153     
-<a name="l00154"></a>00154   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00155"></a>00155 }
-<a name="l00156"></a>00156 
-<a name="l00157"></a>00157 } <span class="comment">// stk namespace</span>
-<a name="l00158"></a>00158 
-<a name="l00159"></a>00159 <span class="preprocessor">#endif</span>
-<a name="l00160"></a>00160 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/NRev_8h_source.html b/doc/html/NRev_8h_source.html
index b2fb3b6..eeddf3a 100644
--- a/doc/html/NRev_8h_source.html
+++ b/doc/html/NRev_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>NRev.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_NREV_H</span>
@@ -58,7 +58,7 @@
 <a name="l00093"></a>00093 {
 <a name="l00094"></a>00094 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00095"></a>00095 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00096"></a>00096     errorString_ &lt;&lt; <span class="stringliteral">&quot;NRev::lastOut(): channel argument must be less than 2!&quot;</span>;
+<a name="l00096"></a>00096     oStream_ &lt;&lt; <span class="stringliteral">&quot;NRev::lastOut(): channel argument must be less than 2!&quot;</span>;
 <a name="l00097"></a>00097     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00098"></a>00098   }
 <a name="l00099"></a>00099 <span class="preprocessor">#endif</span>
@@ -70,7 +70,7 @@
 <a name="l00105"></a>00105 {
 <a name="l00106"></a>00106 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00107"></a>00107 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00108"></a>00108     errorString_ &lt;&lt; <span class="stringliteral">&quot;NRev::tick(): channel argument must be less than 2!&quot;</span>;
+<a name="l00108"></a>00108     oStream_ &lt;&lt; <span class="stringliteral">&quot;NRev::tick(): channel argument must be less than 2!&quot;</span>;
 <a name="l00109"></a>00109     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00110"></a>00110   }
 <a name="l00111"></a>00111 <span class="preprocessor">#endif</span>
@@ -128,7 +128,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Noise_8h-source.html b/doc/html/Noise_8h-source.html
deleted file mode 100644
index ad2d6c1..0000000
--- a/doc/html/Noise_8h-source.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Noise.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_NOISE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_NOISE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Generator.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1Noise.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022 <span class="keyword">public</span>:
-<a name="l00023"></a>00023 
-<a name="l00025"></a>00025 
-<a name="l00029"></a>00029   <a class="code" href="classstk_1_1Noise.html#2d442a08883be25f10952dff4e515f98" title="Default constructor that can also take a specific seed value.">Noise</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> seed = 0 );
-<a name="l00030"></a>00030 
-<a name="l00032"></a>00032 
-<a name="l00036"></a>00036   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Noise.html#9507ae6eb261c577a64b4ecb5c1805dc" title="Seed the random number generator with a specific seed value.">setSeed</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> seed = 0 );
-<a name="l00037"></a>00037 
-<a name="l00039"></a><a class="code" href="classstk_1_1Noise.html#1d6c8ed80425cd0cea014bd2e328c823">00039</a>   StkFloat <a class="code" href="classstk_1_1Noise.html#1d6c8ed80425cd0cea014bd2e328c823" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042   StkFloat <a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045 
-<a name="l00052"></a>00052   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00053"></a>00053 
-<a name="l00054"></a>00054 <span class="keyword">protected</span>:
-<a name="l00055"></a>00055 
-<a name="l00056"></a>00056 };
-<a name="l00057"></a>00057 
-<a name="l00058"></a><a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d">00058</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">Noise :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00059"></a>00059 {
-<a name="l00060"></a>00060   <span class="keywordflow">return</span> lastFrame_[0] = (StkFloat) ( 2.0 * rand() / (RAND_MAX + 1.0) - 1.0 );
-<a name="l00061"></a>00061 }
-<a name="l00062"></a>00062 
-<a name="l00063"></a><a class="code" href="classstk_1_1Noise.html#2f92e91787dc19309305cf246632cd50">00063</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">Noise :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00064"></a>00064 {
-<a name="l00065"></a>00065 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00066"></a>00066 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00067"></a>00067     errorString_ &lt;&lt; <span class="stringliteral">"Noise::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00068"></a>00068     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00069"></a>00069   }
-<a name="l00070"></a>00070 <span class="preprocessor">#endif</span>
-<a name="l00071"></a>00071 <span class="preprocessor"></span>
-<a name="l00072"></a>00072   StkFloat *samples = &amp;frames[channel];
-<a name="l00073"></a>00073   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00074"></a>00074   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00075"></a>00075     *samples = (StkFloat) ( 2.0 * rand() / (RAND_MAX + 1.0) - 1.0 );
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077   lastFrame_[0] = *(samples-hop);
-<a name="l00078"></a>00078   <span class="keywordflow">return</span> frames;
-<a name="l00079"></a>00079 }
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081 } <span class="comment">// stk namespace</span>
-<a name="l00082"></a>00082 
-<a name="l00083"></a>00083 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Noise_8h_source.html b/doc/html/Noise_8h_source.html
index b0a07e5..ad0354c 100644
--- a/doc/html/Noise_8h_source.html
+++ b/doc/html/Noise_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Noise.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_NOISE_H</span>
@@ -52,7 +52,7 @@
 <a name="l00064"></a>00064 {
 <a name="l00065"></a>00065 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00066"></a>00066 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00067"></a>00067     errorString_ &lt;&lt; <span class="stringliteral">&quot;Noise::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00067"></a>00067     oStream_ &lt;&lt; <span class="stringliteral">&quot;Noise::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00068"></a>00068     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00069"></a>00069   }
 <a name="l00070"></a>00070 <span class="preprocessor">#endif</span>
@@ -74,7 +74,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/OnePole_8h-source.html b/doc/html/OnePole_8h-source.html
deleted file mode 100644
index 70ffdde..0000000
--- a/doc/html/OnePole_8h-source.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>OnePole.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ONEPOLE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_ONEPOLE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1OnePole.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022 <span class="keyword">public</span>:
-<a name="l00023"></a>00023 
-<a name="l00025"></a>00025   <a class="code" href="classstk_1_1OnePole.html#d0d322987780778e9f53f34837bea4b8" title="The default constructor creates a low-pass filter (pole at z = 0.9).">OnePole</a>( StkFloat thePole = 0.9 );
-<a name="l00026"></a>00026 
-<a name="l00028"></a>00028   <a class="code" href="classstk_1_1OnePole.html#03ac84c397620180090d86f2ecafccc5" title="Class destructor.">~OnePole</a>();
-<a name="l00029"></a>00029 
-<a name="l00031"></a><a class="code" href="classstk_1_1OnePole.html#ff587fbf5ba36b3dd24b2fb8d66b7e00">00031</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OnePole.html#ff587fbf5ba36b3dd24b2fb8d66b7e00" title="Set the b[0] coefficient value.">setB0</a>( StkFloat b0 ) { b_[0] = b0; };
-<a name="l00032"></a>00032 
-<a name="l00034"></a><a class="code" href="classstk_1_1OnePole.html#1f99beebd9c4fbdfce6478e40d7625d8">00034</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OnePole.html#1f99beebd9c4fbdfce6478e40d7625d8" title="Set the a[1] coefficient value.">setA1</a>( StkFloat a1 ) { a_[1] = a1; };
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OnePole.html#a92dd54382721d5151ef29b291ba6cb5" title="Set all filter coefficients.">setCoefficients</a>( StkFloat b0, StkFloat a1, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OnePole.html#cc1aaa35c6d5ffbbebfe0c4bfa7d1132" title="Set the pole position in the z-plane.">setPole</a>( StkFloat thePole );
-<a name="l00048"></a>00048 
-<a name="l00050"></a><a class="code" href="classstk_1_1OnePole.html#d1ad906374102791a01bfd60844028ec">00050</a>   StkFloat <a class="code" href="classstk_1_1OnePole.html#d1ad906374102791a01bfd60844028ec" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   StkFloat <a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00064"></a>00064   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067 
-<a name="l00075"></a>00075   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077 };
-<a name="l00078"></a>00078 
-<a name="l00079"></a><a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e">00079</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">OnePole :: tick</a>( StkFloat input )
-<a name="l00080"></a>00080 {
-<a name="l00081"></a>00081   inputs_[0] = gain_ * input;
-<a name="l00082"></a>00082   lastFrame_[0] = b_[0] * inputs_[0] - a_[1] * outputs_[1];
-<a name="l00083"></a>00083   outputs_[1] = lastFrame_[0];
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a><a class="code" href="classstk_1_1OnePole.html#f6611322a3c17f728cf6d57a4f932a1f">00088</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">OnePole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00089"></a>00089 {
-<a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00092"></a>00092     errorString_ &lt;&lt; <span class="stringliteral">"OnePole::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00094"></a>00094   }
-<a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
-<a name="l00096"></a>00096 <span class="preprocessor"></span>
-<a name="l00097"></a>00097   StkFloat *samples = &amp;frames[channel];
-<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00099"></a>00099   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00100"></a>00100     inputs_[0] = gain_ * *samples;
-<a name="l00101"></a>00101     *samples = b_[0] * inputs_[0] - a_[1] * outputs_[1];
-<a name="l00102"></a>00102     outputs_[1] = *samples;
-<a name="l00103"></a>00103   }
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   lastFrame_[0] = outputs_[1];
-<a name="l00106"></a>00106   <span class="keywordflow">return</span> frames;
-<a name="l00107"></a>00107 }
-<a name="l00108"></a>00108 
-<a name="l00109"></a><a class="code" href="classstk_1_1OnePole.html#495943f1659f2da6208703a24275defb">00109</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">OnePole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00110"></a>00110 {
-<a name="l00111"></a>00111 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00112"></a>00112 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00113"></a>00113     errorString_ &lt;&lt; <span class="stringliteral">"OnePole::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00114"></a>00114     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00115"></a>00115   }
-<a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
-<a name="l00117"></a>00117 <span class="preprocessor"></span>
-<a name="l00118"></a>00118   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00119"></a>00119   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00120"></a>00120   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00121"></a>00121   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00122"></a>00122     inputs_[0] = gain_ * *iSamples;
-<a name="l00123"></a>00123     *oSamples = b_[0] * inputs_[0] - a_[1] * outputs_[1];
-<a name="l00124"></a>00124     outputs_[1] = *oSamples;
-<a name="l00125"></a>00125   }
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127   lastFrame_[0] = outputs_[1];
-<a name="l00128"></a>00128   <span class="keywordflow">return</span> iFrames;
-<a name="l00129"></a>00129 }
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131 } <span class="comment">// stk namespace</span>
-<a name="l00132"></a>00132 
-<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/OnePole_8h_source.html b/doc/html/OnePole_8h_source.html
index 0b7497d..6deffb0 100644
--- a/doc/html/OnePole_8h_source.html
+++ b/doc/html/OnePole_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>OnePole.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ONEPOLE_H</span>
@@ -37,81 +37,81 @@
 <a name="l00037"></a>00037   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OnePole.html#aa92dd54382721d5151ef29b291ba6cb5" title="Set all filter coefficients.">setCoefficients</a>( StkFloat b0, StkFloat a1, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
 <a name="l00038"></a>00038 
 <a name="l00040"></a>00040 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OnePole.html#acc1aaa35c6d5ffbbebfe0c4bfa7d1132" title="Set the pole position in the z-plane.">setPole</a>( StkFloat thePole );
-<a name="l00048"></a>00048 
-<a name="l00050"></a><a class="code" href="classstk_1_1OnePole.html#ad1ad906374102791a01bfd60844028ec">00050</a>   StkFloat <a class="code" href="classstk_1_1OnePole.html#ad1ad906374102791a01bfd60844028ec" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   StkFloat <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00064"></a>00064   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067 
-<a name="l00075"></a>00075   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077 };
-<a name="l00078"></a>00078 
-<a name="l00079"></a><a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e">00079</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">OnePole :: tick</a>( StkFloat input )
-<a name="l00080"></a>00080 {
-<a name="l00081"></a>00081   inputs_[0] = gain_ * input;
-<a name="l00082"></a>00082   lastFrame_[0] = b_[0] * inputs_[0] - a_[1] * outputs_[1];
-<a name="l00083"></a>00083   outputs_[1] = lastFrame_[0];
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a><a class="code" href="classstk_1_1OnePole.html#af6611322a3c17f728cf6d57a4f932a1f">00088</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">OnePole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00089"></a>00089 {
-<a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00092"></a>00092     errorString_ &lt;&lt; <span class="stringliteral">&quot;OnePole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00094"></a>00094   }
-<a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
-<a name="l00096"></a>00096 <span class="preprocessor"></span>
-<a name="l00097"></a>00097   StkFloat *samples = &amp;frames[channel];
-<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00099"></a>00099   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00100"></a>00100     inputs_[0] = gain_ * *samples;
-<a name="l00101"></a>00101     *samples = b_[0] * inputs_[0] - a_[1] * outputs_[1];
-<a name="l00102"></a>00102     outputs_[1] = *samples;
-<a name="l00103"></a>00103   }
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   lastFrame_[0] = outputs_[1];
-<a name="l00106"></a>00106   <span class="keywordflow">return</span> frames;
-<a name="l00107"></a>00107 }
-<a name="l00108"></a>00108 
-<a name="l00109"></a><a class="code" href="classstk_1_1OnePole.html#a495943f1659f2da6208703a24275defb">00109</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">OnePole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00110"></a>00110 {
-<a name="l00111"></a>00111 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00112"></a>00112 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00113"></a>00113     errorString_ &lt;&lt; <span class="stringliteral">&quot;OnePole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00114"></a>00114     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00115"></a>00115   }
-<a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
-<a name="l00117"></a>00117 <span class="preprocessor"></span>
-<a name="l00118"></a>00118   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00119"></a>00119   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00120"></a>00120   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00121"></a>00121   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00122"></a>00122     inputs_[0] = gain_ * *iSamples;
-<a name="l00123"></a>00123     *oSamples = b_[0] * inputs_[0] - a_[1] * outputs_[1];
-<a name="l00124"></a>00124     outputs_[1] = *oSamples;
-<a name="l00125"></a>00125   }
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127   lastFrame_[0] = outputs_[1];
-<a name="l00128"></a>00128   <span class="keywordflow">return</span> iFrames;
-<a name="l00129"></a>00129 }
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131 } <span class="comment">// stk namespace</span>
-<a name="l00132"></a>00132 
-<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
+<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OnePole.html#acc1aaa35c6d5ffbbebfe0c4bfa7d1132" title="Set the pole position in the z-plane.">setPole</a>( StkFloat thePole );
+<a name="l00049"></a>00049 
+<a name="l00051"></a><a class="code" href="classstk_1_1OnePole.html#ad1ad906374102791a01bfd60844028ec">00051</a>   StkFloat <a class="code" href="classstk_1_1OnePole.html#ad1ad906374102791a01bfd60844028ec" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
+<a name="l00052"></a>00052 
+<a name="l00054"></a>00054   StkFloat <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
+<a name="l00055"></a>00055 
+<a name="l00057"></a>00057 
+<a name="l00065"></a>00065   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00066"></a>00066 
+<a name="l00068"></a>00068 
+<a name="l00076"></a>00076   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
+<a name="l00077"></a>00077 
+<a name="l00078"></a>00078 };
+<a name="l00079"></a>00079 
+<a name="l00080"></a><a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e">00080</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">OnePole :: tick</a>( StkFloat input )
+<a name="l00081"></a>00081 {
+<a name="l00082"></a>00082   inputs_[0] = gain_ * input;
+<a name="l00083"></a>00083   lastFrame_[0] = b_[0] * inputs_[0] - a_[1] * outputs_[1];
+<a name="l00084"></a>00084   outputs_[1] = lastFrame_[0];
+<a name="l00085"></a>00085 
+<a name="l00086"></a>00086   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00087"></a>00087 }
+<a name="l00088"></a>00088 
+<a name="l00089"></a><a class="code" href="classstk_1_1OnePole.html#af6611322a3c17f728cf6d57a4f932a1f">00089</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">OnePole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00090"></a>00090 {
+<a name="l00091"></a>00091 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00092"></a>00092 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00093"></a>00093     oStream_ &lt;&lt; <span class="stringliteral">&quot;OnePole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00094"></a>00094     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00095"></a>00095   }
+<a name="l00096"></a>00096 <span class="preprocessor">#endif</span>
+<a name="l00097"></a>00097 <span class="preprocessor"></span>
+<a name="l00098"></a>00098   StkFloat *samples = &amp;frames[channel];
+<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00100"></a>00100   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00101"></a>00101     inputs_[0] = gain_ * *samples;
+<a name="l00102"></a>00102     *samples = b_[0] * inputs_[0] - a_[1] * outputs_[1];
+<a name="l00103"></a>00103     outputs_[1] = *samples;
+<a name="l00104"></a>00104   }
+<a name="l00105"></a>00105 
+<a name="l00106"></a>00106   lastFrame_[0] = outputs_[1];
+<a name="l00107"></a>00107   <span class="keywordflow">return</span> frames;
+<a name="l00108"></a>00108 }
+<a name="l00109"></a>00109 
+<a name="l00110"></a><a class="code" href="classstk_1_1OnePole.html#a495943f1659f2da6208703a24275defb">00110</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">OnePole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00111"></a>00111 {
+<a name="l00112"></a>00112 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00113"></a>00113 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00114"></a>00114     oStream_ &lt;&lt; <span class="stringliteral">&quot;OnePole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00115"></a>00115     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00116"></a>00116   }
+<a name="l00117"></a>00117 <span class="preprocessor">#endif</span>
+<a name="l00118"></a>00118 <span class="preprocessor"></span>
+<a name="l00119"></a>00119   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00120"></a>00120   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00121"></a>00121   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00122"></a>00122   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00123"></a>00123     inputs_[0] = gain_ * *iSamples;
+<a name="l00124"></a>00124     *oSamples = b_[0] * inputs_[0] - a_[1] * outputs_[1];
+<a name="l00125"></a>00125     outputs_[1] = *oSamples;
+<a name="l00126"></a>00126   }
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128   lastFrame_[0] = outputs_[1];
+<a name="l00129"></a>00129   <span class="keywordflow">return</span> iFrames;
+<a name="l00130"></a>00130 }
+<a name="l00131"></a>00131 
+<a name="l00132"></a>00132 } <span class="comment">// stk namespace</span>
+<a name="l00133"></a>00133 
+<a name="l00134"></a>00134 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/OneZero_8h-source.html b/doc/html/OneZero_8h-source.html
deleted file mode 100644
index 688df02..0000000
--- a/doc/html/OneZero_8h-source.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>OneZero.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ONEZERO_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_ONEZERO_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1OneZero.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022  <span class="keyword">public</span>:
-<a name="l00023"></a>00023 
-<a name="l00025"></a>00025   <a class="code" href="classstk_1_1OneZero.html#da639198d28be5d170508a301ba854da" title="The default constructor creates a low-pass filter (zero at z = -1.0).">OneZero</a>( StkFloat theZero = -1.0 );
-<a name="l00026"></a>00026 
-<a name="l00028"></a>00028   <a class="code" href="classstk_1_1OneZero.html#8abe6156bad57d3a5cfebcf2ddc9b703" title="Class destructor.">~OneZero</a>();
-<a name="l00029"></a>00029 
-<a name="l00031"></a><a class="code" href="classstk_1_1OneZero.html#ef2a8aa1759762649a74fc031198ebca">00031</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OneZero.html#ef2a8aa1759762649a74fc031198ebca" title="Set the b[0] coefficient value.">setB0</a>( StkFloat b0 ) { b_[0] = b0; };
-<a name="l00032"></a>00032 
-<a name="l00034"></a><a class="code" href="classstk_1_1OneZero.html#d4eda332f920e43a33871c8beb6f3042">00034</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OneZero.html#d4eda332f920e43a33871c8beb6f3042" title="Set the b[1] coefficient value.">setB1</a>( StkFloat b1 ) { b_[1] = b1; };
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OneZero.html#6113bf1dce0cb23719e30ee29e7c6735" title="Set all filter coefficients.">setCoefficients</a>( StkFloat b0, StkFloat b1, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1OneZero.html#f8301fdb6a893ec6eb74fbcbeeaa463c" title="Set the zero position in the z-plane.">setZero</a>( StkFloat theZero );
-<a name="l00048"></a>00048 
-<a name="l00050"></a><a class="code" href="classstk_1_1OneZero.html#54e160f62354939876477d9c5a65890c">00050</a>   StkFloat <a class="code" href="classstk_1_1OneZero.html#54e160f62354939876477d9c5a65890c" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   StkFloat <a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00064"></a>00064   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067 
-<a name="l00075"></a>00075   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077 };
-<a name="l00078"></a>00078 
-<a name="l00079"></a><a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da">00079</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">OneZero :: tick</a>( StkFloat input )
-<a name="l00080"></a>00080 {
-<a name="l00081"></a>00081   inputs_[0] = gain_ * input;
-<a name="l00082"></a>00082   lastFrame_[0] = b_[1] * inputs_[1] + b_[0] * inputs_[0];
-<a name="l00083"></a>00083   inputs_[1] = inputs_[0];
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a><a class="code" href="classstk_1_1OneZero.html#2ca42a158bed919d8578c4a2dd184b3d">00088</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">OneZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00089"></a>00089 {
-<a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00092"></a>00092     errorString_ &lt;&lt; <span class="stringliteral">"OneZero::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00094"></a>00094   }
-<a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
-<a name="l00096"></a>00096 <span class="preprocessor"></span>
-<a name="l00097"></a>00097   StkFloat *samples = &amp;frames[channel];
-<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00099"></a>00099   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00100"></a>00100     inputs_[0] = gain_ * *samples;
-<a name="l00101"></a>00101     *samples = b_[1] * inputs_[1] + b_[0] * inputs_[0];
-<a name="l00102"></a>00102     inputs_[1] = inputs_[0];
-<a name="l00103"></a>00103   }
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105   lastFrame_[0] = *(samples-hop);
-<a name="l00106"></a>00106   <span class="keywordflow">return</span> frames;
-<a name="l00107"></a>00107 }
-<a name="l00108"></a>00108 
-<a name="l00109"></a><a class="code" href="classstk_1_1OneZero.html#8568a0d8c4aacc64b656b9fe46f217a4">00109</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">OneZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00110"></a>00110 {
-<a name="l00111"></a>00111 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00112"></a>00112 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00113"></a>00113     errorString_ &lt;&lt; <span class="stringliteral">"OneZero::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00114"></a>00114     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00115"></a>00115   }
-<a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
-<a name="l00117"></a>00117 <span class="preprocessor"></span>
-<a name="l00118"></a>00118   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00119"></a>00119   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00120"></a>00120   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00121"></a>00121   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00122"></a>00122     inputs_[0] = gain_ * *iSamples;
-<a name="l00123"></a>00123     *oSamples = b_[1] * inputs_[1] + b_[0] * inputs_[0];
-<a name="l00124"></a>00124     inputs_[1] = inputs_[0];
-<a name="l00125"></a>00125   }
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00128"></a>00128   <span class="keywordflow">return</span> iFrames;
-<a name="l00129"></a>00129 }
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131 } <span class="comment">// stk namespace</span>
-<a name="l00132"></a>00132 
-<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
-<a name="l00134"></a>00134 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/OneZero_8h_source.html b/doc/html/OneZero_8h_source.html
index 2fb6053..6c679cd 100644
--- a/doc/html/OneZero_8h_source.html
+++ b/doc/html/OneZero_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>OneZero.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_ONEZERO_H</span>
@@ -64,7 +64,7 @@
 <a name="l00089"></a>00089 {
 <a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00092"></a>00092     errorString_ &lt;&lt; <span class="stringliteral">&quot;OneZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00092"></a>00092     oStream_ &lt;&lt; <span class="stringliteral">&quot;OneZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00094"></a>00094   }
 <a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
@@ -85,7 +85,7 @@
 <a name="l00110"></a>00110 {
 <a name="l00111"></a>00111 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00112"></a>00112 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00113"></a>00113     errorString_ &lt;&lt; <span class="stringliteral">&quot;OneZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00113"></a>00113     oStream_ &lt;&lt; <span class="stringliteral">&quot;OneZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00114"></a>00114     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00115"></a>00115   }
 <a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
@@ -112,7 +112,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/PRCRev_8h-source.html b/doc/html/PRCRev_8h-source.html
deleted file mode 100644
index 3f2b3ee..0000000
--- a/doc/html/PRCRev_8h-source.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>PRCRev.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PRCREV_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_PRCREV_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Effect.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Delay.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00022"></a>00022 <span class="comment">/***************************************************/</span>
-<a name="l00023"></a>00023 
-<a name="l00024"></a><a class="code" href="classstk_1_1PRCRev.html">00024</a> <span class="keyword">class </span><a class="code" href="classstk_1_1PRCRev.html" title="Perry&amp;#39;s simple reverberator class.">PRCRev</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Effect.html" title="STK abstract effects parent class.">Effect</a>
-<a name="l00025"></a>00025 {
-<a name="l00026"></a>00026 <span class="keyword">public</span>:
-<a name="l00028"></a>00028   <a class="code" href="classstk_1_1PRCRev.html#fb6440fb909a3091f21f31f3565014de" title="Class constructor taking a T60 decay time argument (one second default value).">PRCRev</a>( StkFloat T60 = 1.0 );
-<a name="l00029"></a>00029 
-<a name="l00031"></a>00031   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PRCRev.html#3e2fa911784a02a6d7211cbe2348ffe1" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PRCRev.html#9478ed84e76d12cc66d11716ebfa8b3b" title="Set the reverberation T60 decay time.">setT60</a>( StkFloat T60 );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037 
-<a name="l00045"></a>00045   StkFloat <a class="code" href="classstk_1_1PRCRev.html#47ed5fee4401f0050d6a47d1154e81c6" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048 
-<a name="l00055"></a>00055   StkFloat <a class="code" href="classstk_1_1PRCRev.html#da84d5241777575b660db100a85b35a6" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058 
-<a name="l00067"></a>00067   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PRCRev.html#da84d5241777575b660db100a85b35a6" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00068"></a>00068 
-<a name="l00070"></a>00070 
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PRCRev.html#da84d5241777575b660db100a85b35a6" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081 <span class="keyword">protected</span>:
-<a name="l00082"></a>00082 
-<a name="l00083"></a>00083   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> allpassDelays_[2];
-<a name="l00084"></a>00084   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> combDelays_[2];
-<a name="l00085"></a>00085   StkFloat allpassCoefficient_;
-<a name="l00086"></a>00086   StkFloat combCoefficient_[2];
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088 };
-<a name="l00089"></a>00089 
-<a name="l00090"></a><a class="code" href="classstk_1_1PRCRev.html#47ed5fee4401f0050d6a47d1154e81c6">00090</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1PRCRev.html#47ed5fee4401f0050d6a47d1154e81c6" title="Return the specified channel value of the last computed stereo frame.">PRCRev :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00091"></a>00091 {
-<a name="l00092"></a>00092 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00093"></a>00093 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00094"></a>00094     errorString_ &lt;&lt; <span class="stringliteral">"PRCRev::lastOut(): channel argument must be less than 2!"</span>;
-<a name="l00095"></a>00095     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00096"></a>00096   }
-<a name="l00097"></a>00097 <span class="preprocessor">#endif</span>
-<a name="l00098"></a>00098 <span class="preprocessor"></span>
-<a name="l00099"></a>00099   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00100"></a>00100 }
-<a name="l00101"></a>00101 
-<a name="l00102"></a><a class="code" href="classstk_1_1PRCRev.html#da84d5241777575b660db100a85b35a6">00102</a>  <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1PRCRev.html#da84d5241777575b660db100a85b35a6" title="Input one sample to the effect and return the specified channel value of the computed...">PRCRev :: tick</a>( StkFloat input, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00103"></a>00103 {
-<a name="l00104"></a>00104 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00105"></a>00105 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00106"></a>00106     errorString_ &lt;&lt; <span class="stringliteral">"PRCRev::tick(): channel argument must be less than 2!"</span>;
-<a name="l00107"></a>00107     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00108"></a>00108   }
-<a name="l00109"></a>00109 <span class="preprocessor">#endif</span>
-<a name="l00110"></a>00110 <span class="preprocessor"></span>
-<a name="l00111"></a>00111   StkFloat temp, temp0, temp1, temp2, temp3;
-<a name="l00112"></a>00112 
-<a name="l00113"></a>00113   temp = allpassDelays_[0].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00114"></a>00114   temp0 = allpassCoefficient_ * temp;
-<a name="l00115"></a>00115   temp0 += input;
-<a name="l00116"></a>00116   allpassDelays_[0].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp0);
-<a name="l00117"></a>00117   temp0 = -(allpassCoefficient_ * temp0) + temp;
-<a name="l00118"></a>00118     
-<a name="l00119"></a>00119   temp = allpassDelays_[1].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>();
-<a name="l00120"></a>00120   temp1 = allpassCoefficient_ * temp;
-<a name="l00121"></a>00121   temp1 += temp0;
-<a name="l00122"></a>00122   allpassDelays_[1].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp1);
-<a name="l00123"></a>00123   temp1 = -(allpassCoefficient_ * temp1) + temp;
-<a name="l00124"></a>00124     
-<a name="l00125"></a>00125   temp2 = temp1 + (combCoefficient_[0] * combDelays_[0].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00126"></a>00126   temp3 = temp1 + (combCoefficient_[1] * combDelays_[1].<a class="code" href="classstk_1_1Delay.html#7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00127"></a>00127 
-<a name="l00128"></a>00128   lastFrame_[0] = effectMix_ * (combDelays_[0].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp2));
-<a name="l00129"></a>00129   lastFrame_[1] = effectMix_ * (combDelays_[1].<a class="code" href="classstk_1_1Delay.html#a1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp3));
-<a name="l00130"></a>00130   temp = (1.0 - effectMix_) * input;
-<a name="l00131"></a>00131   lastFrame_[0] += temp;
-<a name="l00132"></a>00132   lastFrame_[1] += temp;
-<a name="l00133"></a>00133 
-<a name="l00134"></a>00134   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00135"></a>00135 }
-<a name="l00136"></a>00136 
-<a name="l00137"></a>00137 } <span class="comment">// stk namespace</span>
-<a name="l00138"></a>00138 
-<a name="l00139"></a>00139 <span class="preprocessor">#endif</span>
-<a name="l00140"></a>00140 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/PRCRev_8h_source.html b/doc/html/PRCRev_8h_source.html
index 15d4b7e..b7a9cec 100644
--- a/doc/html/PRCRev_8h_source.html
+++ b/doc/html/PRCRev_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>PRCRev.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PRCREV_H</span>
@@ -46,8 +46,8 @@
 <a name="l00080"></a>00080 
 <a name="l00081"></a>00081 <span class="keyword">protected</span>:
 <a name="l00082"></a>00082 
-<a name="l00083"></a>00083   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> allpassDelays_[2];
-<a name="l00084"></a>00084   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a> combDelays_[2];
+<a name="l00083"></a>00083   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a>    allpassDelays_[2];
+<a name="l00084"></a>00084   <a class="code" href="classstk_1_1Delay.html" title="STK non-interpolating delay line class.">Delay</a>    combDelays_[2];
 <a name="l00085"></a>00085   StkFloat allpassCoefficient_;
 <a name="l00086"></a>00086   StkFloat combCoefficient_[2];
 <a name="l00087"></a>00087 
@@ -57,7 +57,7 @@
 <a name="l00091"></a>00091 {
 <a name="l00092"></a>00092 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00093"></a>00093 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00094"></a>00094     errorString_ &lt;&lt; <span class="stringliteral">&quot;PRCRev::lastOut(): channel argument must be less than 2!&quot;</span>;
+<a name="l00094"></a>00094     oStream_ &lt;&lt; <span class="stringliteral">&quot;PRCRev::lastOut(): channel argument must be less than 2!&quot;</span>;
 <a name="l00095"></a>00095     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00096"></a>00096   }
 <a name="l00097"></a>00097 <span class="preprocessor">#endif</span>
@@ -69,7 +69,7 @@
 <a name="l00103"></a>00103 {
 <a name="l00104"></a>00104 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00105"></a>00105 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
-<a name="l00106"></a>00106     errorString_ &lt;&lt; <span class="stringliteral">&quot;PRCRev::tick(): channel argument must be less than 2!&quot;</span>;
+<a name="l00106"></a>00106     oStream_ &lt;&lt; <span class="stringliteral">&quot;PRCRev::tick(): channel argument must be less than 2!&quot;</span>;
 <a name="l00107"></a>00107     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00108"></a>00108   }
 <a name="l00109"></a>00109 <span class="preprocessor">#endif</span>
@@ -88,8 +88,8 @@
 <a name="l00122"></a>00122   allpassDelays_[1].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp1);
 <a name="l00123"></a>00123   temp1 = -(allpassCoefficient_ * temp1) + temp;
 <a name="l00124"></a>00124     
-<a name="l00125"></a>00125   temp2 = temp1 + (combCoefficient_[0] * combDelays_[0].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
-<a name="l00126"></a>00126   temp3 = temp1 + (combCoefficient_[1] * combDelays_[1].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>());
+<a name="l00125"></a>00125   temp2 = temp1 + ( combCoefficient_[0] * combDelays_[0].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>() );
+<a name="l00126"></a>00126   temp3 = temp1 + ( combCoefficient_[1] * combDelays_[1].<a class="code" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2" title="Return the last computed output value.">lastOut</a>() );
 <a name="l00127"></a>00127 
 <a name="l00128"></a>00128   lastFrame_[0] = effectMix_ * (combDelays_[0].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp2));
 <a name="l00129"></a>00129   lastFrame_[1] = effectMix_ * (combDelays_[1].<a class="code" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick</a>(temp3));
@@ -109,7 +109,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/PercFlut_8h-source.html b/doc/html/PercFlut_8h-source.html
deleted file mode 100644
index 5182e01..0000000
--- a/doc/html/PercFlut_8h-source.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>PercFlut.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PERCFLUT_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_PERCFLUT_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "FM.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00034"></a>00034 <span class="comment">/***************************************************/</span>
-<a name="l00035"></a>00035 
-<a name="l00036"></a><a class="code" href="classstk_1_1PercFlut.html">00036</a> <span class="keyword">class </span><a class="code" href="classstk_1_1PercFlut.html" title="STK percussive flute FM synthesis instrument.">PercFlut</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a>
-<a name="l00037"></a>00037 {
-<a name="l00038"></a>00038  <span class="keyword">public</span>:
-<a name="l00040"></a>00040 
-<a name="l00043"></a>00043   <a class="code" href="classstk_1_1PercFlut.html#b51f05b79d818ed8ba80fd827a4839c2" title="Class constructor.">PercFlut</a>( <span class="keywordtype">void</span> );
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046   <a class="code" href="classstk_1_1PercFlut.html#dd2a18e8835d665d505521e0298bd2f0" title="Class destructor.">~PercFlut</a>( <span class="keywordtype">void</span> );
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PercFlut.html#24197fb4ae0bf806d8e3f6fe4eb5598c" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PercFlut.html#7ebfc19d4c41482a699f43b2c06dc02d" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00053"></a>00053 
-<a name="l00055"></a>00055   StkFloat <a class="code" href="classstk_1_1PercFlut.html#c2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00056"></a>00056 
-<a name="l00057"></a>00057  <span class="keyword">protected</span>:
-<a name="l00058"></a>00058 
-<a name="l00059"></a>00059 };
-<a name="l00060"></a>00060 
-<a name="l00061"></a><a class="code" href="classstk_1_1PercFlut.html#c2b2958902c044413a1c7ff3bd0f8054">00061</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1PercFlut.html#c2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">PercFlut :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00062"></a>00062 {
-<a name="l00063"></a>00063   <span class="keyword">register</span> StkFloat temp;
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065   temp = vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_ * 0.2;    
-<a name="l00066"></a>00066   waves_[0]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[0]);
-<a name="l00067"></a>00067   waves_[1]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[1]);
-<a name="l00068"></a>00068   waves_[2]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[2]);
-<a name="l00069"></a>00069   waves_[3]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[3]);
-<a name="l00070"></a>00070     
-<a name="l00071"></a>00071   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#e9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00072"></a>00072   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074   twozero_.<a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00075"></a>00075   waves_[2]-&gt;addPhaseOffset( temp );
-<a name="l00076"></a>00076   temp = (1.0 - (control2_ * 0.5)) * gains_[2] * adsr_[2]-&gt;<a class="code" href="classstk_1_1PercFlut.html#c2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">tick</a>() * waves_[2]-&gt;tick();
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078   temp += control2_ * 0.5 * gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00079"></a>00079   temp = temp * control1_;
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081   waves_[0]-&gt;addPhaseOffset(temp);
-<a name="l00082"></a>00082   temp = gains_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
-<a name="l00083"></a>00083     
-<a name="l00084"></a>00084   lastFrame_[0] = temp * 0.5;
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088 } <span class="comment">// stk namespace</span>
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/PercFlut_8h_source.html b/doc/html/PercFlut_8h_source.html
index 8db1170..b49a492 100644
--- a/doc/html/PercFlut_8h_source.html
+++ b/doc/html/PercFlut_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>PercFlut.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PERCFLUT_H</span>
@@ -36,46 +36,76 @@
 <a name="l00053"></a>00053 
 <a name="l00055"></a>00055   StkFloat <a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00056"></a>00056 
-<a name="l00057"></a>00057  <span class="keyword">protected</span>:
 <a name="l00058"></a>00058 
-<a name="l00059"></a>00059 };
-<a name="l00060"></a>00060 
-<a name="l00061"></a><a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054">00061</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">PercFlut :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00062"></a>00062 {
-<a name="l00063"></a>00063   <span class="keyword">register</span> StkFloat temp;
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065   temp = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_ * 0.2;    
-<a name="l00066"></a>00066   waves_[0]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[0]);
-<a name="l00067"></a>00067   waves_[1]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[1]);
-<a name="l00068"></a>00068   waves_[2]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[2]);
-<a name="l00069"></a>00069   waves_[3]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[3]);
-<a name="l00070"></a>00070     
-<a name="l00071"></a>00071   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00072"></a>00072   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00075"></a>00075   waves_[2]-&gt;addPhaseOffset( temp );
-<a name="l00076"></a>00076   temp = (1.0 - (control2_ * 0.5)) * gains_[2] * adsr_[2]-&gt;<a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">tick</a>() * waves_[2]-&gt;tick();
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078   temp += control2_ * 0.5 * gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00079"></a>00079   temp = temp * control1_;
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081   waves_[0]-&gt;addPhaseOffset(temp);
-<a name="l00082"></a>00082   temp = gains_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
-<a name="l00083"></a>00083     
-<a name="l00084"></a>00084   lastFrame_[0] = temp * 0.5;
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
+<a name="l00065"></a>00065   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00066"></a>00066 
+<a name="l00067"></a>00067  <span class="keyword">protected</span>:
+<a name="l00068"></a>00068 
+<a name="l00069"></a>00069 };
+<a name="l00070"></a>00070 
+<a name="l00071"></a><a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054">00071</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">PercFlut :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00072"></a>00072 {
+<a name="l00073"></a>00073   <span class="keyword">register</span> StkFloat temp;
+<a name="l00074"></a>00074 
+<a name="l00075"></a>00075   temp = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_ * 0.2;    
+<a name="l00076"></a>00076   waves_[0]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[0]);
+<a name="l00077"></a>00077   waves_[1]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[1]);
+<a name="l00078"></a>00078   waves_[2]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[2]);
+<a name="l00079"></a>00079   waves_[3]-&gt;setFrequency(baseFrequency_ * (1.0 + temp) * ratios_[3]);
+<a name="l00080"></a>00080     
+<a name="l00081"></a>00081   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
+<a name="l00082"></a>00082   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
+<a name="l00083"></a>00083 
+<a name="l00084"></a>00084   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
+<a name="l00085"></a>00085   waves_[2]-&gt;addPhaseOffset( temp );
+<a name="l00086"></a>00086   temp = (1.0 - (control2_ * 0.5)) * gains_[2] * adsr_[2]-&gt;<a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">tick</a>() * waves_[2]-&gt;tick();
 <a name="l00087"></a>00087 
-<a name="l00088"></a>00088 } <span class="comment">// stk namespace</span>
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 <span class="preprocessor">#endif</span>
+<a name="l00088"></a>00088   temp += control2_ * 0.5 * gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
+<a name="l00089"></a>00089   temp = temp * control1_;
+<a name="l00090"></a>00090 
+<a name="l00091"></a>00091   waves_[0]-&gt;addPhaseOffset(temp);
+<a name="l00092"></a>00092   temp = gains_[0] * adsr_[0]-&gt;tick() * waves_[0]-&gt;tick();
+<a name="l00093"></a>00093     
+<a name="l00094"></a>00094   lastFrame_[0] = temp * 0.5;
+<a name="l00095"></a>00095   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00096"></a>00096 }
+<a name="l00097"></a>00097 
+<a name="l00098"></a><a class="code" href="classstk_1_1PercFlut.html#a4105b2b1dfe375bcf870fb4903509e4e">00098</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">PercFlut :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00099"></a>00099 {
+<a name="l00100"></a>00100   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00101"></a>00101 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00102"></a>00102 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00103"></a>00103     oStream_ &lt;&lt; <span class="stringliteral">&quot;PercFlut::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00104"></a>00104     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106 <span class="preprocessor">#endif</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span>
+<a name="l00108"></a>00108   StkFloat *samples = &amp;frames[channel];
+<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00110"></a>00110   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00111"></a>00111     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00112"></a>00112       *samples++ = <a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">tick</a>();
+<a name="l00113"></a>00113   }
+<a name="l00114"></a>00114   <span class="keywordflow">else</span> {
+<a name="l00115"></a>00115     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00116"></a>00116       *samples++ = <a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">tick</a>();
+<a name="l00117"></a>00117       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00118"></a>00118         *samples++ = lastFrame_[j];
+<a name="l00119"></a>00119     }
+<a name="l00120"></a>00120   }
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122   <span class="keywordflow">return</span> frames;
+<a name="l00123"></a>00123 }
+<a name="l00124"></a>00124 
+<a name="l00125"></a>00125 } <span class="comment">// stk namespace</span>
+<a name="l00126"></a>00126 
+<a name="l00127"></a>00127 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Phonemes_8h-source.html b/doc/html/Phonemes_8h-source.html
deleted file mode 100644
index 8ad55f2..0000000
--- a/doc/html/Phonemes_8h-source.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Phonemes.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PHONEMES_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_PHONEMES_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1Phonemes.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Phonemes.html" title="STK phonemes table.">Phonemes</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022 <span class="keyword">public</span>:
-<a name="l00023"></a>00023 
-<a name="l00024"></a>00024   <a class="code" href="classstk_1_1Phonemes.html" title="STK phonemes table.">Phonemes</a>(<span class="keywordtype">void</span>);
-<a name="l00025"></a>00025   ~<a class="code" href="classstk_1_1Phonemes.html" title="STK phonemes table.">Phonemes</a>(<span class="keywordtype">void</span>);
-<a name="l00026"></a>00026 
-<a name="l00028"></a>00028   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="classstk_1_1Phonemes.html#8b1a29ac4e6ddb629154d298d5abf585" title="Returns the phoneme name for the given index (0-31).">name</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index );
-<a name="l00029"></a>00029 
-<a name="l00031"></a>00031   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#3e4cded114bb563bc78412c7b6b1d099" title="Returns the voiced component gain for the given phoneme index (0-31).">voiceGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index );
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#57715042b02c835da194753bc8f8a99e" title="Returns the unvoiced component gain for the given phoneme index (0-31).">noiseGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#1234a72b76a952865642c783e80d4d84" title="Returns the formant frequency for the given phoneme index (0-31) and partial (0-3)...">formantFrequency</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> partial );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#aa22b87de100770a4995632932c324bb" title="Returns the formant radius for the given phoneme index (0-31) and partial (0-3).">formantRadius</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> partial );
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#212b5fd0d61c8e4b08a78bb9912f7903" title="Returns the formant gain for the given phoneme index (0-31) and partial (0-3).">formantGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> partial );
-<a name="l00044"></a>00044 
-<a name="l00045"></a>00045 <span class="keyword">private</span>:
-<a name="l00046"></a>00046 
-<a name="l00047"></a>00047   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> phonemeNames[][4];
-<a name="l00048"></a>00048   <span class="keyword">static</span> <span class="keyword">const</span> StkFloat phonemeGains[][2];
-<a name="l00049"></a>00049   <span class="keyword">static</span> <span class="keyword">const</span> StkFloat phonemeParameters[][4][3];
-<a name="l00050"></a>00050 };
-<a name="l00051"></a>00051 
-<a name="l00052"></a>00052 } <span class="comment">// stk namespace</span>
-<a name="l00053"></a>00053 
-<a name="l00054"></a>00054 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Phonemes_8h_source.html b/doc/html/Phonemes_8h_source.html
index f07e0bf..c40dafa 100644
--- a/doc/html/Phonemes_8h_source.html
+++ b/doc/html/Phonemes_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Phonemes.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PHONEMES_H</span>
@@ -26,37 +26,38 @@
 <a name="l00021"></a>00021 {
 <a name="l00022"></a>00022 <span class="keyword">public</span>:
 <a name="l00023"></a>00023 
-<a name="l00024"></a>00024   <a class="code" href="classstk_1_1Phonemes.html" title="STK phonemes table.">Phonemes</a>(<span class="keywordtype">void</span>);
-<a name="l00025"></a>00025   ~<a class="code" href="classstk_1_1Phonemes.html" title="STK phonemes table.">Phonemes</a>(<span class="keywordtype">void</span>);
-<a name="l00026"></a>00026 
-<a name="l00028"></a>00028   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="classstk_1_1Phonemes.html#a8b1a29ac4e6ddb629154d298d5abf585" title="Returns the phoneme name for the given index (0-31).">name</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index );
-<a name="l00029"></a>00029 
-<a name="l00031"></a>00031   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#a3e4cded114bb563bc78412c7b6b1d099" title="Returns the voiced component gain for the given phoneme index (0-31).">voiceGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index );
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#a57715042b02c835da194753bc8f8a99e" title="Returns the unvoiced component gain for the given phoneme index (0-31).">noiseGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#a1234a72b76a952865642c783e80d4d84" title="Returns the formant frequency for the given phoneme index (0-31) and partial (0-3)...">formantFrequency</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> partial );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#aaa22b87de100770a4995632932c324bb" title="Returns the formant radius for the given phoneme index (0-31) and partial (0-3).">formantRadius</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> partial );
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#a212b5fd0d61c8e4b08a78bb9912f7903" title="Returns the formant gain for the given phoneme index (0-31) and partial (0-3).">formantGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> partial );
-<a name="l00044"></a>00044 
-<a name="l00045"></a>00045 <span class="keyword">private</span>:
-<a name="l00046"></a>00046 
-<a name="l00047"></a>00047   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> phonemeNames[][4];
-<a name="l00048"></a>00048   <span class="keyword">static</span> <span class="keyword">const</span> StkFloat phonemeGains[][2];
-<a name="l00049"></a>00049   <span class="keyword">static</span> <span class="keyword">const</span> StkFloat phonemeParameters[][4][3];
-<a name="l00050"></a>00050 };
-<a name="l00051"></a>00051 
-<a name="l00052"></a>00052 } <span class="comment">// stk namespace</span>
-<a name="l00053"></a>00053 
-<a name="l00054"></a>00054 <span class="preprocessor">#endif</span>
+<a name="l00024"></a>00024   <a class="code" href="classstk_1_1Phonemes.html" title="STK phonemes table.">Phonemes</a>( <span class="keywordtype">void</span> );
+<a name="l00025"></a>00025 
+<a name="l00026"></a>00026   ~<a class="code" href="classstk_1_1Phonemes.html" title="STK phonemes table.">Phonemes</a>( <span class="keywordtype">void</span> );
+<a name="l00027"></a>00027 
+<a name="l00029"></a>00029   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="classstk_1_1Phonemes.html#a8b1a29ac4e6ddb629154d298d5abf585" title="Returns the phoneme name for the given index (0-31).">name</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index );
+<a name="l00030"></a>00030 
+<a name="l00032"></a>00032   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#a3e4cded114bb563bc78412c7b6b1d099" title="Returns the voiced component gain for the given phoneme index (0-31).">voiceGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index );
+<a name="l00033"></a>00033 
+<a name="l00035"></a>00035   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#a57715042b02c835da194753bc8f8a99e" title="Returns the unvoiced component gain for the given phoneme index (0-31).">noiseGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index );
+<a name="l00036"></a>00036 
+<a name="l00038"></a>00038   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#a1234a72b76a952865642c783e80d4d84" title="Returns the formant frequency for the given phoneme index (0-31) and partial (0-3)...">formantFrequency</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> partial );
+<a name="l00039"></a>00039 
+<a name="l00041"></a>00041   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#aaa22b87de100770a4995632932c324bb" title="Returns the formant radius for the given phoneme index (0-31) and partial (0-3).">formantRadius</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> partial );
+<a name="l00042"></a>00042 
+<a name="l00044"></a>00044   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Phonemes.html#a212b5fd0d61c8e4b08a78bb9912f7903" title="Returns the formant gain for the given phoneme index (0-31) and partial (0-3).">formantGain</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> index, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> partial );
+<a name="l00045"></a>00045 
+<a name="l00046"></a>00046 <span class="keyword">private</span>:
+<a name="l00047"></a>00047 
+<a name="l00048"></a>00048   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span> phonemeNames[][4];
+<a name="l00049"></a>00049   <span class="keyword">static</span> <span class="keyword">const</span> StkFloat phonemeGains[][2];
+<a name="l00050"></a>00050   <span class="keyword">static</span> <span class="keyword">const</span> StkFloat phonemeParameters[][4][3];
+<a name="l00051"></a>00051 };
+<a name="l00052"></a>00052 
+<a name="l00053"></a>00053 } <span class="comment">// stk namespace</span>
+<a name="l00054"></a>00054 
+<a name="l00055"></a>00055 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/PitShift_8h-source.html b/doc/html/PitShift_8h-source.html
deleted file mode 100644
index 8f28806..0000000
--- a/doc/html/PitShift_8h-source.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>PitShift.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PITSHIFT_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_PITSHIFT_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Effect.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayL.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a>00020 <span class="keyword">const</span> <span class="keywordtype">int</span> maxDelay = 5024;
-<a name="l00021"></a>00021 
-<a name="l00022"></a><a class="code" href="classstk_1_1PitShift.html">00022</a> <span class="keyword">class </span><a class="code" href="classstk_1_1PitShift.html" title="STK simple pitch shifter effect class.">PitShift</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Effect.html" title="STK abstract effects parent class.">Effect</a>
-<a name="l00023"></a>00023 {
-<a name="l00024"></a>00024  <span class="keyword">public</span>:
-<a name="l00026"></a>00026   <a class="code" href="classstk_1_1PitShift.html#8fdf3ef3b1a94e126a2953c6b8ed8cca" title="Class constructor.">PitShift</a>( <span class="keywordtype">void</span> );
-<a name="l00027"></a>00027 
-<a name="l00029"></a>00029   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PitShift.html#fa1b0ff95ef9a22991525f72d703220e" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00030"></a>00030 
-<a name="l00032"></a>00032   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PitShift.html#1ade8534def67636af6f0d7e50825891" title="Set the pitch shift factor (1.0 produces no shift).">setShift</a>( StkFloat shift );
-<a name="l00033"></a>00033 
-<a name="l00035"></a><a class="code" href="classstk_1_1PitShift.html#782ad7b47c450c1584cebd20570f17e3">00035</a>   StkFloat <a class="code" href="classstk_1_1PitShift.html#782ad7b47c450c1584cebd20570f17e3" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038   StkFloat <a class="code" href="classstk_1_1PitShift.html#433fcd3da3e7b08cb8b3392865e93033" title="Input one sample to the effect and return one output.">tick</a>( StkFloat input );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041 
-<a name="l00049"></a>00049   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PitShift.html#433fcd3da3e7b08cb8b3392865e93033" title="Input one sample to the effect and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052 
-<a name="l00060"></a>00060   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PitShift.html#433fcd3da3e7b08cb8b3392865e93033" title="Input one sample to the effect and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00061"></a>00061 
-<a name="l00062"></a>00062  <span class="keyword">protected</span>:
-<a name="l00063"></a>00063 
-<a name="l00064"></a>00064   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a> delayLine_[2];
-<a name="l00065"></a>00065   StkFloat delay_[2];
-<a name="l00066"></a>00066   StkFloat env_[2];
-<a name="l00067"></a>00067   StkFloat rate_;
-<a name="l00068"></a>00068   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delayLength_;
-<a name="l00069"></a>00069   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> halfLength_;
-<a name="l00070"></a>00070 
-<a name="l00071"></a>00071 };
-<a name="l00072"></a>00072 
-<a name="l00073"></a><a class="code" href="classstk_1_1PitShift.html#433fcd3da3e7b08cb8b3392865e93033">00073</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1PitShift.html#433fcd3da3e7b08cb8b3392865e93033" title="Input one sample to the effect and return one output.">PitShift :: tick</a>( StkFloat input )
-<a name="l00074"></a>00074 {
-<a name="l00075"></a>00075   <span class="comment">// Calculate the two delay length values, keeping them within the</span>
-<a name="l00076"></a>00076   <span class="comment">// range 12 to maxDelay-12.</span>
-<a name="l00077"></a>00077   delay_[0] += rate_;
-<a name="l00078"></a>00078   <span class="keywordflow">while</span> ( delay_[0] &gt; maxDelay-12 ) delay_[0] -= delayLength_;
-<a name="l00079"></a>00079   <span class="keywordflow">while</span> ( delay_[0] &lt; 12 ) delay_[0] += delayLength_;
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081   delay_[1] = delay_[0] + halfLength_;
-<a name="l00082"></a>00082   <span class="keywordflow">while</span> ( delay_[1] &gt; maxDelay-12 ) delay_[1] -= delayLength_;
-<a name="l00083"></a>00083   <span class="keywordflow">while</span> ( delay_[1] &lt; 12 ) delay_[1] += delayLength_;
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085   <span class="comment">// Set the new delay line lengths.</span>
-<a name="l00086"></a>00086   delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( delay_[0] );
-<a name="l00087"></a>00087   delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#80dd30628502a7c3b37ff045176eb91f" title="Set the delay-line length.">setDelay</a>( delay_[1] );
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089   <span class="comment">// Calculate a triangular envelope.</span>
-<a name="l00090"></a>00090   env_[1] = fabs( ( delay_[0] - halfLength_ + 12 ) * ( 1.0 / (halfLength_ + 12 ) ) );
-<a name="l00091"></a>00091   env_[0] = 1.0 - env_[1];
-<a name="l00092"></a>00092 
-<a name="l00093"></a>00093   <span class="comment">// Delay input and apply envelope.</span>
-<a name="l00094"></a>00094   lastFrame_[0] =  env_[0] * delayLine_[0].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( input );
-<a name="l00095"></a>00095   lastFrame_[0] += env_[1] * delayLine_[1].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( input );
-<a name="l00096"></a>00096 
-<a name="l00097"></a>00097   <span class="comment">// Compute effect mix and output.</span>
-<a name="l00098"></a>00098   lastFrame_[0] *= effectMix_;
-<a name="l00099"></a>00099   lastFrame_[0] += ( 1.0 - effectMix_ ) * input;
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00102"></a>00102 }
-<a name="l00103"></a>00103 
-<a name="l00104"></a>00104 } <span class="comment">// stk namespace</span>
-<a name="l00105"></a>00105 
-<a name="l00106"></a>00106 <span class="preprocessor">#endif</span>
-<a name="l00107"></a>00107 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/PitShift_8h_source.html b/doc/html/PitShift_8h_source.html
index 009f82f..691dd3d 100644
--- a/doc/html/PitShift_8h_source.html
+++ b/doc/html/PitShift_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>PitShift.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PITSHIFT_H</span>
@@ -95,7 +95,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/PluckTwo_8h-source.html b/doc/html/PluckTwo_8h-source.html
deleted file mode 100644
index 16de4d9..0000000
--- a/doc/html/PluckTwo_8h-source.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>PluckTwo.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PLUCKTWO_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_PLUCKTWO_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayL.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "DelayA.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OneZero.h"</span>
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="keyword">namespace </span>stk {
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 
-<a name="l00031"></a><a class="code" href="classstk_1_1PluckTwo.html">00031</a> <span class="keyword">class </span><a class="code" href="classstk_1_1PluckTwo.html" title="STK enhanced plucked string model class.">PluckTwo</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00032"></a>00032 {
-<a name="l00033"></a>00033  <span class="keyword">public</span>:
-<a name="l00035"></a>00035   <a class="code" href="classstk_1_1PluckTwo.html#a121655f6007003aebb5de425e98d099" title="Class constructor, taking the lowest desired playing frequency.">PluckTwo</a>( StkFloat lowestFrequency );
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1PluckTwo.html#c8a0720b08d20741b0d8a312f1cf7e5c" title="Class destructor.">~PluckTwo</a>( <span class="keywordtype">void</span> );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#71821e47009a94de9e8a1f3305263840" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#9f0618a28243b235f6c0f424a236709c" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#6b355a495d9122273fb8c88009bf79d6" title="Detune the two strings by the given factor. A value of 1.0 produces unison strings...">setDetune</a>( StkFloat detune );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#3cd8e9135b1d8a97b87f9486dd3cd671" title="Efficient combined setting of frequency and detuning.">setFreqAndDetune</a>( StkFloat frequency, StkFloat detune );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#fffb424a2957fc691363ba1227809695" title="Set the pluck or &amp;quot;excitation&amp;quot; position along the string (0.0 - 1.0).">setPluckPosition</a>( StkFloat position );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#168f563174e22b221744ef66b35a5277" title="Set the base loop gain.">setBaseLoopGain</a>( StkFloat aGain );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#0d5d81db10c145f3d5bafc5775d147bf" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066   <span class="keyword">virtual</span> StkFloat tick( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
-<a name="l00067"></a>00067 
-<a name="l00068"></a>00068  <span class="keyword">protected</span>:
-<a name="l00069"></a>00069 
-<a name="l00070"></a>00070   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>  delayLine_;
-<a name="l00071"></a>00071   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>  delayLine2_;
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>  combDelay_;
-<a name="l00073"></a>00073   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> filter_;
-<a name="l00074"></a>00074   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> filter2_;
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00077"></a>00077   StkFloat loopGain_;
-<a name="l00078"></a>00078   StkFloat baseLoopGain_;
-<a name="l00079"></a>00079   StkFloat lastFrequency_;
-<a name="l00080"></a>00080   StkFloat lastLength_;
-<a name="l00081"></a>00081   StkFloat detuning_;
-<a name="l00082"></a>00082   StkFloat pluckAmplitude_;
-<a name="l00083"></a>00083   StkFloat pluckPosition_;
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085 };
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 } <span class="comment">// stk namespace</span>
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/PluckTwo_8h_source.html b/doc/html/PluckTwo_8h_source.html
deleted file mode 100644
index 06dad89..0000000
--- a/doc/html/PluckTwo_8h_source.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
-  </div>
-<div class="contents">
-<h1>PluckTwo.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PLUCKTWO_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_PLUCKTWO_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include &quot;Instrmnt.h&quot;</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &quot;DelayL.h&quot;</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include &quot;DelayA.h&quot;</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include &quot;OneZero.h&quot;</span>
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="keyword">namespace </span>stk {
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 
-<a name="l00031"></a><a class="code" href="classstk_1_1PluckTwo.html">00031</a> <span class="keyword">class </span><a class="code" href="classstk_1_1PluckTwo.html" title="STK enhanced plucked string model class.">PluckTwo</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00032"></a>00032 {
-<a name="l00033"></a>00033  <span class="keyword">public</span>:
-<a name="l00035"></a>00035   <a class="code" href="classstk_1_1PluckTwo.html#aa121655f6007003aebb5de425e98d099" title="Class constructor, taking the lowest desired playing frequency.">PluckTwo</a>( StkFloat lowestFrequency );
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1PluckTwo.html#ac8a0720b08d20741b0d8a312f1cf7e5c" title="Class destructor.">~PluckTwo</a>( <span class="keywordtype">void</span> );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#a71821e47009a94de9e8a1f3305263840" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#a9f0618a28243b235f6c0f424a236709c" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#a6b355a495d9122273fb8c88009bf79d6" title="Detune the two strings by the given factor. A value of 1.0 produces unison strings...">setDetune</a>( StkFloat detune );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#a3cd8e9135b1d8a97b87f9486dd3cd671" title="Efficient combined setting of frequency and detuning.">setFreqAndDetune</a>( StkFloat frequency, StkFloat detune );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#afffb424a2957fc691363ba1227809695" title="Set the pluck or &amp;quot;excitation&amp;quot; position along the string (0.0 - 1.0).">setPluckPosition</a>( StkFloat position );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#a168f563174e22b221744ef66b35a5277" title="Set the base loop gain.">setBaseLoopGain</a>( StkFloat aGain );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PluckTwo.html#a0d5d81db10c145f3d5bafc5775d147bf" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066   <span class="keyword">virtual</span> StkFloat tick( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
-<a name="l00067"></a>00067 
-<a name="l00068"></a>00068  <span class="keyword">protected</span>:
-<a name="l00069"></a>00069 
-<a name="l00070"></a>00070   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>  delayLine_;
-<a name="l00071"></a>00071   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>  delayLine2_;
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>  combDelay_;
-<a name="l00073"></a>00073   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> filter_;
-<a name="l00074"></a>00074   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> filter2_;
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00077"></a>00077   StkFloat loopGain_;
-<a name="l00078"></a>00078   StkFloat baseLoopGain_;
-<a name="l00079"></a>00079   StkFloat lastFrequency_;
-<a name="l00080"></a>00080   StkFloat lastLength_;
-<a name="l00081"></a>00081   StkFloat detuning_;
-<a name="l00082"></a>00082   StkFloat pluckAmplitude_;
-<a name="l00083"></a>00083   StkFloat pluckPosition_;
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085 };
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 } <span class="comment">// stk namespace</span>
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Plucked_8h-source.html b/doc/html/Plucked_8h-source.html
deleted file mode 100644
index 2388f66..0000000
--- a/doc/html/Plucked_8h-source.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Plucked.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PLUCKED_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_PLUCKED_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayA.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "OneZero.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="keyword">namespace </span>stk {
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 
-<a name="l00031"></a><a class="code" href="classstk_1_1Plucked.html">00031</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Plucked.html" title="STK plucked string model class.">Plucked</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00032"></a>00032 {
-<a name="l00033"></a>00033  <span class="keyword">public</span>:
-<a name="l00035"></a>00035   <a class="code" href="classstk_1_1Plucked.html#279ac82759d4184d9ad961e21dacdbca" title="Class constructor, taking the lowest desired playing frequency.">Plucked</a>( StkFloat lowestFrequency );
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038   <a class="code" href="classstk_1_1Plucked.html#6232b4a1ed48407fe9e66e1835011b5e" title="Class destructor.">~Plucked</a>( <span class="keywordtype">void</span> );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#32a7063198af354fc007e3d903e21208" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#1864c705b85633542621ba3ba4491331" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#9c8741ae249b590d24937743caf11f6c" title="Pluck the string with the given amplitude using the current frequency.">pluck</a>( StkFloat amplitude );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#1a8ce6b094c8e2b5c6dda805c032cd44" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#ba5a6b6850874da55c32388e9857d6fc" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   StkFloat <a class="code" href="classstk_1_1Plucked.html#db4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00057"></a>00057 
-<a name="l00058"></a>00058  <span class="keyword">protected</span>:  
-<a name="l00059"></a>00059 
-<a name="l00060"></a>00060   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>   delayLine_;
-<a name="l00061"></a>00061   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>  loopFilter_;
-<a name="l00062"></a>00062   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  pickFilter_;
-<a name="l00063"></a>00063   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
-<a name="l00064"></a>00064   StkFloat loopGain_;
-<a name="l00065"></a>00065   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067 };
-<a name="l00068"></a>00068 
-<a name="l00069"></a><a class="code" href="classstk_1_1Plucked.html#db4a5d731ad2b680120313f03a020c25">00069</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Plucked.html#db4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">Plucked :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00070"></a>00070 {
-<a name="l00071"></a>00071   <span class="comment">// Here's the whole inner loop of the instrument!!</span>
-<a name="l00072"></a>00072   <span class="keywordflow">return</span> lastFrame_[0] = 3.0 * delayLine_.<a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( loopFilter_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delayLine_.<a class="code" href="classstk_1_1DelayA.html#4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_ ) ); 
-<a name="l00073"></a>00073 }
-<a name="l00074"></a>00074 
-<a name="l00075"></a>00075 } <span class="comment">// stk namespace</span>
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077 <span class="preprocessor">#endif</span>
-<a name="l00078"></a>00078 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Plucked_8h_source.html b/doc/html/Plucked_8h_source.html
index 63da4d7..72923ff 100644
--- a/doc/html/Plucked_8h_source.html
+++ b/doc/html/Plucked_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Plucked.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_PLUCKED_H</span>
@@ -24,54 +24,83 @@
 <a name="l00010"></a>00010 <span class="keyword">namespace </span>stk {
 <a name="l00011"></a>00011 
 <a name="l00012"></a>00012 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 
-<a name="l00031"></a><a class="code" href="classstk_1_1Plucked.html">00031</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Plucked.html" title="STK plucked string model class.">Plucked</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00032"></a>00032 {
-<a name="l00033"></a>00033  <span class="keyword">public</span>:
-<a name="l00035"></a>00035   <a class="code" href="classstk_1_1Plucked.html#a279ac82759d4184d9ad961e21dacdbca" title="Class constructor, taking the lowest desired playing frequency.">Plucked</a>( StkFloat lowestFrequency );
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038   <a class="code" href="classstk_1_1Plucked.html#a6232b4a1ed48407fe9e66e1835011b5e" title="Class destructor.">~Plucked</a>( <span class="keywordtype">void</span> );
+<a name="l00032"></a>00032 <span class="comment">/***************************************************/</span>
+<a name="l00033"></a>00033 
+<a name="l00034"></a><a class="code" href="classstk_1_1Plucked.html">00034</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Plucked.html" title="STK basic plucked string class.">Plucked</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
+<a name="l00035"></a>00035 {
+<a name="l00036"></a>00036  <span class="keyword">public</span>:
+<a name="l00038"></a>00038   <a class="code" href="classstk_1_1Plucked.html#a65eee23eda411e7fd82bf4a555d8dd85" title="Class constructor, taking the lowest desired playing frequency.">Plucked</a>( StkFloat lowestFrequency = 10.0 );
 <a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#a32a7063198af354fc007e3d903e21208" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
+<a name="l00041"></a>00041   <a class="code" href="classstk_1_1Plucked.html#a6232b4a1ed48407fe9e66e1835011b5e" title="Class destructor.">~Plucked</a>( <span class="keywordtype">void</span> );
 <a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#a1864c705b85633542621ba3ba4491331" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
+<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#a32a7063198af354fc007e3d903e21208" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
 <a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#a9c8741ae249b590d24937743caf11f6c" title="Pluck the string with the given amplitude using the current frequency.">pluck</a>( StkFloat amplitude );
+<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#a1864c705b85633542621ba3ba4491331" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
 <a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#a1a8ce6b094c8e2b5c6dda805c032cd44" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
+<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#a9c8741ae249b590d24937743caf11f6c" title="Pluck the string with the given amplitude using the current frequency.">pluck</a>( StkFloat amplitude );
 <a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#aba5a6b6850874da55c32388e9857d6fc" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
+<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#a1a8ce6b094c8e2b5c6dda805c032cd44" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
 <a name="l00054"></a>00054 
-<a name="l00056"></a>00056   StkFloat <a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Plucked.html#aba5a6b6850874da55c32388e9857d6fc" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
 <a name="l00057"></a>00057 
-<a name="l00058"></a>00058  <span class="keyword">protected</span>:  
-<a name="l00059"></a>00059 
-<a name="l00060"></a>00060   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>   delayLine_;
-<a name="l00061"></a>00061   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>  loopFilter_;
-<a name="l00062"></a>00062   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  pickFilter_;
-<a name="l00063"></a>00063   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
-<a name="l00064"></a>00064   StkFloat loopGain_;
-<a name="l00065"></a>00065   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067 };
-<a name="l00068"></a>00068 
-<a name="l00069"></a><a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25">00069</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">Plucked :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00070"></a>00070 {
-<a name="l00071"></a>00071   <span class="comment">// Here&#39;s the whole inner loop of the instrument!!</span>
-<a name="l00072"></a>00072   <span class="keywordflow">return</span> lastFrame_[0] = 3.0 * delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( loopFilter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_ ) ); 
-<a name="l00073"></a>00073 }
-<a name="l00074"></a>00074 
-<a name="l00075"></a>00075 } <span class="comment">// stk namespace</span>
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077 <span class="preprocessor">#endif</span>
-<a name="l00078"></a>00078 <span class="preprocessor"></span>
+<a name="l00059"></a>00059   StkFloat <a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00060"></a>00060 
+<a name="l00062"></a>00062 
+<a name="l00069"></a>00069   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00070"></a>00070 
+<a name="l00071"></a>00071  <span class="keyword">protected</span>:  
+<a name="l00072"></a>00072 
+<a name="l00073"></a>00073   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>   delayLine_;
+<a name="l00074"></a>00074   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>  loopFilter_;
+<a name="l00075"></a>00075   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  pickFilter_;
+<a name="l00076"></a>00076   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
+<a name="l00077"></a>00077 
+<a name="l00078"></a>00078   StkFloat loopGain_;
+<a name="l00079"></a>00079 };
+<a name="l00080"></a>00080 
+<a name="l00081"></a><a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25">00081</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">Plucked :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00082"></a>00082 {
+<a name="l00083"></a>00083   <span class="comment">// Here&#39;s the whole inner loop of the instrument!!</span>
+<a name="l00084"></a>00084   <span class="keywordflow">return</span> lastFrame_[0] = 3.0 * delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( loopFilter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_ ) ); 
+<a name="l00085"></a>00085 }
+<a name="l00086"></a>00086 
+<a name="l00087"></a><a class="code" href="classstk_1_1Plucked.html#ab9bb602c6f6867cf00995bc42101c006">00087</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">Plucked :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00088"></a>00088 {
+<a name="l00089"></a>00089   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00092"></a>00092     oStream_ &lt;&lt; <span class="stringliteral">&quot;Plucked::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00094"></a>00094   }
+<a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
+<a name="l00096"></a>00096 <span class="preprocessor"></span>
+<a name="l00097"></a>00097   StkFloat *samples = &amp;frames[channel];
+<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00099"></a>00099   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00100"></a>00100     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00101"></a>00101       *samples++ = <a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">tick</a>();
+<a name="l00102"></a>00102   }
+<a name="l00103"></a>00103   <span class="keywordflow">else</span> {
+<a name="l00104"></a>00104     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00105"></a>00105       *samples++ = <a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">tick</a>();
+<a name="l00106"></a>00106       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00107"></a>00107         *samples++ = lastFrame_[j];
+<a name="l00108"></a>00108     }
+<a name="l00109"></a>00109   }
+<a name="l00110"></a>00110 
+<a name="l00111"></a>00111   <span class="keywordflow">return</span> frames;
+<a name="l00112"></a>00112 }
+<a name="l00113"></a>00113 
+<a name="l00114"></a>00114 } <span class="comment">// stk namespace</span>
+<a name="l00115"></a>00115 
+<a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
+<a name="l00117"></a>00117 <span class="preprocessor"></span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/PoleZero_8h-source.html b/doc/html/PoleZero_8h-source.html
deleted file mode 100644
index 8d587e3..0000000
--- a/doc/html/PoleZero_8h-source.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>PoleZero.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_POLEZERO_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_POLEZERO_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 <span class="comment">/***************************************************/</span>
-<a name="l00020"></a>00020 
-<a name="l00021"></a><a class="code" href="classstk_1_1PoleZero.html">00021</a> <span class="keyword">class </span><a class="code" href="classstk_1_1PoleZero.html" title="STK one-pole, one-zero filter class.">PoleZero</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00022"></a>00022 {
-<a name="l00023"></a>00023  <span class="keyword">public</span>:
-<a name="l00024"></a>00024 
-<a name="l00026"></a>00026   <a class="code" href="classstk_1_1PoleZero.html#d9a46d21ee470d7afcd641807b5e314e" title="Default constructor creates a first-order pass-through filter.">PoleZero</a>();
-<a name="l00027"></a>00027 
-<a name="l00029"></a>00029   <a class="code" href="classstk_1_1PoleZero.html#beb7feab68b5d8370bd9c2aef94c8541" title="Class destructor.">~PoleZero</a>();
-<a name="l00030"></a>00030 
-<a name="l00032"></a><a class="code" href="classstk_1_1PoleZero.html#8e4a45e4a5263c66e9d447688975ca0f">00032</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#8e4a45e4a5263c66e9d447688975ca0f" title="Set the b[0] coefficient value.">setB0</a>( StkFloat b0 ) { b_[0] = b0; };
-<a name="l00033"></a>00033 
-<a name="l00035"></a><a class="code" href="classstk_1_1PoleZero.html#e33d1e1f594b4cf9063518c7b065c5f5">00035</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#e33d1e1f594b4cf9063518c7b065c5f5" title="Set the b[1] coefficient value.">setB1</a>( StkFloat b1 ) { b_[1] = b1; };
-<a name="l00036"></a>00036 
-<a name="l00038"></a><a class="code" href="classstk_1_1PoleZero.html#e3f0fc1182eb06730f09b8137c01779f">00038</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#e3f0fc1182eb06730f09b8137c01779f" title="Set the a[1] coefficient value.">setA1</a>( StkFloat a1 ) { a_[1] = a1; };
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#f34e485fbcaa1f4985a88a882ca9d5c5" title="Set all filter coefficients.">setCoefficients</a>( StkFloat b0, StkFloat b1, StkFloat a1, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044 
-<a name="l00049"></a>00049   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#51264d601b635aa0274c75ba1aa5a048" title="Set the filter for allpass behavior using coefficient.">setAllpass</a>( StkFloat coefficient );
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052 
-<a name="l00058"></a>00058   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#cb7119d8964215546bbeeb6029f5c46f" title="Create a DC blocking filter with the given pole position in the z-plane.">setBlockZero</a>( StkFloat thePole = 0.99 );
-<a name="l00059"></a>00059 
-<a name="l00061"></a><a class="code" href="classstk_1_1PoleZero.html#03edf036d1619bb5d33bb41701833232">00061</a>   StkFloat <a class="code" href="classstk_1_1PoleZero.html#03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064   StkFloat <a class="code" href="classstk_1_1PoleZero.html#1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067 
-<a name="l00074"></a>00074   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PoleZero.html#1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076 };
-<a name="l00077"></a>00077 
-<a name="l00078"></a><a class="code" href="classstk_1_1PoleZero.html#1a29ac6f3a2b75e71693c73554599228">00078</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1PoleZero.html#1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">PoleZero :: tick</a>( StkFloat input )
-<a name="l00079"></a>00079 {
-<a name="l00080"></a>00080   inputs_[0] = gain_ * input;
-<a name="l00081"></a>00081   lastFrame_[0] = b_[0] * inputs_[0] + b_[1] * inputs_[1] - a_[1] * outputs_[1];
-<a name="l00082"></a>00082   inputs_[1] = inputs_[0];
-<a name="l00083"></a>00083   outputs_[1] = lastFrame_[0];
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a><a class="code" href="classstk_1_1PoleZero.html#1b5e97a13c582d97cfaa7fcbd4211b47">00088</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PoleZero.html#1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">PoleZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00089"></a>00089 {
-<a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00092"></a>00092     errorString_ &lt;&lt; <span class="stringliteral">"PoleZero::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00094"></a>00094   }
-<a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
-<a name="l00096"></a>00096 <span class="preprocessor"></span>
-<a name="l00097"></a>00097   StkFloat *samples = &amp;frames[channel];
-<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00099"></a>00099   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00100"></a>00100     inputs_[0] = gain_ * *samples;
-<a name="l00101"></a>00101     *samples = b_[0] * inputs_[0] + b_[1] * inputs_[1] - a_[1] * outputs_[1];
-<a name="l00102"></a>00102     inputs_[1] = inputs_[0];
-<a name="l00103"></a>00103     outputs_[1] = *samples;
-<a name="l00104"></a>00104   }
-<a name="l00105"></a>00105 
-<a name="l00106"></a>00106   lastFrame_[0] = outputs_[1];
-<a name="l00107"></a>00107   <span class="keywordflow">return</span> frames;
-<a name="l00108"></a>00108 }
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 } <span class="comment">// stk namespace</span>
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/PoleZero_8h_source.html b/doc/html/PoleZero_8h_source.html
index 7f01589..8e80e02 100644
--- a/doc/html/PoleZero_8h_source.html
+++ b/doc/html/PoleZero_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>PoleZero.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_POLEZERO_H</span>
@@ -39,61 +39,61 @@
 <a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#af34e485fbcaa1f4985a88a882ca9d5c5" title="Set all filter coefficients.">setCoefficients</a>( StkFloat b0, StkFloat b1, StkFloat a1, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
 <a name="l00042"></a>00042 
 <a name="l00044"></a>00044 
-<a name="l00049"></a>00049   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#a51264d601b635aa0274c75ba1aa5a048" title="Set the filter for allpass behavior using coefficient.">setAllpass</a>( StkFloat coefficient );
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052 
-<a name="l00058"></a>00058   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#acb7119d8964215546bbeeb6029f5c46f" title="Create a DC blocking filter with the given pole position in the z-plane.">setBlockZero</a>( StkFloat thePole = 0.99 );
-<a name="l00059"></a>00059 
-<a name="l00061"></a><a class="code" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232">00061</a>   StkFloat <a class="code" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064   StkFloat <a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067 
-<a name="l00074"></a>00074   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076 };
-<a name="l00077"></a>00077 
-<a name="l00078"></a><a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228">00078</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">PoleZero :: tick</a>( StkFloat input )
-<a name="l00079"></a>00079 {
-<a name="l00080"></a>00080   inputs_[0] = gain_ * input;
-<a name="l00081"></a>00081   lastFrame_[0] = b_[0] * inputs_[0] + b_[1] * inputs_[1] - a_[1] * outputs_[1];
-<a name="l00082"></a>00082   inputs_[1] = inputs_[0];
-<a name="l00083"></a>00083   outputs_[1] = lastFrame_[0];
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a><a class="code" href="classstk_1_1PoleZero.html#a1b5e97a13c582d97cfaa7fcbd4211b47">00088</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">PoleZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00089"></a>00089 {
-<a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00092"></a>00092     errorString_ &lt;&lt; <span class="stringliteral">&quot;PoleZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00094"></a>00094   }
-<a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
-<a name="l00096"></a>00096 <span class="preprocessor"></span>
-<a name="l00097"></a>00097   StkFloat *samples = &amp;frames[channel];
-<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00099"></a>00099   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00100"></a>00100     inputs_[0] = gain_ * *samples;
-<a name="l00101"></a>00101     *samples = b_[0] * inputs_[0] + b_[1] * inputs_[1] - a_[1] * outputs_[1];
-<a name="l00102"></a>00102     inputs_[1] = inputs_[0];
-<a name="l00103"></a>00103     outputs_[1] = *samples;
-<a name="l00104"></a>00104   }
-<a name="l00105"></a>00105 
-<a name="l00106"></a>00106   lastFrame_[0] = outputs_[1];
-<a name="l00107"></a>00107   <span class="keywordflow">return</span> frames;
-<a name="l00108"></a>00108 }
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110 } <span class="comment">// stk namespace</span>
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112 <span class="preprocessor">#endif</span>
+<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#a51264d601b635aa0274c75ba1aa5a048" title="Set the filter for allpass behavior using coefficient.">setAllpass</a>( StkFloat coefficient );
+<a name="l00051"></a>00051 
+<a name="l00053"></a>00053 
+<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1PoleZero.html#acb7119d8964215546bbeeb6029f5c46f" title="Create a DC blocking filter with the given pole position in the z-plane.">setBlockZero</a>( StkFloat thePole = 0.99 );
+<a name="l00060"></a>00060 
+<a name="l00062"></a><a class="code" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232">00062</a>   StkFloat <a class="code" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
+<a name="l00063"></a>00063 
+<a name="l00065"></a>00065   StkFloat <a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
+<a name="l00066"></a>00066 
+<a name="l00068"></a>00068 
+<a name="l00075"></a>00075   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00076"></a>00076 
+<a name="l00077"></a>00077 };
+<a name="l00078"></a>00078 
+<a name="l00079"></a><a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228">00079</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">PoleZero :: tick</a>( StkFloat input )
+<a name="l00080"></a>00080 {
+<a name="l00081"></a>00081   inputs_[0] = gain_ * input;
+<a name="l00082"></a>00082   lastFrame_[0] = b_[0] * inputs_[0] + b_[1] * inputs_[1] - a_[1] * outputs_[1];
+<a name="l00083"></a>00083   inputs_[1] = inputs_[0];
+<a name="l00084"></a>00084   outputs_[1] = lastFrame_[0];
+<a name="l00085"></a>00085 
+<a name="l00086"></a>00086   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00087"></a>00087 }
+<a name="l00088"></a>00088 
+<a name="l00089"></a><a class="code" href="classstk_1_1PoleZero.html#a1b5e97a13c582d97cfaa7fcbd4211b47">00089</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1PoleZero.html#a1a29ac6f3a2b75e71693c73554599228" title="Input one sample to the filter and return one output.">PoleZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00090"></a>00090 {
+<a name="l00091"></a>00091 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00092"></a>00092 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00093"></a>00093     oStream_ &lt;&lt; <span class="stringliteral">&quot;PoleZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00094"></a>00094     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00095"></a>00095   }
+<a name="l00096"></a>00096 <span class="preprocessor">#endif</span>
+<a name="l00097"></a>00097 <span class="preprocessor"></span>
+<a name="l00098"></a>00098   StkFloat *samples = &amp;frames[channel];
+<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00100"></a>00100   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00101"></a>00101     inputs_[0] = gain_ * *samples;
+<a name="l00102"></a>00102     *samples = b_[0] * inputs_[0] + b_[1] * inputs_[1] - a_[1] * outputs_[1];
+<a name="l00103"></a>00103     inputs_[1] = inputs_[0];
+<a name="l00104"></a>00104     outputs_[1] = *samples;
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106 
+<a name="l00107"></a>00107   lastFrame_[0] = outputs_[1];
+<a name="l00108"></a>00108   <span class="keywordflow">return</span> frames;
+<a name="l00109"></a>00109 }
+<a name="l00110"></a>00110 
+<a name="l00111"></a>00111 } <span class="comment">// stk namespace</span>
+<a name="l00112"></a>00112 
+<a name="l00113"></a>00113 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/ReedTable_8h-source.html b/doc/html/ReedTable_8h-source.html
deleted file mode 100644
index 7d25180..0000000
--- a/doc/html/ReedTable_8h-source.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>ReedTable.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_REEDTABLE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_REEDTABLE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Function.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00025"></a>00025 <span class="comment">/***************************************************/</span>
-<a name="l00026"></a>00026 
-<a name="l00027"></a><a class="code" href="classstk_1_1ReedTable.html">00027</a> <span class="keyword">class </span><a class="code" href="classstk_1_1ReedTable.html" title="STK reed table class.">ReedTable</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Function.html" title="STK abstract function parent class.">Function</a>
-<a name="l00028"></a>00028 {
-<a name="l00029"></a>00029 <span class="keyword">public</span>:
-<a name="l00031"></a><a class="code" href="classstk_1_1ReedTable.html#138db7619ec28a4feeaf2a00988e4f0d">00031</a>   <a class="code" href="classstk_1_1ReedTable.html#138db7619ec28a4feeaf2a00988e4f0d" title="Default constructor.">ReedTable</a>( <span class="keywordtype">void</span> ) : offset_(0.6), slope_(-0.8) {};
-<a name="l00032"></a>00032 
-<a name="l00034"></a>00034 
-<a name="l00039"></a><a class="code" href="classstk_1_1ReedTable.html#b40ffd675bd7242a210e8630f8919556">00039</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ReedTable.html#b40ffd675bd7242a210e8630f8919556" title="Set the table offset value.">setOffset</a>( StkFloat offset ) { offset_ = offset; };
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042 
-<a name="l00047"></a><a class="code" href="classstk_1_1ReedTable.html#968a97400ec6bd424634ff377fc6417a">00047</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1ReedTable.html#968a97400ec6bd424634ff377fc6417a" title="Set the table slope value.">setSlope</a>( StkFloat slope ) { slope_ = slope; };
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   StkFloat <a class="code" href="classstk_1_1ReedTable.html#3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>( StkFloat input );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053 
-<a name="l00061"></a>00061   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1ReedTable.html#3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064 
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1ReedTable.html#3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074 <span class="keyword">protected</span>:
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076   StkFloat offset_;
-<a name="l00077"></a>00077   StkFloat slope_;
-<a name="l00078"></a>00078 
-<a name="l00079"></a>00079 };
-<a name="l00080"></a>00080 
-<a name="l00081"></a><a class="code" href="classstk_1_1ReedTable.html#3c1607ed5712e2ab010d8c5e55e431f2">00081</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1ReedTable.html#3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">ReedTable :: tick</a>( StkFloat input )    
-<a name="l00082"></a>00082 {
-<a name="l00083"></a>00083   <span class="comment">// The input is differential pressure across the reed.</span>
-<a name="l00084"></a>00084   lastFrame_[0] = offset_ + (slope_ * input);
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086   <span class="comment">// If output is &gt; 1, the reed has slammed shut and the</span>
-<a name="l00087"></a>00087   <span class="comment">// reflection function value saturates at 1.0.</span>
-<a name="l00088"></a>00088   <span class="keywordflow">if</span> ( lastFrame_[0] &gt; 1.0) lastFrame_[0] = (StkFloat) 1.0;
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090   <span class="comment">// This is nearly impossible in a physical system, but</span>
-<a name="l00091"></a>00091   <span class="comment">// a reflection function value of -1.0 corresponds to</span>
-<a name="l00092"></a>00092   <span class="comment">// an open end (and no discontinuity in bore profile).</span>
-<a name="l00093"></a>00093   <span class="keywordflow">if</span> ( lastFrame_[0] &lt; -1.0) lastFrame_[0] = (StkFloat) -1.0;
-<a name="l00094"></a>00094 
-<a name="l00095"></a>00095   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00096"></a>00096 }
-<a name="l00097"></a>00097 
-<a name="l00098"></a><a class="code" href="classstk_1_1ReedTable.html#3455fa2dedb2c86fc825ec48296822be">00098</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1ReedTable.html#3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">ReedTable :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00099"></a>00099 {
-<a name="l00100"></a>00100 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00101"></a>00101 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00102"></a>00102     errorString_ &lt;&lt; <span class="stringliteral">"ReedTable::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00103"></a>00103     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00104"></a>00104   }
-<a name="l00105"></a>00105 <span class="preprocessor">#endif</span>
-<a name="l00106"></a>00106 <span class="preprocessor"></span>
-<a name="l00107"></a>00107   StkFloat *samples = &amp;frames[channel];
-<a name="l00108"></a>00108   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00109"></a>00109   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00110"></a>00110     *samples = offset_ + (slope_ * *samples);
-<a name="l00111"></a>00111     <span class="keywordflow">if</span> ( *samples &gt; 1.0) *samples = 1.0;
-<a name="l00112"></a>00112     <span class="keywordflow">if</span> ( *samples &lt; -1.0) *samples = -1.0;
-<a name="l00113"></a>00113   }
-<a name="l00114"></a>00114 
-<a name="l00115"></a>00115   lastFrame_[0] = *(samples-hop);
-<a name="l00116"></a>00116   <span class="keywordflow">return</span> frames;
-<a name="l00117"></a>00117 }
-<a name="l00118"></a>00118 
-<a name="l00119"></a><a class="code" href="classstk_1_1ReedTable.html#e682fdc0a6ec68a9f858f5cd6889113d">00119</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1ReedTable.html#3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">ReedTable :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00120"></a>00120 {
-<a name="l00121"></a>00121 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00122"></a>00122 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00123"></a>00123     errorString_ &lt;&lt; <span class="stringliteral">"ReedTable::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00124"></a>00124     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00125"></a>00125   }
-<a name="l00126"></a>00126 <span class="preprocessor">#endif</span>
-<a name="l00127"></a>00127 <span class="preprocessor"></span>
-<a name="l00128"></a>00128   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00129"></a>00129   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00130"></a>00130   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00131"></a>00131   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00132"></a>00132     *oSamples = offset_ + (slope_ * *iSamples);
-<a name="l00133"></a>00133     <span class="keywordflow">if</span> ( *oSamples &gt; 1.0) *oSamples = 1.0;
-<a name="l00134"></a>00134     <span class="keywordflow">if</span> ( *oSamples &lt; -1.0) *oSamples = -1.0;
-<a name="l00135"></a>00135   }
-<a name="l00136"></a>00136 
-<a name="l00137"></a>00137   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00138"></a>00138   <span class="keywordflow">return</span> iFrames;
-<a name="l00139"></a>00139 }
-<a name="l00140"></a>00140 
-<a name="l00141"></a>00141 } <span class="comment">// stk namespace</span>
-<a name="l00142"></a>00142 
-<a name="l00143"></a>00143 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/ReedTable_8h_source.html b/doc/html/ReedTable_8h_source.html
index 9f64503..51c60c5 100644
--- a/doc/html/ReedTable_8h_source.html
+++ b/doc/html/ReedTable_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>ReedTable.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_REEDTABLE_H</span>
@@ -69,7 +69,7 @@
 <a name="l00099"></a>00099 {
 <a name="l00100"></a>00100 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00101"></a>00101 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00102"></a>00102     errorString_ &lt;&lt; <span class="stringliteral">&quot;ReedTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00102"></a>00102     oStream_ &lt;&lt; <span class="stringliteral">&quot;ReedTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00103"></a>00103     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00104"></a>00104   }
 <a name="l00105"></a>00105 <span class="preprocessor">#endif</span>
@@ -90,7 +90,7 @@
 <a name="l00120"></a>00120 {
 <a name="l00121"></a>00121 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00122"></a>00122 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00123"></a>00123     errorString_ &lt;&lt; <span class="stringliteral">&quot;ReedTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00123"></a>00123     oStream_ &lt;&lt; <span class="stringliteral">&quot;ReedTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00124"></a>00124     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00125"></a>00125   }
 <a name="l00126"></a>00126 <span class="preprocessor">#endif</span>
@@ -116,7 +116,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Resonate_8h-source.html b/doc/html/Resonate_8h-source.html
deleted file mode 100644
index a36c63a..0000000
--- a/doc/html/Resonate_8h-source.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Resonate.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_RESONATE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_RESONATE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "ADSR.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "BiQuad.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="keyword">namespace </span>stk {
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="comment">/***************************************************/</span>
-<a name="l00028"></a>00028 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 
-<a name="l00030"></a><a class="code" href="classstk_1_1Resonate.html">00030</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Resonate.html" title="STK noise driven formant filter.">Resonate</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00031"></a>00031 {
-<a name="l00032"></a>00032  <span class="keyword">public</span>:
-<a name="l00034"></a>00034   <a class="code" href="classstk_1_1Resonate.html#b273b41ec296f776a41cfa66bb1e430e" title="Class constructor.">Resonate</a>( <span class="keywordtype">void</span> );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037   <a class="code" href="classstk_1_1Resonate.html#634ab2db8eabad147fa90fb1bf72a580" title="Class destructor.">~Resonate</a>( <span class="keywordtype">void</span> );
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Resonate.html#534740efbbde171d790309e85c96017d" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Resonate.html#8767e6c05862c183483776ac4cf354f9" title="Set the filter for a resonance at the given frequency (Hz) and radius.">setResonance</a>( StkFloat frequency, StkFloat radius );
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Resonate.html#d4476301fba545cbbfc773150ca6901d" title="Set the filter for a notch at the given frequency (Hz) and radius.">setNotch</a>( StkFloat frequency, StkFloat radius );
-<a name="l00047"></a>00047 
-<a name="l00049"></a><a class="code" href="classstk_1_1Resonate.html#d8000ad734634ac7334f4fab09a13a7e">00049</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Resonate.html#d8000ad734634ac7334f4fab09a13a7e" title="Set the filter zero coefficients for contant resonance gain.">setEqualGainZeroes</a>( <span class="keywordtype">void</span> ) { filter_.<a class="code" href="classstk_1_1BiQuad.html#28881f5876ce5bdcc846367cca9363f7" title="Sets the filter zeroes for equal resonance gain.">setEqualGainZeroes</a>(); };
-<a name="l00050"></a>00050 
-<a name="l00052"></a><a class="code" href="classstk_1_1Resonate.html#febf784a302eb0043b4a453b0d1d852c">00052</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Resonate.html#febf784a302eb0043b4a453b0d1d852c" title="Initiate the envelope with a key-on event.">keyOn</a>( <span class="keywordtype">void</span> ) { adsr_.<a class="code" href="classstk_1_1ADSR.html#ad03e82010a20cfb49c1f04bae791631" title="Set target = 1, state = ADSR::ATTACK.">keyOn</a>(); };
-<a name="l00053"></a>00053 
-<a name="l00055"></a><a class="code" href="classstk_1_1Resonate.html#0008e1fdd7611b769b72b52c8bfb1e6a">00055</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Resonate.html#0008e1fdd7611b769b72b52c8bfb1e6a" title="Signal a key-off event to the envelope.">keyOff</a>( <span class="keywordtype">void</span> ) { adsr_.<a class="code" href="classstk_1_1ADSR.html#9400e04b313ab8900a3ba9b693f448e6" title="Set target = 0, state = ADSR::RELEASE.">keyOff</a>(); };
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Resonate.html#76bfadc70f4163f9767e7864d322d144" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Resonate.html#0454a8e9d6ef3a2394b6c348edf0195f" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Resonate.html#f55feabf25f1f6f996c32574656ffd68" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067   StkFloat <a class="code" href="classstk_1_1Resonate.html#b917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00068"></a>00068 
-<a name="l00069"></a>00069  <span class="keyword">protected</span>:
-<a name="l00070"></a>00070 
-<a name="l00071"></a>00071   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   filter_;
-<a name="l00073"></a>00073   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
-<a name="l00074"></a>00074   StkFloat poleFrequency_;
-<a name="l00075"></a>00075   StkFloat poleRadius_;
-<a name="l00076"></a>00076   StkFloat zeroFrequency_;
-<a name="l00077"></a>00077   StkFloat zeroRadius_;
-<a name="l00078"></a>00078 
-<a name="l00079"></a>00079 };
-<a name="l00080"></a>00080 
-<a name="l00081"></a><a class="code" href="classstk_1_1Resonate.html#b917279f4f57d5d305481426e9bffd98">00081</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Resonate.html#b917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">Resonate :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00082"></a>00082 {
-<a name="l00083"></a>00083   lastFrame_[0] = filter_.<a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( noise_.<a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>() );
-<a name="l00084"></a>00084   lastFrame_[0] *= adsr_.<a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088 } <span class="comment">// stk namespace</span>
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Resonate_8h_source.html b/doc/html/Resonate_8h_source.html
index 65479ca..a0a3c58 100644
--- a/doc/html/Resonate_8h_source.html
+++ b/doc/html/Resonate_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Resonate.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_RESONATE_H</span>
@@ -52,34 +52,64 @@
 <a name="l00065"></a>00065 
 <a name="l00067"></a>00067   StkFloat <a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00068"></a>00068 
-<a name="l00069"></a>00069  <span class="keyword">protected</span>:
 <a name="l00070"></a>00070 
-<a name="l00071"></a>00071   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   filter_;
-<a name="l00073"></a>00073   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
-<a name="l00074"></a>00074   StkFloat poleFrequency_;
-<a name="l00075"></a>00075   StkFloat poleRadius_;
-<a name="l00076"></a>00076   StkFloat zeroFrequency_;
-<a name="l00077"></a>00077   StkFloat zeroRadius_;
+<a name="l00077"></a>00077   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00078"></a>00078 
-<a name="l00079"></a>00079 };
+<a name="l00079"></a>00079  <span class="keyword">protected</span>:
 <a name="l00080"></a>00080 
-<a name="l00081"></a><a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98">00081</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">Resonate :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00082"></a>00082 {
-<a name="l00083"></a>00083   lastFrame_[0] = filter_.<a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>() );
-<a name="l00084"></a>00084   lastFrame_[0] *= adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00085"></a>00085   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00086"></a>00086 }
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088 } <span class="comment">// stk namespace</span>
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 <span class="preprocessor">#endif</span>
+<a name="l00081"></a>00081   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>     adsr_;
+<a name="l00082"></a>00082   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>   filter_;
+<a name="l00083"></a>00083   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
+<a name="l00084"></a>00084   StkFloat poleFrequency_;
+<a name="l00085"></a>00085   StkFloat poleRadius_;
+<a name="l00086"></a>00086   StkFloat zeroFrequency_;
+<a name="l00087"></a>00087   StkFloat zeroRadius_;
+<a name="l00088"></a>00088 
+<a name="l00089"></a>00089 };
+<a name="l00090"></a>00090 
+<a name="l00091"></a><a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98">00091</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">Resonate :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00092"></a>00092 {
+<a name="l00093"></a>00093   lastFrame_[0] = filter_.<a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>() );
+<a name="l00094"></a>00094   lastFrame_[0] *= adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
+<a name="l00095"></a>00095   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00096"></a>00096 }
+<a name="l00097"></a>00097 
+<a name="l00098"></a><a class="code" href="classstk_1_1Resonate.html#aeefb870c1eeb430160fdca374e8324b3">00098</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">Resonate :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00099"></a>00099 {
+<a name="l00100"></a>00100   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00101"></a>00101 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00102"></a>00102 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00103"></a>00103     oStream_ &lt;&lt; <span class="stringliteral">&quot;Resonate::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00104"></a>00104     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106 <span class="preprocessor">#endif</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span>
+<a name="l00108"></a>00108   StkFloat *samples = &amp;frames[channel];
+<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00110"></a>00110   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00111"></a>00111     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00112"></a>00112       *samples++ = <a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">tick</a>();
+<a name="l00113"></a>00113   }
+<a name="l00114"></a>00114   <span class="keywordflow">else</span> {
+<a name="l00115"></a>00115     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00116"></a>00116       *samples++ = <a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">tick</a>();
+<a name="l00117"></a>00117       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00118"></a>00118         *samples++ = lastFrame_[j];
+<a name="l00119"></a>00119     }
+<a name="l00120"></a>00120   }
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122   <span class="keywordflow">return</span> frames;
+<a name="l00123"></a>00123 }
+<a name="l00124"></a>00124 
+<a name="l00125"></a>00125 } <span class="comment">// stk namespace</span>
+<a name="l00126"></a>00126 
+<a name="l00127"></a>00127 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Rhodey_8h-source.html b/doc/html/Rhodey_8h-source.html
deleted file mode 100644
index bad44f5..0000000
--- a/doc/html/Rhodey_8h-source.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Rhodey.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_RHODEY_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_RHODEY_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "FM.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00038"></a>00038 <span class="comment">/***************************************************/</span>
-<a name="l00039"></a>00039 
-<a name="l00040"></a><a class="code" href="classstk_1_1Rhodey.html">00040</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Rhodey.html" title="STK Fender Rhodes electric piano FM synthesis instrument.">Rhodey</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a>
-<a name="l00041"></a>00041 {
-<a name="l00042"></a>00042  <span class="keyword">public</span>:
-<a name="l00044"></a>00044 
-<a name="l00047"></a>00047   <a class="code" href="classstk_1_1Rhodey.html#b647310b8bfc12b518b5c3a89db6d94e" title="Class constructor.">Rhodey</a>( <span class="keywordtype">void</span> );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <a class="code" href="classstk_1_1Rhodey.html#6fc6c7473cef051e11a62802848b228c" title="Class destructor.">~Rhodey</a>( <span class="keywordtype">void</span> );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Rhodey.html#216ff771d88e7e03c46bc477d7ed5e86" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Rhodey.html#98e112778609f8eb217c0956f17c65e4" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059   StkFloat <a class="code" href="classstk_1_1Rhodey.html#199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00060"></a>00060 
-<a name="l00061"></a>00061  <span class="keyword">protected</span>:
-<a name="l00062"></a>00062 
-<a name="l00063"></a>00063 };
-<a name="l00064"></a>00064 
-<a name="l00065"></a><a class="code" href="classstk_1_1Rhodey.html#199591ffb4230c653ec7d7ea52e37790">00065</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Rhodey.html#199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">Rhodey :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00066"></a>00066 {
-<a name="l00067"></a>00067   StkFloat temp, temp2;
-<a name="l00068"></a>00068 
-<a name="l00069"></a>00069   temp = gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00070"></a>00070   temp = temp * control1_;
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072   waves_[0]-&gt;addPhaseOffset( temp );
-<a name="l00073"></a>00073   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#e9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00074"></a>00074   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00075"></a>00075   twozero_.<a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077   waves_[2]-&gt;addPhaseOffset( temp );
-<a name="l00078"></a>00078   temp = ( 1.0 - (control2_ * 0.5)) * gains_[0] * adsr_[0]-&gt;<a class="code" href="classstk_1_1Rhodey.html#199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">tick</a>() * waves_[0]-&gt;tick();
-<a name="l00079"></a>00079   temp += control2_ * 0.5 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081   <span class="comment">// Calculate amplitude modulation and apply it to output.</span>
-<a name="l00082"></a>00082   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_;
-<a name="l00083"></a>00083   temp = temp * (1.0 + temp2);
-<a name="l00084"></a>00084     
-<a name="l00085"></a>00085   lastFrame_[0] = temp * 0.5;
-<a name="l00086"></a>00086   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00087"></a>00087 }
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 } <span class="comment">// stk namespace</span>
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Rhodey_8h_source.html b/doc/html/Rhodey_8h_source.html
index 0f00b59..f376a4f 100644
--- a/doc/html/Rhodey_8h_source.html
+++ b/doc/html/Rhodey_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Rhodey.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_RHODEY_H</span>
@@ -36,43 +36,73 @@
 <a name="l00057"></a>00057 
 <a name="l00059"></a>00059   StkFloat <a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00060"></a>00060 
-<a name="l00061"></a>00061  <span class="keyword">protected</span>:
 <a name="l00062"></a>00062 
-<a name="l00063"></a>00063 };
-<a name="l00064"></a>00064 
-<a name="l00065"></a><a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790">00065</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">Rhodey :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00066"></a>00066 {
-<a name="l00067"></a>00067   StkFloat temp, temp2;
-<a name="l00068"></a>00068 
-<a name="l00069"></a>00069   temp = gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00070"></a>00070   temp = temp * control1_;
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072   waves_[0]-&gt;addPhaseOffset( temp );
-<a name="l00073"></a>00073   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00074"></a>00074   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00075"></a>00075   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077   waves_[2]-&gt;addPhaseOffset( temp );
-<a name="l00078"></a>00078   temp = ( 1.0 - (control2_ * 0.5)) * gains_[0] * adsr_[0]-&gt;<a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">tick</a>() * waves_[0]-&gt;tick();
-<a name="l00079"></a>00079   temp += control2_ * 0.5 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081   <span class="comment">// Calculate amplitude modulation and apply it to output.</span>
-<a name="l00082"></a>00082   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_;
-<a name="l00083"></a>00083   temp = temp * (1.0 + temp2);
-<a name="l00084"></a>00084     
-<a name="l00085"></a>00085   lastFrame_[0] = temp * 0.5;
-<a name="l00086"></a>00086   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00087"></a>00087 }
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 } <span class="comment">// stk namespace</span>
+<a name="l00069"></a>00069   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00070"></a>00070 
+<a name="l00071"></a>00071  <span class="keyword">protected</span>:
+<a name="l00072"></a>00072 
+<a name="l00073"></a>00073 };
+<a name="l00074"></a>00074 
+<a name="l00075"></a><a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790">00075</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">Rhodey :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00076"></a>00076 {
+<a name="l00077"></a>00077   StkFloat temp, temp2;
+<a name="l00078"></a>00078 
+<a name="l00079"></a>00079   temp = gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
+<a name="l00080"></a>00080   temp = temp * control1_;
+<a name="l00081"></a>00081 
+<a name="l00082"></a>00082   waves_[0]-&gt;addPhaseOffset( temp );
+<a name="l00083"></a>00083   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
+<a name="l00084"></a>00084   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
+<a name="l00085"></a>00085   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
+<a name="l00086"></a>00086 
+<a name="l00087"></a>00087   waves_[2]-&gt;addPhaseOffset( temp );
+<a name="l00088"></a>00088   temp = ( 1.0 - (control2_ * 0.5)) * gains_[0] * adsr_[0]-&gt;<a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">tick</a>() * waves_[0]-&gt;tick();
+<a name="l00089"></a>00089   temp += control2_ * 0.5 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
 <a name="l00090"></a>00090 
-<a name="l00091"></a>00091 <span class="preprocessor">#endif</span>
+<a name="l00091"></a>00091   <span class="comment">// Calculate amplitude modulation and apply it to output.</span>
+<a name="l00092"></a>00092   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_;
+<a name="l00093"></a>00093   temp = temp * (1.0 + temp2);
+<a name="l00094"></a>00094     
+<a name="l00095"></a>00095   lastFrame_[0] = temp * 0.5;
+<a name="l00096"></a>00096   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00097"></a>00097 }
+<a name="l00098"></a>00098 
+<a name="l00099"></a><a class="code" href="classstk_1_1Rhodey.html#a9d843b764e5219c8289884d0903462f9">00099</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">Rhodey :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00100"></a>00100 {
+<a name="l00101"></a>00101   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00104"></a>00104     oStream_ &lt;&lt; <span class="stringliteral">&quot;Rhodey::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00106"></a>00106   }
+<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span>
+<a name="l00109"></a>00109   StkFloat *samples = &amp;frames[channel];
+<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00111"></a>00111   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00112"></a>00112     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00113"></a>00113       *samples++ = <a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">tick</a>();
+<a name="l00114"></a>00114   }
+<a name="l00115"></a>00115   <span class="keywordflow">else</span> {
+<a name="l00116"></a>00116     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00117"></a>00117       *samples++ = <a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">tick</a>();
+<a name="l00118"></a>00118       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00119"></a>00119         *samples++ = lastFrame_[j];
+<a name="l00120"></a>00120     }
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122 
+<a name="l00123"></a>00123   <span class="keywordflow">return</span> frames;
+<a name="l00124"></a>00124 }
+<a name="l00125"></a>00125 
+<a name="l00126"></a>00126 } <span class="comment">// stk namespace</span>
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/RtAudio_8h-source.html b/doc/html/RtAudio_8h-source.html
deleted file mode 100644
index b9d0e59..0000000
--- a/doc/html/RtAudio_8h-source.html
+++ /dev/null
@@ -1,645 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>RtAudio.h</h1><a href="RtAudio_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/************************************************************************/</span>
-<a name="l00039"></a>00039 <span class="comment">/************************************************************************/</span>
-<a name="l00040"></a>00040 
-<a name="l00045"></a>00045 <span class="comment">// RtAudio: Version 4.0.6</span>
-<a name="l00046"></a>00046 
-<a name="l00047"></a>00047 <span class="preprocessor">#ifndef __RTAUDIO_H</span>
-<a name="l00048"></a>00048 <span class="preprocessor"></span><span class="preprocessor">#define __RTAUDIO_H</span>
-<a name="l00049"></a>00049 <span class="preprocessor"></span>
-<a name="l00050"></a>00050 <span class="preprocessor">#include &lt;string&gt;</span>
-<a name="l00051"></a>00051 <span class="preprocessor">#include &lt;vector&gt;</span>
-<a name="l00052"></a>00052 <span class="preprocessor">#include "RtError.h"</span>
-<a name="l00053"></a>00053 
-<a name="l00070"></a><a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8">00070</a> <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a>;
-<a name="l00071"></a>00071 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT8 = 0x1;    <span class="comment">// 8-bit signed integer.</span>
-<a name="l00072"></a>00072 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT16 = 0x2;   <span class="comment">// 16-bit signed integer.</span>
-<a name="l00073"></a>00073 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT24 = 0x4;   <span class="comment">// Lower 3 bytes of 32-bit signed integer.</span>
-<a name="l00074"></a>00074 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT32 = 0x8;   <span class="comment">// 32-bit signed integer.</span>
-<a name="l00075"></a>00075 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_FLOAT32 = 0x10; <span class="comment">// Normalized between plus/minus 1.0.</span>
-<a name="l00076"></a>00076 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_FLOAT64 = 0x20; <span class="comment">// Normalized between plus/minus 1.0.</span>
-<a name="l00077"></a>00077 
-<a name="l00115"></a><a class="code" href="RtAudio_8h.html#2c0f59b200dcec4d4e760f9166b29c41">00115</a> <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="RtAudio_8h.html#2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a>;
-<a name="l00116"></a>00116 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_NONINTERLEAVED = 0x1;    <span class="comment">// Use non-interleaved buffers (default = interleaved).</span>
-<a name="l00117"></a>00117 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_MINIMIZE_LATENCY = 0x2;  <span class="comment">// Attempt to set stream parameters for lowest possible latency.</span>
-<a name="l00118"></a>00118 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_HOG_DEVICE = 0x4;        <span class="comment">// Attempt grab device and prevent use by others.</span>
-<a name="l00119"></a>00119 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_SCHEDULE_REALTIME = 0x8; <span class="comment">// Try to select realtime scheduling for callback thread.</span>
-<a name="l00120"></a>00120 
-<a name="l00132"></a><a class="code" href="RtAudio_8h.html#80e306d363583da3b0a1b65d9b57c806">00132</a> <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="RtAudio_8h.html#80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a>;
-<a name="l00133"></a>00133 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a> RTAUDIO_INPUT_OVERFLOW = 0x1;    <span class="comment">// Input data was discarded because of an overflow condition at the driver.</span>
-<a name="l00134"></a>00134 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a> RTAUDIO_OUTPUT_UNDERFLOW = 0x2;  <span class="comment">// The output buffer ran low, likely causing a gap in the output sound.</span>
-<a name="l00135"></a>00135 
-<a name="l00137"></a>00137 
-<a name="l00175"></a><a class="code" href="RtAudio_8h.html#112c7b7e25a974977f6fc094cef1a31f">00175</a> <span class="keyword">typedef</span> int (*<a class="code" href="RtAudio_8h.html#112c7b7e25a974977f6fc094cef1a31f" title="RtAudio callback function prototype.">RtAudioCallback</a>)( <span class="keywordtype">void</span> *outputBuffer, <span class="keywordtype">void</span> *inputBuffer,
-<a name="l00176"></a>00176                                 <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nFrames,
-<a name="l00177"></a>00177                                 <span class="keywordtype">double</span> streamTime,
-<a name="l00178"></a>00178                                 <a class="code" href="RtAudio_8h.html#80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a> status,
-<a name="l00179"></a>00179                                 <span class="keywordtype">void</span> *userData );
-<a name="l00180"></a>00180 
-<a name="l00181"></a>00181 
-<a name="l00182"></a>00182 <span class="comment">// **************************************************************** //</span>
-<a name="l00183"></a>00183 <span class="comment">//</span>
-<a name="l00184"></a>00184 <span class="comment">// RtAudio class declaration.</span>
-<a name="l00185"></a>00185 <span class="comment">//</span>
-<a name="l00186"></a>00186 <span class="comment">// RtAudio is a "controller" used to select an available audio i/o</span>
-<a name="l00187"></a>00187 <span class="comment">// interface.  It presents a common API for the user to call but all</span>
-<a name="l00188"></a>00188 <span class="comment">// functionality is implemented by the class RtApi and its</span>
-<a name="l00189"></a>00189 <span class="comment">// subclasses.  RtAudio creates an instance of an RtApi subclass</span>
-<a name="l00190"></a>00190 <span class="comment">// based on the user's API choice.  If no choice is made, RtAudio</span>
-<a name="l00191"></a>00191 <span class="comment">// attempts to make a "logical" API selection.</span>
-<a name="l00192"></a>00192 <span class="comment">//</span>
-<a name="l00193"></a>00193 <span class="comment">// **************************************************************** //</span>
-<a name="l00194"></a>00194 
-<a name="l00195"></a>00195 <span class="keyword">class </span>RtApi;
-<a name="l00196"></a>00196 
-<a name="l00197"></a><a class="code" href="classRtAudio.html">00197</a> <span class="keyword">class </span><a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>
-<a name="l00198"></a>00198 {
-<a name="l00199"></a>00199  <span class="keyword">public</span>:
-<a name="l00200"></a>00200 
-<a name="l00202"></a><a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849">00202</a>   <span class="keyword">enum</span> <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">Api</a> {
-<a name="l00203"></a><a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849a49af3ac767106158bc6cad74fb214ae">00203</a>     <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849a49af3ac767106158bc6cad74fb214ae">UNSPECIFIED</a>,    
-<a name="l00204"></a><a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849a7a2ba095c2806caa893b6fb8fc3a1a8">00204</a>     <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849a7a2ba095c2806caa893b6fb8fc3a1a8">LINUX_ALSA</a>,     
-<a name="l00205"></a><a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d84939c84615e61de75e6a4e865596d62c82">00205</a>     <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d84939c84615e61de75e6a4e865596d62c82">LINUX_OSS</a>,      
-<a name="l00206"></a><a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d8494767e17c6edfbd827f91763915df4105">00206</a>     <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d8494767e17c6edfbd827f91763915df4105">UNIX_JACK</a>,      
-<a name="l00207"></a><a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d8499fec92b8272244a87a6a11a717bd662d">00207</a>     <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d8499fec92b8272244a87a6a11a717bd662d">MACOSX_CORE</a>,    
-<a name="l00208"></a><a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849219517d1df90f94d07758481155bd469">00208</a>     <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849219517d1df90f94d07758481155bd469">WINDOWS_ASIO</a>,   
-<a name="l00209"></a><a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d84928478830f42c2fd61e6c7ad498901931">00209</a>     <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d84928478830f42c2fd61e6c7ad498901931">WINDOWS_DS</a>,     
-<a name="l00210"></a><a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849b06b8fd88bf18c9a2b8271f6961ae2d1">00210</a>     <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849b06b8fd88bf18c9a2b8271f6961ae2d1">RTAUDIO_DUMMY</a>   
-<a name="l00211"></a>00211   };
-<a name="l00212"></a>00212 
-<a name="l00214"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html">00214</a>   <span class="keyword">struct </span><a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">DeviceInfo</a> {
-<a name="l00215"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#5bf008c629ef493c713ec870d0217407">00215</a>     <span class="keywordtype">bool</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#5bf008c629ef493c713ec870d0217407">probed</a>;                  
-<a name="l00216"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a0e2ea10c52c206c9e105ac76b01f194">00216</a>     std::string <a class="code" href="structRtAudio_1_1DeviceInfo.html#a0e2ea10c52c206c9e105ac76b01f194">name</a>;             
-<a name="l00217"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#185f8aac1095de4fbb6e0076875d24c4">00217</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#185f8aac1095de4fbb6e0076875d24c4">outputChannels</a>;  
-<a name="l00218"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#731b31adf84c550ab98329be1baa58b4">00218</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#731b31adf84c550ab98329be1baa58b4">inputChannels</a>;   
-<a name="l00219"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#ca6ecfb8b5b8c114c54809d8af50ee5b">00219</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#ca6ecfb8b5b8c114c54809d8af50ee5b">duplexChannels</a>;  
-<a name="l00220"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#af74fc23f451fdd22ed073a47f0db674">00220</a>     <span class="keywordtype">bool</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#af74fc23f451fdd22ed073a47f0db674">isDefaultOutput</a>;         
-<a name="l00221"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a8b03618fa1d4c051f6add14bb031728">00221</a>     <span class="keywordtype">bool</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a8b03618fa1d4c051f6add14bb031728">isDefaultInput</a>;          
-<a name="l00222"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#5b158efcbfbd30e7226df92d0109d475">00222</a>     std::vector&lt;unsigned int&gt; <a class="code" href="structRtAudio_1_1DeviceInfo.html#5b158efcbfbd30e7226df92d0109d475">sampleRates</a>; 
-<a name="l00223"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#97559ee4a1f2c8cfb765949e6193e1f4">00223</a>     <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> <a class="code" href="structRtAudio_1_1DeviceInfo.html#97559ee4a1f2c8cfb765949e6193e1f4">nativeFormats</a>;  
-<a name="l00225"></a>00225     <span class="comment">// Default constructor.</span>
-<a name="l00226"></a>00226     <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">DeviceInfo</a>()
-<a name="l00227"></a>00227       :<a class="code" href="structRtAudio_1_1DeviceInfo.html#5bf008c629ef493c713ec870d0217407">probed</a>(false), <a class="code" href="structRtAudio_1_1DeviceInfo.html#185f8aac1095de4fbb6e0076875d24c4">outputChannels</a>(0), <a class="code" href="structRtAudio_1_1DeviceInfo.html#731b31adf84c550ab98329be1baa58b4">inputChannels</a>(0), <a class="code" href="structRtAudio_1_1DeviceInfo.html#ca6ecfb8b5b8c114c54809d8af50ee5b">duplexChannels</a>(0),
-<a name="l00228"></a>00228        <a class="code" href="structRtAudio_1_1DeviceInfo.html#af74fc23f451fdd22ed073a47f0db674">isDefaultOutput</a>(false), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a8b03618fa1d4c051f6add14bb031728">isDefaultInput</a>(false), <a class="code" href="structRtAudio_1_1DeviceInfo.html#97559ee4a1f2c8cfb765949e6193e1f4">nativeFormats</a>(0) {}
-<a name="l00229"></a>00229   };
-<a name="l00230"></a>00230 
-<a name="l00232"></a><a class="code" href="structRtAudio_1_1StreamParameters.html">00232</a>   <span class="keyword">struct </span><a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">StreamParameters</a> {
-<a name="l00233"></a><a class="code" href="structRtAudio_1_1StreamParameters.html#ffd27496c70c0986522056234c64e28e">00233</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamParameters.html#ffd27496c70c0986522056234c64e28e">deviceId</a>;     
-<a name="l00234"></a><a class="code" href="structRtAudio_1_1StreamParameters.html#78798b65fada7941e1a7e47c11c9e627">00234</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamParameters.html#78798b65fada7941e1a7e47c11c9e627">nChannels</a>;    
-<a name="l00235"></a><a class="code" href="structRtAudio_1_1StreamParameters.html#ddc8281f23a87455ec6dedbc766a74db">00235</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamParameters.html#ddc8281f23a87455ec6dedbc766a74db">firstChannel</a>; 
-<a name="l00237"></a>00237     <span class="comment">// Default constructor.</span>
-<a name="l00238"></a>00238     <a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">StreamParameters</a>()
-<a name="l00239"></a>00239       : <a class="code" href="structRtAudio_1_1StreamParameters.html#ffd27496c70c0986522056234c64e28e">deviceId</a>(0), <a class="code" href="structRtAudio_1_1StreamParameters.html#78798b65fada7941e1a7e47c11c9e627">nChannels</a>(0), <a class="code" href="structRtAudio_1_1StreamParameters.html#ddc8281f23a87455ec6dedbc766a74db">firstChannel</a>(0) {}
-<a name="l00240"></a>00240   };
-<a name="l00241"></a>00241 
-<a name="l00243"></a>00243 
-<a name="l00294"></a><a class="code" href="structRtAudio_1_1StreamOptions.html">00294</a>   <span class="keyword">struct </span><a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">StreamOptions</a> {
-<a name="l00295"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#6a284d045b8adcfcf178a4f6a22330f8">00295</a>     <a class="code" href="RtAudio_8h.html#2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> <a class="code" href="structRtAudio_1_1StreamOptions.html#6a284d045b8adcfcf178a4f6a22330f8">flags</a>;      
-<a name="l00296"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#5a04d3c3d0c1cfa063872ecff383af1d">00296</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamOptions.html#5a04d3c3d0c1cfa063872ecff383af1d">numberOfBuffers</a>;  
-<a name="l00297"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#214da35056f18ffb7c8e4dc074a01a9a">00297</a>     std::string <a class="code" href="structRtAudio_1_1StreamOptions.html#214da35056f18ffb7c8e4dc074a01a9a">streamName</a>;        
-<a name="l00298"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#81b364f137d1ee1073b74dac666af352">00298</a>     <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamOptions.html#81b364f137d1ee1073b74dac666af352">priority</a>;                  
-<a name="l00300"></a>00300     <span class="comment">// Default constructor.</span>
-<a name="l00301"></a>00301     <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">StreamOptions</a>()
-<a name="l00302"></a>00302     : <a class="code" href="structRtAudio_1_1StreamOptions.html#6a284d045b8adcfcf178a4f6a22330f8">flags</a>(0), <a class="code" href="structRtAudio_1_1StreamOptions.html#5a04d3c3d0c1cfa063872ecff383af1d">numberOfBuffers</a>(0), <a class="code" href="structRtAudio_1_1StreamOptions.html#81b364f137d1ee1073b74dac666af352">priority</a>(0) {}
-<a name="l00303"></a>00303   };
-<a name="l00304"></a>00304 
-<a name="l00306"></a>00306 
-<a name="l00311"></a>00311   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#e266ffad2ef428d0b2c6c262d391ce26" title="A static function to determine the available compiled audio APIs.">getCompiledApi</a>( std::vector&lt;RtAudio::Api&gt; &amp;apis ) <span class="keywordflow">throw</span>();
-<a name="l00312"></a>00312 
-<a name="l00314"></a>00314 
-<a name="l00322"></a>00322   <a class="code" href="classRtAudio.html#fd0bfa26deae9804e18faff59d0273d9" title="The class constructor.">RtAudio</a>( <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> api=<a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849a49af3ac767106158bc6cad74fb214ae">UNSPECIFIED</a> ) throw();
-<a name="l00323"></a>00323 
-<a name="l00325"></a>00325 
-<a name="l00329"></a>00329   ~<a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>() throw();
-<a name="l00330"></a>00330 
-<a name="l00332"></a>00332   <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::<a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">Api</a> <a class="code" href="classRtAudio.html#83687634795792b2c47e4ae1cf8a5246" title="Returns the audio API specifier for the current instance of RtAudio.">getCurrentApi</a>( <span class="keywordtype">void</span> ) throw();
-<a name="l00333"></a>00333 
-<a name="l00335"></a>00335 
-<a name="l00340"></a>00340   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#747ce2d73803641bbb66d6e78092aa1a" title="A public function that queries for the number of audio devices available.">getDeviceCount</a>( <span class="keywordtype">void</span> ) throw();
-<a name="l00341"></a>00341 
-<a name="l00343"></a>00343 
-<a name="l00353"></a>00353   <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::DeviceInfo <a class="code" href="classRtAudio.html#02d7ff44ad1d7eae22283a052f3dfda8" title="Return an RtAudio::DeviceInfo structure for a specified device number.">getDeviceInfo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00354"></a>00354 
-<a name="l00356"></a>00356 
-<a name="l00363"></a>00363   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#3a3f3dbe13ea696b521e49cdaaa357bc" title="A function that returns the index of the default output device.">getDefaultOutputDevice</a>( <span class="keywordtype">void</span> ) throw();
-<a name="l00364"></a>00364 
-<a name="l00366"></a>00366 
-<a name="l00373"></a>00373   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#ad8b94edd3cd379ee300b125750ac6ce" title="A function that returns the index of the default input device.">getDefaultInputDevice</a>( <span class="keywordtype">void</span> ) throw();
-<a name="l00374"></a>00374 
-<a name="l00376"></a>00376 
-<a name="l00413"></a>00413   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#facc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream</a>( <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::StreamParameters *outputParameters,
-<a name="l00414"></a>00414                    <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::StreamParameters *inputParameters,
-<a name="l00415"></a>00415                    <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00416"></a>00416                    <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferFrames, <a class="code" href="RtAudio_8h.html#112c7b7e25a974977f6fc094cef1a31f" title="RtAudio callback function prototype.">RtAudioCallback</a> callback,
-<a name="l00417"></a>00417                    <span class="keywordtype">void</span> *userData = NULL, <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::StreamOptions *options = NULL );
-<a name="l00418"></a>00418 
-<a name="l00420"></a>00420 
-<a name="l00424"></a>00424   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">closeStream</a>( <span class="keywordtype">void</span> ) throw();
-<a name="l00425"></a>00425 
-<a name="l00427"></a>00427 
-<a name="l00433"></a>00433   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">startStream</a>( <span class="keywordtype">void</span> );
-<a name="l00434"></a>00434 
-<a name="l00436"></a>00436 
-<a name="l00442"></a>00442   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#f4c241ff86936ecc8108f0d9dfe3efdd" title="Stop a stream, allowing any samples remaining in the output queue to be played.">stopStream</a>( <span class="keywordtype">void</span> );
-<a name="l00443"></a>00443 
-<a name="l00445"></a>00445 
-<a name="l00451"></a>00451   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#d0586b47cd6bb9591a80b4052815991f" title="Stop a stream, discarding any samples remaining in the input/output queue.">abortStream</a>( <span class="keywordtype">void</span> );
-<a name="l00452"></a>00452 
-<a name="l00454"></a>00454   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#3863e45ff81dbe97176de0ee7545917f" title="Returns true if a stream is open and false if not.">isStreamOpen</a>( <span class="keywordtype">void</span> ) const throw();
-<a name="l00455"></a>00455 
-<a name="l00457"></a>00457   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#84cc8d9b7ab9bc5f37bcf48430ec5aea" title="Returns true if the stream is running and false if it is stopped or not open.">isStreamRunning</a>( <span class="keywordtype">void</span> ) const throw();
-<a name="l00458"></a>00458 
-<a name="l00460"></a>00460 
-<a name="l00463"></a>00463   <span class="keywordtype">double</span> <a class="code" href="classRtAudio.html#344e59a62353c5791db4621b985cb2ca" title="Returns the number of elapsed seconds since the stream was started.">getStreamTime</a>( <span class="keywordtype">void</span> );
-<a name="l00464"></a>00464 
-<a name="l00466"></a>00466 
-<a name="l00474"></a>00474   <span class="keywordtype">long</span> <a class="code" href="classRtAudio.html#843c989d9f501c71bc2f2c5ca18df9f3" title="Returns the internal stream latency in sample frames.">getStreamLatency</a>( <span class="keywordtype">void</span> );
-<a name="l00475"></a>00475 
-<a name="l00477"></a>00477 
-<a name="l00482"></a>00482   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#28214b8b05d60b45c24ee6fae7b2a0b5" title="Returns actual sample rate in use by the stream.">getStreamSampleRate</a>( <span class="keywordtype">void</span> );
-<a name="l00483"></a>00483 
-<a name="l00485"></a>00485   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#f0752ee51cce3dd90a3bd009f9fdbe77" title="Specify whether warning messages should be printed to stderr.">showWarnings</a>( <span class="keywordtype">bool</span> value = true ) throw();
-<a name="l00486"></a>00486 
-<a name="l00487"></a>00487  protected:
-<a name="l00488"></a>00488 
-<a name="l00489"></a>00489   <span class="keywordtype">void</span> openRtApi( <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::<a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">Api</a> api );
-<a name="l00490"></a>00490   RtApi *rtapi_;
-<a name="l00491"></a>00491 };
-<a name="l00492"></a>00492 
-<a name="l00493"></a>00493 <span class="comment">// Operating system dependent thread functionality.</span>
-<a name="l00494"></a>00494 <span class="preprocessor">#if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__)</span>
-<a name="l00495"></a>00495 <span class="preprocessor"></span><span class="preprocessor">  #include &lt;windows.h&gt;</span>
-<a name="l00496"></a>00496 <span class="preprocessor">  #include &lt;process.h&gt;</span>
-<a name="l00497"></a>00497 
-<a name="l00498"></a>00498   <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> ThreadHandle;
-<a name="l00499"></a>00499   <span class="keyword">typedef</span> CRITICAL_SECTION StreamMutex;
-<a name="l00500"></a>00500 
-<a name="l00501"></a>00501 <span class="preprocessor">#elif defined(__LINUX_ALSA__) || defined(__UNIX_JACK__) || defined(__LINUX_OSS__) || defined(__MACOSX_CORE__)</span>
-<a name="l00502"></a>00502 <span class="preprocessor"></span>  <span class="comment">// Using pthread library for various flavors of unix.</span>
-<a name="l00503"></a>00503 <span class="preprocessor">  #include &lt;pthread.h&gt;</span>
-<a name="l00504"></a>00504 
-<a name="l00505"></a>00505   <span class="keyword">typedef</span> pthread_t ThreadHandle;
-<a name="l00506"></a>00506   <span class="keyword">typedef</span> pthread_mutex_t StreamMutex;
-<a name="l00507"></a>00507 
-<a name="l00508"></a>00508 <span class="preprocessor">#else // Setup for "dummy" behavior</span>
-<a name="l00509"></a>00509 <span class="preprocessor"></span>
-<a name="l00510"></a>00510 <span class="preprocessor">  #define __RTAUDIO_DUMMY__</span>
-<a name="l00511"></a>00511 <span class="preprocessor"></span>  <span class="keyword">typedef</span> <span class="keywordtype">int</span> ThreadHandle;
-<a name="l00512"></a>00512   <span class="keyword">typedef</span> <span class="keywordtype">int</span> StreamMutex;
-<a name="l00513"></a>00513 
-<a name="l00514"></a>00514 <span class="preprocessor">#endif</span>
-<a name="l00515"></a>00515 <span class="preprocessor"></span>
-<a name="l00516"></a>00516 <span class="comment">// This global structure type is used to pass callback information</span>
-<a name="l00517"></a>00517 <span class="comment">// between the private RtAudio stream structure and global callback</span>
-<a name="l00518"></a>00518 <span class="comment">// handling functions.</span>
-<a name="l00519"></a>00519 <span class="keyword">struct </span>CallbackInfo {
-<a name="l00520"></a>00520   <span class="keywordtype">void</span> *object;    <span class="comment">// Used as a "this" pointer.</span>
-<a name="l00521"></a>00521   ThreadHandle thread;
-<a name="l00522"></a>00522   <span class="keywordtype">void</span> *callback;
-<a name="l00523"></a>00523   <span class="keywordtype">void</span> *userData;
-<a name="l00524"></a>00524   <span class="keywordtype">void</span> *apiInfo;   <span class="comment">// void pointer for API specific callback information</span>
-<a name="l00525"></a>00525   <span class="keywordtype">bool</span> isRunning;
-<a name="l00526"></a>00526 
-<a name="l00527"></a>00527   <span class="comment">// Default constructor.</span>
-<a name="l00528"></a>00528   CallbackInfo()
-<a name="l00529"></a>00529     :object(0), callback(0), userData(0), apiInfo(0), isRunning(false) {}
-<a name="l00530"></a>00530 };
-<a name="l00531"></a>00531 
-<a name="l00532"></a>00532 <span class="comment">// **************************************************************** //</span>
-<a name="l00533"></a>00533 <span class="comment">//</span>
-<a name="l00534"></a>00534 <span class="comment">// RtApi class declaration.</span>
-<a name="l00535"></a>00535 <span class="comment">//</span>
-<a name="l00536"></a>00536 <span class="comment">// Subclasses of RtApi contain all API- and OS-specific code necessary</span>
-<a name="l00537"></a>00537 <span class="comment">// to fully implement the RtAudio API.</span>
-<a name="l00538"></a>00538 <span class="comment">//</span>
-<a name="l00539"></a>00539 <span class="comment">// Note that RtApi is an abstract base class and cannot be</span>
-<a name="l00540"></a>00540 <span class="comment">// explicitly instantiated.  The class RtAudio will create an</span>
-<a name="l00541"></a>00541 <span class="comment">// instance of an RtApi subclass (RtApiOss, RtApiAlsa,</span>
-<a name="l00542"></a>00542 <span class="comment">// RtApiJack, RtApiCore, RtApiAl, RtApiDs, or RtApiAsio).</span>
-<a name="l00543"></a>00543 <span class="comment">//</span>
-<a name="l00544"></a>00544 <span class="comment">// **************************************************************** //</span>
-<a name="l00545"></a>00545 
-<a name="l00546"></a>00546 <span class="preprocessor">#if defined( HAVE_GETTIMEOFDAY )</span>
-<a name="l00547"></a>00547 <span class="preprocessor"></span><span class="preprocessor">  #include &lt;sys/time.h&gt;</span>
-<a name="l00548"></a>00548 <span class="preprocessor">#endif</span>
-<a name="l00549"></a>00549 <span class="preprocessor"></span>
-<a name="l00550"></a>00550 <span class="preprocessor">#include &lt;sstream&gt;</span>
-<a name="l00551"></a>00551 
-<a name="l00552"></a>00552 <span class="keyword">class </span>RtApi
-<a name="l00553"></a>00553 {
-<a name="l00554"></a>00554 <span class="keyword">public</span>:
-<a name="l00555"></a>00555 
-<a name="l00556"></a>00556   RtApi();
-<a name="l00557"></a>00557   <span class="keyword">virtual</span> ~RtApi();
-<a name="l00558"></a>00558   <span class="keyword">virtual</span> <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> <a class="code" href="classRtAudio.html#83687634795792b2c47e4ae1cf8a5246" title="Returns the audio API specifier for the current instance of RtAudio.">getCurrentApi</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00559"></a>00559   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#747ce2d73803641bbb66d6e78092aa1a" title="A public function that queries for the number of audio devices available.">getDeviceCount</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00560"></a>00560   <span class="keyword">virtual</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> <a class="code" href="classRtAudio.html#02d7ff44ad1d7eae22283a052f3dfda8" title="Return an RtAudio::DeviceInfo structure for a specified device number.">getDeviceInfo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device ) = 0;
-<a name="l00561"></a>00561   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#ad8b94edd3cd379ee300b125750ac6ce" title="A function that returns the index of the default input device.">getDefaultInputDevice</a>( <span class="keywordtype">void</span> );
-<a name="l00562"></a>00562   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#3a3f3dbe13ea696b521e49cdaaa357bc" title="A function that returns the index of the default output device.">getDefaultOutputDevice</a>( <span class="keywordtype">void</span> );
-<a name="l00563"></a>00563   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#facc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream</a>( <a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">RtAudio::StreamParameters</a> *outputParameters,
-<a name="l00564"></a>00564                    <a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">RtAudio::StreamParameters</a> *inputParameters,
-<a name="l00565"></a>00565                    <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00566"></a>00566                    <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferFrames, <a class="code" href="RtAudio_8h.html#112c7b7e25a974977f6fc094cef1a31f" title="RtAudio callback function prototype.">RtAudioCallback</a> callback,
-<a name="l00567"></a>00567                    <span class="keywordtype">void</span> *userData, <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00568"></a>00568   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">closeStream</a>( <span class="keywordtype">void</span> );
-<a name="l00569"></a>00569   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">startStream</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00570"></a>00570   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#f4c241ff86936ecc8108f0d9dfe3efdd" title="Stop a stream, allowing any samples remaining in the output queue to be played.">stopStream</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00571"></a>00571   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#d0586b47cd6bb9591a80b4052815991f" title="Stop a stream, discarding any samples remaining in the input/output queue.">abortStream</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00572"></a>00572   <span class="keywordtype">long</span> <a class="code" href="classRtAudio.html#843c989d9f501c71bc2f2c5ca18df9f3" title="Returns the internal stream latency in sample frames.">getStreamLatency</a>( <span class="keywordtype">void</span> );
-<a name="l00573"></a>00573   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#28214b8b05d60b45c24ee6fae7b2a0b5" title="Returns actual sample rate in use by the stream.">getStreamSampleRate</a>( <span class="keywordtype">void</span> );
-<a name="l00574"></a>00574   <span class="keyword">virtual</span> <span class="keywordtype">double</span> <a class="code" href="classRtAudio.html#344e59a62353c5791db4621b985cb2ca" title="Returns the number of elapsed seconds since the stream was started.">getStreamTime</a>( <span class="keywordtype">void</span> );
-<a name="l00575"></a>00575   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#3863e45ff81dbe97176de0ee7545917f" title="Returns true if a stream is open and false if not.">isStreamOpen</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> stream_.state != STREAM_CLOSED; };
-<a name="l00576"></a>00576   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#84cc8d9b7ab9bc5f37bcf48430ec5aea" title="Returns true if the stream is running and false if it is stopped or not open.">isStreamRunning</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> stream_.state == STREAM_RUNNING; };
-<a name="l00577"></a>00577   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#f0752ee51cce3dd90a3bd009f9fdbe77" title="Specify whether warning messages should be printed to stderr.">showWarnings</a>( <span class="keywordtype">bool</span> value ) { showWarnings_ = value; };
-<a name="l00578"></a>00578 
-<a name="l00579"></a>00579 
-<a name="l00580"></a>00580 <span class="keyword">protected</span>:
-<a name="l00581"></a>00581 
-<a name="l00582"></a>00582   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> MAX_SAMPLE_RATES;
-<a name="l00583"></a>00583   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> SAMPLE_RATES[];
-<a name="l00584"></a>00584 
-<a name="l00585"></a>00585   <span class="keyword">enum</span> { FAILURE, SUCCESS };
-<a name="l00586"></a>00586 
-<a name="l00587"></a>00587   <span class="keyword">enum</span> StreamState {
-<a name="l00588"></a>00588     STREAM_STOPPED,
-<a name="l00589"></a>00589     STREAM_RUNNING,
-<a name="l00590"></a>00590     STREAM_CLOSED = -50
-<a name="l00591"></a>00591   };
-<a name="l00592"></a>00592 
-<a name="l00593"></a>00593   <span class="keyword">enum</span> StreamMode {
-<a name="l00594"></a>00594     OUTPUT,
-<a name="l00595"></a>00595     INPUT,
-<a name="l00596"></a>00596     DUPLEX,
-<a name="l00597"></a>00597     UNINITIALIZED = -75
-<a name="l00598"></a>00598   };
-<a name="l00599"></a>00599 
-<a name="l00600"></a>00600   <span class="comment">// A protected structure used for buffer conversion.</span>
-<a name="l00601"></a>00601   <span class="keyword">struct </span>ConvertInfo {
-<a name="l00602"></a>00602     <span class="keywordtype">int</span> channels;
-<a name="l00603"></a>00603     <span class="keywordtype">int</span> inJump, outJump;
-<a name="l00604"></a>00604     <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> inFormat, outFormat;
-<a name="l00605"></a>00605     std::vector&lt;int&gt; inOffset;
-<a name="l00606"></a>00606     std::vector&lt;int&gt; outOffset;
-<a name="l00607"></a>00607   };
-<a name="l00608"></a>00608 
-<a name="l00609"></a>00609   <span class="comment">// A protected structure for audio streams.</span>
-<a name="l00610"></a>00610   <span class="keyword">struct </span>RtApiStream {
-<a name="l00611"></a>00611     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device[2];    <span class="comment">// Playback and record, respectively.</span>
-<a name="l00612"></a>00612     <span class="keywordtype">void</span> *apiHandle;           <span class="comment">// void pointer for API specific stream handle information</span>
-<a name="l00613"></a>00613     StreamMode mode;           <span class="comment">// OUTPUT, INPUT, or DUPLEX.</span>
-<a name="l00614"></a>00614     StreamState state;         <span class="comment">// STOPPED, RUNNING, or CLOSED</span>
-<a name="l00615"></a>00615     <span class="keywordtype">char</span> *userBuffer[2];       <span class="comment">// Playback and record, respectively.</span>
-<a name="l00616"></a>00616     <span class="keywordtype">char</span> *deviceBuffer;
-<a name="l00617"></a>00617     <span class="keywordtype">bool</span> doConvertBuffer[2];   <span class="comment">// Playback and record, respectively.</span>
-<a name="l00618"></a>00618     <span class="keywordtype">bool</span> userInterleaved;
-<a name="l00619"></a>00619     <span class="keywordtype">bool</span> deviceInterleaved[2]; <span class="comment">// Playback and record, respectively.</span>
-<a name="l00620"></a>00620     <span class="keywordtype">bool</span> doByteSwap[2];        <span class="comment">// Playback and record, respectively.</span>
-<a name="l00621"></a>00621     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate;
-<a name="l00622"></a>00622     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> bufferSize;
-<a name="l00623"></a>00623     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nBuffers;
-<a name="l00624"></a>00624     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nUserChannels[2];    <span class="comment">// Playback and record, respectively.</span>
-<a name="l00625"></a>00625     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nDeviceChannels[2];  <span class="comment">// Playback and record channels, respectively.</span>
-<a name="l00626"></a>00626     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channelOffset[2];    <span class="comment">// Playback and record, respectively.</span>
-<a name="l00627"></a>00627     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> latency[2];         <span class="comment">// Playback and record, respectively.</span>
-<a name="l00628"></a>00628     <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> userFormat;
-<a name="l00629"></a>00629     <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> deviceFormat[2];    <span class="comment">// Playback and record, respectively.</span>
-<a name="l00630"></a>00630     StreamMutex mutex;
-<a name="l00631"></a>00631     CallbackInfo callbackInfo;
-<a name="l00632"></a>00632     ConvertInfo convertInfo[2];
-<a name="l00633"></a>00633     <span class="keywordtype">double</span> streamTime;         <span class="comment">// Number of elapsed seconds since the stream started.</span>
-<a name="l00634"></a>00634 
-<a name="l00635"></a>00635 <span class="preprocessor">#if defined(HAVE_GETTIMEOFDAY)</span>
-<a name="l00636"></a>00636 <span class="preprocessor"></span>    <span class="keyword">struct </span>timeval lastTickTimestamp;
-<a name="l00637"></a>00637 <span class="preprocessor">#endif</span>
-<a name="l00638"></a>00638 <span class="preprocessor"></span>
-<a name="l00639"></a>00639     RtApiStream()
-<a name="l00640"></a>00640       :apiHandle(0), deviceBuffer(0) { device[0] = 11111; device[1] = 11111; }
-<a name="l00641"></a>00641   };
-<a name="l00642"></a>00642 
-<a name="l00643"></a>00643   <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">short</span> Int16;
-<a name="l00644"></a>00644   <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">int</span> Int32;
-<a name="l00645"></a>00645   <span class="keyword">typedef</span> <span class="keywordtype">float</span> Float32;
-<a name="l00646"></a>00646   <span class="keyword">typedef</span> <span class="keywordtype">double</span> Float64;
-<a name="l00647"></a>00647 
-<a name="l00648"></a>00648   std::ostringstream errorStream_;
-<a name="l00649"></a>00649   std::string errorText_;
-<a name="l00650"></a>00650   <span class="keywordtype">bool</span> showWarnings_;
-<a name="l00651"></a>00651   RtApiStream stream_;
-<a name="l00652"></a>00652 
-<a name="l00660"></a>00660   <span class="keyword">virtual</span> <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00661"></a>00661                                 <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00662"></a>00662                                 <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00663"></a>00663                                 <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00664"></a>00664 
-<a name="l00666"></a>00666   <span class="keywordtype">void</span> tickStreamTime( <span class="keywordtype">void</span> );
-<a name="l00667"></a>00667 
-<a name="l00669"></a>00669   <span class="keywordtype">void</span> clearStreamInfo();
-<a name="l00670"></a>00670 
-<a name="l00675"></a>00675   <span class="keywordtype">void</span> verifyStream( <span class="keywordtype">void</span> );
-<a name="l00676"></a>00676 
-<a name="l00678"></a>00678   <span class="keywordtype">void</span> error( <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac" title="Defined RtError types.">RtError::Type</a> type );
-<a name="l00679"></a>00679 
-<a name="l00684"></a>00684   <span class="keywordtype">void</span> convertBuffer( <span class="keywordtype">char</span> *outBuffer, <span class="keywordtype">char</span> *inBuffer, ConvertInfo &amp;info );
-<a name="l00685"></a>00685 
-<a name="l00687"></a>00687   <span class="keywordtype">void</span> byteSwapBuffer( <span class="keywordtype">char</span> *buffer, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> samples, <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format );
-<a name="l00688"></a>00688 
-<a name="l00690"></a>00690   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> formatBytes( <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format );
-<a name="l00691"></a>00691 
-<a name="l00693"></a>00693   <span class="keywordtype">void</span> setConvertInfo( StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel );
-<a name="l00694"></a>00694 };
-<a name="l00695"></a>00695 
-<a name="l00696"></a>00696 <span class="comment">// **************************************************************** //</span>
-<a name="l00697"></a>00697 <span class="comment">//</span>
-<a name="l00698"></a>00698 <span class="comment">// Inline RtAudio definitions.</span>
-<a name="l00699"></a>00699 <span class="comment">//</span>
-<a name="l00700"></a>00700 <span class="comment">// **************************************************************** //</span>
-<a name="l00701"></a>00701 
-<a name="l00702"></a><a class="code" href="classRtAudio.html#83687634795792b2c47e4ae1cf8a5246">00702</a> <span class="keyword">inline</span> <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> <a class="code" href="classRtAudio.html#83687634795792b2c47e4ae1cf8a5246" title="Returns the audio API specifier for the current instance of RtAudio.">RtAudio :: getCurrentApi</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getCurrentApi(); }
-<a name="l00703"></a><a class="code" href="classRtAudio.html#747ce2d73803641bbb66d6e78092aa1a">00703</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#747ce2d73803641bbb66d6e78092aa1a" title="A public function that queries for the number of audio devices available.">RtAudio :: getDeviceCount</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getDeviceCount(); }
-<a name="l00704"></a><a class="code" href="classRtAudio.html#02d7ff44ad1d7eae22283a052f3dfda8">00704</a> <span class="keyword">inline</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> <a class="code" href="classRtAudio.html#02d7ff44ad1d7eae22283a052f3dfda8" title="Return an RtAudio::DeviceInfo structure for a specified device number.">RtAudio :: getDeviceInfo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device ) { <span class="keywordflow">return</span> rtapi_-&gt;getDeviceInfo( device ); }
-<a name="l00705"></a><a class="code" href="classRtAudio.html#ad8b94edd3cd379ee300b125750ac6ce">00705</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#ad8b94edd3cd379ee300b125750ac6ce" title="A function that returns the index of the default input device.">RtAudio :: getDefaultInputDevice</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getDefaultInputDevice(); }
-<a name="l00706"></a><a class="code" href="classRtAudio.html#3a3f3dbe13ea696b521e49cdaaa357bc">00706</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#3a3f3dbe13ea696b521e49cdaaa357bc" title="A function that returns the index of the default output device.">RtAudio :: getDefaultOutputDevice</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getDefaultOutputDevice(); }
-<a name="l00707"></a><a class="code" href="classRtAudio.html#90d599002ad32cf250a4cb866f2cc93a">00707</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">RtAudio :: closeStream</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;closeStream(); }
-<a name="l00708"></a><a class="code" href="classRtAudio.html#ec017a89629ccef66a90b60be22a2f80">00708</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">RtAudio :: startStream</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;startStream(); }
-<a name="l00709"></a><a class="code" href="classRtAudio.html#f4c241ff86936ecc8108f0d9dfe3efdd">00709</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#f4c241ff86936ecc8108f0d9dfe3efdd" title="Stop a stream, allowing any samples remaining in the output queue to be played.">RtAudio :: stopStream</a>( <span class="keywordtype">void</span> )  { <span class="keywordflow">return</span> rtapi_-&gt;stopStream(); }
-<a name="l00710"></a><a class="code" href="classRtAudio.html#d0586b47cd6bb9591a80b4052815991f">00710</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#d0586b47cd6bb9591a80b4052815991f" title="Stop a stream, discarding any samples remaining in the input/output queue.">RtAudio :: abortStream</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;abortStream(); }
-<a name="l00711"></a><a class="code" href="classRtAudio.html#3863e45ff81dbe97176de0ee7545917f">00711</a> <span class="keyword">inline</span> <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#3863e45ff81dbe97176de0ee7545917f" title="Returns true if a stream is open and false if not.">RtAudio :: isStreamOpen</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span> throw() { <span class="keywordflow">return</span> rtapi_-&gt;isStreamOpen(); }
-<a name="l00712"></a><a class="code" href="classRtAudio.html#84cc8d9b7ab9bc5f37bcf48430ec5aea">00712</a> <span class="keyword">inline</span> <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#84cc8d9b7ab9bc5f37bcf48430ec5aea" title="Returns true if the stream is running and false if it is stopped or not open.">RtAudio :: isStreamRunning</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span> throw() { <span class="keywordflow">return</span> rtapi_-&gt;isStreamRunning(); }
-<a name="l00713"></a><a class="code" href="classRtAudio.html#843c989d9f501c71bc2f2c5ca18df9f3">00713</a> <span class="keyword">inline</span> <span class="keywordtype">long</span> <a class="code" href="classRtAudio.html#843c989d9f501c71bc2f2c5ca18df9f3" title="Returns the internal stream latency in sample frames.">RtAudio :: getStreamLatency</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;getStreamLatency(); }
-<a name="l00714"></a><a class="code" href="classRtAudio.html#28214b8b05d60b45c24ee6fae7b2a0b5">00714</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#28214b8b05d60b45c24ee6fae7b2a0b5" title="Returns actual sample rate in use by the stream.">RtAudio :: getStreamSampleRate</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;getStreamSampleRate(); };
-<a name="l00715"></a><a class="code" href="classRtAudio.html#344e59a62353c5791db4621b985cb2ca">00715</a> <span class="keyword">inline</span> <span class="keywordtype">double</span> <a class="code" href="classRtAudio.html#344e59a62353c5791db4621b985cb2ca" title="Returns the number of elapsed seconds since the stream was started.">RtAudio :: getStreamTime</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;getStreamTime(); }
-<a name="l00716"></a><a class="code" href="classRtAudio.html#f0752ee51cce3dd90a3bd009f9fdbe77">00716</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#f0752ee51cce3dd90a3bd009f9fdbe77" title="Specify whether warning messages should be printed to stderr.">RtAudio :: showWarnings</a>( <span class="keywordtype">bool</span> value ) <span class="keywordflow">throw</span>() { rtapi_-&gt;showWarnings( value ); }
-<a name="l00717"></a>00717 
-<a name="l00718"></a>00718 <span class="comment">// RtApi Subclass prototypes.</span>
-<a name="l00719"></a>00719 
-<a name="l00720"></a>00720 <span class="preprocessor">#if defined(__MACOSX_CORE__)</span>
-<a name="l00721"></a>00721 <span class="preprocessor"></span>
-<a name="l00722"></a>00722 <span class="preprocessor">#include &lt;CoreAudio/AudioHardware.h&gt;</span>
-<a name="l00723"></a>00723 
-<a name="l00724"></a>00724 <span class="keyword">class </span>RtApiCore: <span class="keyword">public</span> RtApi
-<a name="l00725"></a>00725 {
-<a name="l00726"></a>00726 <span class="keyword">public</span>:
-<a name="l00727"></a>00727 
-<a name="l00728"></a>00728   RtApiCore();
-<a name="l00729"></a>00729   ~RtApiCore();
-<a name="l00730"></a>00730   <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d8499fec92b8272244a87a6a11a717bd662d">RtAudio::MACOSX_CORE</a>; };
-<a name="l00731"></a>00731   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00732"></a>00732   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00733"></a>00733   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultOutputDevice( <span class="keywordtype">void</span> );
-<a name="l00734"></a>00734   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultInputDevice( <span class="keywordtype">void</span> );
-<a name="l00735"></a>00735   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00736"></a>00736   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00737"></a>00737   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00738"></a>00738   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00739"></a>00739   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
-<a name="l00740"></a>00740 
-<a name="l00741"></a>00741   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00742"></a>00742   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00743"></a>00743   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00744"></a>00744   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00745"></a>00745   <span class="keywordtype">bool</span> callbackEvent( AudioDeviceID deviceId,
-<a name="l00746"></a>00746                       <span class="keyword">const</span> AudioBufferList *inBufferList,
-<a name="l00747"></a>00747                       <span class="keyword">const</span> AudioBufferList *outBufferList );
-<a name="l00748"></a>00748 
-<a name="l00749"></a>00749   <span class="keyword">private</span>:
-<a name="l00750"></a>00750 
-<a name="l00751"></a>00751   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00752"></a>00752                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00753"></a>00753                         <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00754"></a>00754                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00755"></a>00755   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* getErrorCode( OSStatus code );
-<a name="l00756"></a>00756 };
-<a name="l00757"></a>00757 
-<a name="l00758"></a>00758 <span class="preprocessor">#endif</span>
-<a name="l00759"></a>00759 <span class="preprocessor"></span>
-<a name="l00760"></a>00760 <span class="preprocessor">#if defined(__UNIX_JACK__)</span>
-<a name="l00761"></a>00761 <span class="preprocessor"></span>
-<a name="l00762"></a>00762 <span class="keyword">class </span>RtApiJack: <span class="keyword">public</span> RtApi
-<a name="l00763"></a>00763 {
-<a name="l00764"></a>00764 <span class="keyword">public</span>:
-<a name="l00765"></a>00765 
-<a name="l00766"></a>00766   RtApiJack();
-<a name="l00767"></a>00767   ~RtApiJack();
-<a name="l00768"></a>00768   <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d8494767e17c6edfbd827f91763915df4105">RtAudio::UNIX_JACK</a>; };
-<a name="l00769"></a>00769   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00770"></a>00770   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00771"></a>00771   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00772"></a>00772   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00773"></a>00773   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00774"></a>00774   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00775"></a>00775   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
-<a name="l00776"></a>00776 
-<a name="l00777"></a>00777   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00778"></a>00778   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00779"></a>00779   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00780"></a>00780   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00781"></a>00781   <span class="keywordtype">bool</span> callbackEvent( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> nframes );
-<a name="l00782"></a>00782 
-<a name="l00783"></a>00783   <span class="keyword">private</span>:
-<a name="l00784"></a>00784 
-<a name="l00785"></a>00785   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00786"></a>00786                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00787"></a>00787                         <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00788"></a>00788                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00789"></a>00789 };
-<a name="l00790"></a>00790 
-<a name="l00791"></a>00791 <span class="preprocessor">#endif</span>
-<a name="l00792"></a>00792 <span class="preprocessor"></span>
-<a name="l00793"></a>00793 <span class="preprocessor">#if defined(__WINDOWS_ASIO__)</span>
-<a name="l00794"></a>00794 <span class="preprocessor"></span>
-<a name="l00795"></a>00795 <span class="keyword">class </span>RtApiAsio: <span class="keyword">public</span> RtApi
-<a name="l00796"></a>00796 {
-<a name="l00797"></a>00797 <span class="keyword">public</span>:
-<a name="l00798"></a>00798 
-<a name="l00799"></a>00799   RtApiAsio();
-<a name="l00800"></a>00800   ~RtApiAsio();
-<a name="l00801"></a>00801   <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849219517d1df90f94d07758481155bd469">RtAudio::WINDOWS_ASIO</a>; };
-<a name="l00802"></a>00802   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00803"></a>00803   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00804"></a>00804   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00805"></a>00805   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00806"></a>00806   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00807"></a>00807   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00808"></a>00808   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
-<a name="l00809"></a>00809 
-<a name="l00810"></a>00810   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00811"></a>00811   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00812"></a>00812   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00813"></a>00813   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00814"></a>00814   <span class="keywordtype">bool</span> callbackEvent( <span class="keywordtype">long</span> bufferIndex );
-<a name="l00815"></a>00815 
-<a name="l00816"></a>00816   <span class="keyword">private</span>:
-<a name="l00817"></a>00817 
-<a name="l00818"></a>00818   std::vector&lt;RtAudio::DeviceInfo&gt; devices_;
-<a name="l00819"></a>00819   <span class="keywordtype">void</span> saveDeviceInfo( <span class="keywordtype">void</span> );
-<a name="l00820"></a>00820   <span class="keywordtype">bool</span> coInitialized_;
-<a name="l00821"></a>00821   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00822"></a>00822                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00823"></a>00823                         <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00824"></a>00824                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00825"></a>00825 };
-<a name="l00826"></a>00826 
-<a name="l00827"></a>00827 <span class="preprocessor">#endif</span>
-<a name="l00828"></a>00828 <span class="preprocessor"></span>
-<a name="l00829"></a>00829 <span class="preprocessor">#if defined(__WINDOWS_DS__)</span>
-<a name="l00830"></a>00830 <span class="preprocessor"></span>
-<a name="l00831"></a>00831 <span class="keyword">class </span>RtApiDs: <span class="keyword">public</span> RtApi
-<a name="l00832"></a>00832 {
-<a name="l00833"></a>00833 <span class="keyword">public</span>:
-<a name="l00834"></a>00834 
-<a name="l00835"></a>00835   RtApiDs();
-<a name="l00836"></a>00836   ~RtApiDs();
-<a name="l00837"></a>00837   <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d84928478830f42c2fd61e6c7ad498901931">RtAudio::WINDOWS_DS</a>; };
-<a name="l00838"></a>00838   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00839"></a>00839   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultOutputDevice( <span class="keywordtype">void</span> );
-<a name="l00840"></a>00840   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultInputDevice( <span class="keywordtype">void</span> );
-<a name="l00841"></a>00841   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00842"></a>00842   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00843"></a>00843   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00844"></a>00844   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00845"></a>00845   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00846"></a>00846   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
-<a name="l00847"></a>00847 
-<a name="l00848"></a>00848   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00849"></a>00849   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00850"></a>00850   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00851"></a>00851   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00852"></a>00852   <span class="keywordtype">void</span> callbackEvent( <span class="keywordtype">void</span> );
-<a name="l00853"></a>00853 
-<a name="l00854"></a>00854   <span class="keyword">private</span>:
-<a name="l00855"></a>00855 
-<a name="l00856"></a>00856   <span class="keywordtype">bool</span> coInitialized_;
-<a name="l00857"></a>00857   <span class="keywordtype">bool</span> buffersRolling;
-<a name="l00858"></a>00858   <span class="keywordtype">long</span> duplexPrerollBytes;
-<a name="l00859"></a>00859   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00860"></a>00860                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00861"></a>00861                         <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00862"></a>00862                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00863"></a>00863 };
-<a name="l00864"></a>00864 
-<a name="l00865"></a>00865 <span class="preprocessor">#endif</span>
-<a name="l00866"></a>00866 <span class="preprocessor"></span>
-<a name="l00867"></a>00867 <span class="preprocessor">#if defined(__LINUX_ALSA__)</span>
-<a name="l00868"></a>00868 <span class="preprocessor"></span>
-<a name="l00869"></a>00869 <span class="keyword">class </span>RtApiAlsa: <span class="keyword">public</span> RtApi
-<a name="l00870"></a>00870 {
-<a name="l00871"></a>00871 <span class="keyword">public</span>:
-<a name="l00872"></a>00872 
-<a name="l00873"></a>00873   RtApiAlsa();
-<a name="l00874"></a>00874   ~RtApiAlsa();
-<a name="l00875"></a>00875   <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi() { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849a7a2ba095c2806caa893b6fb8fc3a1a8">RtAudio::LINUX_ALSA</a>; };
-<a name="l00876"></a>00876   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00877"></a>00877   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00878"></a>00878   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00879"></a>00879   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00880"></a>00880   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00881"></a>00881   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00882"></a>00882 
-<a name="l00883"></a>00883   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00884"></a>00884   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00885"></a>00885   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00886"></a>00886   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00887"></a>00887   <span class="keywordtype">void</span> callbackEvent( <span class="keywordtype">void</span> );
-<a name="l00888"></a>00888 
-<a name="l00889"></a>00889   <span class="keyword">private</span>:
-<a name="l00890"></a>00890 
-<a name="l00891"></a>00891   std::vector&lt;RtAudio::DeviceInfo&gt; devices_;
-<a name="l00892"></a>00892   <span class="keywordtype">void</span> saveDeviceInfo( <span class="keywordtype">void</span> );
-<a name="l00893"></a>00893   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00894"></a>00894                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00895"></a>00895                         <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00896"></a>00896                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00897"></a>00897 };
-<a name="l00898"></a>00898 
-<a name="l00899"></a>00899 <span class="preprocessor">#endif</span>
-<a name="l00900"></a>00900 <span class="preprocessor"></span>
-<a name="l00901"></a>00901 <span class="preprocessor">#if defined(__LINUX_OSS__)</span>
-<a name="l00902"></a>00902 <span class="preprocessor"></span>
-<a name="l00903"></a>00903 <span class="keyword">class </span>RtApiOss: <span class="keyword">public</span> RtApi
-<a name="l00904"></a>00904 {
-<a name="l00905"></a>00905 <span class="keyword">public</span>:
-<a name="l00906"></a>00906 
-<a name="l00907"></a>00907   RtApiOss();
-<a name="l00908"></a>00908   ~RtApiOss();
-<a name="l00909"></a>00909   <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi() { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d84939c84615e61de75e6a4e865596d62c82">RtAudio::LINUX_OSS</a>; };
-<a name="l00910"></a>00910   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00911"></a>00911   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00912"></a>00912   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00913"></a>00913   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00914"></a>00914   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00915"></a>00915   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00916"></a>00916 
-<a name="l00917"></a>00917   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00918"></a>00918   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00919"></a>00919   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00920"></a>00920   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00921"></a>00921   <span class="keywordtype">void</span> callbackEvent( <span class="keywordtype">void</span> );
-<a name="l00922"></a>00922 
-<a name="l00923"></a>00923   <span class="keyword">private</span>:
-<a name="l00924"></a>00924 
-<a name="l00925"></a>00925   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00926"></a>00926                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00927"></a>00927                         <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00928"></a>00928                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00929"></a>00929 };
-<a name="l00930"></a>00930 
-<a name="l00931"></a>00931 <span class="preprocessor">#endif</span>
-<a name="l00932"></a>00932 <span class="preprocessor"></span>
-<a name="l00933"></a>00933 <span class="preprocessor">#if defined(__RTAUDIO_DUMMY__)</span>
-<a name="l00934"></a>00934 <span class="preprocessor"></span>
-<a name="l00935"></a>00935 <span class="keyword">class </span>RtApiDummy: <span class="keyword">public</span> RtApi
-<a name="l00936"></a>00936 {
-<a name="l00937"></a>00937 <span class="keyword">public</span>:
-<a name="l00938"></a>00938 
-<a name="l00939"></a>00939   RtApiDummy() { errorText_ = <span class="stringliteral">"RtApiDummy: This class provides no functionality."</span>; error( <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac3a1603c24a56cbdaf5f8ae4ddcb86398">RtError::WARNING</a> ); };
-<a name="l00940"></a>00940   <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#c9b6f625da88249d08a8409a9db0d849b06b8fd88bf18c9a2b8271f6961ae2d1">RtAudio::RTAUDIO_DUMMY</a>; };
-<a name="l00941"></a>00941   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> 0; };
-<a name="l00942"></a>00942   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device ) { <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> info; <span class="keywordflow">return</span> info; };
-<a name="l00943"></a>00943   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> ) {};
-<a name="l00944"></a>00944   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> ) {};
-<a name="l00945"></a>00945   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> ) {};
-<a name="l00946"></a>00946   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> ) {};
-<a name="l00947"></a>00947 
-<a name="l00948"></a>00948   <span class="keyword">private</span>:
-<a name="l00949"></a>00949 
-<a name="l00950"></a>00950   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00951"></a>00951                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00952"></a>00952                         <a class="code" href="RtAudio_8h.html#afca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00953"></a>00953                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options ) { <span class="keywordflow">return</span> <span class="keyword">false</span>; };
-<a name="l00954"></a>00954 };
-<a name="l00955"></a>00955 
-<a name="l00956"></a>00956 <span class="preprocessor">#endif</span>
-<a name="l00957"></a>00957 <span class="preprocessor"></span>
-<a name="l00958"></a>00958 <span class="preprocessor">#endif</span>
-<a name="l00959"></a>00959 <span class="preprocessor"></span>
-<a name="l00960"></a>00960 <span class="comment">// Indentation settings for Vim and Emacs</span>
-<a name="l00961"></a>00961 <span class="comment">//</span>
-<a name="l00962"></a>00962 <span class="comment">// Local Variables:</span>
-<a name="l00963"></a>00963 <span class="comment">// c-basic-offset: 2</span>
-<a name="l00964"></a>00964 <span class="comment">// indent-tabs-mode: nil</span>
-<a name="l00965"></a>00965 <span class="comment">// End:</span>
-<a name="l00966"></a>00966 <span class="comment">//</span>
-<a name="l00967"></a>00967 <span class="comment">// vim: et sts=2 sw=2</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/RtAudio_8h.html b/doc/html/RtAudio_8h.html
index e0cb4a7..10a641b 100644
--- a/doc/html/RtAudio_8h.html
+++ b/doc/html/RtAudio_8h.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>RtAudio.h File Reference</h1>
@@ -48,11 +48,11 @@
 <div class="memdoc">
 
 <p><a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> data format type. </p>
-<p>Support for signed integers and floats. Audio data fed to/from an <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> stream is assumed to ALWAYS be in host byte order. The internal routines will automatically take care of any necessary byte-swapping between the host format and the soundcard. Thus, endian-ness is not a concern in the following format definitions.</p>
+<p>Support for signed integers and floats. Audio data fed to/from an <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> stream is assumed to ALWAYS be in host byte order. The internal routines will automatically take care of any necessary byte-swapping between the host format and the soundcard. Thus, endian-ness is not a concern in the following format definitions. Note that 24-bit data is expected to be encapsulated in a 32-bit format.</p>
 <ul>
 <li><em>RTAUDIO_SINT8:</em> 8-bit signed integer.</li>
 <li><em>RTAUDIO_SINT16:</em> 16-bit signed integer.</li>
-<li><em>RTAUDIO_SINT24:</em> Upper 3 bytes of 32-bit signed integer.</li>
+<li><em>RTAUDIO_SINT24:</em> Lower 3 bytes of 32-bit signed integer.</li>
 <li><em>RTAUDIO_SINT32:</em> 32-bit signed integer.</li>
 <li><em>RTAUDIO_FLOAT32:</em> Normalized between plus/minus 1.0.</li>
 <li><em>RTAUDIO_FLOAT64:</em> Normalized between plus/minus 1.0. </li>
@@ -77,11 +77,13 @@
 <li><em>RTAUDIO_NONINTERLEAVED:</em> Use non-interleaved buffers (default = interleaved).</li>
 <li><em>RTAUDIO_MINIMIZE_LATENCY:</em> Attempt to set stream parameters for lowest possible latency.</li>
 <li><em>RTAUDIO_HOG_DEVICE:</em> Attempt grab device for exclusive use.</li>
+<li><em>RTAUDIO_ALSA_USE_DEFAULT:</em> Use the "default" PCM device (ALSA only).</li>
 </ul>
 <p>By default, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> streams pass and receive audio data from the client in an interleaved format. By passing the RTAUDIO_NONINTERLEAVED flag to the openStream() function, audio data will instead be presented in non-interleaved buffers. In this case, each buffer argument in the RtAudioCallback function will point to a single array of data, with <code>nFrames</code> samples for each channel concatenated back-to-back. For example, the first sample of data for the second channel would be located at index <code>nFrames</code> (assuming the <code>buffer</code> pointer was recast to the correct data type for the stream).</p>
 <p>Certain audio APIs offer a number of parameters that influence the I/O latency of a stream. By default, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> will attempt to set these parameters internally for robust (glitch-free) performance (though some APIs, like Windows Direct Sound, make this difficult). By passing the RTAUDIO_MINIMIZE_LATENCY flag to the openStream() function, internal stream settings will be influenced in an attempt to minimize stream latency, though possibly at the expense of stream performance.</p>
 <p>If the RTAUDIO_HOG_DEVICE flag is set, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> will attempt to open the input and/or output stream device(s) for exclusive use. Note that this is not possible with all supported audio APIs.</p>
-<p>If the RTAUDIO_SCHEDULE_REALTIME flag is set, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> will attempt to select realtime scheduling (round-robin) for the callback thread. </p>
+<p>If the RTAUDIO_SCHEDULE_REALTIME flag is set, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> will attempt to select realtime scheduling (round-robin) for the callback thread.</p>
+<p>If the RTAUDIO_ALSA_USE_DEFAULT flag is set, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> will attempt to open the "default" PCM device when using the ALSA API. Note that this will override any specified input or output device id. </p>
 
 </div>
 </div>
@@ -138,7 +140,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/RtAudio_8h_source.html b/doc/html/RtAudio_8h_source.html
index c48ff59..837cc6a 100644
--- a/doc/html/RtAudio_8h_source.html
+++ b/doc/html/RtAudio_8h_source.html
@@ -9,13 +9,13 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>RtAudio.h</h1><a href="RtAudio_8h.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/************************************************************************/</span>
 <a name="l00039"></a>00039 <span class="comment">/************************************************************************/</span>
 <a name="l00040"></a>00040 
-<a name="l00045"></a>00045 <span class="comment">// RtAudio: Version 4.0.7</span>
+<a name="l00045"></a>00045 <span class="comment">// RtAudio: Version 4.0.10</span>
 <a name="l00046"></a>00046 
 <a name="l00047"></a>00047 <span class="preprocessor">#ifndef __RTAUDIO_H</span>
 <a name="l00048"></a>00048 <span class="preprocessor"></span><span class="preprocessor">#define __RTAUDIO_H</span>
@@ -24,621 +24,622 @@
 <a name="l00051"></a>00051 <span class="preprocessor">#include &lt;vector&gt;</span>
 <a name="l00052"></a>00052 <span class="preprocessor">#include &quot;RtError.h&quot;</span>
 <a name="l00053"></a>00053 
-<a name="l00070"></a><a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8">00070</a> <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a>;
-<a name="l00071"></a>00071 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT8 = 0x1;    <span class="comment">// 8-bit signed integer.</span>
-<a name="l00072"></a>00072 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT16 = 0x2;   <span class="comment">// 16-bit signed integer.</span>
-<a name="l00073"></a>00073 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT24 = 0x4;   <span class="comment">// Lower 3 bytes of 32-bit signed integer.</span>
-<a name="l00074"></a>00074 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT32 = 0x8;   <span class="comment">// 32-bit signed integer.</span>
-<a name="l00075"></a>00075 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_FLOAT32 = 0x10; <span class="comment">// Normalized between plus/minus 1.0.</span>
-<a name="l00076"></a>00076 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_FLOAT64 = 0x20; <span class="comment">// Normalized between plus/minus 1.0.</span>
-<a name="l00077"></a>00077 
-<a name="l00115"></a><a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41">00115</a> <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a>;
-<a name="l00116"></a>00116 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_NONINTERLEAVED = 0x1;    <span class="comment">// Use non-interleaved buffers (default = interleaved).</span>
-<a name="l00117"></a>00117 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_MINIMIZE_LATENCY = 0x2;  <span class="comment">// Attempt to set stream parameters for lowest possible latency.</span>
-<a name="l00118"></a>00118 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_HOG_DEVICE = 0x4;        <span class="comment">// Attempt grab device and prevent use by others.</span>
-<a name="l00119"></a>00119 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_SCHEDULE_REALTIME = 0x8; <span class="comment">// Try to select realtime scheduling for callback thread.</span>
-<a name="l00120"></a>00120 
-<a name="l00132"></a><a class="code" href="RtAudio_8h.html#a80e306d363583da3b0a1b65d9b57c806">00132</a> <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="RtAudio_8h.html#a80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a>;
-<a name="l00133"></a>00133 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a> RTAUDIO_INPUT_OVERFLOW = 0x1;    <span class="comment">// Input data was discarded because of an overflow condition at the driver.</span>
-<a name="l00134"></a>00134 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a> RTAUDIO_OUTPUT_UNDERFLOW = 0x2;  <span class="comment">// The output buffer ran low, likely causing a gap in the output sound.</span>
-<a name="l00135"></a>00135 
-<a name="l00137"></a>00137 
-<a name="l00175"></a><a class="code" href="RtAudio_8h.html#a112c7b7e25a974977f6fc094cef1a31f">00175</a> <span class="keyword">typedef</span> int (*<a class="code" href="RtAudio_8h.html#a112c7b7e25a974977f6fc094cef1a31f" title="RtAudio callback function prototype.">RtAudioCallback</a>)( <span class="keywordtype">void</span> *outputBuffer, <span class="keywordtype">void</span> *inputBuffer,
-<a name="l00176"></a>00176                                 <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nFrames,
-<a name="l00177"></a>00177                                 <span class="keywordtype">double</span> streamTime,
-<a name="l00178"></a>00178                                 <a class="code" href="RtAudio_8h.html#a80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a> status,
-<a name="l00179"></a>00179                                 <span class="keywordtype">void</span> *userData );
-<a name="l00180"></a>00180 
-<a name="l00181"></a>00181 
-<a name="l00182"></a>00182 <span class="comment">// **************************************************************** //</span>
-<a name="l00183"></a>00183 <span class="comment">//</span>
-<a name="l00184"></a>00184 <span class="comment">// RtAudio class declaration.</span>
-<a name="l00185"></a>00185 <span class="comment">//</span>
-<a name="l00186"></a>00186 <span class="comment">// RtAudio is a &quot;controller&quot; used to select an available audio i/o</span>
-<a name="l00187"></a>00187 <span class="comment">// interface.  It presents a common API for the user to call but all</span>
-<a name="l00188"></a>00188 <span class="comment">// functionality is implemented by the class RtApi and its</span>
-<a name="l00189"></a>00189 <span class="comment">// subclasses.  RtAudio creates an instance of an RtApi subclass</span>
-<a name="l00190"></a>00190 <span class="comment">// based on the user&#39;s API choice.  If no choice is made, RtAudio</span>
-<a name="l00191"></a>00191 <span class="comment">// attempts to make a &quot;logical&quot; API selection.</span>
-<a name="l00192"></a>00192 <span class="comment">//</span>
-<a name="l00193"></a>00193 <span class="comment">// **************************************************************** //</span>
-<a name="l00194"></a>00194 
-<a name="l00195"></a>00195 <span class="keyword">class </span>RtApi;
-<a name="l00196"></a>00196 
-<a name="l00197"></a><a class="code" href="classRtAudio.html">00197</a> <span class="keyword">class </span><a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>
-<a name="l00198"></a>00198 {
-<a name="l00199"></a>00199  <span class="keyword">public</span>:
-<a name="l00200"></a>00200 
-<a name="l00202"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849">00202</a>   <span class="keyword">enum</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">Api</a> {
-<a name="l00203"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa49af3ac767106158bc6cad74fb214ae">00203</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa49af3ac767106158bc6cad74fb214ae">UNSPECIFIED</a>,    
-<a name="l00204"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa7a2ba095c2806caa893b6fb8fc3a1a8">00204</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa7a2ba095c2806caa893b6fb8fc3a1a8">LINUX_ALSA</a>,     
-<a name="l00205"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a39c84615e61de75e6a4e865596d62c82">00205</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a39c84615e61de75e6a4e865596d62c82">LINUX_OSS</a>,      
-<a name="l00206"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a4767e17c6edfbd827f91763915df4105">00206</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a4767e17c6edfbd827f91763915df4105">UNIX_JACK</a>,      
-<a name="l00207"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a9fec92b8272244a87a6a11a717bd662d">00207</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a9fec92b8272244a87a6a11a717bd662d">MACOSX_CORE</a>,    
-<a name="l00208"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a219517d1df90f94d07758481155bd469">00208</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a219517d1df90f94d07758481155bd469">WINDOWS_ASIO</a>,   
-<a name="l00209"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a28478830f42c2fd61e6c7ad498901931">00209</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a28478830f42c2fd61e6c7ad498901931">WINDOWS_DS</a>,     
-<a name="l00210"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849ab06b8fd88bf18c9a2b8271f6961ae2d1">00210</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849ab06b8fd88bf18c9a2b8271f6961ae2d1">RTAUDIO_DUMMY</a>   
-<a name="l00211"></a>00211   };
-<a name="l00212"></a>00212 
-<a name="l00214"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html">00214</a>   <span class="keyword">struct </span><a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">DeviceInfo</a> {
-<a name="l00215"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a97573717ccb1e75a834a0a108cd6982d">00215</a>     <span class="keywordtype">bool</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a97573717ccb1e75a834a0a108cd6982d">probed</a>;                  
-<a name="l00216"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a24df596ab8d54f2eb540c7cf16212b3b">00216</a>     std::string <a class="code" href="structRtAudio_1_1DeviceInfo.html#a24df596ab8d54f2eb540c7cf16212b3b">name</a>;             
-<a name="l00217"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a81aaf488f8158ef55b1bb678f66feb7d">00217</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a81aaf488f8158ef55b1bb678f66feb7d">outputChannels</a>;  
-<a name="l00218"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a56247b458a937ae84d98ca9c4b243275">00218</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a56247b458a937ae84d98ca9c4b243275">inputChannels</a>;   
-<a name="l00219"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a3e8ad34c2d14e24293a0beafc26186e7">00219</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a3e8ad34c2d14e24293a0beafc26186e7">duplexChannels</a>;  
-<a name="l00220"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a5365245e73ffe29a05734de4474acd58">00220</a>     <span class="keywordtype">bool</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a5365245e73ffe29a05734de4474acd58">isDefaultOutput</a>;         
-<a name="l00221"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a7c8aca084bd908799b6be5954b80def2">00221</a>     <span class="keywordtype">bool</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a7c8aca084bd908799b6be5954b80def2">isDefaultInput</a>;          
-<a name="l00222"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#afa65f5f92f66ce7aacd3ff35e11b230f">00222</a>     std::vector&lt;unsigned int&gt; <a class="code" href="structRtAudio_1_1DeviceInfo.html#afa65f5f92f66ce7aacd3ff35e11b230f">sampleRates</a>; 
-<a name="l00223"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a23251b549b89b2fe04a57fcd7cb76ea4">00223</a>     <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a23251b549b89b2fe04a57fcd7cb76ea4">nativeFormats</a>;  
-<a name="l00225"></a>00225     <span class="comment">// Default constructor.</span>
-<a name="l00226"></a>00226     <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">DeviceInfo</a>()
-<a name="l00227"></a>00227       :<a class="code" href="structRtAudio_1_1DeviceInfo.html#a97573717ccb1e75a834a0a108cd6982d">probed</a>(false), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a81aaf488f8158ef55b1bb678f66feb7d">outputChannels</a>(0), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a56247b458a937ae84d98ca9c4b243275">inputChannels</a>(0), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a3e8ad34c2d14e24293a0beafc26186e7">duplexChannels</a>(0),
-<a name="l00228"></a>00228        <a class="code" href="structRtAudio_1_1DeviceInfo.html#a5365245e73ffe29a05734de4474acd58">isDefaultOutput</a>(false), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a7c8aca084bd908799b6be5954b80def2">isDefaultInput</a>(false), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a23251b549b89b2fe04a57fcd7cb76ea4">nativeFormats</a>(0) {}
-<a name="l00229"></a>00229   };
-<a name="l00230"></a>00230 
-<a name="l00232"></a><a class="code" href="structRtAudio_1_1StreamParameters.html">00232</a>   <span class="keyword">struct </span><a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">StreamParameters</a> {
-<a name="l00233"></a><a class="code" href="structRtAudio_1_1StreamParameters.html#ab3c72bcf3ef12149ae9a4fb597cc5489">00233</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamParameters.html#ab3c72bcf3ef12149ae9a4fb597cc5489">deviceId</a>;     
-<a name="l00234"></a><a class="code" href="structRtAudio_1_1StreamParameters.html#a88a10091b6e284e21235cc6f25332ebd">00234</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamParameters.html#a88a10091b6e284e21235cc6f25332ebd">nChannels</a>;    
-<a name="l00235"></a><a class="code" href="structRtAudio_1_1StreamParameters.html#ad4b4503782653ec93c83328c46abe50c">00235</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamParameters.html#ad4b4503782653ec93c83328c46abe50c">firstChannel</a>; 
-<a name="l00237"></a>00237     <span class="comment">// Default constructor.</span>
-<a name="l00238"></a>00238     <a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">StreamParameters</a>()
-<a name="l00239"></a>00239       : <a class="code" href="structRtAudio_1_1StreamParameters.html#ab3c72bcf3ef12149ae9a4fb597cc5489">deviceId</a>(0), <a class="code" href="structRtAudio_1_1StreamParameters.html#a88a10091b6e284e21235cc6f25332ebd">nChannels</a>(0), <a class="code" href="structRtAudio_1_1StreamParameters.html#ad4b4503782653ec93c83328c46abe50c">firstChannel</a>(0) {}
-<a name="l00240"></a>00240   };
-<a name="l00241"></a>00241 
-<a name="l00243"></a>00243 
-<a name="l00294"></a><a class="code" href="structRtAudio_1_1StreamOptions.html">00294</a>   <span class="keyword">struct </span><a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">StreamOptions</a> {
-<a name="l00295"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#a0ecc98b031aa3af49d09b781643e298b">00295</a>     <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> <a class="code" href="structRtAudio_1_1StreamOptions.html#a0ecc98b031aa3af49d09b781643e298b">flags</a>;      
-<a name="l00296"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#a75a14cfab903d0e1c091bc16aec80240">00296</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamOptions.html#a75a14cfab903d0e1c091bc16aec80240">numberOfBuffers</a>;  
-<a name="l00297"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#a2a4b0b8d690c624d20f4e8f4be6ca9ba">00297</a>     std::string <a class="code" href="structRtAudio_1_1StreamOptions.html#a2a4b0b8d690c624d20f4e8f4be6ca9ba">streamName</a>;        
-<a name="l00298"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#adfd267059434edb21573c584e6367def">00298</a>     <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamOptions.html#adfd267059434edb21573c584e6367def">priority</a>;                  
-<a name="l00300"></a>00300     <span class="comment">// Default constructor.</span>
-<a name="l00301"></a>00301     <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">StreamOptions</a>()
-<a name="l00302"></a>00302     : <a class="code" href="structRtAudio_1_1StreamOptions.html#a0ecc98b031aa3af49d09b781643e298b">flags</a>(0), <a class="code" href="structRtAudio_1_1StreamOptions.html#a75a14cfab903d0e1c091bc16aec80240">numberOfBuffers</a>(0), <a class="code" href="structRtAudio_1_1StreamOptions.html#adfd267059434edb21573c584e6367def">priority</a>(0) {}
-<a name="l00303"></a>00303   };
-<a name="l00304"></a>00304 
-<a name="l00306"></a>00306 
-<a name="l00311"></a>00311   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ae266ffad2ef428d0b2c6c262d391ce26" title="A static function to determine the available compiled audio APIs.">getCompiledApi</a>( std::vector&lt;RtAudio::Api&gt; &amp;apis ) <span class="keywordflow">throw</span>();
-<a name="l00312"></a>00312 
-<a name="l00314"></a>00314 
-<a name="l00322"></a>00322   <a class="code" href="classRtAudio.html#afd0bfa26deae9804e18faff59d0273d9" title="The class constructor.">RtAudio</a>( <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> api=<a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa49af3ac767106158bc6cad74fb214ae">UNSPECIFIED</a> ) throw();
-<a name="l00323"></a>00323 
+<a name="l00072"></a><a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8">00072</a> <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a>;
+<a name="l00073"></a>00073 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT8 = 0x1;    <span class="comment">// 8-bit signed integer.</span>
+<a name="l00074"></a>00074 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT16 = 0x2;   <span class="comment">// 16-bit signed integer.</span>
+<a name="l00075"></a>00075 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT24 = 0x4;   <span class="comment">// Lower 3 bytes of 32-bit signed integer.</span>
+<a name="l00076"></a>00076 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_SINT32 = 0x8;   <span class="comment">// 32-bit signed integer.</span>
+<a name="l00077"></a>00077 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_FLOAT32 = 0x10; <span class="comment">// Normalized between plus/minus 1.0.</span>
+<a name="l00078"></a>00078 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> RTAUDIO_FLOAT64 = 0x20; <span class="comment">// Normalized between plus/minus 1.0.</span>
+<a name="l00079"></a>00079 
+<a name="l00122"></a><a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41">00122</a> <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a>;
+<a name="l00123"></a>00123 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_NONINTERLEAVED = 0x1;    <span class="comment">// Use non-interleaved buffers (default = interleaved).</span>
+<a name="l00124"></a>00124 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_MINIMIZE_LATENCY = 0x2;  <span class="comment">// Attempt to set stream parameters for lowest possible latency.</span>
+<a name="l00125"></a>00125 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_HOG_DEVICE = 0x4;        <span class="comment">// Attempt grab device and prevent use by others.</span>
+<a name="l00126"></a>00126 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_SCHEDULE_REALTIME = 0x8; <span class="comment">// Try to select realtime scheduling for callback thread.</span>
+<a name="l00127"></a>00127 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> RTAUDIO_ALSA_USE_DEFAULT = 0x10; <span class="comment">// Use the &quot;default&quot; PCM device (ALSA only).</span>
+<a name="l00128"></a>00128 
+<a name="l00140"></a><a class="code" href="RtAudio_8h.html#a80e306d363583da3b0a1b65d9b57c806">00140</a> <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="RtAudio_8h.html#a80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a>;
+<a name="l00141"></a>00141 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a> RTAUDIO_INPUT_OVERFLOW = 0x1;    <span class="comment">// Input data was discarded because of an overflow condition at the driver.</span>
+<a name="l00142"></a>00142 <span class="keyword">static</span> <span class="keyword">const</span> <a class="code" href="RtAudio_8h.html#a80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a> RTAUDIO_OUTPUT_UNDERFLOW = 0x2;  <span class="comment">// The output buffer ran low, likely causing a gap in the output sound.</span>
+<a name="l00143"></a>00143 
+<a name="l00145"></a>00145 
+<a name="l00183"></a><a class="code" href="RtAudio_8h.html#a112c7b7e25a974977f6fc094cef1a31f">00183</a> <span class="keyword">typedef</span> int (*<a class="code" href="RtAudio_8h.html#a112c7b7e25a974977f6fc094cef1a31f" title="RtAudio callback function prototype.">RtAudioCallback</a>)( <span class="keywordtype">void</span> *outputBuffer, <span class="keywordtype">void</span> *inputBuffer,
+<a name="l00184"></a>00184                                 <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nFrames,
+<a name="l00185"></a>00185                                 <span class="keywordtype">double</span> streamTime,
+<a name="l00186"></a>00186                                 <a class="code" href="RtAudio_8h.html#a80e306d363583da3b0a1b65d9b57c806" title="RtAudio stream status (over- or underflow) flags.">RtAudioStreamStatus</a> status,
+<a name="l00187"></a>00187                                 <span class="keywordtype">void</span> *userData );
+<a name="l00188"></a>00188 
+<a name="l00189"></a>00189 
+<a name="l00190"></a>00190 <span class="comment">// **************************************************************** //</span>
+<a name="l00191"></a>00191 <span class="comment">//</span>
+<a name="l00192"></a>00192 <span class="comment">// RtAudio class declaration.</span>
+<a name="l00193"></a>00193 <span class="comment">//</span>
+<a name="l00194"></a>00194 <span class="comment">// RtAudio is a &quot;controller&quot; used to select an available audio i/o</span>
+<a name="l00195"></a>00195 <span class="comment">// interface.  It presents a common API for the user to call but all</span>
+<a name="l00196"></a>00196 <span class="comment">// functionality is implemented by the class RtApi and its</span>
+<a name="l00197"></a>00197 <span class="comment">// subclasses.  RtAudio creates an instance of an RtApi subclass</span>
+<a name="l00198"></a>00198 <span class="comment">// based on the user&#39;s API choice.  If no choice is made, RtAudio</span>
+<a name="l00199"></a>00199 <span class="comment">// attempts to make a &quot;logical&quot; API selection.</span>
+<a name="l00200"></a>00200 <span class="comment">//</span>
+<a name="l00201"></a>00201 <span class="comment">// **************************************************************** //</span>
+<a name="l00202"></a>00202 
+<a name="l00203"></a>00203 <span class="keyword">class </span>RtApi;
+<a name="l00204"></a>00204 
+<a name="l00205"></a><a class="code" href="classRtAudio.html">00205</a> <span class="keyword">class </span><a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>
+<a name="l00206"></a>00206 {
+<a name="l00207"></a>00207  <span class="keyword">public</span>:
+<a name="l00208"></a>00208 
+<a name="l00210"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849">00210</a>   <span class="keyword">enum</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">Api</a> {
+<a name="l00211"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa49af3ac767106158bc6cad74fb214ae">00211</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa49af3ac767106158bc6cad74fb214ae">UNSPECIFIED</a>,    
+<a name="l00212"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa7a2ba095c2806caa893b6fb8fc3a1a8">00212</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa7a2ba095c2806caa893b6fb8fc3a1a8">LINUX_ALSA</a>,     
+<a name="l00213"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a39c84615e61de75e6a4e865596d62c82">00213</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a39c84615e61de75e6a4e865596d62c82">LINUX_OSS</a>,      
+<a name="l00214"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a4767e17c6edfbd827f91763915df4105">00214</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a4767e17c6edfbd827f91763915df4105">UNIX_JACK</a>,      
+<a name="l00215"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a9fec92b8272244a87a6a11a717bd662d">00215</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a9fec92b8272244a87a6a11a717bd662d">MACOSX_CORE</a>,    
+<a name="l00216"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a219517d1df90f94d07758481155bd469">00216</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a219517d1df90f94d07758481155bd469">WINDOWS_ASIO</a>,   
+<a name="l00217"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a28478830f42c2fd61e6c7ad498901931">00217</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a28478830f42c2fd61e6c7ad498901931">WINDOWS_DS</a>,     
+<a name="l00218"></a><a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849ab06b8fd88bf18c9a2b8271f6961ae2d1">00218</a>     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849ab06b8fd88bf18c9a2b8271f6961ae2d1">RTAUDIO_DUMMY</a>   
+<a name="l00219"></a>00219   };
+<a name="l00220"></a>00220 
+<a name="l00222"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html">00222</a>   <span class="keyword">struct </span><a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">DeviceInfo</a> {
+<a name="l00223"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a97573717ccb1e75a834a0a108cd6982d">00223</a>     <span class="keywordtype">bool</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a97573717ccb1e75a834a0a108cd6982d">probed</a>;                  
+<a name="l00224"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a24df596ab8d54f2eb540c7cf16212b3b">00224</a>     std::string <a class="code" href="structRtAudio_1_1DeviceInfo.html#a24df596ab8d54f2eb540c7cf16212b3b">name</a>;             
+<a name="l00225"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a81aaf488f8158ef55b1bb678f66feb7d">00225</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a81aaf488f8158ef55b1bb678f66feb7d">outputChannels</a>;  
+<a name="l00226"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a56247b458a937ae84d98ca9c4b243275">00226</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a56247b458a937ae84d98ca9c4b243275">inputChannels</a>;   
+<a name="l00227"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a3e8ad34c2d14e24293a0beafc26186e7">00227</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a3e8ad34c2d14e24293a0beafc26186e7">duplexChannels</a>;  
+<a name="l00228"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a5365245e73ffe29a05734de4474acd58">00228</a>     <span class="keywordtype">bool</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a5365245e73ffe29a05734de4474acd58">isDefaultOutput</a>;         
+<a name="l00229"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a7c8aca084bd908799b6be5954b80def2">00229</a>     <span class="keywordtype">bool</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a7c8aca084bd908799b6be5954b80def2">isDefaultInput</a>;          
+<a name="l00230"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#afa65f5f92f66ce7aacd3ff35e11b230f">00230</a>     std::vector&lt;unsigned int&gt; <a class="code" href="structRtAudio_1_1DeviceInfo.html#afa65f5f92f66ce7aacd3ff35e11b230f">sampleRates</a>; 
+<a name="l00231"></a><a class="code" href="structRtAudio_1_1DeviceInfo.html#a23251b549b89b2fe04a57fcd7cb76ea4">00231</a>     <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> <a class="code" href="structRtAudio_1_1DeviceInfo.html#a23251b549b89b2fe04a57fcd7cb76ea4">nativeFormats</a>;  
+<a name="l00233"></a>00233     <span class="comment">// Default constructor.</span>
+<a name="l00234"></a>00234     <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">DeviceInfo</a>()
+<a name="l00235"></a>00235       :<a class="code" href="structRtAudio_1_1DeviceInfo.html#a97573717ccb1e75a834a0a108cd6982d">probed</a>(false), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a81aaf488f8158ef55b1bb678f66feb7d">outputChannels</a>(0), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a56247b458a937ae84d98ca9c4b243275">inputChannels</a>(0), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a3e8ad34c2d14e24293a0beafc26186e7">duplexChannels</a>(0),
+<a name="l00236"></a>00236        <a class="code" href="structRtAudio_1_1DeviceInfo.html#a5365245e73ffe29a05734de4474acd58">isDefaultOutput</a>(false), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a7c8aca084bd908799b6be5954b80def2">isDefaultInput</a>(false), <a class="code" href="structRtAudio_1_1DeviceInfo.html#a23251b549b89b2fe04a57fcd7cb76ea4">nativeFormats</a>(0) {}
+<a name="l00237"></a>00237   };
+<a name="l00238"></a>00238 
+<a name="l00240"></a><a class="code" href="structRtAudio_1_1StreamParameters.html">00240</a>   <span class="keyword">struct </span><a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">StreamParameters</a> {
+<a name="l00241"></a><a class="code" href="structRtAudio_1_1StreamParameters.html#ab3c72bcf3ef12149ae9a4fb597cc5489">00241</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamParameters.html#ab3c72bcf3ef12149ae9a4fb597cc5489">deviceId</a>;     
+<a name="l00242"></a><a class="code" href="structRtAudio_1_1StreamParameters.html#a88a10091b6e284e21235cc6f25332ebd">00242</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamParameters.html#a88a10091b6e284e21235cc6f25332ebd">nChannels</a>;    
+<a name="l00243"></a><a class="code" href="structRtAudio_1_1StreamParameters.html#ad4b4503782653ec93c83328c46abe50c">00243</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamParameters.html#ad4b4503782653ec93c83328c46abe50c">firstChannel</a>; 
+<a name="l00245"></a>00245     <span class="comment">// Default constructor.</span>
+<a name="l00246"></a>00246     <a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">StreamParameters</a>()
+<a name="l00247"></a>00247       : <a class="code" href="structRtAudio_1_1StreamParameters.html#ab3c72bcf3ef12149ae9a4fb597cc5489">deviceId</a>(0), <a class="code" href="structRtAudio_1_1StreamParameters.html#a88a10091b6e284e21235cc6f25332ebd">nChannels</a>(0), <a class="code" href="structRtAudio_1_1StreamParameters.html#ad4b4503782653ec93c83328c46abe50c">firstChannel</a>(0) {}
+<a name="l00248"></a>00248   };
+<a name="l00249"></a>00249 
+<a name="l00251"></a>00251 
+<a name="l00307"></a><a class="code" href="structRtAudio_1_1StreamOptions.html">00307</a>   <span class="keyword">struct </span><a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">StreamOptions</a> {
+<a name="l00308"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#a0ecc98b031aa3af49d09b781643e298b">00308</a>     <a class="code" href="RtAudio_8h.html#a2c0f59b200dcec4d4e760f9166b29c41" title="RtAudio stream option flags.">RtAudioStreamFlags</a> <a class="code" href="structRtAudio_1_1StreamOptions.html#a0ecc98b031aa3af49d09b781643e298b">flags</a>;      
+<a name="l00309"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#a75a14cfab903d0e1c091bc16aec80240">00309</a>     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamOptions.html#a75a14cfab903d0e1c091bc16aec80240">numberOfBuffers</a>;  
+<a name="l00310"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#a2a4b0b8d690c624d20f4e8f4be6ca9ba">00310</a>     std::string <a class="code" href="structRtAudio_1_1StreamOptions.html#a2a4b0b8d690c624d20f4e8f4be6ca9ba">streamName</a>;        
+<a name="l00311"></a><a class="code" href="structRtAudio_1_1StreamOptions.html#adfd267059434edb21573c584e6367def">00311</a>     <span class="keywordtype">int</span> <a class="code" href="structRtAudio_1_1StreamOptions.html#adfd267059434edb21573c584e6367def">priority</a>;                  
+<a name="l00313"></a>00313     <span class="comment">// Default constructor.</span>
+<a name="l00314"></a>00314     <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">StreamOptions</a>()
+<a name="l00315"></a>00315     : <a class="code" href="structRtAudio_1_1StreamOptions.html#a0ecc98b031aa3af49d09b781643e298b">flags</a>(0), <a class="code" href="structRtAudio_1_1StreamOptions.html#a75a14cfab903d0e1c091bc16aec80240">numberOfBuffers</a>(0), <a class="code" href="structRtAudio_1_1StreamOptions.html#adfd267059434edb21573c584e6367def">priority</a>(0) {}
+<a name="l00316"></a>00316   };
+<a name="l00317"></a>00317 
+<a name="l00319"></a>00319 
+<a name="l00324"></a>00324   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ae266ffad2ef428d0b2c6c262d391ce26" title="A static function to determine the available compiled audio APIs.">getCompiledApi</a>( std::vector&lt;RtAudio::Api&gt; &amp;apis ) <span class="keywordflow">throw</span>();
 <a name="l00325"></a>00325 
-<a name="l00329"></a>00329   ~<a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>() throw();
-<a name="l00330"></a>00330 
-<a name="l00332"></a>00332   <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::<a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">Api</a> <a class="code" href="classRtAudio.html#a83687634795792b2c47e4ae1cf8a5246" title="Returns the audio API specifier for the current instance of RtAudio.">getCurrentApi</a>( <span class="keywordtype">void</span> ) throw();
-<a name="l00333"></a>00333 
-<a name="l00335"></a>00335 
-<a name="l00340"></a>00340   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a747ce2d73803641bbb66d6e78092aa1a" title="A public function that queries for the number of audio devices available.">getDeviceCount</a>( <span class="keywordtype">void</span> ) throw();
-<a name="l00341"></a>00341 
+<a name="l00327"></a>00327 
+<a name="l00335"></a>00335   <a class="code" href="classRtAudio.html#afd0bfa26deae9804e18faff59d0273d9" title="The class constructor.">RtAudio</a>( <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> api=<a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa49af3ac767106158bc6cad74fb214ae">UNSPECIFIED</a> ) throw();
+<a name="l00336"></a>00336 
+<a name="l00338"></a>00338 
+<a name="l00342"></a>00342   ~<a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>() throw();
 <a name="l00343"></a>00343 
-<a name="l00353"></a>00353   <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::DeviceInfo <a class="code" href="classRtAudio.html#a02d7ff44ad1d7eae22283a052f3dfda8" title="Return an RtAudio::DeviceInfo structure for a specified device number.">getDeviceInfo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
+<a name="l00345"></a>00345   <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::<a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">Api</a> <a class="code" href="classRtAudio.html#a83687634795792b2c47e4ae1cf8a5246" title="Returns the audio API specifier for the current instance of RtAudio.">getCurrentApi</a>( <span class="keywordtype">void</span> ) throw();
+<a name="l00346"></a>00346 
+<a name="l00348"></a>00348 
+<a name="l00353"></a>00353   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a747ce2d73803641bbb66d6e78092aa1a" title="A public function that queries for the number of audio devices available.">getDeviceCount</a>( <span class="keywordtype">void</span> ) throw();
 <a name="l00354"></a>00354 
 <a name="l00356"></a>00356 
-<a name="l00363"></a>00363   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a3a3f3dbe13ea696b521e49cdaaa357bc" title="A function that returns the index of the default output device.">getDefaultOutputDevice</a>( <span class="keywordtype">void</span> ) throw();
-<a name="l00364"></a>00364 
-<a name="l00366"></a>00366 
-<a name="l00373"></a>00373   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#aad8b94edd3cd379ee300b125750ac6ce" title="A function that returns the index of the default input device.">getDefaultInputDevice</a>( <span class="keywordtype">void</span> ) throw();
-<a name="l00374"></a>00374 
-<a name="l00376"></a>00376 
-<a name="l00413"></a>00413   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream</a>( <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::StreamParameters *outputParameters,
-<a name="l00414"></a>00414                    <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::StreamParameters *inputParameters,
-<a name="l00415"></a>00415                    <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00416"></a>00416                    <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferFrames, <a class="code" href="RtAudio_8h.html#a112c7b7e25a974977f6fc094cef1a31f" title="RtAudio callback function prototype.">RtAudioCallback</a> callback,
-<a name="l00417"></a>00417                    <span class="keywordtype">void</span> *userData = NULL, <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::StreamOptions *options = NULL );
-<a name="l00418"></a>00418 
-<a name="l00420"></a>00420 
-<a name="l00424"></a>00424   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">closeStream</a>( <span class="keywordtype">void</span> ) throw();
-<a name="l00425"></a>00425 
-<a name="l00427"></a>00427 
-<a name="l00433"></a>00433   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">startStream</a>( <span class="keywordtype">void</span> );
-<a name="l00434"></a>00434 
-<a name="l00436"></a>00436 
-<a name="l00442"></a>00442   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af4c241ff86936ecc8108f0d9dfe3efdd" title="Stop a stream, allowing any samples remaining in the output queue to be played.">stopStream</a>( <span class="keywordtype">void</span> );
-<a name="l00443"></a>00443 
-<a name="l00445"></a>00445 
-<a name="l00451"></a>00451   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ad0586b47cd6bb9591a80b4052815991f" title="Stop a stream, discarding any samples remaining in the input/output queue.">abortStream</a>( <span class="keywordtype">void</span> );
-<a name="l00452"></a>00452 
-<a name="l00454"></a>00454   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a3863e45ff81dbe97176de0ee7545917f" title="Returns true if a stream is open and false if not.">isStreamOpen</a>( <span class="keywordtype">void</span> ) const throw();
-<a name="l00455"></a>00455 
-<a name="l00457"></a>00457   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a84cc8d9b7ab9bc5f37bcf48430ec5aea" title="Returns true if the stream is running and false if it is stopped or not open.">isStreamRunning</a>( <span class="keywordtype">void</span> ) const throw();
+<a name="l00366"></a>00366   <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::DeviceInfo <a class="code" href="classRtAudio.html#a02d7ff44ad1d7eae22283a052f3dfda8" title="Return an RtAudio::DeviceInfo structure for a specified device number.">getDeviceInfo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
+<a name="l00367"></a>00367 
+<a name="l00369"></a>00369 
+<a name="l00376"></a>00376   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a3a3f3dbe13ea696b521e49cdaaa357bc" title="A function that returns the index of the default output device.">getDefaultOutputDevice</a>( <span class="keywordtype">void</span> ) throw();
+<a name="l00377"></a>00377 
+<a name="l00379"></a>00379 
+<a name="l00386"></a>00386   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#aad8b94edd3cd379ee300b125750ac6ce" title="A function that returns the index of the default input device.">getDefaultInputDevice</a>( <span class="keywordtype">void</span> ) throw();
+<a name="l00387"></a>00387 
+<a name="l00389"></a>00389 
+<a name="l00426"></a>00426   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream</a>( <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::StreamParameters *outputParameters,
+<a name="l00427"></a>00427                    <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::StreamParameters *inputParameters,
+<a name="l00428"></a>00428                    <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
+<a name="l00429"></a>00429                    <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferFrames, <a class="code" href="RtAudio_8h.html#a112c7b7e25a974977f6fc094cef1a31f" title="RtAudio callback function prototype.">RtAudioCallback</a> callback,
+<a name="l00430"></a>00430                    <span class="keywordtype">void</span> *userData = NULL, <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::StreamOptions *options = NULL );
+<a name="l00431"></a>00431 
+<a name="l00433"></a>00433 
+<a name="l00437"></a>00437   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">closeStream</a>( <span class="keywordtype">void</span> ) throw();
+<a name="l00438"></a>00438 
+<a name="l00440"></a>00440 
+<a name="l00446"></a>00446   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">startStream</a>( <span class="keywordtype">void</span> );
+<a name="l00447"></a>00447 
+<a name="l00449"></a>00449 
+<a name="l00455"></a>00455   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af4c241ff86936ecc8108f0d9dfe3efdd" title="Stop a stream, allowing any samples remaining in the output queue to be played.">stopStream</a>( <span class="keywordtype">void</span> );
+<a name="l00456"></a>00456 
 <a name="l00458"></a>00458 
-<a name="l00460"></a>00460 
-<a name="l00463"></a>00463   <span class="keywordtype">double</span> <a class="code" href="classRtAudio.html#a344e59a62353c5791db4621b985cb2ca" title="Returns the number of elapsed seconds since the stream was started.">getStreamTime</a>( <span class="keywordtype">void</span> );
-<a name="l00464"></a>00464 
-<a name="l00466"></a>00466 
-<a name="l00474"></a>00474   <span class="keywordtype">long</span> <a class="code" href="classRtAudio.html#a843c989d9f501c71bc2f2c5ca18df9f3" title="Returns the internal stream latency in sample frames.">getStreamLatency</a>( <span class="keywordtype">void</span> );
-<a name="l00475"></a>00475 
+<a name="l00464"></a>00464   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ad0586b47cd6bb9591a80b4052815991f" title="Stop a stream, discarding any samples remaining in the input/output queue.">abortStream</a>( <span class="keywordtype">void</span> );
+<a name="l00465"></a>00465 
+<a name="l00467"></a>00467   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a3863e45ff81dbe97176de0ee7545917f" title="Returns true if a stream is open and false if not.">isStreamOpen</a>( <span class="keywordtype">void</span> ) const throw();
+<a name="l00468"></a>00468 
+<a name="l00470"></a>00470   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a84cc8d9b7ab9bc5f37bcf48430ec5aea" title="Returns true if the stream is running and false if it is stopped or not open.">isStreamRunning</a>( <span class="keywordtype">void</span> ) const throw();
+<a name="l00471"></a>00471 
+<a name="l00473"></a>00473 
+<a name="l00476"></a>00476   <span class="keywordtype">double</span> <a class="code" href="classRtAudio.html#a344e59a62353c5791db4621b985cb2ca" title="Returns the number of elapsed seconds since the stream was started.">getStreamTime</a>( <span class="keywordtype">void</span> );
 <a name="l00477"></a>00477 
-<a name="l00482"></a>00482   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a28214b8b05d60b45c24ee6fae7b2a0b5" title="Returns actual sample rate in use by the stream.">getStreamSampleRate</a>( <span class="keywordtype">void</span> );
-<a name="l00483"></a>00483 
-<a name="l00485"></a>00485   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af0752ee51cce3dd90a3bd009f9fdbe77" title="Specify whether warning messages should be printed to stderr.">showWarnings</a>( <span class="keywordtype">bool</span> value = true ) throw();
-<a name="l00486"></a>00486 
-<a name="l00487"></a>00487  protected:
+<a name="l00479"></a>00479 
+<a name="l00487"></a>00487   <span class="keywordtype">long</span> <a class="code" href="classRtAudio.html#a843c989d9f501c71bc2f2c5ca18df9f3" title="Returns the internal stream latency in sample frames.">getStreamLatency</a>( <span class="keywordtype">void</span> );
 <a name="l00488"></a>00488 
-<a name="l00489"></a>00489   <span class="keywordtype">void</span> openRtApi( <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::<a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">Api</a> api );
-<a name="l00490"></a>00490   RtApi *rtapi_;
-<a name="l00491"></a>00491 };
-<a name="l00492"></a>00492 
-<a name="l00493"></a>00493 <span class="comment">// Operating system dependent thread functionality.</span>
-<a name="l00494"></a>00494 <span class="preprocessor">#if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__)</span>
-<a name="l00495"></a>00495 <span class="preprocessor"></span><span class="preprocessor">  #include &lt;windows.h&gt;</span>
-<a name="l00496"></a>00496 <span class="preprocessor">  #include &lt;process.h&gt;</span>
-<a name="l00497"></a>00497 
-<a name="l00498"></a>00498   <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> ThreadHandle;
-<a name="l00499"></a>00499   <span class="keyword">typedef</span> CRITICAL_SECTION StreamMutex;
-<a name="l00500"></a>00500 
-<a name="l00501"></a>00501 <span class="preprocessor">#elif defined(__LINUX_ALSA__) || defined(__UNIX_JACK__) || defined(__LINUX_OSS__) || defined(__MACOSX_CORE__)</span>
-<a name="l00502"></a>00502 <span class="preprocessor"></span>  <span class="comment">// Using pthread library for various flavors of unix.</span>
-<a name="l00503"></a>00503 <span class="preprocessor">  #include &lt;pthread.h&gt;</span>
-<a name="l00504"></a>00504 
-<a name="l00505"></a>00505   <span class="keyword">typedef</span> pthread_t ThreadHandle;
-<a name="l00506"></a>00506   <span class="keyword">typedef</span> pthread_mutex_t StreamMutex;
-<a name="l00507"></a>00507 
-<a name="l00508"></a>00508 <span class="preprocessor">#else // Setup for &quot;dummy&quot; behavior</span>
-<a name="l00509"></a>00509 <span class="preprocessor"></span>
-<a name="l00510"></a>00510 <span class="preprocessor">  #define __RTAUDIO_DUMMY__</span>
-<a name="l00511"></a>00511 <span class="preprocessor"></span>  <span class="keyword">typedef</span> <span class="keywordtype">int</span> ThreadHandle;
-<a name="l00512"></a>00512   <span class="keyword">typedef</span> <span class="keywordtype">int</span> StreamMutex;
+<a name="l00490"></a>00490 
+<a name="l00495"></a>00495   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a28214b8b05d60b45c24ee6fae7b2a0b5" title="Returns actual sample rate in use by the stream.">getStreamSampleRate</a>( <span class="keywordtype">void</span> );
+<a name="l00496"></a>00496 
+<a name="l00498"></a>00498   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af0752ee51cce3dd90a3bd009f9fdbe77" title="Specify whether warning messages should be printed to stderr.">showWarnings</a>( <span class="keywordtype">bool</span> value = true ) throw();
+<a name="l00499"></a>00499 
+<a name="l00500"></a>00500  protected:
+<a name="l00501"></a>00501 
+<a name="l00502"></a>00502   <span class="keywordtype">void</span> openRtApi( <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>::<a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">Api</a> api );
+<a name="l00503"></a>00503   RtApi *rtapi_;
+<a name="l00504"></a>00504 };
+<a name="l00505"></a>00505 
+<a name="l00506"></a>00506 <span class="comment">// Operating system dependent thread functionality.</span>
+<a name="l00507"></a>00507 <span class="preprocessor">#if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__)</span>
+<a name="l00508"></a>00508 <span class="preprocessor"></span><span class="preprocessor">  #include &lt;windows.h&gt;</span>
+<a name="l00509"></a>00509 <span class="preprocessor">  #include &lt;process.h&gt;</span>
+<a name="l00510"></a>00510 
+<a name="l00511"></a>00511   <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> ThreadHandle;
+<a name="l00512"></a>00512   <span class="keyword">typedef</span> CRITICAL_SECTION StreamMutex;
 <a name="l00513"></a>00513 
-<a name="l00514"></a>00514 <span class="preprocessor">#endif</span>
-<a name="l00515"></a>00515 <span class="preprocessor"></span>
-<a name="l00516"></a>00516 <span class="comment">// This global structure type is used to pass callback information</span>
-<a name="l00517"></a>00517 <span class="comment">// between the private RtAudio stream structure and global callback</span>
-<a name="l00518"></a>00518 <span class="comment">// handling functions.</span>
-<a name="l00519"></a>00519 <span class="keyword">struct </span>CallbackInfo {
-<a name="l00520"></a>00520   <span class="keywordtype">void</span> *object;    <span class="comment">// Used as a &quot;this&quot; pointer.</span>
-<a name="l00521"></a>00521   ThreadHandle thread;
-<a name="l00522"></a>00522   <span class="keywordtype">void</span> *callback;
-<a name="l00523"></a>00523   <span class="keywordtype">void</span> *userData;
-<a name="l00524"></a>00524   <span class="keywordtype">void</span> *apiInfo;   <span class="comment">// void pointer for API specific callback information</span>
-<a name="l00525"></a>00525   <span class="keywordtype">bool</span> isRunning;
+<a name="l00514"></a>00514 <span class="preprocessor">#elif defined(__LINUX_ALSA__) || defined(__UNIX_JACK__) || defined(__LINUX_OSS__) || defined(__MACOSX_CORE__)</span>
+<a name="l00515"></a>00515 <span class="preprocessor"></span>  <span class="comment">// Using pthread library for various flavors of unix.</span>
+<a name="l00516"></a>00516 <span class="preprocessor">  #include &lt;pthread.h&gt;</span>
+<a name="l00517"></a>00517 
+<a name="l00518"></a>00518   <span class="keyword">typedef</span> pthread_t ThreadHandle;
+<a name="l00519"></a>00519   <span class="keyword">typedef</span> pthread_mutex_t StreamMutex;
+<a name="l00520"></a>00520 
+<a name="l00521"></a>00521 <span class="preprocessor">#else // Setup for &quot;dummy&quot; behavior</span>
+<a name="l00522"></a>00522 <span class="preprocessor"></span>
+<a name="l00523"></a>00523 <span class="preprocessor">  #define __RTAUDIO_DUMMY__</span>
+<a name="l00524"></a>00524 <span class="preprocessor"></span>  <span class="keyword">typedef</span> <span class="keywordtype">int</span> ThreadHandle;
+<a name="l00525"></a>00525   <span class="keyword">typedef</span> <span class="keywordtype">int</span> StreamMutex;
 <a name="l00526"></a>00526 
-<a name="l00527"></a>00527   <span class="comment">// Default constructor.</span>
-<a name="l00528"></a>00528   CallbackInfo()
-<a name="l00529"></a>00529     :object(0), callback(0), userData(0), apiInfo(0), isRunning(false) {}
-<a name="l00530"></a>00530 };
-<a name="l00531"></a>00531 
-<a name="l00532"></a>00532 <span class="comment">// **************************************************************** //</span>
-<a name="l00533"></a>00533 <span class="comment">//</span>
-<a name="l00534"></a>00534 <span class="comment">// RtApi class declaration.</span>
-<a name="l00535"></a>00535 <span class="comment">//</span>
-<a name="l00536"></a>00536 <span class="comment">// Subclasses of RtApi contain all API- and OS-specific code necessary</span>
-<a name="l00537"></a>00537 <span class="comment">// to fully implement the RtAudio API.</span>
-<a name="l00538"></a>00538 <span class="comment">//</span>
-<a name="l00539"></a>00539 <span class="comment">// Note that RtApi is an abstract base class and cannot be</span>
-<a name="l00540"></a>00540 <span class="comment">// explicitly instantiated.  The class RtAudio will create an</span>
-<a name="l00541"></a>00541 <span class="comment">// instance of an RtApi subclass (RtApiOss, RtApiAlsa,</span>
-<a name="l00542"></a>00542 <span class="comment">// RtApiJack, RtApiCore, RtApiAl, RtApiDs, or RtApiAsio).</span>
-<a name="l00543"></a>00543 <span class="comment">//</span>
-<a name="l00544"></a>00544 <span class="comment">// **************************************************************** //</span>
-<a name="l00545"></a>00545 
-<a name="l00546"></a>00546 <span class="preprocessor">#if defined( HAVE_GETTIMEOFDAY )</span>
-<a name="l00547"></a>00547 <span class="preprocessor"></span><span class="preprocessor">  #include &lt;sys/time.h&gt;</span>
-<a name="l00548"></a>00548 <span class="preprocessor">#endif</span>
-<a name="l00549"></a>00549 <span class="preprocessor"></span>
-<a name="l00550"></a>00550 <span class="preprocessor">#include &lt;sstream&gt;</span>
-<a name="l00551"></a>00551 
-<a name="l00552"></a>00552 <span class="keyword">class </span>RtApi
-<a name="l00553"></a>00553 {
-<a name="l00554"></a>00554 <span class="keyword">public</span>:
-<a name="l00555"></a>00555 
-<a name="l00556"></a>00556   RtApi();
-<a name="l00557"></a>00557   <span class="keyword">virtual</span> ~RtApi();
-<a name="l00558"></a>00558   <span class="keyword">virtual</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> <a class="code" href="classRtAudio.html#a83687634795792b2c47e4ae1cf8a5246" title="Returns the audio API specifier for the current instance of RtAudio.">getCurrentApi</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00559"></a>00559   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a747ce2d73803641bbb66d6e78092aa1a" title="A public function that queries for the number of audio devices available.">getDeviceCount</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00560"></a>00560   <span class="keyword">virtual</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> <a class="code" href="classRtAudio.html#a02d7ff44ad1d7eae22283a052f3dfda8" title="Return an RtAudio::DeviceInfo structure for a specified device number.">getDeviceInfo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device ) = 0;
-<a name="l00561"></a>00561   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#aad8b94edd3cd379ee300b125750ac6ce" title="A function that returns the index of the default input device.">getDefaultInputDevice</a>( <span class="keywordtype">void</span> );
-<a name="l00562"></a>00562   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a3a3f3dbe13ea696b521e49cdaaa357bc" title="A function that returns the index of the default output device.">getDefaultOutputDevice</a>( <span class="keywordtype">void</span> );
-<a name="l00563"></a>00563   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream</a>( <a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">RtAudio::StreamParameters</a> *outputParameters,
-<a name="l00564"></a>00564                    <a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">RtAudio::StreamParameters</a> *inputParameters,
-<a name="l00565"></a>00565                    <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00566"></a>00566                    <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferFrames, <a class="code" href="RtAudio_8h.html#a112c7b7e25a974977f6fc094cef1a31f" title="RtAudio callback function prototype.">RtAudioCallback</a> callback,
-<a name="l00567"></a>00567                    <span class="keywordtype">void</span> *userData, <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00568"></a>00568   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">closeStream</a>( <span class="keywordtype">void</span> );
-<a name="l00569"></a>00569   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">startStream</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00570"></a>00570   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af4c241ff86936ecc8108f0d9dfe3efdd" title="Stop a stream, allowing any samples remaining in the output queue to be played.">stopStream</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00571"></a>00571   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ad0586b47cd6bb9591a80b4052815991f" title="Stop a stream, discarding any samples remaining in the input/output queue.">abortStream</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00572"></a>00572   <span class="keywordtype">long</span> <a class="code" href="classRtAudio.html#a843c989d9f501c71bc2f2c5ca18df9f3" title="Returns the internal stream latency in sample frames.">getStreamLatency</a>( <span class="keywordtype">void</span> );
-<a name="l00573"></a>00573   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a28214b8b05d60b45c24ee6fae7b2a0b5" title="Returns actual sample rate in use by the stream.">getStreamSampleRate</a>( <span class="keywordtype">void</span> );
-<a name="l00574"></a>00574   <span class="keyword">virtual</span> <span class="keywordtype">double</span> <a class="code" href="classRtAudio.html#a344e59a62353c5791db4621b985cb2ca" title="Returns the number of elapsed seconds since the stream was started.">getStreamTime</a>( <span class="keywordtype">void</span> );
-<a name="l00575"></a>00575   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a3863e45ff81dbe97176de0ee7545917f" title="Returns true if a stream is open and false if not.">isStreamOpen</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> stream_.state != STREAM_CLOSED; };
-<a name="l00576"></a>00576   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a84cc8d9b7ab9bc5f37bcf48430ec5aea" title="Returns true if the stream is running and false if it is stopped or not open.">isStreamRunning</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> stream_.state == STREAM_RUNNING; };
-<a name="l00577"></a>00577   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af0752ee51cce3dd90a3bd009f9fdbe77" title="Specify whether warning messages should be printed to stderr.">showWarnings</a>( <span class="keywordtype">bool</span> value ) { showWarnings_ = value; };
-<a name="l00578"></a>00578 
-<a name="l00579"></a>00579 
-<a name="l00580"></a>00580 <span class="keyword">protected</span>:
-<a name="l00581"></a>00581 
-<a name="l00582"></a>00582   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> MAX_SAMPLE_RATES;
-<a name="l00583"></a>00583   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> SAMPLE_RATES[];
-<a name="l00584"></a>00584 
-<a name="l00585"></a>00585   <span class="keyword">enum</span> { FAILURE, SUCCESS };
-<a name="l00586"></a>00586 
-<a name="l00587"></a>00587   <span class="keyword">enum</span> StreamState {
-<a name="l00588"></a>00588     STREAM_STOPPED,
-<a name="l00589"></a>00589     STREAM_RUNNING,
-<a name="l00590"></a>00590     STREAM_CLOSED = -50
-<a name="l00591"></a>00591   };
+<a name="l00527"></a>00527 <span class="preprocessor">#endif</span>
+<a name="l00528"></a>00528 <span class="preprocessor"></span>
+<a name="l00529"></a>00529 <span class="comment">// This global structure type is used to pass callback information</span>
+<a name="l00530"></a>00530 <span class="comment">// between the private RtAudio stream structure and global callback</span>
+<a name="l00531"></a>00531 <span class="comment">// handling functions.</span>
+<a name="l00532"></a>00532 <span class="keyword">struct </span>CallbackInfo {
+<a name="l00533"></a>00533   <span class="keywordtype">void</span> *object;    <span class="comment">// Used as a &quot;this&quot; pointer.</span>
+<a name="l00534"></a>00534   ThreadHandle thread;
+<a name="l00535"></a>00535   <span class="keywordtype">void</span> *callback;
+<a name="l00536"></a>00536   <span class="keywordtype">void</span> *userData;
+<a name="l00537"></a>00537   <span class="keywordtype">void</span> *apiInfo;   <span class="comment">// void pointer for API specific callback information</span>
+<a name="l00538"></a>00538   <span class="keywordtype">bool</span> isRunning;
+<a name="l00539"></a>00539 
+<a name="l00540"></a>00540   <span class="comment">// Default constructor.</span>
+<a name="l00541"></a>00541   CallbackInfo()
+<a name="l00542"></a>00542     :object(0), callback(0), userData(0), apiInfo(0), isRunning(false) {}
+<a name="l00543"></a>00543 };
+<a name="l00544"></a>00544 
+<a name="l00545"></a>00545 <span class="comment">// **************************************************************** //</span>
+<a name="l00546"></a>00546 <span class="comment">//</span>
+<a name="l00547"></a>00547 <span class="comment">// RtApi class declaration.</span>
+<a name="l00548"></a>00548 <span class="comment">//</span>
+<a name="l00549"></a>00549 <span class="comment">// Subclasses of RtApi contain all API- and OS-specific code necessary</span>
+<a name="l00550"></a>00550 <span class="comment">// to fully implement the RtAudio API.</span>
+<a name="l00551"></a>00551 <span class="comment">//</span>
+<a name="l00552"></a>00552 <span class="comment">// Note that RtApi is an abstract base class and cannot be</span>
+<a name="l00553"></a>00553 <span class="comment">// explicitly instantiated.  The class RtAudio will create an</span>
+<a name="l00554"></a>00554 <span class="comment">// instance of an RtApi subclass (RtApiOss, RtApiAlsa,</span>
+<a name="l00555"></a>00555 <span class="comment">// RtApiJack, RtApiCore, RtApiAl, RtApiDs, or RtApiAsio).</span>
+<a name="l00556"></a>00556 <span class="comment">//</span>
+<a name="l00557"></a>00557 <span class="comment">// **************************************************************** //</span>
+<a name="l00558"></a>00558 
+<a name="l00559"></a>00559 <span class="preprocessor">#if defined( HAVE_GETTIMEOFDAY )</span>
+<a name="l00560"></a>00560 <span class="preprocessor"></span><span class="preprocessor">  #include &lt;sys/time.h&gt;</span>
+<a name="l00561"></a>00561 <span class="preprocessor">#endif</span>
+<a name="l00562"></a>00562 <span class="preprocessor"></span>
+<a name="l00563"></a>00563 <span class="preprocessor">#include &lt;sstream&gt;</span>
+<a name="l00564"></a>00564 
+<a name="l00565"></a>00565 <span class="keyword">class </span>RtApi
+<a name="l00566"></a>00566 {
+<a name="l00567"></a>00567 <span class="keyword">public</span>:
+<a name="l00568"></a>00568 
+<a name="l00569"></a>00569   RtApi();
+<a name="l00570"></a>00570   <span class="keyword">virtual</span> ~RtApi();
+<a name="l00571"></a>00571   <span class="keyword">virtual</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> <a class="code" href="classRtAudio.html#a83687634795792b2c47e4ae1cf8a5246" title="Returns the audio API specifier for the current instance of RtAudio.">getCurrentApi</a>( <span class="keywordtype">void</span> ) = 0;
+<a name="l00572"></a>00572   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a747ce2d73803641bbb66d6e78092aa1a" title="A public function that queries for the number of audio devices available.">getDeviceCount</a>( <span class="keywordtype">void</span> ) = 0;
+<a name="l00573"></a>00573   <span class="keyword">virtual</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> <a class="code" href="classRtAudio.html#a02d7ff44ad1d7eae22283a052f3dfda8" title="Return an RtAudio::DeviceInfo structure for a specified device number.">getDeviceInfo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device ) = 0;
+<a name="l00574"></a>00574   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#aad8b94edd3cd379ee300b125750ac6ce" title="A function that returns the index of the default input device.">getDefaultInputDevice</a>( <span class="keywordtype">void</span> );
+<a name="l00575"></a>00575   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a3a3f3dbe13ea696b521e49cdaaa357bc" title="A function that returns the index of the default output device.">getDefaultOutputDevice</a>( <span class="keywordtype">void</span> );
+<a name="l00576"></a>00576   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream</a>( <a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">RtAudio::StreamParameters</a> *outputParameters,
+<a name="l00577"></a>00577                    <a class="code" href="structRtAudio_1_1StreamParameters.html" title="The structure for specifying input or ouput stream parameters.">RtAudio::StreamParameters</a> *inputParameters,
+<a name="l00578"></a>00578                    <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
+<a name="l00579"></a>00579                    <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferFrames, <a class="code" href="RtAudio_8h.html#a112c7b7e25a974977f6fc094cef1a31f" title="RtAudio callback function prototype.">RtAudioCallback</a> callback,
+<a name="l00580"></a>00580                    <span class="keywordtype">void</span> *userData, <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
+<a name="l00581"></a>00581   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">closeStream</a>( <span class="keywordtype">void</span> );
+<a name="l00582"></a>00582   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">startStream</a>( <span class="keywordtype">void</span> ) = 0;
+<a name="l00583"></a>00583   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af4c241ff86936ecc8108f0d9dfe3efdd" title="Stop a stream, allowing any samples remaining in the output queue to be played.">stopStream</a>( <span class="keywordtype">void</span> ) = 0;
+<a name="l00584"></a>00584   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ad0586b47cd6bb9591a80b4052815991f" title="Stop a stream, discarding any samples remaining in the input/output queue.">abortStream</a>( <span class="keywordtype">void</span> ) = 0;
+<a name="l00585"></a>00585   <span class="keywordtype">long</span> <a class="code" href="classRtAudio.html#a843c989d9f501c71bc2f2c5ca18df9f3" title="Returns the internal stream latency in sample frames.">getStreamLatency</a>( <span class="keywordtype">void</span> );
+<a name="l00586"></a>00586   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a28214b8b05d60b45c24ee6fae7b2a0b5" title="Returns actual sample rate in use by the stream.">getStreamSampleRate</a>( <span class="keywordtype">void</span> );
+<a name="l00587"></a>00587   <span class="keyword">virtual</span> <span class="keywordtype">double</span> <a class="code" href="classRtAudio.html#a344e59a62353c5791db4621b985cb2ca" title="Returns the number of elapsed seconds since the stream was started.">getStreamTime</a>( <span class="keywordtype">void</span> );
+<a name="l00588"></a>00588   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a3863e45ff81dbe97176de0ee7545917f" title="Returns true if a stream is open and false if not.">isStreamOpen</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> stream_.state != STREAM_CLOSED; };
+<a name="l00589"></a>00589   <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a84cc8d9b7ab9bc5f37bcf48430ec5aea" title="Returns true if the stream is running and false if it is stopped or not open.">isStreamRunning</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> stream_.state == STREAM_RUNNING; };
+<a name="l00590"></a>00590   <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af0752ee51cce3dd90a3bd009f9fdbe77" title="Specify whether warning messages should be printed to stderr.">showWarnings</a>( <span class="keywordtype">bool</span> value ) { showWarnings_ = value; };
+<a name="l00591"></a>00591 
 <a name="l00592"></a>00592 
-<a name="l00593"></a>00593   <span class="keyword">enum</span> StreamMode {
-<a name="l00594"></a>00594     OUTPUT,
-<a name="l00595"></a>00595     INPUT,
-<a name="l00596"></a>00596     DUPLEX,
-<a name="l00597"></a>00597     UNINITIALIZED = -75
-<a name="l00598"></a>00598   };
+<a name="l00593"></a>00593 <span class="keyword">protected</span>:
+<a name="l00594"></a>00594 
+<a name="l00595"></a>00595   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> MAX_SAMPLE_RATES;
+<a name="l00596"></a>00596   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> SAMPLE_RATES[];
+<a name="l00597"></a>00597 
+<a name="l00598"></a>00598   <span class="keyword">enum</span> { FAILURE, SUCCESS };
 <a name="l00599"></a>00599 
-<a name="l00600"></a>00600   <span class="comment">// A protected structure used for buffer conversion.</span>
-<a name="l00601"></a>00601   <span class="keyword">struct </span>ConvertInfo {
-<a name="l00602"></a>00602     <span class="keywordtype">int</span> channels;
-<a name="l00603"></a>00603     <span class="keywordtype">int</span> inJump, outJump;
-<a name="l00604"></a>00604     <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> inFormat, outFormat;
-<a name="l00605"></a>00605     std::vector&lt;int&gt; inOffset;
-<a name="l00606"></a>00606     std::vector&lt;int&gt; outOffset;
-<a name="l00607"></a>00607   };
-<a name="l00608"></a>00608 
-<a name="l00609"></a>00609   <span class="comment">// A protected structure for audio streams.</span>
-<a name="l00610"></a>00610   <span class="keyword">struct </span>RtApiStream {
-<a name="l00611"></a>00611     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device[2];    <span class="comment">// Playback and record, respectively.</span>
-<a name="l00612"></a>00612     <span class="keywordtype">void</span> *apiHandle;           <span class="comment">// void pointer for API specific stream handle information</span>
-<a name="l00613"></a>00613     StreamMode mode;           <span class="comment">// OUTPUT, INPUT, or DUPLEX.</span>
-<a name="l00614"></a>00614     StreamState state;         <span class="comment">// STOPPED, RUNNING, or CLOSED</span>
-<a name="l00615"></a>00615     <span class="keywordtype">char</span> *userBuffer[2];       <span class="comment">// Playback and record, respectively.</span>
-<a name="l00616"></a>00616     <span class="keywordtype">char</span> *deviceBuffer;
-<a name="l00617"></a>00617     <span class="keywordtype">bool</span> doConvertBuffer[2];   <span class="comment">// Playback and record, respectively.</span>
-<a name="l00618"></a>00618     <span class="keywordtype">bool</span> userInterleaved;
-<a name="l00619"></a>00619     <span class="keywordtype">bool</span> deviceInterleaved[2]; <span class="comment">// Playback and record, respectively.</span>
-<a name="l00620"></a>00620     <span class="keywordtype">bool</span> doByteSwap[2];        <span class="comment">// Playback and record, respectively.</span>
-<a name="l00621"></a>00621     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate;
-<a name="l00622"></a>00622     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> bufferSize;
-<a name="l00623"></a>00623     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nBuffers;
-<a name="l00624"></a>00624     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nUserChannels[2];    <span class="comment">// Playback and record, respectively.</span>
-<a name="l00625"></a>00625     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nDeviceChannels[2];  <span class="comment">// Playback and record channels, respectively.</span>
-<a name="l00626"></a>00626     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channelOffset[2];    <span class="comment">// Playback and record, respectively.</span>
-<a name="l00627"></a>00627     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> latency[2];         <span class="comment">// Playback and record, respectively.</span>
-<a name="l00628"></a>00628     <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> userFormat;
-<a name="l00629"></a>00629     <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> deviceFormat[2];    <span class="comment">// Playback and record, respectively.</span>
-<a name="l00630"></a>00630     StreamMutex mutex;
-<a name="l00631"></a>00631     CallbackInfo callbackInfo;
-<a name="l00632"></a>00632     ConvertInfo convertInfo[2];
-<a name="l00633"></a>00633     <span class="keywordtype">double</span> streamTime;         <span class="comment">// Number of elapsed seconds since the stream started.</span>
-<a name="l00634"></a>00634 
-<a name="l00635"></a>00635 <span class="preprocessor">#if defined(HAVE_GETTIMEOFDAY)</span>
-<a name="l00636"></a>00636 <span class="preprocessor"></span>    <span class="keyword">struct </span>timeval lastTickTimestamp;
-<a name="l00637"></a>00637 <span class="preprocessor">#endif</span>
-<a name="l00638"></a>00638 <span class="preprocessor"></span>
-<a name="l00639"></a>00639     RtApiStream()
-<a name="l00640"></a>00640       :apiHandle(0), deviceBuffer(0) { device[0] = 11111; device[1] = 11111; }
-<a name="l00641"></a>00641   };
-<a name="l00642"></a>00642 
-<a name="l00643"></a>00643   <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">short</span> Int16;
-<a name="l00644"></a>00644   <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">int</span> Int32;
-<a name="l00645"></a>00645   <span class="keyword">typedef</span> <span class="keywordtype">float</span> Float32;
-<a name="l00646"></a>00646   <span class="keyword">typedef</span> <span class="keywordtype">double</span> Float64;
+<a name="l00600"></a>00600   <span class="keyword">enum</span> StreamState {
+<a name="l00601"></a>00601     STREAM_STOPPED,
+<a name="l00602"></a>00602     STREAM_RUNNING,
+<a name="l00603"></a>00603     STREAM_CLOSED = -50
+<a name="l00604"></a>00604   };
+<a name="l00605"></a>00605 
+<a name="l00606"></a>00606   <span class="keyword">enum</span> StreamMode {
+<a name="l00607"></a>00607     OUTPUT,
+<a name="l00608"></a>00608     INPUT,
+<a name="l00609"></a>00609     DUPLEX,
+<a name="l00610"></a>00610     UNINITIALIZED = -75
+<a name="l00611"></a>00611   };
+<a name="l00612"></a>00612 
+<a name="l00613"></a>00613   <span class="comment">// A protected structure used for buffer conversion.</span>
+<a name="l00614"></a>00614   <span class="keyword">struct </span>ConvertInfo {
+<a name="l00615"></a>00615     <span class="keywordtype">int</span> channels;
+<a name="l00616"></a>00616     <span class="keywordtype">int</span> inJump, outJump;
+<a name="l00617"></a>00617     <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> inFormat, outFormat;
+<a name="l00618"></a>00618     std::vector&lt;int&gt; inOffset;
+<a name="l00619"></a>00619     std::vector&lt;int&gt; outOffset;
+<a name="l00620"></a>00620   };
+<a name="l00621"></a>00621 
+<a name="l00622"></a>00622   <span class="comment">// A protected structure for audio streams.</span>
+<a name="l00623"></a>00623   <span class="keyword">struct </span>RtApiStream {
+<a name="l00624"></a>00624     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device[2];    <span class="comment">// Playback and record, respectively.</span>
+<a name="l00625"></a>00625     <span class="keywordtype">void</span> *apiHandle;           <span class="comment">// void pointer for API specific stream handle information</span>
+<a name="l00626"></a>00626     StreamMode mode;           <span class="comment">// OUTPUT, INPUT, or DUPLEX.</span>
+<a name="l00627"></a>00627     StreamState state;         <span class="comment">// STOPPED, RUNNING, or CLOSED</span>
+<a name="l00628"></a>00628     <span class="keywordtype">char</span> *userBuffer[2];       <span class="comment">// Playback and record, respectively.</span>
+<a name="l00629"></a>00629     <span class="keywordtype">char</span> *deviceBuffer;
+<a name="l00630"></a>00630     <span class="keywordtype">bool</span> doConvertBuffer[2];   <span class="comment">// Playback and record, respectively.</span>
+<a name="l00631"></a>00631     <span class="keywordtype">bool</span> userInterleaved;
+<a name="l00632"></a>00632     <span class="keywordtype">bool</span> deviceInterleaved[2]; <span class="comment">// Playback and record, respectively.</span>
+<a name="l00633"></a>00633     <span class="keywordtype">bool</span> doByteSwap[2];        <span class="comment">// Playback and record, respectively.</span>
+<a name="l00634"></a>00634     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate;
+<a name="l00635"></a>00635     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> bufferSize;
+<a name="l00636"></a>00636     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nBuffers;
+<a name="l00637"></a>00637     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nUserChannels[2];    <span class="comment">// Playback and record, respectively.</span>
+<a name="l00638"></a>00638     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nDeviceChannels[2];  <span class="comment">// Playback and record channels, respectively.</span>
+<a name="l00639"></a>00639     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channelOffset[2];    <span class="comment">// Playback and record, respectively.</span>
+<a name="l00640"></a>00640     <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> latency[2];         <span class="comment">// Playback and record, respectively.</span>
+<a name="l00641"></a>00641     <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> userFormat;
+<a name="l00642"></a>00642     <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> deviceFormat[2];    <span class="comment">// Playback and record, respectively.</span>
+<a name="l00643"></a>00643     StreamMutex mutex;
+<a name="l00644"></a>00644     CallbackInfo callbackInfo;
+<a name="l00645"></a>00645     ConvertInfo convertInfo[2];
+<a name="l00646"></a>00646     <span class="keywordtype">double</span> streamTime;         <span class="comment">// Number of elapsed seconds since the stream started.</span>
 <a name="l00647"></a>00647 
-<a name="l00648"></a>00648   std::ostringstream errorStream_;
-<a name="l00649"></a>00649   std::string errorText_;
-<a name="l00650"></a>00650   <span class="keywordtype">bool</span> showWarnings_;
-<a name="l00651"></a>00651   RtApiStream stream_;
-<a name="l00652"></a>00652 
-<a name="l00660"></a>00660   <span class="keyword">virtual</span> <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00661"></a>00661                                 <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00662"></a>00662                                 <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00663"></a>00663                                 <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00664"></a>00664 
-<a name="l00666"></a>00666   <span class="keywordtype">void</span> tickStreamTime( <span class="keywordtype">void</span> );
-<a name="l00667"></a>00667 
-<a name="l00669"></a>00669   <span class="keywordtype">void</span> clearStreamInfo();
-<a name="l00670"></a>00670 
-<a name="l00675"></a>00675   <span class="keywordtype">void</span> verifyStream( <span class="keywordtype">void</span> );
-<a name="l00676"></a>00676 
-<a name="l00678"></a>00678   <span class="keywordtype">void</span> error( <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903ac" title="Defined RtError types.">RtError::Type</a> type );
-<a name="l00679"></a>00679 
-<a name="l00684"></a>00684   <span class="keywordtype">void</span> convertBuffer( <span class="keywordtype">char</span> *outBuffer, <span class="keywordtype">char</span> *inBuffer, ConvertInfo &amp;info );
-<a name="l00685"></a>00685 
-<a name="l00687"></a>00687   <span class="keywordtype">void</span> byteSwapBuffer( <span class="keywordtype">char</span> *buffer, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> samples, <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format );
-<a name="l00688"></a>00688 
-<a name="l00690"></a>00690   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> formatBytes( <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format );
-<a name="l00691"></a>00691 
-<a name="l00693"></a>00693   <span class="keywordtype">void</span> setConvertInfo( StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel );
-<a name="l00694"></a>00694 };
-<a name="l00695"></a>00695 
-<a name="l00696"></a>00696 <span class="comment">// **************************************************************** //</span>
-<a name="l00697"></a>00697 <span class="comment">//</span>
-<a name="l00698"></a>00698 <span class="comment">// Inline RtAudio definitions.</span>
-<a name="l00699"></a>00699 <span class="comment">//</span>
-<a name="l00700"></a>00700 <span class="comment">// **************************************************************** //</span>
+<a name="l00648"></a>00648 <span class="preprocessor">#if defined(HAVE_GETTIMEOFDAY)</span>
+<a name="l00649"></a>00649 <span class="preprocessor"></span>    <span class="keyword">struct </span>timeval lastTickTimestamp;
+<a name="l00650"></a>00650 <span class="preprocessor">#endif</span>
+<a name="l00651"></a>00651 <span class="preprocessor"></span>
+<a name="l00652"></a>00652     RtApiStream()
+<a name="l00653"></a>00653       :apiHandle(0), deviceBuffer(0) { device[0] = 11111; device[1] = 11111; }
+<a name="l00654"></a>00654   };
+<a name="l00655"></a>00655 
+<a name="l00656"></a>00656   <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">short</span> Int16;
+<a name="l00657"></a>00657   <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">int</span> Int32;
+<a name="l00658"></a>00658   <span class="keyword">typedef</span> <span class="keywordtype">float</span> Float32;
+<a name="l00659"></a>00659   <span class="keyword">typedef</span> <span class="keywordtype">double</span> Float64;
+<a name="l00660"></a>00660 
+<a name="l00661"></a>00661   std::ostringstream errorStream_;
+<a name="l00662"></a>00662   std::string errorText_;
+<a name="l00663"></a>00663   <span class="keywordtype">bool</span> showWarnings_;
+<a name="l00664"></a>00664   RtApiStream stream_;
+<a name="l00665"></a>00665 
+<a name="l00673"></a>00673   <span class="keyword">virtual</span> <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
+<a name="l00674"></a>00674                                 <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
+<a name="l00675"></a>00675                                 <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
+<a name="l00676"></a>00676                                 <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
+<a name="l00677"></a>00677 
+<a name="l00679"></a>00679   <span class="keywordtype">void</span> tickStreamTime( <span class="keywordtype">void</span> );
+<a name="l00680"></a>00680 
+<a name="l00682"></a>00682   <span class="keywordtype">void</span> clearStreamInfo();
+<a name="l00683"></a>00683 
+<a name="l00688"></a>00688   <span class="keywordtype">void</span> verifyStream( <span class="keywordtype">void</span> );
+<a name="l00689"></a>00689 
+<a name="l00691"></a>00691   <span class="keywordtype">void</span> error( <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903ac" title="Defined RtError types.">RtError::Type</a> type );
+<a name="l00692"></a>00692 
+<a name="l00697"></a>00697   <span class="keywordtype">void</span> convertBuffer( <span class="keywordtype">char</span> *outBuffer, <span class="keywordtype">char</span> *inBuffer, ConvertInfo &amp;info );
+<a name="l00698"></a>00698 
+<a name="l00700"></a>00700   <span class="keywordtype">void</span> byteSwapBuffer( <span class="keywordtype">char</span> *buffer, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> samples, <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format );
 <a name="l00701"></a>00701 
-<a name="l00702"></a><a class="code" href="classRtAudio.html#a83687634795792b2c47e4ae1cf8a5246">00702</a> <span class="keyword">inline</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> <a class="code" href="classRtAudio.html#a83687634795792b2c47e4ae1cf8a5246" title="Returns the audio API specifier for the current instance of RtAudio.">RtAudio :: getCurrentApi</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getCurrentApi(); }
-<a name="l00703"></a><a class="code" href="classRtAudio.html#a747ce2d73803641bbb66d6e78092aa1a">00703</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a747ce2d73803641bbb66d6e78092aa1a" title="A public function that queries for the number of audio devices available.">RtAudio :: getDeviceCount</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getDeviceCount(); }
-<a name="l00704"></a><a class="code" href="classRtAudio.html#a02d7ff44ad1d7eae22283a052f3dfda8">00704</a> <span class="keyword">inline</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> <a class="code" href="classRtAudio.html#a02d7ff44ad1d7eae22283a052f3dfda8" title="Return an RtAudio::DeviceInfo structure for a specified device number.">RtAudio :: getDeviceInfo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device ) { <span class="keywordflow">return</span> rtapi_-&gt;getDeviceInfo( device ); }
-<a name="l00705"></a><a class="code" href="classRtAudio.html#aad8b94edd3cd379ee300b125750ac6ce">00705</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#aad8b94edd3cd379ee300b125750ac6ce" title="A function that returns the index of the default input device.">RtAudio :: getDefaultInputDevice</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getDefaultInputDevice(); }
-<a name="l00706"></a><a class="code" href="classRtAudio.html#a3a3f3dbe13ea696b521e49cdaaa357bc">00706</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a3a3f3dbe13ea696b521e49cdaaa357bc" title="A function that returns the index of the default output device.">RtAudio :: getDefaultOutputDevice</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getDefaultOutputDevice(); }
-<a name="l00707"></a><a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a">00707</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">RtAudio :: closeStream</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;closeStream(); }
-<a name="l00708"></a><a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80">00708</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">RtAudio :: startStream</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;startStream(); }
-<a name="l00709"></a><a class="code" href="classRtAudio.html#af4c241ff86936ecc8108f0d9dfe3efdd">00709</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af4c241ff86936ecc8108f0d9dfe3efdd" title="Stop a stream, allowing any samples remaining in the output queue to be played.">RtAudio :: stopStream</a>( <span class="keywordtype">void</span> )  { <span class="keywordflow">return</span> rtapi_-&gt;stopStream(); }
-<a name="l00710"></a><a class="code" href="classRtAudio.html#ad0586b47cd6bb9591a80b4052815991f">00710</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ad0586b47cd6bb9591a80b4052815991f" title="Stop a stream, discarding any samples remaining in the input/output queue.">RtAudio :: abortStream</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;abortStream(); }
-<a name="l00711"></a><a class="code" href="classRtAudio.html#a3863e45ff81dbe97176de0ee7545917f">00711</a> <span class="keyword">inline</span> <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a3863e45ff81dbe97176de0ee7545917f" title="Returns true if a stream is open and false if not.">RtAudio :: isStreamOpen</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span> throw() { <span class="keywordflow">return</span> rtapi_-&gt;isStreamOpen(); }
-<a name="l00712"></a><a class="code" href="classRtAudio.html#a84cc8d9b7ab9bc5f37bcf48430ec5aea">00712</a> <span class="keyword">inline</span> <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a84cc8d9b7ab9bc5f37bcf48430ec5aea" title="Returns true if the stream is running and false if it is stopped or not open.">RtAudio :: isStreamRunning</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span> throw() { <span class="keywordflow">return</span> rtapi_-&gt;isStreamRunning(); }
-<a name="l00713"></a><a class="code" href="classRtAudio.html#a843c989d9f501c71bc2f2c5ca18df9f3">00713</a> <span class="keyword">inline</span> <span class="keywordtype">long</span> <a class="code" href="classRtAudio.html#a843c989d9f501c71bc2f2c5ca18df9f3" title="Returns the internal stream latency in sample frames.">RtAudio :: getStreamLatency</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;getStreamLatency(); }
-<a name="l00714"></a><a class="code" href="classRtAudio.html#a28214b8b05d60b45c24ee6fae7b2a0b5">00714</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a28214b8b05d60b45c24ee6fae7b2a0b5" title="Returns actual sample rate in use by the stream.">RtAudio :: getStreamSampleRate</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;getStreamSampleRate(); };
-<a name="l00715"></a><a class="code" href="classRtAudio.html#a344e59a62353c5791db4621b985cb2ca">00715</a> <span class="keyword">inline</span> <span class="keywordtype">double</span> <a class="code" href="classRtAudio.html#a344e59a62353c5791db4621b985cb2ca" title="Returns the number of elapsed seconds since the stream was started.">RtAudio :: getStreamTime</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;getStreamTime(); }
-<a name="l00716"></a><a class="code" href="classRtAudio.html#af0752ee51cce3dd90a3bd009f9fdbe77">00716</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af0752ee51cce3dd90a3bd009f9fdbe77" title="Specify whether warning messages should be printed to stderr.">RtAudio :: showWarnings</a>( <span class="keywordtype">bool</span> value ) <span class="keywordflow">throw</span>() { rtapi_-&gt;showWarnings( value ); }
-<a name="l00717"></a>00717 
-<a name="l00718"></a>00718 <span class="comment">// RtApi Subclass prototypes.</span>
-<a name="l00719"></a>00719 
-<a name="l00720"></a>00720 <span class="preprocessor">#if defined(__MACOSX_CORE__)</span>
-<a name="l00721"></a>00721 <span class="preprocessor"></span>
-<a name="l00722"></a>00722 <span class="preprocessor">#include &lt;CoreAudio/AudioHardware.h&gt;</span>
-<a name="l00723"></a>00723 
-<a name="l00724"></a>00724 <span class="keyword">class </span>RtApiCore: <span class="keyword">public</span> RtApi
-<a name="l00725"></a>00725 {
-<a name="l00726"></a>00726 <span class="keyword">public</span>:
-<a name="l00727"></a>00727 
-<a name="l00728"></a>00728   RtApiCore();
-<a name="l00729"></a>00729   ~RtApiCore();
-<a name="l00730"></a>00730   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a9fec92b8272244a87a6a11a717bd662d">RtAudio::MACOSX_CORE</a>; };
-<a name="l00731"></a>00731   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00732"></a>00732   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00733"></a>00733   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultOutputDevice( <span class="keywordtype">void</span> );
-<a name="l00734"></a>00734   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultInputDevice( <span class="keywordtype">void</span> );
-<a name="l00735"></a>00735   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00736"></a>00736   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00737"></a>00737   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00738"></a>00738   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00739"></a>00739   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
+<a name="l00703"></a>00703   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> formatBytes( <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format );
+<a name="l00704"></a>00704 
+<a name="l00706"></a>00706   <span class="keywordtype">void</span> setConvertInfo( StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel );
+<a name="l00707"></a>00707 };
+<a name="l00708"></a>00708 
+<a name="l00709"></a>00709 <span class="comment">// **************************************************************** //</span>
+<a name="l00710"></a>00710 <span class="comment">//</span>
+<a name="l00711"></a>00711 <span class="comment">// Inline RtAudio definitions.</span>
+<a name="l00712"></a>00712 <span class="comment">//</span>
+<a name="l00713"></a>00713 <span class="comment">// **************************************************************** //</span>
+<a name="l00714"></a>00714 
+<a name="l00715"></a><a class="code" href="classRtAudio.html#a83687634795792b2c47e4ae1cf8a5246">00715</a> <span class="keyword">inline</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> <a class="code" href="classRtAudio.html#a83687634795792b2c47e4ae1cf8a5246" title="Returns the audio API specifier for the current instance of RtAudio.">RtAudio :: getCurrentApi</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getCurrentApi(); }
+<a name="l00716"></a><a class="code" href="classRtAudio.html#a747ce2d73803641bbb66d6e78092aa1a">00716</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a747ce2d73803641bbb66d6e78092aa1a" title="A public function that queries for the number of audio devices available.">RtAudio :: getDeviceCount</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getDeviceCount(); }
+<a name="l00717"></a><a class="code" href="classRtAudio.html#a02d7ff44ad1d7eae22283a052f3dfda8">00717</a> <span class="keyword">inline</span> <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> <a class="code" href="classRtAudio.html#a02d7ff44ad1d7eae22283a052f3dfda8" title="Return an RtAudio::DeviceInfo structure for a specified device number.">RtAudio :: getDeviceInfo</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device ) { <span class="keywordflow">return</span> rtapi_-&gt;getDeviceInfo( device ); }
+<a name="l00718"></a><a class="code" href="classRtAudio.html#aad8b94edd3cd379ee300b125750ac6ce">00718</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#aad8b94edd3cd379ee300b125750ac6ce" title="A function that returns the index of the default input device.">RtAudio :: getDefaultInputDevice</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getDefaultInputDevice(); }
+<a name="l00719"></a><a class="code" href="classRtAudio.html#a3a3f3dbe13ea696b521e49cdaaa357bc">00719</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a3a3f3dbe13ea696b521e49cdaaa357bc" title="A function that returns the index of the default output device.">RtAudio :: getDefaultOutputDevice</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;getDefaultOutputDevice(); }
+<a name="l00720"></a><a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a">00720</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">RtAudio :: closeStream</a>( <span class="keywordtype">void</span> ) throw() { <span class="keywordflow">return</span> rtapi_-&gt;closeStream(); }
+<a name="l00721"></a><a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80">00721</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">RtAudio :: startStream</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;startStream(); }
+<a name="l00722"></a><a class="code" href="classRtAudio.html#af4c241ff86936ecc8108f0d9dfe3efdd">00722</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af4c241ff86936ecc8108f0d9dfe3efdd" title="Stop a stream, allowing any samples remaining in the output queue to be played.">RtAudio :: stopStream</a>( <span class="keywordtype">void</span> )  { <span class="keywordflow">return</span> rtapi_-&gt;stopStream(); }
+<a name="l00723"></a><a class="code" href="classRtAudio.html#ad0586b47cd6bb9591a80b4052815991f">00723</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#ad0586b47cd6bb9591a80b4052815991f" title="Stop a stream, discarding any samples remaining in the input/output queue.">RtAudio :: abortStream</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;abortStream(); }
+<a name="l00724"></a><a class="code" href="classRtAudio.html#a3863e45ff81dbe97176de0ee7545917f">00724</a> <span class="keyword">inline</span> <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a3863e45ff81dbe97176de0ee7545917f" title="Returns true if a stream is open and false if not.">RtAudio :: isStreamOpen</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span> throw() { <span class="keywordflow">return</span> rtapi_-&gt;isStreamOpen(); }
+<a name="l00725"></a><a class="code" href="classRtAudio.html#a84cc8d9b7ab9bc5f37bcf48430ec5aea">00725</a> <span class="keyword">inline</span> <span class="keywordtype">bool</span> <a class="code" href="classRtAudio.html#a84cc8d9b7ab9bc5f37bcf48430ec5aea" title="Returns true if the stream is running and false if it is stopped or not open.">RtAudio :: isStreamRunning</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span> throw() { <span class="keywordflow">return</span> rtapi_-&gt;isStreamRunning(); }
+<a name="l00726"></a><a class="code" href="classRtAudio.html#a843c989d9f501c71bc2f2c5ca18df9f3">00726</a> <span class="keyword">inline</span> <span class="keywordtype">long</span> <a class="code" href="classRtAudio.html#a843c989d9f501c71bc2f2c5ca18df9f3" title="Returns the internal stream latency in sample frames.">RtAudio :: getStreamLatency</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;getStreamLatency(); }
+<a name="l00727"></a><a class="code" href="classRtAudio.html#a28214b8b05d60b45c24ee6fae7b2a0b5">00727</a> <span class="keyword">inline</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtAudio.html#a28214b8b05d60b45c24ee6fae7b2a0b5" title="Returns actual sample rate in use by the stream.">RtAudio :: getStreamSampleRate</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;getStreamSampleRate(); };
+<a name="l00728"></a><a class="code" href="classRtAudio.html#a344e59a62353c5791db4621b985cb2ca">00728</a> <span class="keyword">inline</span> <span class="keywordtype">double</span> <a class="code" href="classRtAudio.html#a344e59a62353c5791db4621b985cb2ca" title="Returns the number of elapsed seconds since the stream was started.">RtAudio :: getStreamTime</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> rtapi_-&gt;getStreamTime(); }
+<a name="l00729"></a><a class="code" href="classRtAudio.html#af0752ee51cce3dd90a3bd009f9fdbe77">00729</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classRtAudio.html#af0752ee51cce3dd90a3bd009f9fdbe77" title="Specify whether warning messages should be printed to stderr.">RtAudio :: showWarnings</a>( <span class="keywordtype">bool</span> value ) <span class="keywordflow">throw</span>() { rtapi_-&gt;showWarnings( value ); }
+<a name="l00730"></a>00730 
+<a name="l00731"></a>00731 <span class="comment">// RtApi Subclass prototypes.</span>
+<a name="l00732"></a>00732 
+<a name="l00733"></a>00733 <span class="preprocessor">#if defined(__MACOSX_CORE__)</span>
+<a name="l00734"></a>00734 <span class="preprocessor"></span>
+<a name="l00735"></a>00735 <span class="preprocessor">#include &lt;CoreAudio/AudioHardware.h&gt;</span>
+<a name="l00736"></a>00736 
+<a name="l00737"></a>00737 <span class="keyword">class </span>RtApiCore: <span class="keyword">public</span> RtApi
+<a name="l00738"></a>00738 {
+<a name="l00739"></a>00739 <span class="keyword">public</span>:
 <a name="l00740"></a>00740 
-<a name="l00741"></a>00741   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00742"></a>00742   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00743"></a>00743   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00744"></a>00744   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00745"></a>00745   <span class="keywordtype">bool</span> callbackEvent( AudioDeviceID deviceId,
-<a name="l00746"></a>00746                       <span class="keyword">const</span> AudioBufferList *inBufferList,
-<a name="l00747"></a>00747                       <span class="keyword">const</span> AudioBufferList *outBufferList );
-<a name="l00748"></a>00748 
-<a name="l00749"></a>00749   <span class="keyword">private</span>:
-<a name="l00750"></a>00750 
-<a name="l00751"></a>00751   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00752"></a>00752                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00753"></a>00753                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00754"></a>00754                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00755"></a>00755   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* getErrorCode( OSStatus code );
-<a name="l00756"></a>00756 };
-<a name="l00757"></a>00757 
-<a name="l00758"></a>00758 <span class="preprocessor">#endif</span>
-<a name="l00759"></a>00759 <span class="preprocessor"></span>
-<a name="l00760"></a>00760 <span class="preprocessor">#if defined(__UNIX_JACK__)</span>
-<a name="l00761"></a>00761 <span class="preprocessor"></span>
-<a name="l00762"></a>00762 <span class="keyword">class </span>RtApiJack: <span class="keyword">public</span> RtApi
-<a name="l00763"></a>00763 {
-<a name="l00764"></a>00764 <span class="keyword">public</span>:
-<a name="l00765"></a>00765 
-<a name="l00766"></a>00766   RtApiJack();
-<a name="l00767"></a>00767   ~RtApiJack();
-<a name="l00768"></a>00768   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a4767e17c6edfbd827f91763915df4105">RtAudio::UNIX_JACK</a>; };
-<a name="l00769"></a>00769   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00770"></a>00770   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00771"></a>00771   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00772"></a>00772   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00773"></a>00773   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00774"></a>00774   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00775"></a>00775   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
-<a name="l00776"></a>00776 
-<a name="l00777"></a>00777   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00778"></a>00778   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00779"></a>00779   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00780"></a>00780   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00781"></a>00781   <span class="keywordtype">bool</span> callbackEvent( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> nframes );
-<a name="l00782"></a>00782 
-<a name="l00783"></a>00783   <span class="keyword">private</span>:
-<a name="l00784"></a>00784 
-<a name="l00785"></a>00785   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00786"></a>00786                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00787"></a>00787                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00788"></a>00788                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00789"></a>00789 };
-<a name="l00790"></a>00790 
-<a name="l00791"></a>00791 <span class="preprocessor">#endif</span>
-<a name="l00792"></a>00792 <span class="preprocessor"></span>
-<a name="l00793"></a>00793 <span class="preprocessor">#if defined(__WINDOWS_ASIO__)</span>
-<a name="l00794"></a>00794 <span class="preprocessor"></span>
-<a name="l00795"></a>00795 <span class="keyword">class </span>RtApiAsio: <span class="keyword">public</span> RtApi
-<a name="l00796"></a>00796 {
-<a name="l00797"></a>00797 <span class="keyword">public</span>:
-<a name="l00798"></a>00798 
-<a name="l00799"></a>00799   RtApiAsio();
-<a name="l00800"></a>00800   ~RtApiAsio();
-<a name="l00801"></a>00801   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a219517d1df90f94d07758481155bd469">RtAudio::WINDOWS_ASIO</a>; };
-<a name="l00802"></a>00802   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00803"></a>00803   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00804"></a>00804   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00805"></a>00805   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00806"></a>00806   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00807"></a>00807   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00808"></a>00808   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
-<a name="l00809"></a>00809 
-<a name="l00810"></a>00810   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00811"></a>00811   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00812"></a>00812   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00813"></a>00813   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00814"></a>00814   <span class="keywordtype">bool</span> callbackEvent( <span class="keywordtype">long</span> bufferIndex );
-<a name="l00815"></a>00815 
-<a name="l00816"></a>00816   <span class="keyword">private</span>:
-<a name="l00817"></a>00817 
-<a name="l00818"></a>00818   std::vector&lt;RtAudio::DeviceInfo&gt; devices_;
-<a name="l00819"></a>00819   <span class="keywordtype">void</span> saveDeviceInfo( <span class="keywordtype">void</span> );
-<a name="l00820"></a>00820   <span class="keywordtype">bool</span> coInitialized_;
-<a name="l00821"></a>00821   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00822"></a>00822                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00823"></a>00823                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00824"></a>00824                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00825"></a>00825 };
-<a name="l00826"></a>00826 
-<a name="l00827"></a>00827 <span class="preprocessor">#endif</span>
-<a name="l00828"></a>00828 <span class="preprocessor"></span>
-<a name="l00829"></a>00829 <span class="preprocessor">#if defined(__WINDOWS_DS__)</span>
-<a name="l00830"></a>00830 <span class="preprocessor"></span>
-<a name="l00831"></a>00831 <span class="keyword">class </span>RtApiDs: <span class="keyword">public</span> RtApi
-<a name="l00832"></a>00832 {
-<a name="l00833"></a>00833 <span class="keyword">public</span>:
-<a name="l00834"></a>00834 
-<a name="l00835"></a>00835   RtApiDs();
-<a name="l00836"></a>00836   ~RtApiDs();
-<a name="l00837"></a>00837   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a28478830f42c2fd61e6c7ad498901931">RtAudio::WINDOWS_DS</a>; };
-<a name="l00838"></a>00838   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00839"></a>00839   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultOutputDevice( <span class="keywordtype">void</span> );
-<a name="l00840"></a>00840   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultInputDevice( <span class="keywordtype">void</span> );
-<a name="l00841"></a>00841   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00842"></a>00842   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00843"></a>00843   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00844"></a>00844   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00845"></a>00845   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00846"></a>00846   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
+<a name="l00741"></a>00741   RtApiCore();
+<a name="l00742"></a>00742   ~RtApiCore();
+<a name="l00743"></a>00743   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a9fec92b8272244a87a6a11a717bd662d">RtAudio::MACOSX_CORE</a>; };
+<a name="l00744"></a>00744   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
+<a name="l00745"></a>00745   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
+<a name="l00746"></a>00746   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultOutputDevice( <span class="keywordtype">void</span> );
+<a name="l00747"></a>00747   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultInputDevice( <span class="keywordtype">void</span> );
+<a name="l00748"></a>00748   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
+<a name="l00749"></a>00749   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
+<a name="l00750"></a>00750   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
+<a name="l00751"></a>00751   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
+<a name="l00752"></a>00752   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
+<a name="l00753"></a>00753 
+<a name="l00754"></a>00754   <span class="comment">// This function is intended for internal use only.  It must be</span>
+<a name="l00755"></a>00755   <span class="comment">// public because it is called by the internal callback handler,</span>
+<a name="l00756"></a>00756   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
+<a name="l00757"></a>00757   <span class="comment">// will most likely produce highly undesireable results!</span>
+<a name="l00758"></a>00758   <span class="keywordtype">bool</span> callbackEvent( AudioDeviceID deviceId,
+<a name="l00759"></a>00759                       <span class="keyword">const</span> AudioBufferList *inBufferList,
+<a name="l00760"></a>00760                       <span class="keyword">const</span> AudioBufferList *outBufferList );
+<a name="l00761"></a>00761 
+<a name="l00762"></a>00762   <span class="keyword">private</span>:
+<a name="l00763"></a>00763 
+<a name="l00764"></a>00764   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
+<a name="l00765"></a>00765                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
+<a name="l00766"></a>00766                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
+<a name="l00767"></a>00767                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
+<a name="l00768"></a>00768   <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* getErrorCode( OSStatus code );
+<a name="l00769"></a>00769 };
+<a name="l00770"></a>00770 
+<a name="l00771"></a>00771 <span class="preprocessor">#endif</span>
+<a name="l00772"></a>00772 <span class="preprocessor"></span>
+<a name="l00773"></a>00773 <span class="preprocessor">#if defined(__UNIX_JACK__)</span>
+<a name="l00774"></a>00774 <span class="preprocessor"></span>
+<a name="l00775"></a>00775 <span class="keyword">class </span>RtApiJack: <span class="keyword">public</span> RtApi
+<a name="l00776"></a>00776 {
+<a name="l00777"></a>00777 <span class="keyword">public</span>:
+<a name="l00778"></a>00778 
+<a name="l00779"></a>00779   RtApiJack();
+<a name="l00780"></a>00780   ~RtApiJack();
+<a name="l00781"></a>00781   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a4767e17c6edfbd827f91763915df4105">RtAudio::UNIX_JACK</a>; };
+<a name="l00782"></a>00782   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
+<a name="l00783"></a>00783   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
+<a name="l00784"></a>00784   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
+<a name="l00785"></a>00785   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
+<a name="l00786"></a>00786   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
+<a name="l00787"></a>00787   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
+<a name="l00788"></a>00788   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
+<a name="l00789"></a>00789 
+<a name="l00790"></a>00790   <span class="comment">// This function is intended for internal use only.  It must be</span>
+<a name="l00791"></a>00791   <span class="comment">// public because it is called by the internal callback handler,</span>
+<a name="l00792"></a>00792   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
+<a name="l00793"></a>00793   <span class="comment">// will most likely produce highly undesireable results!</span>
+<a name="l00794"></a>00794   <span class="keywordtype">bool</span> callbackEvent( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> nframes );
+<a name="l00795"></a>00795 
+<a name="l00796"></a>00796   <span class="keyword">private</span>:
+<a name="l00797"></a>00797 
+<a name="l00798"></a>00798   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
+<a name="l00799"></a>00799                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
+<a name="l00800"></a>00800                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
+<a name="l00801"></a>00801                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
+<a name="l00802"></a>00802 };
+<a name="l00803"></a>00803 
+<a name="l00804"></a>00804 <span class="preprocessor">#endif</span>
+<a name="l00805"></a>00805 <span class="preprocessor"></span>
+<a name="l00806"></a>00806 <span class="preprocessor">#if defined(__WINDOWS_ASIO__)</span>
+<a name="l00807"></a>00807 <span class="preprocessor"></span>
+<a name="l00808"></a>00808 <span class="keyword">class </span>RtApiAsio: <span class="keyword">public</span> RtApi
+<a name="l00809"></a>00809 {
+<a name="l00810"></a>00810 <span class="keyword">public</span>:
+<a name="l00811"></a>00811 
+<a name="l00812"></a>00812   RtApiAsio();
+<a name="l00813"></a>00813   ~RtApiAsio();
+<a name="l00814"></a>00814   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a219517d1df90f94d07758481155bd469">RtAudio::WINDOWS_ASIO</a>; };
+<a name="l00815"></a>00815   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
+<a name="l00816"></a>00816   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
+<a name="l00817"></a>00817   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
+<a name="l00818"></a>00818   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
+<a name="l00819"></a>00819   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
+<a name="l00820"></a>00820   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
+<a name="l00821"></a>00821   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
+<a name="l00822"></a>00822 
+<a name="l00823"></a>00823   <span class="comment">// This function is intended for internal use only.  It must be</span>
+<a name="l00824"></a>00824   <span class="comment">// public because it is called by the internal callback handler,</span>
+<a name="l00825"></a>00825   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
+<a name="l00826"></a>00826   <span class="comment">// will most likely produce highly undesireable results!</span>
+<a name="l00827"></a>00827   <span class="keywordtype">bool</span> callbackEvent( <span class="keywordtype">long</span> bufferIndex );
+<a name="l00828"></a>00828 
+<a name="l00829"></a>00829   <span class="keyword">private</span>:
+<a name="l00830"></a>00830 
+<a name="l00831"></a>00831   std::vector&lt;RtAudio::DeviceInfo&gt; devices_;
+<a name="l00832"></a>00832   <span class="keywordtype">void</span> saveDeviceInfo( <span class="keywordtype">void</span> );
+<a name="l00833"></a>00833   <span class="keywordtype">bool</span> coInitialized_;
+<a name="l00834"></a>00834   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
+<a name="l00835"></a>00835                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
+<a name="l00836"></a>00836                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
+<a name="l00837"></a>00837                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
+<a name="l00838"></a>00838 };
+<a name="l00839"></a>00839 
+<a name="l00840"></a>00840 <span class="preprocessor">#endif</span>
+<a name="l00841"></a>00841 <span class="preprocessor"></span>
+<a name="l00842"></a>00842 <span class="preprocessor">#if defined(__WINDOWS_DS__)</span>
+<a name="l00843"></a>00843 <span class="preprocessor"></span>
+<a name="l00844"></a>00844 <span class="keyword">class </span>RtApiDs: <span class="keyword">public</span> RtApi
+<a name="l00845"></a>00845 {
+<a name="l00846"></a>00846 <span class="keyword">public</span>:
 <a name="l00847"></a>00847 
-<a name="l00848"></a>00848   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00849"></a>00849   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00850"></a>00850   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00851"></a>00851   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00852"></a>00852   <span class="keywordtype">void</span> callbackEvent( <span class="keywordtype">void</span> );
-<a name="l00853"></a>00853 
-<a name="l00854"></a>00854   <span class="keyword">private</span>:
-<a name="l00855"></a>00855 
-<a name="l00856"></a>00856   <span class="keywordtype">bool</span> coInitialized_;
-<a name="l00857"></a>00857   <span class="keywordtype">bool</span> buffersRolling;
-<a name="l00858"></a>00858   <span class="keywordtype">long</span> duplexPrerollBytes;
-<a name="l00859"></a>00859   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00860"></a>00860                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00861"></a>00861                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00862"></a>00862                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00863"></a>00863 };
-<a name="l00864"></a>00864 
-<a name="l00865"></a>00865 <span class="preprocessor">#endif</span>
-<a name="l00866"></a>00866 <span class="preprocessor"></span>
-<a name="l00867"></a>00867 <span class="preprocessor">#if defined(__LINUX_ALSA__)</span>
-<a name="l00868"></a>00868 <span class="preprocessor"></span>
-<a name="l00869"></a>00869 <span class="keyword">class </span>RtApiAlsa: <span class="keyword">public</span> RtApi
-<a name="l00870"></a>00870 {
-<a name="l00871"></a>00871 <span class="keyword">public</span>:
-<a name="l00872"></a>00872 
-<a name="l00873"></a>00873   RtApiAlsa();
-<a name="l00874"></a>00874   ~RtApiAlsa();
-<a name="l00875"></a>00875   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi() { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa7a2ba095c2806caa893b6fb8fc3a1a8">RtAudio::LINUX_ALSA</a>; };
-<a name="l00876"></a>00876   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00877"></a>00877   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00878"></a>00878   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00879"></a>00879   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00880"></a>00880   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00881"></a>00881   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00882"></a>00882 
-<a name="l00883"></a>00883   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00884"></a>00884   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00885"></a>00885   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00886"></a>00886   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00887"></a>00887   <span class="keywordtype">void</span> callbackEvent( <span class="keywordtype">void</span> );
-<a name="l00888"></a>00888 
-<a name="l00889"></a>00889   <span class="keyword">private</span>:
-<a name="l00890"></a>00890 
-<a name="l00891"></a>00891   std::vector&lt;RtAudio::DeviceInfo&gt; devices_;
-<a name="l00892"></a>00892   <span class="keywordtype">void</span> saveDeviceInfo( <span class="keywordtype">void</span> );
-<a name="l00893"></a>00893   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00894"></a>00894                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00895"></a>00895                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00896"></a>00896                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00897"></a>00897 };
-<a name="l00898"></a>00898 
-<a name="l00899"></a>00899 <span class="preprocessor">#endif</span>
-<a name="l00900"></a>00900 <span class="preprocessor"></span>
-<a name="l00901"></a>00901 <span class="preprocessor">#if defined(__LINUX_OSS__)</span>
-<a name="l00902"></a>00902 <span class="preprocessor"></span>
-<a name="l00903"></a>00903 <span class="keyword">class </span>RtApiOss: <span class="keyword">public</span> RtApi
-<a name="l00904"></a>00904 {
-<a name="l00905"></a>00905 <span class="keyword">public</span>:
-<a name="l00906"></a>00906 
-<a name="l00907"></a>00907   RtApiOss();
-<a name="l00908"></a>00908   ~RtApiOss();
-<a name="l00909"></a>00909   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi() { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a39c84615e61de75e6a4e865596d62c82">RtAudio::LINUX_OSS</a>; };
-<a name="l00910"></a>00910   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
-<a name="l00911"></a>00911   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
-<a name="l00912"></a>00912   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
-<a name="l00913"></a>00913   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
-<a name="l00914"></a>00914   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
-<a name="l00915"></a>00915   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
-<a name="l00916"></a>00916 
-<a name="l00917"></a>00917   <span class="comment">// This function is intended for internal use only.  It must be</span>
-<a name="l00918"></a>00918   <span class="comment">// public because it is called by the internal callback handler,</span>
-<a name="l00919"></a>00919   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
-<a name="l00920"></a>00920   <span class="comment">// will most likely produce highly undesireable results!</span>
-<a name="l00921"></a>00921   <span class="keywordtype">void</span> callbackEvent( <span class="keywordtype">void</span> );
-<a name="l00922"></a>00922 
-<a name="l00923"></a>00923   <span class="keyword">private</span>:
-<a name="l00924"></a>00924 
-<a name="l00925"></a>00925   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00926"></a>00926                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00927"></a>00927                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00928"></a>00928                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
-<a name="l00929"></a>00929 };
-<a name="l00930"></a>00930 
-<a name="l00931"></a>00931 <span class="preprocessor">#endif</span>
-<a name="l00932"></a>00932 <span class="preprocessor"></span>
-<a name="l00933"></a>00933 <span class="preprocessor">#if defined(__RTAUDIO_DUMMY__)</span>
-<a name="l00934"></a>00934 <span class="preprocessor"></span>
-<a name="l00935"></a>00935 <span class="keyword">class </span>RtApiDummy: <span class="keyword">public</span> RtApi
-<a name="l00936"></a>00936 {
-<a name="l00937"></a>00937 <span class="keyword">public</span>:
-<a name="l00938"></a>00938 
-<a name="l00939"></a>00939   RtApiDummy() { errorText_ = <span class="stringliteral">&quot;RtApiDummy: This class provides no functionality.&quot;</span>; error( <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca3a1603c24a56cbdaf5f8ae4ddcb86398">RtError::WARNING</a> ); };
-<a name="l00940"></a>00940   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849ab06b8fd88bf18c9a2b8271f6961ae2d1">RtAudio::RTAUDIO_DUMMY</a>; };
-<a name="l00941"></a>00941   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> 0; };
-<a name="l00942"></a>00942   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device ) { <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> info; <span class="keywordflow">return</span> info; };
-<a name="l00943"></a>00943   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> ) {};
-<a name="l00944"></a>00944   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> ) {};
-<a name="l00945"></a>00945   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> ) {};
-<a name="l00946"></a>00946   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> ) {};
-<a name="l00947"></a>00947 
-<a name="l00948"></a>00948   <span class="keyword">private</span>:
-<a name="l00949"></a>00949 
-<a name="l00950"></a>00950   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
-<a name="l00951"></a>00951                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
-<a name="l00952"></a>00952                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
-<a name="l00953"></a>00953                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options ) { <span class="keywordflow">return</span> <span class="keyword">false</span>; };
-<a name="l00954"></a>00954 };
-<a name="l00955"></a>00955 
-<a name="l00956"></a>00956 <span class="preprocessor">#endif</span>
-<a name="l00957"></a>00957 <span class="preprocessor"></span>
-<a name="l00958"></a>00958 <span class="preprocessor">#endif</span>
-<a name="l00959"></a>00959 <span class="preprocessor"></span>
-<a name="l00960"></a>00960 <span class="comment">// Indentation settings for Vim and Emacs</span>
-<a name="l00961"></a>00961 <span class="comment">//</span>
-<a name="l00962"></a>00962 <span class="comment">// Local Variables:</span>
-<a name="l00963"></a>00963 <span class="comment">// c-basic-offset: 2</span>
-<a name="l00964"></a>00964 <span class="comment">// indent-tabs-mode: nil</span>
-<a name="l00965"></a>00965 <span class="comment">// End:</span>
-<a name="l00966"></a>00966 <span class="comment">//</span>
-<a name="l00967"></a>00967 <span class="comment">// vim: et sts=2 sw=2</span>
+<a name="l00848"></a>00848   RtApiDs();
+<a name="l00849"></a>00849   ~RtApiDs();
+<a name="l00850"></a>00850   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a28478830f42c2fd61e6c7ad498901931">RtAudio::WINDOWS_DS</a>; };
+<a name="l00851"></a>00851   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
+<a name="l00852"></a>00852   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultOutputDevice( <span class="keywordtype">void</span> );
+<a name="l00853"></a>00853   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDefaultInputDevice( <span class="keywordtype">void</span> );
+<a name="l00854"></a>00854   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
+<a name="l00855"></a>00855   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
+<a name="l00856"></a>00856   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
+<a name="l00857"></a>00857   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
+<a name="l00858"></a>00858   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
+<a name="l00859"></a>00859   <span class="keywordtype">long</span> getStreamLatency( <span class="keywordtype">void</span> );
+<a name="l00860"></a>00860 
+<a name="l00861"></a>00861   <span class="comment">// This function is intended for internal use only.  It must be</span>
+<a name="l00862"></a>00862   <span class="comment">// public because it is called by the internal callback handler,</span>
+<a name="l00863"></a>00863   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
+<a name="l00864"></a>00864   <span class="comment">// will most likely produce highly undesireable results!</span>
+<a name="l00865"></a>00865   <span class="keywordtype">void</span> callbackEvent( <span class="keywordtype">void</span> );
+<a name="l00866"></a>00866 
+<a name="l00867"></a>00867   <span class="keyword">private</span>:
+<a name="l00868"></a>00868 
+<a name="l00869"></a>00869   <span class="keywordtype">bool</span> coInitialized_;
+<a name="l00870"></a>00870   <span class="keywordtype">bool</span> buffersRolling;
+<a name="l00871"></a>00871   <span class="keywordtype">long</span> duplexPrerollBytes;
+<a name="l00872"></a>00872   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
+<a name="l00873"></a>00873                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
+<a name="l00874"></a>00874                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
+<a name="l00875"></a>00875                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
+<a name="l00876"></a>00876 };
+<a name="l00877"></a>00877 
+<a name="l00878"></a>00878 <span class="preprocessor">#endif</span>
+<a name="l00879"></a>00879 <span class="preprocessor"></span>
+<a name="l00880"></a>00880 <span class="preprocessor">#if defined(__LINUX_ALSA__)</span>
+<a name="l00881"></a>00881 <span class="preprocessor"></span>
+<a name="l00882"></a>00882 <span class="keyword">class </span>RtApiAlsa: <span class="keyword">public</span> RtApi
+<a name="l00883"></a>00883 {
+<a name="l00884"></a>00884 <span class="keyword">public</span>:
+<a name="l00885"></a>00885 
+<a name="l00886"></a>00886   RtApiAlsa();
+<a name="l00887"></a>00887   ~RtApiAlsa();
+<a name="l00888"></a>00888   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi() { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa7a2ba095c2806caa893b6fb8fc3a1a8">RtAudio::LINUX_ALSA</a>; };
+<a name="l00889"></a>00889   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
+<a name="l00890"></a>00890   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
+<a name="l00891"></a>00891   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
+<a name="l00892"></a>00892   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
+<a name="l00893"></a>00893   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
+<a name="l00894"></a>00894   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
+<a name="l00895"></a>00895 
+<a name="l00896"></a>00896   <span class="comment">// This function is intended for internal use only.  It must be</span>
+<a name="l00897"></a>00897   <span class="comment">// public because it is called by the internal callback handler,</span>
+<a name="l00898"></a>00898   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
+<a name="l00899"></a>00899   <span class="comment">// will most likely produce highly undesireable results!</span>
+<a name="l00900"></a>00900   <span class="keywordtype">void</span> callbackEvent( <span class="keywordtype">void</span> );
+<a name="l00901"></a>00901 
+<a name="l00902"></a>00902   <span class="keyword">private</span>:
+<a name="l00903"></a>00903 
+<a name="l00904"></a>00904   std::vector&lt;RtAudio::DeviceInfo&gt; devices_;
+<a name="l00905"></a>00905   <span class="keywordtype">void</span> saveDeviceInfo( <span class="keywordtype">void</span> );
+<a name="l00906"></a>00906   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
+<a name="l00907"></a>00907                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
+<a name="l00908"></a>00908                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
+<a name="l00909"></a>00909                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
+<a name="l00910"></a>00910 };
+<a name="l00911"></a>00911 
+<a name="l00912"></a>00912 <span class="preprocessor">#endif</span>
+<a name="l00913"></a>00913 <span class="preprocessor"></span>
+<a name="l00914"></a>00914 <span class="preprocessor">#if defined(__LINUX_OSS__)</span>
+<a name="l00915"></a>00915 <span class="preprocessor"></span>
+<a name="l00916"></a>00916 <span class="keyword">class </span>RtApiOss: <span class="keyword">public</span> RtApi
+<a name="l00917"></a>00917 {
+<a name="l00918"></a>00918 <span class="keyword">public</span>:
+<a name="l00919"></a>00919 
+<a name="l00920"></a>00920   RtApiOss();
+<a name="l00921"></a>00921   ~RtApiOss();
+<a name="l00922"></a>00922   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi() { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a39c84615e61de75e6a4e865596d62c82">RtAudio::LINUX_OSS</a>; };
+<a name="l00923"></a>00923   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> );
+<a name="l00924"></a>00924   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device );
+<a name="l00925"></a>00925   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> );
+<a name="l00926"></a>00926   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> );
+<a name="l00927"></a>00927   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> );
+<a name="l00928"></a>00928   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> );
+<a name="l00929"></a>00929 
+<a name="l00930"></a>00930   <span class="comment">// This function is intended for internal use only.  It must be</span>
+<a name="l00931"></a>00931   <span class="comment">// public because it is called by the internal callback handler,</span>
+<a name="l00932"></a>00932   <span class="comment">// which is not a member of RtAudio.  External use of this function</span>
+<a name="l00933"></a>00933   <span class="comment">// will most likely produce highly undesireable results!</span>
+<a name="l00934"></a>00934   <span class="keywordtype">void</span> callbackEvent( <span class="keywordtype">void</span> );
+<a name="l00935"></a>00935 
+<a name="l00936"></a>00936   <span class="keyword">private</span>:
+<a name="l00937"></a>00937 
+<a name="l00938"></a>00938   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
+<a name="l00939"></a>00939                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
+<a name="l00940"></a>00940                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
+<a name="l00941"></a>00941                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options );
+<a name="l00942"></a>00942 };
+<a name="l00943"></a>00943 
+<a name="l00944"></a>00944 <span class="preprocessor">#endif</span>
+<a name="l00945"></a>00945 <span class="preprocessor"></span>
+<a name="l00946"></a>00946 <span class="preprocessor">#if defined(__RTAUDIO_DUMMY__)</span>
+<a name="l00947"></a>00947 <span class="preprocessor"></span>
+<a name="l00948"></a>00948 <span class="keyword">class </span>RtApiDummy: <span class="keyword">public</span> RtApi
+<a name="l00949"></a>00949 {
+<a name="l00950"></a>00950 <span class="keyword">public</span>:
+<a name="l00951"></a>00951 
+<a name="l00952"></a>00952   RtApiDummy() { errorText_ = <span class="stringliteral">&quot;RtApiDummy: This class provides no functionality.&quot;</span>; error( <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca3a1603c24a56cbdaf5f8ae4ddcb86398">RtError::WARNING</a> ); };
+<a name="l00953"></a>00953   <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849" title="Audio API specifier arguments.">RtAudio::Api</a> getCurrentApi( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849ab06b8fd88bf18c9a2b8271f6961ae2d1">RtAudio::RTAUDIO_DUMMY</a>; };
+<a name="l00954"></a>00954   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> getDeviceCount( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> 0; };
+<a name="l00955"></a>00955   <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> getDeviceInfo( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device ) { <a class="code" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> info; <span class="keywordflow">return</span> info; };
+<a name="l00956"></a>00956   <span class="keywordtype">void</span> closeStream( <span class="keywordtype">void</span> ) {};
+<a name="l00957"></a>00957   <span class="keywordtype">void</span> startStream( <span class="keywordtype">void</span> ) {};
+<a name="l00958"></a>00958   <span class="keywordtype">void</span> stopStream( <span class="keywordtype">void</span> ) {};
+<a name="l00959"></a>00959   <span class="keywordtype">void</span> abortStream( <span class="keywordtype">void</span> ) {};
+<a name="l00960"></a>00960 
+<a name="l00961"></a>00961   <span class="keyword">private</span>:
+<a name="l00962"></a>00962 
+<a name="l00963"></a>00963   <span class="keywordtype">bool</span> probeDeviceOpen( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> device, StreamMode mode, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channels, 
+<a name="l00964"></a>00964                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> firstChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> sampleRate,
+<a name="l00965"></a>00965                         <a class="code" href="RtAudio_8h.html#aafca92882d25915560018873221e44b8" title="RtAudio data format type.">RtAudioFormat</a> format, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> *bufferSize,
+<a name="l00966"></a>00966                         <a class="code" href="structRtAudio_1_1StreamOptions.html" title="The structure for specifying stream options.">RtAudio::StreamOptions</a> *options ) { <span class="keywordflow">return</span> <span class="keyword">false</span>; };
+<a name="l00967"></a>00967 };
+<a name="l00968"></a>00968 
+<a name="l00969"></a>00969 <span class="preprocessor">#endif</span>
+<a name="l00970"></a>00970 <span class="preprocessor"></span>
+<a name="l00971"></a>00971 <span class="preprocessor">#endif</span>
+<a name="l00972"></a>00972 <span class="preprocessor"></span>
+<a name="l00973"></a>00973 <span class="comment">// Indentation settings for Vim and Emacs</span>
+<a name="l00974"></a>00974 <span class="comment">//</span>
+<a name="l00975"></a>00975 <span class="comment">// Local Variables:</span>
+<a name="l00976"></a>00976 <span class="comment">// c-basic-offset: 2</span>
+<a name="l00977"></a>00977 <span class="comment">// indent-tabs-mode: nil</span>
+<a name="l00978"></a>00978 <span class="comment">// End:</span>
+<a name="l00979"></a>00979 <span class="comment">//</span>
+<a name="l00980"></a>00980 <span class="comment">// vim: et sts=2 sw=2</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/RtError_8h-source.html b/doc/html/RtError_8h-source.html
deleted file mode 100644
index 5bddf52..0000000
--- a/doc/html/RtError_8h-source.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>RtError.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/************************************************************************/</span>
-<a name="l00010"></a>00010 <span class="comment">/************************************************************************/</span>
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="preprocessor">#ifndef RTERROR_H</span>
-<a name="l00013"></a>00013 <span class="preprocessor"></span><span class="preprocessor">#define RTERROR_H</span>
-<a name="l00014"></a>00014 <span class="preprocessor"></span>
-<a name="l00015"></a>00015 <span class="preprocessor">#include &lt;exception&gt;</span>
-<a name="l00016"></a>00016 <span class="preprocessor">#include &lt;iostream&gt;</span>
-<a name="l00017"></a>00017 <span class="preprocessor">#include &lt;string&gt;</span>
-<a name="l00018"></a>00018 
-<a name="l00019"></a><a class="code" href="classRtError.html">00019</a> <span class="keyword">class </span><a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> : <span class="keyword">public</span> std::exception
-<a name="l00020"></a>00020 {
-<a name="l00021"></a>00021  <span class="keyword">public</span>:
-<a name="l00023"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac">00023</a>   <span class="keyword">enum</span> <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac" title="Defined RtError types.">Type</a> {
-<a name="l00024"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac3a1603c24a56cbdaf5f8ae4ddcb86398">00024</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac3a1603c24a56cbdaf5f8ae4ddcb86398">WARNING</a>,           
-<a name="l00025"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac20e5a369394d19b704ace17002007eba">00025</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac20e5a369394d19b704ace17002007eba">DEBUG_WARNING</a>,     
-<a name="l00026"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac444efd3ccf774b2ba9f9bde70ec71cd6">00026</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac444efd3ccf774b2ba9f9bde70ec71cd6">UNSPECIFIED</a>,       
-<a name="l00027"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903acf267eb2d710f33d649ba840eeab6ff82">00027</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903acf267eb2d710f33d649ba840eeab6ff82">NO_DEVICES_FOUND</a>,  
-<a name="l00028"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903acd6064062066fffdba258237a7c2159b1">00028</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903acd6064062066fffdba258237a7c2159b1">INVALID_DEVICE</a>,    
-<a name="l00029"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903acb4f813e5a36905c89d4081a59497432e">00029</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903acb4f813e5a36905c89d4081a59497432e">MEMORY_ERROR</a>,      
-<a name="l00030"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903aca3eabf0f71120beaba94148a1b78fed6">00030</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903aca3eabf0f71120beaba94148a1b78fed6">INVALID_PARAMETER</a>, 
-<a name="l00031"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac8e65f51a3fbdc1a4a1552b3260df36bc">00031</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac8e65f51a3fbdc1a4a1552b3260df36bc">INVALID_USE</a>,       
-<a name="l00032"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac995e97ecf6beeedaba525022a63aec6b">00032</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac995e97ecf6beeedaba525022a63aec6b">DRIVER_ERROR</a>,      
-<a name="l00033"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac8947d0a2e2a84ecf3646271844e06a6b">00033</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac8947d0a2e2a84ecf3646271844e06a6b">SYSTEM_ERROR</a>,      
-<a name="l00034"></a><a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903aceb6282f991e2d93ab294a4272fc3f6c6">00034</a>     <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903aceb6282f991e2d93ab294a4272fc3f6c6">THREAD_ERROR</a>       
-<a name="l00035"></a>00035   };
-<a name="l00036"></a>00036 
-<a name="l00038"></a><a class="code" href="classRtError.html#a479a305ccbe56be0fd9137b9b405a37">00038</a>   <a class="code" href="classRtError.html#a479a305ccbe56be0fd9137b9b405a37" title="The constructor.">RtError</a>( <span class="keyword">const</span> std::string&amp; message, <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac" title="Defined RtError types.">Type</a> type = <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac444efd3ccf774b2ba9f9bde70ec71cd6">RtError::UNSPECIFIED</a> ) throw() : message_(message), type_(type) {}
-<a name="l00039"></a>00039  
-<a name="l00041"></a><a class="code" href="classRtError.html#6793e03386e7e69ffafb65a296dfa48c">00041</a>   <span class="keyword">virtual</span> <a class="code" href="classRtError.html#6793e03386e7e69ffafb65a296dfa48c" title="The destructor.">~RtError</a>( <span class="keywordtype">void</span> ) throw() {}
-<a name="l00042"></a>00042 
-<a name="l00044"></a><a class="code" href="classRtError.html#da41f7472122f45bc5b4677f066e0943">00044</a>   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtError.html#da41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>( <span class="keywordtype">void</span> ) throw() { std::cerr &lt;&lt; <span class="charliteral">'\n'</span> &lt;&lt; message_ &lt;&lt; <span class="stringliteral">"\n\n"</span>; }
-<a name="l00045"></a>00045 
-<a name="l00047"></a><a class="code" href="classRtError.html#4ee7df9728d73f533afbaddcd9ca4d9c">00047</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac" title="Defined RtError types.">Type</a>&amp; <a class="code" href="classRtError.html#4ee7df9728d73f533afbaddcd9ca4d9c" title="Returns the thrown error message type.">getType</a>(<span class="keywordtype">void</span>) throw() { <span class="keywordflow">return</span> type_; }
-<a name="l00048"></a>00048 
-<a name="l00050"></a><a class="code" href="classRtError.html#c7f467788e29d246333d7af050801164">00050</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> std::string&amp; <a class="code" href="classRtError.html#c7f467788e29d246333d7af050801164" title="Returns the thrown error message string.">getMessage</a>(<span class="keywordtype">void</span>) throw() { <span class="keywordflow">return</span> message_; }
-<a name="l00051"></a>00051 
-<a name="l00053"></a><a class="code" href="classRtError.html#eb843b7a7785d66061c61ebfc29e7e9d">00053</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* <a class="code" href="classRtError.html#eb843b7a7785d66061c61ebfc29e7e9d" title="Returns the thrown error message as a c-style string.">what</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span> throw() { <span class="keywordflow">return</span> message_.c_str(); }
-<a name="l00054"></a>00054 
-<a name="l00055"></a>00055  <span class="keyword">protected</span>:
-<a name="l00056"></a>00056   std::string message_;
-<a name="l00057"></a>00057   <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac" title="Defined RtError types.">Type</a> type_;
-<a name="l00058"></a>00058 };
-<a name="l00059"></a>00059 
-<a name="l00060"></a>00060 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/RtError_8h_source.html b/doc/html/RtError_8h_source.html
index 53a2920..5661ace 100644
--- a/doc/html/RtError_8h_source.html
+++ b/doc/html/RtError_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>RtError.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/************************************************************************/</span>
@@ -43,11 +43,11 @@
 <a name="l00039"></a>00039  
 <a name="l00041"></a><a class="code" href="classRtError.html#a6793e03386e7e69ffafb65a296dfa48c">00041</a>   <span class="keyword">virtual</span> <a class="code" href="classRtError.html#a6793e03386e7e69ffafb65a296dfa48c" title="The destructor.">~RtError</a>( <span class="keywordtype">void</span> ) throw() {}
 <a name="l00042"></a>00042 
-<a name="l00044"></a><a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943">00044</a>   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>( <span class="keywordtype">void</span> ) throw() { std::cerr &lt;&lt; <span class="charliteral">&#39;\n&#39;</span> &lt;&lt; message_ &lt;&lt; <span class="stringliteral">&quot;\n\n&quot;</span>; }
+<a name="l00044"></a><a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc">00044</a>   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span> throw() { std::cerr &lt;&lt; <span class="charliteral">&#39;\n&#39;</span> &lt;&lt; message_ &lt;&lt; <span class="stringliteral">&quot;\n\n&quot;</span>; }
 <a name="l00045"></a>00045 
-<a name="l00047"></a><a class="code" href="classRtError.html#a4ee7df9728d73f533afbaddcd9ca4d9c">00047</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903ac" title="Defined RtError types.">Type</a>&amp; <a class="code" href="classRtError.html#a4ee7df9728d73f533afbaddcd9ca4d9c" title="Returns the thrown error message type.">getType</a>(<span class="keywordtype">void</span>) throw() { <span class="keywordflow">return</span> type_; }
+<a name="l00047"></a><a class="code" href="classRtError.html#a3e316dc9b9b41fe2f64cabf34beb4fe7">00047</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903ac" title="Defined RtError types.">Type</a>&amp; <a class="code" href="classRtError.html#a3e316dc9b9b41fe2f64cabf34beb4fe7" title="Returns the thrown error message type.">getType</a>(<span class="keywordtype">void</span>) <span class="keyword">const</span> throw() { <span class="keywordflow">return</span> type_; }
 <a name="l00048"></a>00048 
-<a name="l00050"></a><a class="code" href="classRtError.html#ac7f467788e29d246333d7af050801164">00050</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> std::string&amp; <a class="code" href="classRtError.html#ac7f467788e29d246333d7af050801164" title="Returns the thrown error message string.">getMessage</a>(<span class="keywordtype">void</span>) throw() { <span class="keywordflow">return</span> message_; }
+<a name="l00050"></a><a class="code" href="classRtError.html#afd067ba6b46edd37f989cad02cd70b50">00050</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> std::string&amp; <a class="code" href="classRtError.html#afd067ba6b46edd37f989cad02cd70b50" title="Returns the thrown error message string.">getMessage</a>(<span class="keywordtype">void</span>) <span class="keyword">const</span> throw() { <span class="keywordflow">return</span> message_; }
 <a name="l00051"></a>00051 
 <a name="l00053"></a><a class="code" href="classRtError.html#aeb843b7a7785d66061c61ebfc29e7e9d">00053</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* <a class="code" href="classRtError.html#aeb843b7a7785d66061c61ebfc29e7e9d" title="Returns the thrown error message as a c-style string.">what</a>( <span class="keywordtype">void</span> ) <span class="keyword">const</span> throw() { <span class="keywordflow">return</span> message_.c_str(); }
 <a name="l00054"></a>00054 
@@ -62,7 +62,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/RtMidi_8h-source.html b/doc/html/RtMidi_8h-source.html
deleted file mode 100644
index b88c6f2..0000000
--- a/doc/html/RtMidi_8h-source.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>RtMidi.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/**********************************************************************/</span>
-<a name="l00036"></a>00036 <span class="comment">/**********************************************************************/</span>
-<a name="l00037"></a>00037 
-<a name="l00038"></a>00038 <span class="comment">// RtMidi: Version 1.0.10</span>
-<a name="l00039"></a>00039 
-<a name="l00040"></a>00040 <span class="preprocessor">#ifndef RTMIDI_H</span>
-<a name="l00041"></a>00041 <span class="preprocessor"></span><span class="preprocessor">#define RTMIDI_H</span>
-<a name="l00042"></a>00042 <span class="preprocessor"></span>
-<a name="l00043"></a>00043 <span class="preprocessor">#include "RtError.h"</span>
-<a name="l00044"></a>00044 <span class="preprocessor">#include &lt;string&gt;</span>
-<a name="l00045"></a>00045 
-<a name="l00046"></a><a class="code" href="classRtMidi.html">00046</a> <span class="keyword">class </span><a class="code" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>
-<a name="l00047"></a>00047 {
-<a name="l00048"></a>00048  <span class="keyword">public</span>:
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtMidi.html#d9e30a89638f93193cb40edebaa536f5" title="Pure virtual openPort() function.">openPort</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0, <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">"RtMidi"</span> ) ) = 0;
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtMidi.html#9200cde4f5337c0bc421d20bd4fcf654" title="Pure virtual openVirtualPort() function.">openVirtualPort</a>( <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">"RtMidi"</span> ) ) = 0;
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keyword">virtual</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtMidi.html#9a49ef73a1e6007444019a7ae095e195" title="Pure virtual getPortCount() function.">getPortCount</a>() = 0;
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keyword">virtual</span> std::string <a class="code" href="classRtMidi.html#799e2b9f4df39b298518f2b394db3391" title="Pure virtual getPortName() function.">getPortName</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0 ) = 0;
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classRtMidi.html#36125c4fa16550345b57f4a4927f5b4a" title="Pure virtual closePort() function.">closePort</a>( <span class="keywordtype">void</span> ) = 0;
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065  <span class="keyword">protected</span>:
-<a name="l00066"></a>00066 
-<a name="l00067"></a>00067   <a class="code" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>();
-<a name="l00068"></a>00068   <span class="keyword">virtual</span> ~<a class="code" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>() {};
-<a name="l00069"></a>00069 
-<a name="l00070"></a>00070   <span class="comment">// A basic error reporting function for internal use in the RtMidi</span>
-<a name="l00071"></a>00071   <span class="comment">// subclasses.  The behavior of this function can be modified to</span>
-<a name="l00072"></a>00072   <span class="comment">// suit specific needs.</span>
-<a name="l00073"></a>00073   <span class="keywordtype">void</span> error( <a class="code" href="classRtError.html#b04667aae01bffc354a9ac6bda6903ac" title="Defined RtError types.">RtError::Type</a> type );
-<a name="l00074"></a>00074 
-<a name="l00075"></a>00075   <span class="keywordtype">void</span> *apiData_;
-<a name="l00076"></a>00076   <span class="keywordtype">bool</span> connected_;
-<a name="l00077"></a>00077   std::string errorString_;
-<a name="l00078"></a>00078 };
-<a name="l00079"></a>00079 
-<a name="l00080"></a>00080 <span class="comment">/**********************************************************************/</span>
-<a name="l00096"></a>00096 <span class="comment">/**********************************************************************/</span>
-<a name="l00097"></a>00097 
-<a name="l00098"></a>00098 <span class="preprocessor">#include &lt;vector&gt;</span>
-<a name="l00099"></a>00099 <span class="preprocessor">#include &lt;queue&gt;</span>
-<a name="l00100"></a>00100 
-<a name="l00101"></a><a class="code" href="classRtMidiIn.html">00101</a> <span class="keyword">class </span><a class="code" href="classRtMidiIn.html" title="A realtime MIDI input class.">RtMidiIn</a> : <span class="keyword">public</span> <a class="code" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>
-<a name="l00102"></a>00102 {
-<a name="l00103"></a>00103  <span class="keyword">public</span>:
-<a name="l00104"></a>00104 
-<a name="l00106"></a>00106   <span class="keyword">typedef</span> void (*<a class="code" href="classRtMidiIn.html#297d2eb3c3420b437970a6fc59d89cbf" title="User callback function type definition.">RtMidiCallback</a>)( <span class="keywordtype">double</span> timeStamp, std::vector&lt;unsigned char&gt; *message, <span class="keywordtype">void</span> *userData);
-<a name="l00107"></a>00107 
-<a name="l00109"></a>00109 
-<a name="l00112"></a>00112   <a class="code" href="classRtMidiIn.html#31abb996e5fdc4a8f9dc5a50848e2ee5" title="Default constructor that allows an optional client name.">RtMidiIn</a>( <span class="keyword">const</span> std::string clientName = std::string( <span class="stringliteral">"RtMidi Input Client"</span>) );
-<a name="l00113"></a>00113 
-<a name="l00115"></a>00115   <a class="code" href="classRtMidiIn.html#f865d88c154b6fdadc640da5dc278d40" title="If a MIDI connection is still open, it will be closed by the destructor.">~RtMidiIn</a>();
-<a name="l00116"></a>00116 
-<a name="l00118"></a>00118 
-<a name="l00122"></a>00122   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#7e853661b1056083e07318d67c51f6fd" title="Open a MIDI input connection.">openPort</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0, <span class="keyword">const</span> std::string Portname = std::string( <span class="stringliteral">"RtMidi Input"</span> ) );
-<a name="l00123"></a>00123 
-<a name="l00125"></a>00125 
-<a name="l00131"></a>00131   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#245261b3f12ce727faed18fcfeef18c2" title="Create a virtual input port, with optional name, to allow software connections (OS...">openVirtualPort</a>( <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">"RtMidi Input"</span> ) );
-<a name="l00132"></a>00132 
-<a name="l00134"></a>00134 
-<a name="l00140"></a>00140   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#7590563461c7467608a4b3806406b32d" title="Set a callback function to be invoked for incoming MIDI messages.">setCallback</a>( <a class="code" href="classRtMidiIn.html#297d2eb3c3420b437970a6fc59d89cbf" title="User callback function type definition.">RtMidiCallback</a> callback, <span class="keywordtype">void</span> *userData = 0 );
-<a name="l00141"></a>00141 
-<a name="l00143"></a>00143 
-<a name="l00147"></a>00147   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#de23832a66c1ed56965c26325602543e" title="Cancel use of the current callback function (if one exists).">cancelCallback</a>();
-<a name="l00148"></a>00148 
-<a name="l00150"></a>00150   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#55bacf0d228fd8e3be6a79d12fd1dc39" title="Close an open MIDI connection (if one exists).">closePort</a>( <span class="keywordtype">void</span> );
-<a name="l00151"></a>00151 
-<a name="l00153"></a>00153   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtMidiIn.html#62b1b38aa8e5f11cd66f03d59228f4e4" title="Return the number of available MIDI input ports.">getPortCount</a>();
-<a name="l00154"></a>00154 
-<a name="l00156"></a>00156 
-<a name="l00159"></a>00159   std::string <a class="code" href="classRtMidiIn.html#f2961fff09fa01a3d5bc0f0c5a042aaf" title="Return a string identifier for the specified MIDI input port number.">getPortName</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0 );
-<a name="l00160"></a>00160 
-<a name="l00162"></a>00162 
-<a name="l00166"></a>00166   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#2e15868916737039e0a34d47bffdf188" title="Set the maximum number of MIDI messages to be saved in the queue.">setQueueSizeLimit</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> queueSize );
-<a name="l00167"></a>00167 
-<a name="l00169"></a>00169 
-<a name="l00176"></a>00176   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#f9507125aaa42276ccc01df576fc3533" title="Specify whether certain MIDI message types should be queued or ignored during input...">ignoreTypes</a>( <span class="keywordtype">bool</span> midiSysex = <span class="keyword">true</span>, <span class="keywordtype">bool</span> midiTime = <span class="keyword">true</span>, <span class="keywordtype">bool</span> midiSense = <span class="keyword">true</span> );
-<a name="l00177"></a>00177 
-<a name="l00179"></a>00179 
-<a name="l00186"></a>00186   <span class="keywordtype">double</span> <a class="code" href="classRtMidiIn.html#1ba10ecd276b30a8579c7d60a9c890eb" title="Fill the user-provided vector with the data bytes for the next available MIDI message...">getMessage</a>( std::vector&lt;unsigned char&gt; *message );
-<a name="l00187"></a>00187 
-<a name="l00188"></a>00188   <span class="comment">// A MIDI structure used internally by the class to store incoming</span>
-<a name="l00189"></a>00189   <span class="comment">// messages.  Each message represents one and only one MIDI message.</span>
-<a name="l00190"></a>00190   <span class="keyword">struct </span>MidiMessage { 
-<a name="l00191"></a>00191     std::vector&lt;unsigned char&gt; bytes; 
-<a name="l00192"></a>00192     <span class="keywordtype">double</span> timeStamp;
-<a name="l00193"></a>00193 
-<a name="l00194"></a>00194     <span class="comment">// Default constructor.</span>
-<a name="l00195"></a>00195     MidiMessage()
-<a name="l00196"></a>00196       :bytes(3), timeStamp(0.0) {}
-<a name="l00197"></a>00197   };
-<a name="l00198"></a>00198 
-<a name="l00199"></a>00199   <span class="comment">// The RtMidiInData structure is used to pass private class data to</span>
-<a name="l00200"></a>00200   <span class="comment">// the MIDI input handling function or thread.</span>
-<a name="l00201"></a>00201   <span class="keyword">struct </span>RtMidiInData {
-<a name="l00202"></a>00202     std::queue&lt;MidiMessage&gt; queue;
-<a name="l00203"></a>00203     MidiMessage message;
-<a name="l00204"></a>00204     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> queueLimit;
-<a name="l00205"></a>00205     <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> ignoreFlags;
-<a name="l00206"></a>00206     <span class="keywordtype">bool</span> doInput;
-<a name="l00207"></a>00207     <span class="keywordtype">bool</span> firstMessage;
-<a name="l00208"></a>00208     <span class="keywordtype">void</span> *apiData;
-<a name="l00209"></a>00209     <span class="keywordtype">bool</span> usingCallback;
-<a name="l00210"></a>00210     <span class="keywordtype">void</span> *userCallback;
-<a name="l00211"></a>00211     <span class="keywordtype">void</span> *userData;
-<a name="l00212"></a>00212     <span class="keywordtype">bool</span> continueSysex;
-<a name="l00213"></a>00213 
-<a name="l00214"></a>00214     <span class="comment">// Default constructor.</span>
-<a name="l00215"></a>00215     RtMidiInData()
-<a name="l00216"></a>00216       : queueLimit(1024), ignoreFlags(7), doInput(<span class="keyword">false</span>), firstMessage(<span class="keyword">true</span>),
-<a name="l00217"></a>00217         apiData(0), usingCallback(<span class="keyword">false</span>), userCallback(0), userData(0),
-<a name="l00218"></a>00218         continueSysex(<span class="keyword">false</span>) {}
-<a name="l00219"></a>00219   };
-<a name="l00220"></a>00220 
-<a name="l00221"></a>00221  <span class="keyword">private</span>:
-<a name="l00222"></a>00222 
-<a name="l00223"></a>00223   <span class="keywordtype">void</span> initialize( <span class="keyword">const</span> std::string&amp; clientName );
-<a name="l00224"></a>00224   RtMidiInData inputData_;
-<a name="l00225"></a>00225 
-<a name="l00226"></a>00226 };
-<a name="l00227"></a>00227 
-<a name="l00228"></a>00228 <span class="comment">/**********************************************************************/</span>
-<a name="l00240"></a>00240 <span class="comment">/**********************************************************************/</span>
-<a name="l00241"></a>00241 
-<a name="l00242"></a><a class="code" href="classRtMidiOut.html">00242</a> <span class="keyword">class </span><a class="code" href="classRtMidiOut.html" title="A realtime MIDI output class.">RtMidiOut</a> : <span class="keyword">public</span> <a class="code" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>
-<a name="l00243"></a>00243 {
-<a name="l00244"></a>00244  <span class="keyword">public</span>:
-<a name="l00245"></a>00245 
-<a name="l00247"></a>00247 
-<a name="l00250"></a>00250   <a class="code" href="classRtMidiOut.html#8ed1b492900f3410bf91ad53203b9db3" title="Default constructor that allows an optional client name.">RtMidiOut</a>( <span class="keyword">const</span> std::string clientName = std::string( <span class="stringliteral">"RtMidi Output Client"</span> ) );
-<a name="l00251"></a>00251 
-<a name="l00253"></a>00253   <a class="code" href="classRtMidiOut.html#b776c431bd84193febb2f78fb8c7e792" title="The destructor closes any open MIDI connections.">~RtMidiOut</a>();
-<a name="l00254"></a>00254 
-<a name="l00256"></a>00256 
-<a name="l00262"></a>00262   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#1b280d67317cd473a8816aeb2fe6c186" title="Open a MIDI output connection.">openPort</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0, <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">"RtMidi Output"</span> ) );
-<a name="l00263"></a>00263 
-<a name="l00265"></a>00265   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#3092e53a8aed2d3b163fcaa05fafd041" title="Close an open MIDI connection (if one exists).">closePort</a>();
-<a name="l00266"></a>00266 
-<a name="l00268"></a>00268 
-<a name="l00276"></a>00276   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#47068e1c076d91fd89587c0ccdeddc7a" title="Create a virtual output port, with optional name, to allow software connections (OS...">openVirtualPort</a>( <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">"RtMidi Output"</span> ) );
-<a name="l00277"></a>00277 
-<a name="l00279"></a>00279   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtMidiOut.html#d6cddbcc7faa20a7be229f765ade0877" title="Return the number of available MIDI output ports.">getPortCount</a>();
-<a name="l00280"></a>00280 
-<a name="l00282"></a>00282 
-<a name="l00285"></a>00285   std::string <a class="code" href="classRtMidiOut.html#cc4ae0ab71a49ae7629075d5a9cd837c" title="Return a string identifier for the specified MIDI port type and number.">getPortName</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0 );
-<a name="l00286"></a>00286 
-<a name="l00288"></a>00288 
-<a name="l00292"></a>00292   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#0bd8972ef8ac4e8d37ccc4b5d51c2eb3" title="Immediately send a single message out an open MIDI output port.">sendMessage</a>( std::vector&lt;unsigned char&gt; *message );
-<a name="l00293"></a>00293 
-<a name="l00294"></a>00294  <span class="keyword">private</span>:
-<a name="l00295"></a>00295 
-<a name="l00296"></a>00296   <span class="keywordtype">void</span> initialize( <span class="keyword">const</span> std::string&amp; clientName );
-<a name="l00297"></a>00297 };
-<a name="l00298"></a>00298 
-<a name="l00299"></a>00299 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/RtMidi_8h_source.html b/doc/html/RtMidi_8h_source.html
index 104d78f..1ff07d8 100644
--- a/doc/html/RtMidi_8h_source.html
+++ b/doc/html/RtMidi_8h_source.html
@@ -9,13 +9,13 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>RtMidi.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/**********************************************************************/</span>
 <a name="l00036"></a>00036 <span class="comment">/**********************************************************************/</span>
 <a name="l00037"></a>00037 
-<a name="l00038"></a>00038 <span class="comment">// RtMidi: Version 1.0.11</span>
+<a name="l00038"></a>00038 <span class="comment">// RtMidi: Version 1.0.15</span>
 <a name="l00039"></a>00039 
 <a name="l00040"></a>00040 <span class="preprocessor">#ifndef RTMIDI_H</span>
 <a name="l00041"></a>00041 <span class="preprocessor"></span><span class="preprocessor">#define RTMIDI_H</span>
@@ -56,127 +56,134 @@
 <a name="l00096"></a>00096 <span class="comment">/**********************************************************************/</span>
 <a name="l00097"></a>00097 
 <a name="l00098"></a>00098 <span class="preprocessor">#include &lt;vector&gt;</span>
-<a name="l00099"></a>00099 <span class="preprocessor">#include &lt;queue&gt;</span>
-<a name="l00100"></a>00100 
-<a name="l00101"></a><a class="code" href="classRtMidiIn.html">00101</a> <span class="keyword">class </span><a class="code" href="classRtMidiIn.html" title="A realtime MIDI input class.">RtMidiIn</a> : <span class="keyword">public</span> <a class="code" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>
-<a name="l00102"></a>00102 {
-<a name="l00103"></a>00103  <span class="keyword">public</span>:
-<a name="l00104"></a>00104 
-<a name="l00106"></a><a class="code" href="classRtMidiIn.html#a297d2eb3c3420b437970a6fc59d89cbf">00106</a>   <span class="keyword">typedef</span> void (*<a class="code" href="classRtMidiIn.html#a297d2eb3c3420b437970a6fc59d89cbf" title="User callback function type definition.">RtMidiCallback</a>)( <span class="keywordtype">double</span> timeStamp, std::vector&lt;unsigned char&gt; *message, <span class="keywordtype">void</span> *userData);
-<a name="l00107"></a>00107 
-<a name="l00109"></a>00109 
-<a name="l00112"></a>00112   <a class="code" href="classRtMidiIn.html#a31abb996e5fdc4a8f9dc5a50848e2ee5" title="Default constructor that allows an optional client name.">RtMidiIn</a>( <span class="keyword">const</span> std::string clientName = std::string( <span class="stringliteral">&quot;RtMidi Input Client&quot;</span>) );
-<a name="l00113"></a>00113 
-<a name="l00115"></a>00115   <a class="code" href="classRtMidiIn.html#af865d88c154b6fdadc640da5dc278d40" title="If a MIDI connection is still open, it will be closed by the destructor.">~RtMidiIn</a>();
+<a name="l00099"></a>00099 
+<a name="l00100"></a><a class="code" href="classRtMidiIn.html">00100</a> <span class="keyword">class </span><a class="code" href="classRtMidiIn.html" title="A realtime MIDI input class.">RtMidiIn</a> : <span class="keyword">public</span> <a class="code" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>
+<a name="l00101"></a>00101 {
+<a name="l00102"></a>00102  <span class="keyword">public</span>:
+<a name="l00103"></a>00103 
+<a name="l00105"></a><a class="code" href="classRtMidiIn.html#a297d2eb3c3420b437970a6fc59d89cbf">00105</a>   <span class="keyword">typedef</span> void (*<a class="code" href="classRtMidiIn.html#a297d2eb3c3420b437970a6fc59d89cbf" title="User callback function type definition.">RtMidiCallback</a>)( <span class="keywordtype">double</span> timeStamp, std::vector&lt;unsigned char&gt; *message, <span class="keywordtype">void</span> *userData);
+<a name="l00106"></a>00106 
+<a name="l00108"></a>00108 
+<a name="l00115"></a>00115   <a class="code" href="classRtMidiIn.html#a1d70da3ef18d24c5b3f0cc01888e093d" title="Default constructor that allows an optional client name and queue size.">RtMidiIn</a>( <span class="keyword">const</span> std::string clientName = std::string( <span class="stringliteral">&quot;RtMidi Input Client&quot;</span>), <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> queueSizeLimit = 100 );
 <a name="l00116"></a>00116 
-<a name="l00118"></a>00118 
-<a name="l00122"></a>00122   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#a7e853661b1056083e07318d67c51f6fd" title="Open a MIDI input connection.">openPort</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0, <span class="keyword">const</span> std::string Portname = std::string( <span class="stringliteral">&quot;RtMidi Input&quot;</span> ) );
-<a name="l00123"></a>00123 
-<a name="l00125"></a>00125 
-<a name="l00131"></a>00131   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#a245261b3f12ce727faed18fcfeef18c2" title="Create a virtual input port, with optional name, to allow software connections (OS...">openVirtualPort</a>( <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">&quot;RtMidi Input&quot;</span> ) );
-<a name="l00132"></a>00132 
-<a name="l00134"></a>00134 
-<a name="l00140"></a>00140   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#a7590563461c7467608a4b3806406b32d" title="Set a callback function to be invoked for incoming MIDI messages.">setCallback</a>( <a class="code" href="classRtMidiIn.html#a297d2eb3c3420b437970a6fc59d89cbf" title="User callback function type definition.">RtMidiCallback</a> callback, <span class="keywordtype">void</span> *userData = 0 );
-<a name="l00141"></a>00141 
-<a name="l00143"></a>00143 
-<a name="l00147"></a>00147   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#ade23832a66c1ed56965c26325602543e" title="Cancel use of the current callback function (if one exists).">cancelCallback</a>();
-<a name="l00148"></a>00148 
-<a name="l00150"></a>00150   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#a55bacf0d228fd8e3be6a79d12fd1dc39" title="Close an open MIDI connection (if one exists).">closePort</a>( <span class="keywordtype">void</span> );
+<a name="l00118"></a>00118   <a class="code" href="classRtMidiIn.html#af865d88c154b6fdadc640da5dc278d40" title="If a MIDI connection is still open, it will be closed by the destructor.">~RtMidiIn</a>();
+<a name="l00119"></a>00119 
+<a name="l00121"></a>00121 
+<a name="l00125"></a>00125   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#a7e853661b1056083e07318d67c51f6fd" title="Open a MIDI input connection.">openPort</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0, <span class="keyword">const</span> std::string Portname = std::string( <span class="stringliteral">&quot;RtMidi Input&quot;</span> ) );
+<a name="l00126"></a>00126 
+<a name="l00128"></a>00128 
+<a name="l00134"></a>00134   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#a245261b3f12ce727faed18fcfeef18c2" title="Create a virtual input port, with optional name, to allow software connections (OS...">openVirtualPort</a>( <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">&quot;RtMidi Input&quot;</span> ) );
+<a name="l00135"></a>00135 
+<a name="l00137"></a>00137 
+<a name="l00143"></a>00143   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#a7590563461c7467608a4b3806406b32d" title="Set a callback function to be invoked for incoming MIDI messages.">setCallback</a>( <a class="code" href="classRtMidiIn.html#a297d2eb3c3420b437970a6fc59d89cbf" title="User callback function type definition.">RtMidiCallback</a> callback, <span class="keywordtype">void</span> *userData = 0 );
+<a name="l00144"></a>00144 
+<a name="l00146"></a>00146 
+<a name="l00150"></a>00150   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#ade23832a66c1ed56965c26325602543e" title="Cancel use of the current callback function (if one exists).">cancelCallback</a>();
 <a name="l00151"></a>00151 
-<a name="l00153"></a>00153   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtMidiIn.html#a62b1b38aa8e5f11cd66f03d59228f4e4" title="Return the number of available MIDI input ports.">getPortCount</a>();
+<a name="l00153"></a>00153   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#a55bacf0d228fd8e3be6a79d12fd1dc39" title="Close an open MIDI connection (if one exists).">closePort</a>( <span class="keywordtype">void</span> );
 <a name="l00154"></a>00154 
-<a name="l00156"></a>00156 
-<a name="l00159"></a>00159   std::string <a class="code" href="classRtMidiIn.html#af2961fff09fa01a3d5bc0f0c5a042aaf" title="Return a string identifier for the specified MIDI input port number.">getPortName</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0 );
-<a name="l00160"></a>00160 
-<a name="l00162"></a>00162 
-<a name="l00166"></a>00166   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#a2e15868916737039e0a34d47bffdf188" title="Set the maximum number of MIDI messages to be saved in the queue.">setQueueSizeLimit</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> queueSize );
-<a name="l00167"></a>00167 
-<a name="l00169"></a>00169 
-<a name="l00176"></a>00176   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#af9507125aaa42276ccc01df576fc3533" title="Specify whether certain MIDI message types should be queued or ignored during input...">ignoreTypes</a>( <span class="keywordtype">bool</span> midiSysex = <span class="keyword">true</span>, <span class="keywordtype">bool</span> midiTime = <span class="keyword">true</span>, <span class="keywordtype">bool</span> midiSense = <span class="keyword">true</span> );
-<a name="l00177"></a>00177 
-<a name="l00179"></a>00179 
-<a name="l00186"></a>00186   <span class="keywordtype">double</span> <a class="code" href="classRtMidiIn.html#a1ba10ecd276b30a8579c7d60a9c890eb" title="Fill the user-provided vector with the data bytes for the next available MIDI message...">getMessage</a>( std::vector&lt;unsigned char&gt; *message );
-<a name="l00187"></a>00187 
-<a name="l00188"></a>00188   <span class="comment">// A MIDI structure used internally by the class to store incoming</span>
-<a name="l00189"></a>00189   <span class="comment">// messages.  Each message represents one and only one MIDI message.</span>
-<a name="l00190"></a>00190   <span class="keyword">struct </span>MidiMessage { 
-<a name="l00191"></a>00191     std::vector&lt;unsigned char&gt; bytes; 
-<a name="l00192"></a>00192     <span class="keywordtype">double</span> timeStamp;
-<a name="l00193"></a>00193 
-<a name="l00194"></a>00194     <span class="comment">// Default constructor.</span>
-<a name="l00195"></a>00195     MidiMessage()
-<a name="l00196"></a>00196       :bytes(3), timeStamp(0.0) {}
-<a name="l00197"></a>00197   };
-<a name="l00198"></a>00198 
-<a name="l00199"></a>00199   <span class="comment">// The RtMidiInData structure is used to pass private class data to</span>
-<a name="l00200"></a>00200   <span class="comment">// the MIDI input handling function or thread.</span>
-<a name="l00201"></a>00201   <span class="keyword">struct </span>RtMidiInData {
-<a name="l00202"></a>00202     std::queue&lt;MidiMessage&gt; queue;
-<a name="l00203"></a>00203     MidiMessage message;
-<a name="l00204"></a>00204     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> queueLimit;
-<a name="l00205"></a>00205     <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> ignoreFlags;
-<a name="l00206"></a>00206     <span class="keywordtype">bool</span> doInput;
-<a name="l00207"></a>00207     <span class="keywordtype">bool</span> firstMessage;
-<a name="l00208"></a>00208     <span class="keywordtype">void</span> *apiData;
-<a name="l00209"></a>00209     <span class="keywordtype">bool</span> usingCallback;
-<a name="l00210"></a>00210     <span class="keywordtype">void</span> *userCallback;
-<a name="l00211"></a>00211     <span class="keywordtype">void</span> *userData;
-<a name="l00212"></a>00212     <span class="keywordtype">bool</span> continueSysex;
-<a name="l00213"></a>00213 
-<a name="l00214"></a>00214     <span class="comment">// Default constructor.</span>
-<a name="l00215"></a>00215     RtMidiInData()
-<a name="l00216"></a>00216       : queueLimit(1024), ignoreFlags(7), doInput(false), firstMessage(true),
-<a name="l00217"></a>00217         apiData(0), usingCallback(false), userCallback(0), userData(0),
-<a name="l00218"></a>00218         continueSysex(false) {}
-<a name="l00219"></a>00219   };
+<a name="l00156"></a>00156   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtMidiIn.html#a62b1b38aa8e5f11cd66f03d59228f4e4" title="Return the number of available MIDI input ports.">getPortCount</a>();
+<a name="l00157"></a>00157 
+<a name="l00159"></a>00159 
+<a name="l00162"></a>00162   std::string <a class="code" href="classRtMidiIn.html#af2961fff09fa01a3d5bc0f0c5a042aaf" title="Return a string identifier for the specified MIDI input port number.">getPortName</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0 );
+<a name="l00163"></a>00163 
+<a name="l00165"></a>00165 
+<a name="l00172"></a>00172   <span class="keywordtype">void</span> <a class="code" href="classRtMidiIn.html#af9507125aaa42276ccc01df576fc3533" title="Specify whether certain MIDI message types should be queued or ignored during input...">ignoreTypes</a>( <span class="keywordtype">bool</span> midiSysex = <span class="keyword">true</span>, <span class="keywordtype">bool</span> midiTime = <span class="keyword">true</span>, <span class="keywordtype">bool</span> midiSense = <span class="keyword">true</span> );
+<a name="l00173"></a>00173 
+<a name="l00175"></a>00175 
+<a name="l00182"></a>00182   <span class="keywordtype">double</span> <a class="code" href="classRtMidiIn.html#a1ba10ecd276b30a8579c7d60a9c890eb" title="Fill the user-provided vector with the data bytes for the next available MIDI message...">getMessage</a>( std::vector&lt;unsigned char&gt; *message );
+<a name="l00183"></a>00183 
+<a name="l00184"></a>00184   <span class="comment">// A MIDI structure used internally by the class to store incoming</span>
+<a name="l00185"></a>00185   <span class="comment">// messages.  Each message represents one and only one MIDI message.</span>
+<a name="l00186"></a>00186   <span class="keyword">struct </span>MidiMessage { 
+<a name="l00187"></a>00187     std::vector&lt;unsigned char&gt; bytes; 
+<a name="l00188"></a>00188     <span class="keywordtype">double</span> timeStamp;
+<a name="l00189"></a>00189 
+<a name="l00190"></a>00190     <span class="comment">// Default constructor.</span>
+<a name="l00191"></a>00191     MidiMessage()
+<a name="l00192"></a>00192       :bytes(0), timeStamp(0.0) {}
+<a name="l00193"></a>00193   };
+<a name="l00194"></a>00194 
+<a name="l00195"></a>00195   <span class="keyword">struct </span>MidiQueue {
+<a name="l00196"></a>00196     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> front;
+<a name="l00197"></a>00197     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> back;
+<a name="l00198"></a>00198     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> size;
+<a name="l00199"></a>00199     <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> ringSize;
+<a name="l00200"></a>00200                   MidiMessage *ring;
+<a name="l00201"></a>00201 
+<a name="l00202"></a>00202     <span class="comment">// Default constructor.</span>
+<a name="l00203"></a>00203     MidiQueue()
+<a name="l00204"></a>00204       :front(0), back(0), size(0), ringSize(0) {}
+<a name="l00205"></a>00205   };
+<a name="l00206"></a>00206 
+<a name="l00207"></a>00207   <span class="comment">// The RtMidiInData structure is used to pass private class data to</span>
+<a name="l00208"></a>00208   <span class="comment">// the MIDI input handling function or thread.</span>
+<a name="l00209"></a>00209   <span class="keyword">struct </span>RtMidiInData {
+<a name="l00210"></a>00210     MidiQueue queue;
+<a name="l00211"></a>00211     MidiMessage message;
+<a name="l00212"></a>00212     <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> ignoreFlags;
+<a name="l00213"></a>00213     <span class="keywordtype">bool</span> doInput;
+<a name="l00214"></a>00214     <span class="keywordtype">bool</span> firstMessage;
+<a name="l00215"></a>00215     <span class="keywordtype">void</span> *apiData;
+<a name="l00216"></a>00216     <span class="keywordtype">bool</span> usingCallback;
+<a name="l00217"></a>00217     <span class="keywordtype">void</span> *userCallback;
+<a name="l00218"></a>00218     <span class="keywordtype">void</span> *userData;
+<a name="l00219"></a>00219     <span class="keywordtype">bool</span> continueSysex;
 <a name="l00220"></a>00220 
-<a name="l00221"></a>00221  <span class="keyword">private</span>:
-<a name="l00222"></a>00222 
-<a name="l00223"></a>00223   <span class="keywordtype">void</span> initialize( <span class="keyword">const</span> std::string&amp; clientName );
-<a name="l00224"></a>00224   RtMidiInData inputData_;
-<a name="l00225"></a>00225 
-<a name="l00226"></a>00226 };
+<a name="l00221"></a>00221     <span class="comment">// Default constructor.</span>
+<a name="l00222"></a>00222     RtMidiInData()
+<a name="l00223"></a>00223       : ignoreFlags(7), doInput(false), firstMessage(true),
+<a name="l00224"></a>00224         apiData(0), usingCallback(false), userCallback(0), userData(0),
+<a name="l00225"></a>00225         continueSysex(false) {}
+<a name="l00226"></a>00226   };
 <a name="l00227"></a>00227 
-<a name="l00228"></a>00228 <span class="comment">/**********************************************************************/</span>
-<a name="l00240"></a>00240 <span class="comment">/**********************************************************************/</span>
-<a name="l00241"></a>00241 
-<a name="l00242"></a><a class="code" href="classRtMidiOut.html">00242</a> <span class="keyword">class </span><a class="code" href="classRtMidiOut.html" title="A realtime MIDI output class.">RtMidiOut</a> : <span class="keyword">public</span> <a class="code" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>
-<a name="l00243"></a>00243 {
-<a name="l00244"></a>00244  <span class="keyword">public</span>:
-<a name="l00245"></a>00245 
-<a name="l00247"></a>00247 
-<a name="l00250"></a>00250   <a class="code" href="classRtMidiOut.html#a8ed1b492900f3410bf91ad53203b9db3" title="Default constructor that allows an optional client name.">RtMidiOut</a>( <span class="keyword">const</span> std::string clientName = std::string( <span class="stringliteral">&quot;RtMidi Output Client&quot;</span> ) );
-<a name="l00251"></a>00251 
-<a name="l00253"></a>00253   <a class="code" href="classRtMidiOut.html#ab776c431bd84193febb2f78fb8c7e792" title="The destructor closes any open MIDI connections.">~RtMidiOut</a>();
+<a name="l00228"></a>00228  <span class="keyword">private</span>:
+<a name="l00229"></a>00229 
+<a name="l00230"></a>00230   <span class="keywordtype">void</span> initialize( <span class="keyword">const</span> std::string&amp; clientName );
+<a name="l00231"></a>00231   RtMidiInData inputData_;
+<a name="l00232"></a>00232 
+<a name="l00233"></a>00233 };
+<a name="l00234"></a>00234 
+<a name="l00235"></a>00235 <span class="comment">/**********************************************************************/</span>
+<a name="l00247"></a>00247 <span class="comment">/**********************************************************************/</span>
+<a name="l00248"></a>00248 
+<a name="l00249"></a><a class="code" href="classRtMidiOut.html">00249</a> <span class="keyword">class </span><a class="code" href="classRtMidiOut.html" title="A realtime MIDI output class.">RtMidiOut</a> : <span class="keyword">public</span> <a class="code" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>
+<a name="l00250"></a>00250 {
+<a name="l00251"></a>00251  <span class="keyword">public</span>:
+<a name="l00252"></a>00252 
 <a name="l00254"></a>00254 
-<a name="l00256"></a>00256 
-<a name="l00262"></a>00262   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#a1b280d67317cd473a8816aeb2fe6c186" title="Open a MIDI output connection.">openPort</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0, <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">&quot;RtMidi Output&quot;</span> ) );
+<a name="l00257"></a>00257   <a class="code" href="classRtMidiOut.html#a8ed1b492900f3410bf91ad53203b9db3" title="Default constructor that allows an optional client name.">RtMidiOut</a>( <span class="keyword">const</span> std::string clientName = std::string( <span class="stringliteral">&quot;RtMidi Output Client&quot;</span> ) );
+<a name="l00258"></a>00258 
+<a name="l00260"></a>00260   <a class="code" href="classRtMidiOut.html#ab776c431bd84193febb2f78fb8c7e792" title="The destructor closes any open MIDI connections.">~RtMidiOut</a>();
+<a name="l00261"></a>00261 
 <a name="l00263"></a>00263 
-<a name="l00265"></a>00265   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#a3092e53a8aed2d3b163fcaa05fafd041" title="Close an open MIDI connection (if one exists).">closePort</a>();
-<a name="l00266"></a>00266 
-<a name="l00268"></a>00268 
-<a name="l00276"></a>00276   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#a47068e1c076d91fd89587c0ccdeddc7a" title="Create a virtual output port, with optional name, to allow software connections (OS...">openVirtualPort</a>( <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">&quot;RtMidi Output&quot;</span> ) );
-<a name="l00277"></a>00277 
-<a name="l00279"></a>00279   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtMidiOut.html#ad6cddbcc7faa20a7be229f765ade0877" title="Return the number of available MIDI output ports.">getPortCount</a>();
-<a name="l00280"></a>00280 
-<a name="l00282"></a>00282 
-<a name="l00285"></a>00285   std::string <a class="code" href="classRtMidiOut.html#acc4ae0ab71a49ae7629075d5a9cd837c" title="Return a string identifier for the specified MIDI port type and number.">getPortName</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0 );
-<a name="l00286"></a>00286 
-<a name="l00288"></a>00288 
-<a name="l00292"></a>00292   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#a0bd8972ef8ac4e8d37ccc4b5d51c2eb3" title="Immediately send a single message out an open MIDI output port.">sendMessage</a>( std::vector&lt;unsigned char&gt; *message );
+<a name="l00269"></a>00269   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#a1b280d67317cd473a8816aeb2fe6c186" title="Open a MIDI output connection.">openPort</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0, <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">&quot;RtMidi Output&quot;</span> ) );
+<a name="l00270"></a>00270 
+<a name="l00272"></a>00272   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#a3092e53a8aed2d3b163fcaa05fafd041" title="Close an open MIDI connection (if one exists).">closePort</a>();
+<a name="l00273"></a>00273 
+<a name="l00275"></a>00275 
+<a name="l00283"></a>00283   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#a47068e1c076d91fd89587c0ccdeddc7a" title="Create a virtual output port, with optional name, to allow software connections (OS...">openVirtualPort</a>( <span class="keyword">const</span> std::string portName = std::string( <span class="stringliteral">&quot;RtMidi Output&quot;</span> ) );
+<a name="l00284"></a>00284 
+<a name="l00286"></a>00286   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classRtMidiOut.html#ad6cddbcc7faa20a7be229f765ade0877" title="Return the number of available MIDI output ports.">getPortCount</a>();
+<a name="l00287"></a>00287 
+<a name="l00289"></a>00289 
+<a name="l00292"></a>00292   std::string <a class="code" href="classRtMidiOut.html#acc4ae0ab71a49ae7629075d5a9cd837c" title="Return a string identifier for the specified MIDI port type and number.">getPortName</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> portNumber = 0 );
 <a name="l00293"></a>00293 
-<a name="l00294"></a>00294  <span class="keyword">private</span>:
 <a name="l00295"></a>00295 
-<a name="l00296"></a>00296   <span class="keywordtype">void</span> initialize( <span class="keyword">const</span> std::string&amp; clientName );
-<a name="l00297"></a>00297 };
-<a name="l00298"></a>00298 
-<a name="l00299"></a>00299 <span class="preprocessor">#endif</span>
+<a name="l00299"></a>00299   <span class="keywordtype">void</span> <a class="code" href="classRtMidiOut.html#a0bd8972ef8ac4e8d37ccc4b5d51c2eb3" title="Immediately send a single message out an open MIDI output port.">sendMessage</a>( std::vector&lt;unsigned char&gt; *message );
+<a name="l00300"></a>00300 
+<a name="l00301"></a>00301  <span class="keyword">private</span>:
+<a name="l00302"></a>00302 
+<a name="l00303"></a>00303   <span class="keywordtype">void</span> initialize( <span class="keyword">const</span> std::string&amp; clientName );
+<a name="l00304"></a>00304 };
+<a name="l00305"></a>00305 
+<a name="l00306"></a>00306 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/RtWvIn_8h-source.html b/doc/html/RtWvIn_8h-source.html
deleted file mode 100644
index 9732a08..0000000
--- a/doc/html/RtWvIn_8h-source.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>RtWvIn.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_RTWVIN_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_RTWVIN_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "WvIn.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "<a class="code" href="RtAudio_8h.html">RtAudio.h</a>"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "Mutex.h"</span>
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 
-<a name="l00031"></a><a class="code" href="classstk_1_1RtWvIn.html">00031</a> <span class="keyword">class </span><a class="code" href="classstk_1_1RtWvIn.html" title="STK realtime audio (blocking) input class.">RtWvIn</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1WvIn.html" title="STK audio input abstract base class.">WvIn</a>
-<a name="l00032"></a>00032 {
-<a name="l00033"></a>00033 <span class="keyword">public</span>:
-<a name="l00035"></a>00035 
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1RtWvIn.html#b84c98c568346d1ad86251961f7d1fba" title="Default constructor.">RtWvIn</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1, StkFloat <a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">sampleRate</a> = <a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>(),
-<a name="l00043"></a>00043           <span class="keywordtype">int</span> device = 0, <span class="keywordtype">int</span> bufferFrames = RT_BUFFER_SIZE, <span class="keywordtype">int</span> nBuffers = 20 );
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046   <a class="code" href="classstk_1_1RtWvIn.html#efae2caa7f77522e8baa4908e3157f4d" title="Class destructor.">~RtWvIn</a>();
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1RtWvIn.html#0ae4012cb269fb70536611b9116142fa" title="Start the audio input stream.">start</a>( <span class="keywordtype">void</span> );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1RtWvIn.html#39d0d9702569ee3afa769309e8b2e152" title="Stop the audio input stream.">stop</a>( <span class="keywordtype">void</span> );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063 
-<a name="l00072"></a>00072   StkFloat <a class="code" href="classstk_1_1RtWvIn.html#3a4f4035fc01fee4c2423791f9e9317e" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075 
-<a name="l00084"></a>00084   StkFloat <a class="code" href="classstk_1_1RtWvIn.html#d2ace75cfe44dd82dd706d2c8dac7901" title="Compute a sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00085"></a>00085 
-<a name="l00087"></a>00087 
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1RtWvIn.html#d2ace75cfe44dd82dd706d2c8dac7901" title="Compute a sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
-<a name="l00095"></a>00095 
-<a name="l00096"></a>00096   <span class="comment">// This function is not intended for general use but must be</span>
-<a name="l00097"></a>00097   <span class="comment">// public for access from the audio callback function.</span>
-<a name="l00098"></a>00098   <span class="keywordtype">void</span> fillBuffer( <span class="keywordtype">void</span> *buffer, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nFrames );
-<a name="l00099"></a>00099 
-<a name="l00100"></a>00100 <span class="keyword">protected</span>:
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102          <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> adc_;
-<a name="l00103"></a>00103   <a class="code" href="classstk_1_1Mutex.html" title="STK mutex class.">Mutex</a> mutex_;
-<a name="l00104"></a>00104   <span class="keywordtype">bool</span> stopped_;
-<a name="l00105"></a>00105   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> readIndex_;
-<a name="l00106"></a>00106   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> writeIndex_;
-<a name="l00107"></a>00107   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> framesFilled_;
-<a name="l00108"></a>00108 
-<a name="l00109"></a>00109 };
-<a name="l00110"></a>00110 
-<a name="l00111"></a><a class="code" href="classstk_1_1RtWvIn.html#3a4f4035fc01fee4c2423791f9e9317e">00111</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1RtWvIn.html#3a4f4035fc01fee4c2423791f9e9317e" title="Return the specified channel value of the last computed frame.">RtWvIn :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00112"></a>00112 {
-<a name="l00113"></a>00113 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00114"></a>00114 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= data_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00115"></a>00115     errorString_ &lt;&lt; <span class="stringliteral">"RtWvIn::lastOut(): channel argument and audio stream are incompatible!"</span>;
-<a name="l00116"></a>00116     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00117"></a>00117   }
-<a name="l00118"></a>00118 <span class="preprocessor">#endif</span>
-<a name="l00119"></a>00119 <span class="preprocessor"></span>
-<a name="l00120"></a>00120   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00121"></a>00121 }
-<a name="l00122"></a>00122 
-<a name="l00123"></a>00123 } <span class="comment">// stk namespace</span>
-<a name="l00124"></a>00124 
-<a name="l00125"></a>00125 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/RtWvIn_8h_source.html b/doc/html/RtWvIn_8h_source.html
index 6cc5ec8..5c0fd20 100644
--- a/doc/html/RtWvIn_8h_source.html
+++ b/doc/html/RtWvIn_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>RtWvIn.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_RTWVIN_H</span>
@@ -67,7 +67,7 @@
 <a name="l00112"></a>00112 {
 <a name="l00113"></a>00113 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00114"></a>00114 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= data_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00115"></a>00115     errorString_ &lt;&lt; <span class="stringliteral">&quot;RtWvIn::lastOut(): channel argument and audio stream are incompatible!&quot;</span>;
+<a name="l00115"></a>00115     oStream_ &lt;&lt; <span class="stringliteral">&quot;RtWvIn::lastOut(): channel argument and audio stream are incompatible!&quot;</span>;
 <a name="l00116"></a>00116     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00117"></a>00117   }
 <a name="l00118"></a>00118 <span class="preprocessor">#endif</span>
@@ -83,7 +83,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/RtWvOut_8h-source.html b/doc/html/RtWvOut_8h-source.html
deleted file mode 100644
index 1bf0b23..0000000
--- a/doc/html/RtWvOut_8h-source.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>RtWvOut.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_RTWVOUT_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_RTWVOUT_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "WvOut.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "<a class="code" href="RtAudio_8h.html">RtAudio.h</a>"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "Mutex.h"</span>
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
-<a name="l00028"></a>00028 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 
-<a name="l00030"></a><a class="code" href="classstk_1_1RtWvOut.html">00030</a> <span class="keyword">class </span><a class="code" href="classstk_1_1RtWvOut.html" title="STK realtime audio (blocking) output class.">RtWvOut</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1WvOut.html" title="STK audio output abstract base class.">WvOut</a>
-<a name="l00031"></a>00031 {
-<a name="l00032"></a>00032  <span class="keyword">public</span>:
-<a name="l00033"></a>00033 
-<a name="l00035"></a>00035 
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1RtWvOut.html#f2ee408eb10a0dbf9e14407b34f2181e" title="Default constructor.">RtWvOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1, StkFloat <a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">sampleRate</a> = <a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>(),
-<a name="l00043"></a>00043            <span class="keywordtype">int</span> device = 0, <span class="keywordtype">int</span> bufferFrames = RT_BUFFER_SIZE, <span class="keywordtype">int</span> nBuffers = 20 );
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046   <a class="code" href="classstk_1_1RtWvOut.html#85b2e30c6a153c959a33ec4aae528ca2" title="Class destructor.">~RtWvOut</a>();
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1RtWvOut.html#2e34c9ff845155230e0336ea3729dc45" title="Start the audio output stream.">start</a>( <span class="keywordtype">void</span> );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1RtWvOut.html#7368c42b81670c0335b25f14faa08918" title="Stop the audio output stream.">stop</a>( <span class="keywordtype">void</span> );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063 
-<a name="l00066"></a>00066   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1RtWvOut.html#02adabdc987f3b9ac4dc4e02ea20962d" title="Output a single sample to all channels in a sample frame.">tick</a>( <span class="keyword">const</span> StkFloat sample );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069 
-<a name="l00076"></a>00076   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1RtWvOut.html#02adabdc987f3b9ac4dc4e02ea20962d" title="Output a single sample to all channels in a sample frame.">tick</a>( <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames );
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078   <span class="comment">// This function is not intended for general use but must be</span>
-<a name="l00079"></a>00079   <span class="comment">// public for access from the audio callback function.</span>
-<a name="l00080"></a>00080   <span class="keywordtype">int</span> readBuffer( <span class="keywordtype">void</span> *buffer, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> frameCount );
-<a name="l00081"></a>00081 
-<a name="l00082"></a>00082  <span class="keyword">protected</span>:
-<a name="l00083"></a>00083 
-<a name="l00084"></a>00084   <a class="code" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> dac_;
-<a name="l00085"></a>00085   <a class="code" href="classstk_1_1Mutex.html" title="STK mutex class.">Mutex</a> mutex_;
-<a name="l00086"></a>00086   <span class="keywordtype">bool</span> stopped_;
-<a name="l00087"></a>00087   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> readIndex_;
-<a name="l00088"></a>00088   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> writeIndex_;
-<a name="l00089"></a>00089   <span class="keywordtype">long</span> framesFilled_;
-<a name="l00090"></a>00090   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> status_; <span class="comment">// running = 0, emptying buffer = 1, finished = 2</span>
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092 };
-<a name="l00093"></a>00093 
-<a name="l00094"></a>00094 } <span class="comment">// stk namespace</span>
-<a name="l00095"></a>00095 
-<a name="l00096"></a>00096 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/RtWvOut_8h_source.html b/doc/html/RtWvOut_8h_source.html
index 611e227..7bfbd5c 100644
--- a/doc/html/RtWvOut_8h_source.html
+++ b/doc/html/RtWvOut_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>RtWvOut.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_RTWVOUT_H</span>
@@ -70,7 +70,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Sampler_8h-source.html b/doc/html/Sampler_8h-source.html
deleted file mode 100644
index 66f160b..0000000
--- a/doc/html/Sampler_8h-source.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Sampler.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SAMPLER_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_SAMPLER_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "ADSR.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "FileLoop.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="keyword">namespace </span>stk {
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="comment">/***************************************************/</span>
-<a name="l00020"></a>00020 <span class="comment">/***************************************************/</span>
-<a name="l00021"></a>00021 
-<a name="l00022"></a><a class="code" href="classstk_1_1Sampler.html">00022</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Sampler.html" title="STK sampling synthesis abstract base class.">Sampler</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00023"></a>00023 {
-<a name="l00024"></a>00024  <span class="keyword">public</span>:
-<a name="l00026"></a>00026   <a class="code" href="classstk_1_1Sampler.html#97dbec0c39f3307560736173b4ede4e1" title="Default constructor.">Sampler</a>( <span class="keywordtype">void</span> );
-<a name="l00027"></a>00027 
-<a name="l00029"></a>00029   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1Sampler.html#9262914e25d4b9fd28a760621902fd74" title="Class destructor.">~Sampler</a>( <span class="keywordtype">void</span> );
-<a name="l00030"></a>00030 
-<a name="l00032"></a>00032   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sampler.html#6c80aad733f5e90dfa63d29c6a5c88ac" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00033"></a>00033 
-<a name="l00035"></a>00035   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sampler.html#746eaab88793e3e8cdac9f6e59e00ca3" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency ) = 0;
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sampler.html#d277ac455b3434eeb21d628d6c70141a" title="Initiate the envelopes with a key-on event and reset the attack waves.">keyOn</a>( <span class="keywordtype">void</span> );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sampler.html#808aec2bf546b01e1ef53503c5a164e1" title="Signal a key-off event to the envelopes.">keyOff</a>( <span class="keywordtype">void</span> );
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sampler.html#36c3ed945fb3e8db300b7ae01a4a4a76" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00045"></a>00045 
-<a name="l00047"></a>00047   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sampler.html#d9c0789f033978165226beb7c8133cc3" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value ) = 0;
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1Sampler.html#08502c96fa3e5f4c853c781354ed1965" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
-<a name="l00051"></a>00051 
-<a name="l00052"></a>00052  <span class="keyword">protected</span>:
-<a name="l00053"></a>00053 
-<a name="l00054"></a>00054   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> adsr_;
-<a name="l00055"></a>00055   std::vector&lt;FileWvIn *&gt; attacks_;
-<a name="l00056"></a>00056   std::vector&lt;FileLoop *&gt; loops_;
-<a name="l00057"></a>00057   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a> filter_;
-<a name="l00058"></a>00058   StkFloat baseFrequency_;
-<a name="l00059"></a>00059   std::vector&lt;StkFloat&gt; attackRatios_;
-<a name="l00060"></a>00060   std::vector&lt;StkFloat&gt; loopRatios_;
-<a name="l00061"></a>00061   StkFloat attackGain_;
-<a name="l00062"></a>00062   StkFloat loopGain_;
-<a name="l00063"></a>00063 
-<a name="l00064"></a>00064 };
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066 } <span class="comment">// stk namespace</span>
-<a name="l00067"></a>00067 
-<a name="l00068"></a>00068 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Sampler_8h_source.html b/doc/html/Sampler_8h_source.html
index 4824bfe..6edcdf5 100644
--- a/doc/html/Sampler_8h_source.html
+++ b/doc/html/Sampler_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Sampler.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SAMPLER_H</span>
@@ -46,29 +46,32 @@
 <a name="l00048"></a>00048 
 <a name="l00050"></a>00050   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1Sampler.html#a08502c96fa3e5f4c853c781354ed1965" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
 <a name="l00051"></a>00051 
-<a name="l00052"></a>00052  <span class="keyword">protected</span>:
 <a name="l00053"></a>00053 
-<a name="l00054"></a>00054   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> adsr_;
-<a name="l00055"></a>00055   std::vector&lt;FileWvIn *&gt; attacks_;
-<a name="l00056"></a>00056   std::vector&lt;FileLoop *&gt; loops_;
-<a name="l00057"></a>00057   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a> filter_;
-<a name="l00058"></a>00058   StkFloat baseFrequency_;
-<a name="l00059"></a>00059   std::vector&lt;StkFloat&gt; attackRatios_;
-<a name="l00060"></a>00060   std::vector&lt;StkFloat&gt; loopRatios_;
-<a name="l00061"></a>00061   StkFloat attackGain_;
-<a name="l00062"></a>00062   StkFloat loopGain_;
+<a name="l00060"></a>00060   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Sampler.html#a08502c96fa3e5f4c853c781354ed1965" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
+<a name="l00061"></a>00061 
+<a name="l00062"></a>00062  <span class="keyword">protected</span>:
 <a name="l00063"></a>00063 
-<a name="l00064"></a>00064 };
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066 } <span class="comment">// stk namespace</span>
-<a name="l00067"></a>00067 
-<a name="l00068"></a>00068 <span class="preprocessor">#endif</span>
+<a name="l00064"></a>00064   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> adsr_;
+<a name="l00065"></a>00065   std::vector&lt;FileWvIn *&gt; attacks_;
+<a name="l00066"></a>00066   std::vector&lt;FileLoop *&gt; loops_;
+<a name="l00067"></a>00067   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a> filter_;
+<a name="l00068"></a>00068   StkFloat baseFrequency_;
+<a name="l00069"></a>00069   std::vector&lt;StkFloat&gt; attackRatios_;
+<a name="l00070"></a>00070   std::vector&lt;StkFloat&gt; loopRatios_;
+<a name="l00071"></a>00071   StkFloat attackGain_;
+<a name="l00072"></a>00072   StkFloat loopGain_;
+<a name="l00073"></a>00073 
+<a name="l00074"></a>00074 };
+<a name="l00075"></a>00075 
+<a name="l00076"></a>00076 } <span class="comment">// stk namespace</span>
+<a name="l00077"></a>00077 
+<a name="l00078"></a>00078 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Saxofony_8h-source.html b/doc/html/Saxofony_8h-source.html
deleted file mode 100644
index 1c40c47..0000000
--- a/doc/html/Saxofony_8h-source.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Saxofony.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SAXOFONY_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_SAXOFONY_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayL.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "ReedTable.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OneZero.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "Envelope.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00010"></a>00010 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="keyword">namespace </span>stk {
-<a name="l00013"></a>00013 
-<a name="l00014"></a>00014 <span class="comment">/***************************************************/</span>
-<a name="l00049"></a>00049 <span class="comment">/***************************************************/</span>
-<a name="l00050"></a>00050 
-<a name="l00051"></a><a class="code" href="classstk_1_1Saxofony.html">00051</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Saxofony.html" title="STK faux conical bore reed instrument class.">Saxofony</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00052"></a>00052 {
-<a name="l00053"></a>00053  <span class="keyword">public</span>:
-<a name="l00055"></a>00055 
-<a name="l00058"></a>00058   <a class="code" href="classstk_1_1Saxofony.html#15984d74213308e0d81d1ee32d99ee76" title="Class constructor, taking the lowest desired playing frequency.">Saxofony</a>( StkFloat lowestFrequency );
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061   <a class="code" href="classstk_1_1Saxofony.html#1ff6a35de027e292c8a693aac314720d" title="Class destructor.">~Saxofony</a>( <span class="keywordtype">void</span> );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Saxofony.html#c74981cfa3b36ec1288eccab6aa80210" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Saxofony.html#5844455497f50e4b64beb23f275ac8d1" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00068"></a>00068 
-<a name="l00070"></a>00070   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Saxofony.html#eccfcfe10cef314cedf727ed5ba9d3d5" title="Set the &amp;quot;blowing&amp;quot; position between the air column terminations (0.0 - 1...">setBlowPosition</a>( StkFloat aPosition );
-<a name="l00071"></a>00071 
-<a name="l00073"></a>00073   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Saxofony.html#6e46b18ad2f992dfc3d948f966ec1bf2" title="Apply breath pressure to instrument with given amplitude and rate of increase.">startBlowing</a>( StkFloat amplitude, StkFloat rate );
-<a name="l00074"></a>00074 
-<a name="l00076"></a>00076   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Saxofony.html#e792c62c3bcf2fe756387c1f5cd61794" title="Decrease breath pressure with given rate of decrease.">stopBlowing</a>( StkFloat rate );
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Saxofony.html#924eed4733c9ecfd0e4de44f69011ea5" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00080"></a>00080 
-<a name="l00082"></a>00082   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Saxofony.html#a930437a8044fc01dc906d79a482894c" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00083"></a>00083 
-<a name="l00085"></a>00085   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Saxofony.html#38efe138bea7af7aeab3652bf0a305ff" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00086"></a>00086 
-<a name="l00088"></a>00088   StkFloat <a class="code" href="classstk_1_1Saxofony.html#955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090  <span class="keyword">protected</span>:
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>    delays_[2];
-<a name="l00093"></a>00093   <a class="code" href="classstk_1_1ReedTable.html" title="STK reed table class.">ReedTable</a> reedTable_;
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>   filter_;
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a>  envelope_;
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>     noise_;
-<a name="l00097"></a>00097   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00099"></a>00099   StkFloat outputGain_;
-<a name="l00100"></a>00100   StkFloat noiseGain_;
-<a name="l00101"></a>00101   StkFloat vibratoGain_;
-<a name="l00102"></a>00102   StkFloat position_;
-<a name="l00103"></a>00103 
-<a name="l00104"></a>00104 };
-<a name="l00105"></a>00105 
-<a name="l00106"></a><a class="code" href="classstk_1_1Saxofony.html#955d2ea0b3236039851d19b681ca2b0f">00106</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Saxofony.html#955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">Saxofony :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00107"></a>00107 {
-<a name="l00108"></a>00108   StkFloat pressureDiff;
-<a name="l00109"></a>00109   StkFloat breathPressure;
-<a name="l00110"></a>00110   StkFloat temp;
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
-<a name="l00113"></a>00113   breathPressure = envelope_.<a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>(); 
-<a name="l00114"></a>00114   breathPressure += breathPressure * noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00115"></a>00115   breathPressure += breathPressure * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
-<a name="l00116"></a>00116 
-<a name="l00117"></a>00117   temp = -0.95 * filter_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delays_[0].<a class="code" href="classstk_1_1Instrmnt.html#aa6bd5e4a5be7f9b0be967daf012872e" title="Return the specified channel value of the last computed frame.">lastOut</a>() );
-<a name="l00118"></a>00118   lastFrame_[0] = temp - delays_[1].<a class="code" href="classstk_1_1DelayL.html#16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
-<a name="l00119"></a>00119   pressureDiff = breathPressure - lastFrame_[0];
-<a name="l00120"></a>00120   delays_[1].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( temp );
-<a name="l00121"></a>00121   delays_[0].<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( breathPressure - (pressureDiff * reedTable_.<a class="code" href="classstk_1_1ReedTable.html#3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>(pressureDiff)) - temp );
-<a name="l00122"></a>00122 
-<a name="l00123"></a>00123   lastFrame_[0] *= outputGain_;
-<a name="l00124"></a>00124   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00125"></a>00125 }
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127 } <span class="comment">// stk namespace</span>
-<a name="l00128"></a>00128 
-<a name="l00129"></a>00129 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Saxofony_8h_source.html b/doc/html/Saxofony_8h_source.html
index 553ae18..0d3130f 100644
--- a/doc/html/Saxofony_8h_source.html
+++ b/doc/html/Saxofony_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Saxofony.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SAXOFONY_H</span>
@@ -54,52 +54,82 @@
 <a name="l00086"></a>00086 
 <a name="l00088"></a>00088   StkFloat <a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00089"></a>00089 
-<a name="l00090"></a>00090  <span class="keyword">protected</span>:
 <a name="l00091"></a>00091 
-<a name="l00092"></a>00092   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>    delays_[2];
-<a name="l00093"></a>00093   <a class="code" href="classstk_1_1ReedTable.html" title="STK reed table class.">ReedTable</a> reedTable_;
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>   filter_;
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a>  envelope_;
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>     noise_;
-<a name="l00097"></a>00097   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
-<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00099"></a>00099   StkFloat outputGain_;
-<a name="l00100"></a>00100   StkFloat noiseGain_;
-<a name="l00101"></a>00101   StkFloat vibratoGain_;
-<a name="l00102"></a>00102   StkFloat position_;
-<a name="l00103"></a>00103 
-<a name="l00104"></a>00104 };
-<a name="l00105"></a>00105 
-<a name="l00106"></a><a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f">00106</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">Saxofony :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00107"></a>00107 {
-<a name="l00108"></a>00108   StkFloat pressureDiff;
-<a name="l00109"></a>00109   StkFloat breathPressure;
-<a name="l00110"></a>00110   StkFloat temp;
-<a name="l00111"></a>00111 
-<a name="l00112"></a>00112   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
-<a name="l00113"></a>00113   breathPressure = envelope_.<a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>(); 
-<a name="l00114"></a>00114   breathPressure += breathPressure * noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00115"></a>00115   breathPressure += breathPressure * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
-<a name="l00116"></a>00116 
-<a name="l00117"></a>00117   temp = -0.95 * filter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delays_[0].<a class="code" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e" title="Return the specified channel value of the last computed frame.">lastOut</a>() );
-<a name="l00118"></a>00118   lastFrame_[0] = temp - delays_[1].<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
-<a name="l00119"></a>00119   pressureDiff = breathPressure - lastFrame_[0];
-<a name="l00120"></a>00120   delays_[1].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( temp );
-<a name="l00121"></a>00121   delays_[0].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( breathPressure - (pressureDiff * reedTable_.<a class="code" href="classstk_1_1ReedTable.html#a3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>(pressureDiff)) - temp );
-<a name="l00122"></a>00122 
-<a name="l00123"></a>00123   lastFrame_[0] *= outputGain_;
-<a name="l00124"></a>00124   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00125"></a>00125 }
+<a name="l00098"></a>00098   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00099"></a>00099 
+<a name="l00100"></a>00100  <span class="keyword">protected</span>:
+<a name="l00101"></a>00101 
+<a name="l00102"></a>00102   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>    delays_[2];
+<a name="l00103"></a>00103   <a class="code" href="classstk_1_1ReedTable.html" title="STK reed table class.">ReedTable</a> reedTable_;
+<a name="l00104"></a>00104   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>   filter_;
+<a name="l00105"></a>00105   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a>  envelope_;
+<a name="l00106"></a>00106   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>     noise_;
+<a name="l00107"></a>00107   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> vibrato_;
+<a name="l00108"></a>00108 
+<a name="l00109"></a>00109   StkFloat outputGain_;
+<a name="l00110"></a>00110   StkFloat noiseGain_;
+<a name="l00111"></a>00111   StkFloat vibratoGain_;
+<a name="l00112"></a>00112   StkFloat position_;
+<a name="l00113"></a>00113 
+<a name="l00114"></a>00114 };
+<a name="l00115"></a>00115 
+<a name="l00116"></a><a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f">00116</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">Saxofony :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00117"></a>00117 {
+<a name="l00118"></a>00118   StkFloat pressureDiff;
+<a name="l00119"></a>00119   StkFloat breathPressure;
+<a name="l00120"></a>00120   StkFloat temp;
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122   <span class="comment">// Calculate the breath pressure (envelope + noise + vibrato)</span>
+<a name="l00123"></a>00123   breathPressure = envelope_.<a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>(); 
+<a name="l00124"></a>00124   breathPressure += breathPressure * noiseGain_ * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
+<a name="l00125"></a>00125   breathPressure += breathPressure * vibratoGain_ * vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>();
 <a name="l00126"></a>00126 
-<a name="l00127"></a>00127 } <span class="comment">// stk namespace</span>
-<a name="l00128"></a>00128 
-<a name="l00129"></a>00129 <span class="preprocessor">#endif</span>
+<a name="l00127"></a>00127   temp = -0.95 * filter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delays_[0].<a class="code" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e" title="Return the specified channel value of the last computed frame.">lastOut</a>() );
+<a name="l00128"></a>00128   lastFrame_[0] = temp - delays_[1].<a class="code" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9" title="Return the last computed output value.">lastOut</a>();
+<a name="l00129"></a>00129   pressureDiff = breathPressure - lastFrame_[0];
+<a name="l00130"></a>00130   delays_[1].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( temp );
+<a name="l00131"></a>00131   delays_[0].<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( breathPressure - (pressureDiff * reedTable_.<a class="code" href="classstk_1_1ReedTable.html#a3c1607ed5712e2ab010d8c5e55e431f2" title="Take one sample input and map to one sample of output.">tick</a>(pressureDiff)) - temp );
+<a name="l00132"></a>00132 
+<a name="l00133"></a>00133   lastFrame_[0] *= outputGain_;
+<a name="l00134"></a>00134   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00135"></a>00135 }
+<a name="l00136"></a>00136 
+<a name="l00137"></a><a class="code" href="classstk_1_1Saxofony.html#a98c686337ea0c2be7683ddc569bb0a1d">00137</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">Saxofony :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00138"></a>00138 {
+<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00140"></a>00140 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00141"></a>00141 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00142"></a>00142     oStream_ &lt;&lt; <span class="stringliteral">&quot;Saxofony::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00143"></a>00143     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00144"></a>00144   }
+<a name="l00145"></a>00145 <span class="preprocessor">#endif</span>
+<a name="l00146"></a>00146 <span class="preprocessor"></span>
+<a name="l00147"></a>00147   StkFloat *samples = &amp;frames[channel];
+<a name="l00148"></a>00148   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00149"></a>00149   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00150"></a>00150     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00151"></a>00151       *samples++ = <a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">tick</a>();
+<a name="l00152"></a>00152   }
+<a name="l00153"></a>00153   <span class="keywordflow">else</span> {
+<a name="l00154"></a>00154     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00155"></a>00155       *samples++ = <a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">tick</a>();
+<a name="l00156"></a>00156       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00157"></a>00157         *samples++ = lastFrame_[j];
+<a name="l00158"></a>00158     }
+<a name="l00159"></a>00159   }
+<a name="l00160"></a>00160 
+<a name="l00161"></a>00161   <span class="keywordflow">return</span> frames;
+<a name="l00162"></a>00162 }
+<a name="l00163"></a>00163 
+<a name="l00164"></a>00164 } <span class="comment">// stk namespace</span>
+<a name="l00165"></a>00165 
+<a name="l00166"></a>00166 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Shakers_8h-source.html b/doc/html/Shakers_8h-source.html
deleted file mode 100644
index 5d697c1..0000000
--- a/doc/html/Shakers_8h-source.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Shakers.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SHAKERS_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_SHAKERS_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00060"></a>00060 <span class="comment">/***************************************************/</span>
-<a name="l00061"></a>00061 
-<a name="l00062"></a>00062 <span class="keyword">const</span> <span class="keywordtype">int</span> MAX_FREQS = 8;
-<a name="l00063"></a>00063 <span class="keyword">const</span> <span class="keywordtype">int</span> NUM_INSTR = 24;
-<a name="l00064"></a>00064 
-<a name="l00065"></a><a class="code" href="classstk_1_1Shakers.html">00065</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Shakers.html" title="PhISEM and PhOLIES class.">Shakers</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00066"></a>00066 {
-<a name="l00067"></a>00067  <span class="keyword">public</span>:
-<a name="l00069"></a>00069   <a class="code" href="classstk_1_1Shakers.html#34e4859c572a158d8fda15b7a5c6954d" title="Class constructor.">Shakers</a>( <span class="keywordtype">void</span> );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1Shakers.html#a1b2ab640268da68b867de1495f19a77" title="Class destructor.">~Shakers</a>( <span class="keywordtype">void</span> );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075 
-<a name="l00079"></a>00079   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Shakers.html#81ffb0ad1e350993af10b2795ec01861" title="Start a note with the given instrument and amplitude.">noteOn</a>( StkFloat instrument, StkFloat amplitude );
-<a name="l00080"></a>00080 
-<a name="l00082"></a>00082   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Shakers.html#b63b4b57f8306eb7cf1adbf5a5cd1d05" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00083"></a>00083 
-<a name="l00085"></a>00085   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Shakers.html#688d9d8318e0c69779868079a7c64157" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00086"></a>00086 
-<a name="l00088"></a>00088   StkFloat <a class="code" href="classstk_1_1Shakers.html#e06ebba276cef74cb8c83db4e33f21c2" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090  <span class="keyword">protected</span>:
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092   <span class="keywordtype">int</span> setupName( <span class="keywordtype">char</span>* instr );
-<a name="l00093"></a>00093   <span class="keywordtype">int</span> setupNum( <span class="keywordtype">int</span> inst );
-<a name="l00094"></a>00094   <span class="keywordtype">int</span> setFreqAndReson( <span class="keywordtype">int</span> which, StkFloat freq, StkFloat reson );
-<a name="l00095"></a>00095   <span class="keywordtype">void</span> setDecays( StkFloat sndDecay, StkFloat sysDecay );
-<a name="l00096"></a>00096   <span class="keywordtype">void</span> setFinalZs( StkFloat z0, StkFloat z1, StkFloat z2 );
-<a name="l00097"></a>00097   StkFloat wuter_tick( <span class="keywordtype">void</span> );
-<a name="l00098"></a>00098   StkFloat tbamb_tick( <span class="keywordtype">void</span> );
-<a name="l00099"></a>00099   StkFloat ratchet_tick( <span class="keywordtype">void</span> );
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101   <span class="keywordtype">int</span> instType_;
-<a name="l00102"></a>00102   <span class="keywordtype">int</span> ratchetPos_, lastRatchetPos_;
-<a name="l00103"></a>00103   StkFloat shakeEnergy_;
-<a name="l00104"></a>00104   StkFloat inputs_[MAX_FREQS];
-<a name="l00105"></a>00105   StkFloat outputs_[MAX_FREQS][2];
-<a name="l00106"></a>00106   StkFloat coeffs_[MAX_FREQS][2];
-<a name="l00107"></a>00107   StkFloat sndLevel_;
-<a name="l00108"></a>00108   StkFloat baseGain_;
-<a name="l00109"></a>00109   StkFloat gains_[MAX_FREQS];
-<a name="l00110"></a>00110   <span class="keywordtype">int</span> nFreqs_;
-<a name="l00111"></a>00111   StkFloat t_center_freqs_[MAX_FREQS];
-<a name="l00112"></a>00112   StkFloat center_freqs_[MAX_FREQS];
-<a name="l00113"></a>00113   StkFloat resons_[MAX_FREQS];
-<a name="l00114"></a>00114   StkFloat freq_rand_[MAX_FREQS];
-<a name="l00115"></a>00115   <span class="keywordtype">int</span> freqalloc_[MAX_FREQS];
-<a name="l00116"></a>00116   StkFloat soundDecay_;
-<a name="l00117"></a>00117   StkFloat systemDecay_;
-<a name="l00118"></a>00118   StkFloat nObjects_;
-<a name="l00119"></a>00119   StkFloat totalEnergy_;
-<a name="l00120"></a>00120   StkFloat ratchet_, ratchetDelta_;
-<a name="l00121"></a>00121   StkFloat finalZ_[3];
-<a name="l00122"></a>00122   StkFloat finalZCoeffs_[3];
-<a name="l00123"></a>00123   StkFloat defObjs_[NUM_INSTR];
-<a name="l00124"></a>00124   StkFloat defDecays_[NUM_INSTR];
-<a name="l00125"></a>00125   StkFloat decayScale_[NUM_INSTR];
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127 };
-<a name="l00128"></a>00128 
-<a name="l00129"></a>00129 } <span class="comment">// stk namespace</span>
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Shakers_8h_source.html b/doc/html/Shakers_8h_source.html
index aa94634..5453b88 100644
--- a/doc/html/Shakers_8h_source.html
+++ b/doc/html/Shakers_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Shakers.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SHAKERS_H</span>
@@ -41,54 +41,84 @@
 <a name="l00086"></a>00086 
 <a name="l00088"></a>00088   StkFloat <a class="code" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00089"></a>00089 
-<a name="l00090"></a>00090  <span class="keyword">protected</span>:
 <a name="l00091"></a>00091 
-<a name="l00092"></a>00092   <span class="keywordtype">int</span> setupName( <span class="keywordtype">char</span>* instr );
-<a name="l00093"></a>00093   <span class="keywordtype">int</span> setupNum( <span class="keywordtype">int</span> inst );
-<a name="l00094"></a>00094   <span class="keywordtype">int</span> setFreqAndReson( <span class="keywordtype">int</span> which, StkFloat freq, StkFloat reson );
-<a name="l00095"></a>00095   <span class="keywordtype">void</span> setDecays( StkFloat sndDecay, StkFloat sysDecay );
-<a name="l00096"></a>00096   <span class="keywordtype">void</span> setFinalZs( StkFloat z0, StkFloat z1, StkFloat z2 );
-<a name="l00097"></a>00097   StkFloat wuter_tick( <span class="keywordtype">void</span> );
-<a name="l00098"></a>00098   StkFloat tbamb_tick( <span class="keywordtype">void</span> );
-<a name="l00099"></a>00099   StkFloat ratchet_tick( <span class="keywordtype">void</span> );
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101   <span class="keywordtype">int</span> instType_;
-<a name="l00102"></a>00102   <span class="keywordtype">int</span> ratchetPos_, lastRatchetPos_;
-<a name="l00103"></a>00103   StkFloat shakeEnergy_;
-<a name="l00104"></a>00104   StkFloat inputs_[MAX_FREQS];
-<a name="l00105"></a>00105   StkFloat outputs_[MAX_FREQS][2];
-<a name="l00106"></a>00106   StkFloat coeffs_[MAX_FREQS][2];
-<a name="l00107"></a>00107   StkFloat sndLevel_;
-<a name="l00108"></a>00108   StkFloat baseGain_;
-<a name="l00109"></a>00109   StkFloat gains_[MAX_FREQS];
-<a name="l00110"></a>00110   <span class="keywordtype">int</span> nFreqs_;
-<a name="l00111"></a>00111   StkFloat t_center_freqs_[MAX_FREQS];
-<a name="l00112"></a>00112   StkFloat center_freqs_[MAX_FREQS];
-<a name="l00113"></a>00113   StkFloat resons_[MAX_FREQS];
-<a name="l00114"></a>00114   StkFloat freq_rand_[MAX_FREQS];
-<a name="l00115"></a>00115   <span class="keywordtype">int</span> freqalloc_[MAX_FREQS];
-<a name="l00116"></a>00116   StkFloat soundDecay_;
-<a name="l00117"></a>00117   StkFloat systemDecay_;
-<a name="l00118"></a>00118   StkFloat nObjects_;
-<a name="l00119"></a>00119   StkFloat totalEnergy_;
-<a name="l00120"></a>00120   StkFloat ratchet_, ratchetDelta_;
-<a name="l00121"></a>00121   StkFloat finalZ_[3];
-<a name="l00122"></a>00122   StkFloat finalZCoeffs_[3];
-<a name="l00123"></a>00123   StkFloat defObjs_[NUM_INSTR];
-<a name="l00124"></a>00124   StkFloat defDecays_[NUM_INSTR];
-<a name="l00125"></a>00125   StkFloat decayScale_[NUM_INSTR];
-<a name="l00126"></a>00126 
-<a name="l00127"></a>00127 };
-<a name="l00128"></a>00128 
-<a name="l00129"></a>00129 } <span class="comment">// stk namespace</span>
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131 <span class="preprocessor">#endif</span>
+<a name="l00098"></a>00098   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00099"></a>00099 
+<a name="l00100"></a>00100  <span class="keyword">protected</span>:
+<a name="l00101"></a>00101 
+<a name="l00102"></a>00102   <span class="keywordtype">int</span> setupName( <span class="keywordtype">char</span>* instr );
+<a name="l00103"></a>00103   <span class="keywordtype">int</span> setupNum( <span class="keywordtype">int</span> inst );
+<a name="l00104"></a>00104   <span class="keywordtype">int</span> setFreqAndReson( <span class="keywordtype">int</span> which, StkFloat freq, StkFloat reson );
+<a name="l00105"></a>00105   <span class="keywordtype">void</span> setDecays( StkFloat sndDecay, StkFloat sysDecay );
+<a name="l00106"></a>00106   <span class="keywordtype">void</span> setFinalZs( StkFloat z0, StkFloat z1, StkFloat z2 );
+<a name="l00107"></a>00107   StkFloat wuter_tick( <span class="keywordtype">void</span> );
+<a name="l00108"></a>00108   StkFloat tbamb_tick( <span class="keywordtype">void</span> );
+<a name="l00109"></a>00109   StkFloat ratchet_tick( <span class="keywordtype">void</span> );
+<a name="l00110"></a>00110 
+<a name="l00111"></a>00111   <span class="keywordtype">int</span> instType_;
+<a name="l00112"></a>00112   <span class="keywordtype">int</span> ratchetPos_, lastRatchetPos_;
+<a name="l00113"></a>00113   StkFloat shakeEnergy_;
+<a name="l00114"></a>00114   StkFloat inputs_[MAX_FREQS];
+<a name="l00115"></a>00115   StkFloat outputs_[MAX_FREQS][2];
+<a name="l00116"></a>00116   StkFloat coeffs_[MAX_FREQS][2];
+<a name="l00117"></a>00117   StkFloat sndLevel_;
+<a name="l00118"></a>00118   StkFloat baseGain_;
+<a name="l00119"></a>00119   StkFloat gains_[MAX_FREQS];
+<a name="l00120"></a>00120   <span class="keywordtype">int</span> nFreqs_;
+<a name="l00121"></a>00121   StkFloat t_center_freqs_[MAX_FREQS];
+<a name="l00122"></a>00122   StkFloat center_freqs_[MAX_FREQS];
+<a name="l00123"></a>00123   StkFloat resons_[MAX_FREQS];
+<a name="l00124"></a>00124   StkFloat freq_rand_[MAX_FREQS];
+<a name="l00125"></a>00125   <span class="keywordtype">int</span> freqalloc_[MAX_FREQS];
+<a name="l00126"></a>00126   StkFloat soundDecay_;
+<a name="l00127"></a>00127   StkFloat systemDecay_;
+<a name="l00128"></a>00128   StkFloat nObjects_;
+<a name="l00129"></a>00129   StkFloat totalEnergy_;
+<a name="l00130"></a>00130   StkFloat ratchet_, ratchetDelta_;
+<a name="l00131"></a>00131   StkFloat finalZ_[3];
+<a name="l00132"></a>00132   StkFloat finalZCoeffs_[3];
+<a name="l00133"></a>00133   StkFloat defObjs_[NUM_INSTR];
+<a name="l00134"></a>00134   StkFloat defDecays_[NUM_INSTR];
+<a name="l00135"></a>00135   StkFloat decayScale_[NUM_INSTR];
+<a name="l00136"></a>00136 
+<a name="l00137"></a>00137 };
+<a name="l00138"></a>00138 
+<a name="l00139"></a><a class="code" href="classstk_1_1Shakers.html#a655713b658ddeb065d755997cac4b62e">00139</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2" title="Compute and return one output sample.">Shakers :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00140"></a>00140 {
+<a name="l00141"></a>00141   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00142"></a>00142 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00143"></a>00143 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00144"></a>00144     oStream_ &lt;&lt; <span class="stringliteral">&quot;Shakers::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00145"></a>00145     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00146"></a>00146   }
+<a name="l00147"></a>00147 <span class="preprocessor">#endif</span>
+<a name="l00148"></a>00148 <span class="preprocessor"></span>
+<a name="l00149"></a>00149   StkFloat *samples = &amp;frames[channel];
+<a name="l00150"></a>00150   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00151"></a>00151   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00152"></a>00152     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00153"></a>00153       *samples++ = <a class="code" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2" title="Compute and return one output sample.">tick</a>();
+<a name="l00154"></a>00154   }
+<a name="l00155"></a>00155   <span class="keywordflow">else</span> {
+<a name="l00156"></a>00156     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00157"></a>00157       *samples++ = <a class="code" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2" title="Compute and return one output sample.">tick</a>();
+<a name="l00158"></a>00158       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00159"></a>00159         *samples++ = lastFrame_[j];
+<a name="l00160"></a>00160     }
+<a name="l00161"></a>00161   }
+<a name="l00162"></a>00162 
+<a name="l00163"></a>00163   <span class="keywordflow">return</span> frames;
+<a name="l00164"></a>00164 }
+<a name="l00165"></a>00165 
+<a name="l00166"></a>00166 } <span class="comment">// stk namespace</span>
+<a name="l00167"></a>00167 
+<a name="l00168"></a>00168 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Simple_8h-source.html b/doc/html/Simple_8h-source.html
deleted file mode 100644
index c5c73bf..0000000
--- a/doc/html/Simple_8h-source.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Simple.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SIMPLE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_SIMPLE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "ADSR.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "FileLoop.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "BiQuad.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="keyword">namespace </span>stk {
-<a name="l00012"></a>00012 
-<a name="l00013"></a>00013 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 <span class="comment">/***************************************************/</span>
-<a name="l00031"></a>00031 
-<a name="l00032"></a><a class="code" href="classstk_1_1Simple.html">00032</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Simple.html" title="STK wavetable/noise instrument.">Simple</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00033"></a>00033 {
-<a name="l00034"></a>00034  <span class="keyword">public</span>:
-<a name="l00036"></a>00036 
-<a name="l00039"></a>00039   <a class="code" href="classstk_1_1Simple.html#7fae7f883b6180e7d07c9e06b62e1283" title="Class constructor.">Simple</a>( <span class="keywordtype">void</span> );
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1Simple.html#7fc1b20b362b5902d8a47ea889144601" title="Class destructor.">~Simple</a>( <span class="keywordtype">void</span> );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Simple.html#8281297483ef2363a01590722dd739d8" title="Clear internal states.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Simple.html#a2dcec630c97fdafb2ba75e74194540d" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Simple.html#44650c4b65de79d4bf0b04b908c207b2" title="Start envelope toward &amp;quot;on&amp;quot; target.">keyOn</a>( <span class="keywordtype">void</span> );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Simple.html#4183bd057f8bf3783c8b1812f3459d32" title="Start envelope toward &amp;quot;off&amp;quot; target.">keyOff</a>( <span class="keywordtype">void</span> );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Simple.html#eba26edadfba0dfe0f21834bd730fdad" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Simple.html#6fbdaba299b3733b7e81ec4de5073350" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Simple.html#cd14d5368545f5650aeebbbdad65fc52" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   StkFloat <a class="code" href="classstk_1_1Simple.html#a65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00067"></a>00067 
-<a name="l00068"></a>00068  <span class="keyword">protected</span>:
-<a name="l00069"></a>00069 
-<a name="l00070"></a>00070   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>      adsr_; 
-<a name="l00071"></a>00071   <a class="code" href="classstk_1_1FileLoop.html" title="STK file looping / oscillator class.">FileLoop</a> *loop_;
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>   filter_;
-<a name="l00073"></a>00073   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>    biquad_;
-<a name="l00074"></a>00074   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>     noise_;
-<a name="l00075"></a>00075   StkFloat  baseFrequency_;
-<a name="l00076"></a>00076   StkFloat  loopGain_;
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078 };
-<a name="l00079"></a>00079 
-<a name="l00080"></a><a class="code" href="classstk_1_1Simple.html#a65326847f8b693f7b5549d18df6e882">00080</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Simple.html#a65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">Simple :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00081"></a>00081 {
-<a name="l00082"></a>00082   lastFrame_[0] = loopGain_ * loop_-&gt;<a class="code" href="classstk_1_1FileLoop.html#037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick</a>();
-<a name="l00083"></a>00083   biquad_.<a class="code" href="classstk_1_1BiQuad.html#648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( noise_.<a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>() );
-<a name="l00084"></a>00084   lastFrame_[0] += (1.0 - loopGain_) * biquad_.<a class="code" href="classstk_1_1BiQuad.html#412f224363b1a222423ecf0cd7be9063" title="Return the last computed output value.">lastOut</a>();
-<a name="l00085"></a>00085   lastFrame_[0] = filter_.<a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( lastFrame_[0] );
-<a name="l00086"></a>00086   lastFrame_[0] *= adsr_.<a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00087"></a>00087   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00088"></a>00088 }
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 } <span class="comment">// stk namespace</span>
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Simple_8h_source.html b/doc/html/Simple_8h_source.html
index e9b49bd..b36a84d 100644
--- a/doc/html/Simple_8h_source.html
+++ b/doc/html/Simple_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Simple.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SIMPLE_H</span>
@@ -51,37 +51,67 @@
 <a name="l00064"></a>00064 
 <a name="l00066"></a>00066   StkFloat <a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00067"></a>00067 
-<a name="l00068"></a>00068  <span class="keyword">protected</span>:
 <a name="l00069"></a>00069 
-<a name="l00070"></a>00070   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>      adsr_; 
-<a name="l00071"></a>00071   <a class="code" href="classstk_1_1FileLoop.html" title="STK file looping / oscillator class.">FileLoop</a> *loop_;
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>   filter_;
-<a name="l00073"></a>00073   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>    biquad_;
-<a name="l00074"></a>00074   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>     noise_;
-<a name="l00075"></a>00075   StkFloat  baseFrequency_;
-<a name="l00076"></a>00076   StkFloat  loopGain_;
+<a name="l00076"></a>00076   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00077"></a>00077 
-<a name="l00078"></a>00078 };
+<a name="l00078"></a>00078  <span class="keyword">protected</span>:
 <a name="l00079"></a>00079 
-<a name="l00080"></a><a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882">00080</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">Simple :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00081"></a>00081 {
-<a name="l00082"></a>00082   lastFrame_[0] = loopGain_ * loop_-&gt;<a class="code" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick</a>();
-<a name="l00083"></a>00083   biquad_.<a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>() );
-<a name="l00084"></a>00084   lastFrame_[0] += (1.0 - loopGain_) * biquad_.<a class="code" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063" title="Return the last computed output value.">lastOut</a>();
-<a name="l00085"></a>00085   lastFrame_[0] = filter_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( lastFrame_[0] );
-<a name="l00086"></a>00086   lastFrame_[0] *= adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
-<a name="l00087"></a>00087   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00088"></a>00088 }
+<a name="l00080"></a>00080   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>      adsr_; 
+<a name="l00081"></a>00081   <a class="code" href="classstk_1_1FileLoop.html" title="STK file looping / oscillator class.">FileLoop</a> *loop_;
+<a name="l00082"></a>00082   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>   filter_;
+<a name="l00083"></a>00083   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>    biquad_;
+<a name="l00084"></a>00084   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>     noise_;
+<a name="l00085"></a>00085   StkFloat  baseFrequency_;
+<a name="l00086"></a>00086   StkFloat  loopGain_;
+<a name="l00087"></a>00087 
+<a name="l00088"></a>00088 };
 <a name="l00089"></a>00089 
-<a name="l00090"></a>00090 } <span class="comment">// stk namespace</span>
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092 <span class="preprocessor">#endif</span>
+<a name="l00090"></a><a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882">00090</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">Simple :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00091"></a>00091 {
+<a name="l00092"></a>00092   lastFrame_[0] = loopGain_ * loop_-&gt;<a class="code" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick</a>();
+<a name="l00093"></a>00093   biquad_.<a class="code" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635" title="Input one sample to the filter and return a reference to one output.">tick</a>( noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>() );
+<a name="l00094"></a>00094   lastFrame_[0] += (1.0 - loopGain_) * biquad_.<a class="code" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063" title="Return the last computed output value.">lastOut</a>();
+<a name="l00095"></a>00095   lastFrame_[0] = filter_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( lastFrame_[0] );
+<a name="l00096"></a>00096   lastFrame_[0] *= adsr_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>();
+<a name="l00097"></a>00097   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00098"></a>00098 }
+<a name="l00099"></a>00099 
+<a name="l00100"></a><a class="code" href="classstk_1_1Simple.html#adff17b07913c312e989f1987e4fb5cc8">00100</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">Simple :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00101"></a>00101 {
+<a name="l00102"></a>00102   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00103"></a>00103 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00104"></a>00104 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00105"></a>00105     oStream_ &lt;&lt; <span class="stringliteral">&quot;Simple::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00106"></a>00106     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00107"></a>00107   }
+<a name="l00108"></a>00108 <span class="preprocessor">#endif</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span>
+<a name="l00110"></a>00110   StkFloat *samples = &amp;frames[channel];
+<a name="l00111"></a>00111   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00112"></a>00112   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00113"></a>00113     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00114"></a>00114       *samples++ = <a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">tick</a>();
+<a name="l00115"></a>00115   }
+<a name="l00116"></a>00116   <span class="keywordflow">else</span> {
+<a name="l00117"></a>00117     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00118"></a>00118       *samples++ = <a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">tick</a>();
+<a name="l00119"></a>00119       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00120"></a>00120         *samples++ = lastFrame_[j];
+<a name="l00121"></a>00121     }
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124   <span class="keywordflow">return</span> frames;
+<a name="l00125"></a>00125 }
+<a name="l00126"></a>00126 
+<a name="l00127"></a>00127 } <span class="comment">// stk namespace</span>
+<a name="l00128"></a>00128 
+<a name="l00129"></a>00129 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/SineWave_8h-source.html b/doc/html/SineWave_8h-source.html
deleted file mode 100644
index 7147170..0000000
--- a/doc/html/SineWave_8h-source.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>SineWave.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SINEWAVE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_SINEWAVE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> TABLE_SIZE = 2048;
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="preprocessor">#include "Generator.h"</span>
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
-<a name="l00023"></a>00023 <span class="comment">/***************************************************/</span>
-<a name="l00024"></a>00024 
-<a name="l00025"></a><a class="code" href="classstk_1_1SineWave.html">00025</a> <span class="keyword">class </span><a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00026"></a>00026 {
-<a name="l00027"></a>00027 <span class="keyword">public</span>:
-<a name="l00029"></a>00029   <a class="code" href="classstk_1_1SineWave.html#d25afe03871430c533986b0852e04c62" title="Default constructor.">SineWave</a>( <span class="keywordtype">void</span> );
-<a name="l00030"></a>00030 
-<a name="l00032"></a>00032   <a class="code" href="classstk_1_1SineWave.html#e192f1813531f4b2ba933bcc5b288bfb" title="Class destructor.">~SineWave</a>( <span class="keywordtype">void</span> );
-<a name="l00033"></a>00033 
-<a name="l00035"></a>00035   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SineWave.html#667b211ead65a23aa8ab89e4a9c9ae6c" title="Clear output and reset time pointer to zero.">reset</a>( <span class="keywordtype">void</span> );
-<a name="l00036"></a>00036 
-<a name="l00038"></a>00038 
-<a name="l00041"></a><a class="code" href="classstk_1_1SineWave.html#e69b232dd3a33963d25cf6215692d9d5">00041</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SineWave.html#e69b232dd3a33963d25cf6215692d9d5" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( StkFloat rate ) { rate_ = rate; };
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044 
-<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SineWave.html#1047a43714bc2e40c7e31e8f7e34adbc" title="Set the data interpolation rate based on a looping frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SineWave.html#dc8f03d5d81cfc24c20794033aad876f" title="Increment the read pointer by time in samples, modulo the table size.">addTime</a>( StkFloat time );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SineWave.html#62d69af61e6905ddda203756cd6e3516" title="Increment the read pointer by a normalized phase value.">addPhase</a>( StkFloat phase );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064 
-<a name="l00068"></a>00068   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SineWave.html#87bd4c92259b9b389f568f8d7cd7524f" title="Add a normalized phase offset to the read pointer.">addPhaseOffset</a>( StkFloat phaseOffset );
-<a name="l00069"></a>00069 
-<a name="l00071"></a><a class="code" href="classstk_1_1SineWave.html#b788e787e5bb54445dd0769283567224">00071</a>   StkFloat <a class="code" href="classstk_1_1SineWave.html#b788e787e5bb54445dd0769283567224" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00072"></a>00072 
-<a name="l00074"></a>00074   StkFloat <a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00075"></a>00075 
-<a name="l00077"></a>00077 
-<a name="l00084"></a>00084   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086 <span class="keyword">protected</span>:
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090   <span class="keyword">static</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> table_;
-<a name="l00091"></a>00091   StkFloat time_;
-<a name="l00092"></a>00092   StkFloat rate_;
-<a name="l00093"></a>00093   StkFloat phaseOffset_;
-<a name="l00094"></a>00094   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iIndex_;
-<a name="l00095"></a>00095   StkFloat alpha_;
-<a name="l00096"></a>00096 
-<a name="l00097"></a>00097 };
-<a name="l00098"></a>00098 
-<a name="l00099"></a><a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda">00099</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">SineWave :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00100"></a>00100 {
-<a name="l00101"></a>00101   <span class="comment">// Check limits of time address ... if necessary, recalculate modulo</span>
-<a name="l00102"></a>00102   <span class="comment">// TABLE_SIZE.</span>
-<a name="l00103"></a>00103   <span class="keywordflow">while</span> ( time_ &lt; 0.0 )
-<a name="l00104"></a>00104     time_ += TABLE_SIZE;
-<a name="l00105"></a>00105   <span class="keywordflow">while</span> ( time_ &gt;= TABLE_SIZE )
-<a name="l00106"></a>00106     time_ -= TABLE_SIZE;
-<a name="l00107"></a>00107 
-<a name="l00108"></a>00108   iIndex_ = (<span class="keywordtype">unsigned</span> int) time_;
-<a name="l00109"></a>00109   alpha_ = time_ - iIndex_;
-<a name="l00110"></a>00110   StkFloat tmp = table_[ iIndex_ ];
-<a name="l00111"></a>00111   tmp += ( alpha_ * ( table_[ iIndex_ + 1 ] - tmp ) );
-<a name="l00112"></a>00112 
-<a name="l00113"></a>00113   <span class="comment">// Increment time, which can be negative.</span>
-<a name="l00114"></a>00114   time_ += rate_;
-<a name="l00115"></a>00115 
-<a name="l00116"></a>00116   lastFrame_[0] = tmp;
-<a name="l00117"></a>00117   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00118"></a>00118 }
-<a name="l00119"></a>00119 
-<a name="l00120"></a><a class="code" href="classstk_1_1SineWave.html#f205d7029046af8a392341cabd58f9de">00120</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">SineWave :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00121"></a>00121 {
-<a name="l00122"></a>00122 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00123"></a>00123 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00124"></a>00124     errorString_ &lt;&lt; <span class="stringliteral">"SineWave::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00125"></a>00125     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00126"></a>00126   }
-<a name="l00127"></a>00127 <span class="preprocessor">#endif</span>
-<a name="l00128"></a>00128 <span class="preprocessor"></span>
-<a name="l00129"></a>00129   StkFloat *samples = &amp;frames[channel];
-<a name="l00130"></a>00130   StkFloat tmp = 0.0;
-<a name="l00131"></a>00131 
-<a name="l00132"></a>00132   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00133"></a>00133   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00134"></a>00134 
-<a name="l00135"></a>00135     <span class="comment">// Check limits of time address ... if necessary, recalculate modulo</span>
-<a name="l00136"></a>00136     <span class="comment">// TABLE_SIZE.</span>
-<a name="l00137"></a>00137     <span class="keywordflow">while</span> ( time_ &lt; 0.0 )
-<a name="l00138"></a>00138       time_ += TABLE_SIZE;
-<a name="l00139"></a>00139     <span class="keywordflow">while</span> ( time_ &gt;= TABLE_SIZE )
-<a name="l00140"></a>00140       time_ -= TABLE_SIZE;
-<a name="l00141"></a>00141 
-<a name="l00142"></a>00142     iIndex_ = (<span class="keywordtype">unsigned</span> int) time_;
-<a name="l00143"></a>00143     alpha_ = time_ - iIndex_;
-<a name="l00144"></a>00144     tmp = table_[ iIndex_ ];
-<a name="l00145"></a>00145     tmp += ( alpha_ * ( table_[ iIndex_ + 1 ] - tmp ) );
-<a name="l00146"></a>00146     *samples = tmp;
-<a name="l00147"></a>00147 
-<a name="l00148"></a>00148     <span class="comment">// Increment time, which can be negative.</span>
-<a name="l00149"></a>00149     time_ += rate_;
-<a name="l00150"></a>00150   }
-<a name="l00151"></a>00151 
-<a name="l00152"></a>00152   lastFrame_[0] = tmp;
-<a name="l00153"></a>00153   <span class="keywordflow">return</span> frames;
-<a name="l00154"></a>00154 }
-<a name="l00155"></a>00155 
-<a name="l00156"></a>00156 } <span class="comment">// stk namespace</span>
-<a name="l00157"></a>00157 
-<a name="l00158"></a>00158 <span class="preprocessor">#endif</span>
-<a name="l00159"></a>00159 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/SineWave_8h_source.html b/doc/html/SineWave_8h_source.html
index 7070280..9f5caf6 100644
--- a/doc/html/SineWave_8h_source.html
+++ b/doc/html/SineWave_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>SineWave.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SINEWAVE_H</span>
@@ -92,7 +92,7 @@
 <a name="l00121"></a>00121 {
 <a name="l00122"></a>00122 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00123"></a>00123 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00124"></a>00124     errorString_ &lt;&lt; <span class="stringliteral">&quot;SineWave::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00124"></a>00124     oStream_ &lt;&lt; <span class="stringliteral">&quot;SineWave::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00125"></a>00125     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00126"></a>00126   }
 <a name="l00127"></a>00127 <span class="preprocessor">#endif</span>
@@ -133,7 +133,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/SingWave_8h-source.html b/doc/html/SingWave_8h-source.html
deleted file mode 100644
index 778edab..0000000
--- a/doc/html/SingWave_8h-source.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>SingWave.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SINGWAVE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_SINGWAVE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "FileLoop.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Modulate.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "Envelope.h"</span>
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="keyword">namespace </span>stk {
-<a name="l00009"></a>00009 
-<a name="l00010"></a>00010 <span class="comment">/***************************************************/</span>
-<a name="l00023"></a>00023 <span class="comment">/***************************************************/</span>
-<a name="l00024"></a>00024 
-<a name="l00025"></a><a class="code" href="classstk_1_1SingWave.html">00025</a> <span class="keyword">class </span><a class="code" href="classstk_1_1SingWave.html" title="STK &amp;quot;singing&amp;quot; looped soundfile class.">SingWave</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a>
-<a name="l00026"></a>00026 {
-<a name="l00027"></a>00027  <span class="keyword">public</span>:
-<a name="l00029"></a>00029 
-<a name="l00036"></a>00036   <a class="code" href="classstk_1_1SingWave.html#7a38283d4e42d5f9b96d3ce8c401183a" title="Class constructor taking filename argument.">SingWave</a>( std::string fileName, <span class="keywordtype">bool</span> raw = <span class="keyword">false</span> );
-<a name="l00037"></a>00037 
-<a name="l00039"></a>00039   <a class="code" href="classstk_1_1SingWave.html#0cd0c9dc6878705b638098c425ced782" title="Class destructor.">~SingWave</a>( <span class="keywordtype">void</span> );
-<a name="l00040"></a>00040 
-<a name="l00042"></a><a class="code" href="classstk_1_1SingWave.html#906a50d64292988d48aa742c80e4f572">00042</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#906a50d64292988d48aa742c80e4f572" title="Reset file to beginning.">reset</a>( <span class="keywordtype">void</span> ) { wave_.<a class="code" href="classstk_1_1FileLoop.html#2c539902d697d0b87334ca7dc4f3ce69" title="Clear outputs and reset time (file) pointer to zero.">reset</a>(); lastFrame_[0] = 0.0; };
-<a name="l00043"></a>00043 
-<a name="l00045"></a><a class="code" href="classstk_1_1SingWave.html#ed07d9ebe8289abe232eb1337d0708db">00045</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#ed07d9ebe8289abe232eb1337d0708db" title="Normalize the file to a maximum of +-1.0.">normalize</a>( <span class="keywordtype">void</span> ) { wave_.<a class="code" href="classstk_1_1FileLoop.html#7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">normalize</a>(); };
-<a name="l00046"></a>00046 
-<a name="l00048"></a><a class="code" href="classstk_1_1SingWave.html#eece74c720cfe97c3d7f67c01a102b3d">00048</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#eece74c720cfe97c3d7f67c01a102b3d" title="Normalize the file to a maximum of +- peak.">normalize</a>( StkFloat peak ) { wave_.<a class="code" href="classstk_1_1FileLoop.html#7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">normalize</a>( peak ); };
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#e1ac4a84551f89570ff0842d032a3cba" title="Set looping parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00052"></a>00052 
-<a name="l00054"></a><a class="code" href="classstk_1_1SingWave.html#9143162e223ad86682c099d2a6c79ea0">00054</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#9143162e223ad86682c099d2a6c79ea0" title="Set the vibrato frequency in Hz.">setVibratoRate</a>( StkFloat rate ) { modulator_.<a class="code" href="classstk_1_1Modulate.html#298b25f4b7cc56f2dffae5474a05999d" title="Set the periodic (vibrato) rate or frequency in Hz.">setVibratoRate</a>( rate ); };
-<a name="l00055"></a>00055 
-<a name="l00057"></a><a class="code" href="classstk_1_1SingWave.html#5276e1e244551d1ca1dcc70ed42e9228">00057</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#5276e1e244551d1ca1dcc70ed42e9228" title="Set the vibrato gain.">setVibratoGain</a>( StkFloat gain ) { modulator_.<a class="code" href="classstk_1_1Modulate.html#08f2d489a3fba3a10d1f301aed869ed4" title="Set the periodic (vibrato) gain.">setVibratoGain</a>( gain ); };
-<a name="l00058"></a>00058 
-<a name="l00060"></a><a class="code" href="classstk_1_1SingWave.html#287cf0feecb7eda88328fb2bc0edff92">00060</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#287cf0feecb7eda88328fb2bc0edff92" title="Set the random-ness amount.">setRandomGain</a>( StkFloat gain ) { modulator_.<a class="code" href="classstk_1_1Modulate.html#c6e7a02378facf59916f2460ed5c2fa5" title="Set the random modulation gain.">setRandomGain</a>( gain ); };
-<a name="l00061"></a>00061 
-<a name="l00063"></a><a class="code" href="classstk_1_1SingWave.html#b80c50b3c8fc05f056221452504aa150">00063</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#b80c50b3c8fc05f056221452504aa150" title="Set the sweep rate.">setSweepRate</a>( StkFloat rate ) { sweepRate_ = rate; };
-<a name="l00064"></a>00064 
-<a name="l00066"></a><a class="code" href="classstk_1_1SingWave.html#7e2a4183704bea50f9d793bd998d6554">00066</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#7e2a4183704bea50f9d793bd998d6554" title="Set the gain rate.">setGainRate</a>( StkFloat rate ) { envelope_.<a class="code" href="classstk_1_1Envelope.html#de99b5c7cb974f71f1d2919868d774a0" title="Set the rate.">setRate</a>( rate ); };
-<a name="l00067"></a>00067 
-<a name="l00069"></a><a class="code" href="classstk_1_1SingWave.html#c248b298dd095bd7c9ed2c84a229a55f">00069</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#c248b298dd095bd7c9ed2c84a229a55f" title="Set the gain target value.">setGainTarget</a>( StkFloat target ) { envelope_.<a class="code" href="classstk_1_1Envelope.html#5269bc5dc1d56161ab82b677b5462a3e" title="Set the target value.">setTarget</a>( target ); };
-<a name="l00070"></a>00070 
-<a name="l00072"></a><a class="code" href="classstk_1_1SingWave.html#9bd638590605e5b5eb679467506e42ff">00072</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#9bd638590605e5b5eb679467506e42ff" title="Start a note.">noteOn</a>( <span class="keywordtype">void</span> ) { envelope_.<a class="code" href="classstk_1_1Envelope.html#18cf8f21ef70227bd5cd17f53752bd0f" title="Set target = 1.">keyOn</a>(); };
-<a name="l00073"></a>00073 
-<a name="l00075"></a><a class="code" href="classstk_1_1SingWave.html#c81240ee79f64b90a9c37d45c0aa3a7f">00075</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1SingWave.html#c81240ee79f64b90a9c37d45c0aa3a7f" title="Stop a note.">noteOff</a>( <span class="keywordtype">void</span> ) { envelope_.<a class="code" href="classstk_1_1Envelope.html#9dbefb15f8d64aac3969f77d38791774" title="Set target = 0.">keyOff</a>(); };
-<a name="l00076"></a>00076 
-<a name="l00078"></a><a class="code" href="classstk_1_1SingWave.html#f1c5286c4a58904241d7b73ff29d4be0">00078</a>   StkFloat <a class="code" href="classstk_1_1SingWave.html#f1c5286c4a58904241d7b73ff29d4be0" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00079"></a>00079 
-<a name="l00081"></a>00081   StkFloat <a class="code" href="classstk_1_1SingWave.html#45136f9bf5b6f58433d4d65864d9db78" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">void</span> );
-<a name="l00082"></a>00082 
-<a name="l00084"></a>00084 
-<a name="l00091"></a>00091   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1SingWave.html#45136f9bf5b6f58433d4d65864d9db78" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00092"></a>00092 
-<a name="l00093"></a>00093  <span class="keyword">protected</span>:
-<a name="l00094"></a>00094 
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1FileLoop.html" title="STK file looping / oscillator class.">FileLoop</a> wave_;
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1Modulate.html" title="STK periodic/random modulator.">Modulate</a> modulator_;
-<a name="l00097"></a>00097   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> envelope_;
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> pitchEnvelope_;
-<a name="l00099"></a>00099   StkFloat rate_;
-<a name="l00100"></a>00100   StkFloat sweepRate_;
-<a name="l00101"></a>00101 
-<a name="l00102"></a>00102 };
-<a name="l00103"></a>00103 
-<a name="l00104"></a><a class="code" href="classstk_1_1SingWave.html#45136f9bf5b6f58433d4d65864d9db78">00104</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1SingWave.html#45136f9bf5b6f58433d4d65864d9db78" title="Compute and return one output sample.">SingWave :: tick</a>( <span class="keywordtype">void</span> )
-<a name="l00105"></a>00105 {
-<a name="l00106"></a>00106   <span class="comment">// Set the wave rate.</span>
-<a name="l00107"></a>00107   StkFloat newRate = pitchEnvelope_.<a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>();
-<a name="l00108"></a>00108   newRate += newRate * modulator_.<a class="code" href="classstk_1_1Modulate.html#237b96dd553d65253abbf00a186e293d" title="Compute and return one output sample.">tick</a>();
-<a name="l00109"></a>00109   wave_.<a class="code" href="classstk_1_1FileLoop.html#13e1f693bc8a29d9051a400087347a3c" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( newRate );
-<a name="l00110"></a>00110 
-<a name="l00111"></a>00111   lastFrame_[0] = wave_.<a class="code" href="classstk_1_1FileLoop.html#037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick</a>();
-<a name="l00112"></a>00112   lastFrame_[0] *= envelope_.<a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>();
-<a name="l00113"></a>00113 
-<a name="l00114"></a>00114   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00115"></a>00115 }
-<a name="l00116"></a>00116 
-<a name="l00117"></a><a class="code" href="classstk_1_1SingWave.html#b74d7a305510eec92a9aa1a26bcb5e94">00117</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1SingWave.html#45136f9bf5b6f58433d4d65864d9db78" title="Compute and return one output sample.">SingWave :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00118"></a>00118 {
-<a name="l00119"></a>00119 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00120"></a>00120 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00121"></a>00121     errorString_ &lt;&lt; <span class="stringliteral">"SingWave::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00122"></a>00122     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00123"></a>00123   }
-<a name="l00124"></a>00124 <span class="preprocessor">#endif</span>
-<a name="l00125"></a>00125 <span class="preprocessor"></span>
-<a name="l00126"></a>00126   StkFloat *samples = &amp;frames[channel];
-<a name="l00127"></a>00127   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00128"></a>00128   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
-<a name="l00129"></a>00129     *samples = <a class="code" href="classstk_1_1SingWave.html#45136f9bf5b6f58433d4d65864d9db78" title="Compute and return one output sample.">SingWave::tick</a>();
-<a name="l00130"></a>00130 
-<a name="l00131"></a>00131   <span class="keywordflow">return</span> frames;
-<a name="l00132"></a>00132 }
-<a name="l00133"></a>00133 
-<a name="l00134"></a>00134 } <span class="comment">// stk namespace</span>
-<a name="l00135"></a>00135 
-<a name="l00136"></a>00136 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/SingWave_8h_source.html b/doc/html/SingWave_8h_source.html
index 8871d7c..3191a49 100644
--- a/doc/html/SingWave_8h_source.html
+++ b/doc/html/SingWave_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>SingWave.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SINGWAVE_H</span>
@@ -91,7 +91,7 @@
 <a name="l00118"></a>00118 {
 <a name="l00119"></a>00119 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00120"></a>00120 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00121"></a>00121     errorString_ &lt;&lt; <span class="stringliteral">&quot;SingWave::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00121"></a>00121     oStream_ &lt;&lt; <span class="stringliteral">&quot;SingWave::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00122"></a>00122     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00123"></a>00123   }
 <a name="l00124"></a>00124 <span class="preprocessor">#endif</span>
@@ -112,7 +112,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Sitar_8h-source.html b/doc/html/Sitar_8h-source.html
deleted file mode 100644
index a5a68df..0000000
--- a/doc/html/Sitar_8h-source.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Sitar.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SITAR_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_SITAR_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayA.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "OneZero.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "ADSR.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include &lt;cmath&gt;</span>
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="keyword">namespace </span>stk {
-<a name="l00012"></a>00012 
-<a name="l00013"></a>00013 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 <span class="comment">/***************************************************/</span>
-<a name="l00031"></a>00031 
-<a name="l00032"></a><a class="code" href="classstk_1_1Sitar.html">00032</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Sitar.html" title="STK sitar string model class.">Sitar</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00033"></a>00033 {
-<a name="l00034"></a>00034  <span class="keyword">public</span>:
-<a name="l00036"></a>00036   <a class="code" href="classstk_1_1Sitar.html#a645039b4c1609f979775f5ec7e8bd4b" title="Class constructor, taking the lowest desired playing frequency.">Sitar</a>( StkFloat lowestFrequency = 20 );
-<a name="l00037"></a>00037 
-<a name="l00039"></a>00039   <a class="code" href="classstk_1_1Sitar.html#4bb1d8cd5c1ffc331e6c97e28f6f3000" title="Class destructor.">~Sitar</a>( <span class="keywordtype">void</span> );
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sitar.html#52cc4d38204e6825e524228008a0e94c" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sitar.html#02acfe592d8d601a37fadb94aaedb074" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sitar.html#fcbccba0e49bf538c190381785c90752" title="Pluck the string with the given amplitude using the current frequency.">pluck</a>( StkFloat amplitude );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sitar.html#02fb8c574a4ea9acd4ae7f3f3636b3b3" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sitar.html#e4acf7cf5f8319fa3420133c2802e9f6" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   StkFloat <a class="code" href="classstk_1_1Sitar.html#811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00058"></a>00058 
-<a name="l00059"></a>00059  <span class="keyword">protected</span>:
-<a name="l00060"></a>00060 
-<a name="l00061"></a>00061   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>  delayLine_;
-<a name="l00062"></a>00062   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> loopFilter_;
-<a name="l00063"></a>00063   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>   noise_;
-<a name="l00064"></a>00064   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>    envelope_;
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066   StkFloat loopGain_;
-<a name="l00067"></a>00067   StkFloat amGain_;
-<a name="l00068"></a>00068   StkFloat delay_;
-<a name="l00069"></a>00069   StkFloat targetDelay_;
-<a name="l00070"></a>00070 
-<a name="l00071"></a>00071 };
-<a name="l00072"></a>00072 
-<a name="l00073"></a><a class="code" href="classstk_1_1Sitar.html#811c8d08d78cfbd5061396af7027043e">00073</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Sitar.html#811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">Sitar :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00074"></a>00074 {
-<a name="l00075"></a>00075   <span class="keywordflow">if</span> ( fabs(targetDelay_ - delay_) &gt; 0.001 ) {
-<a name="l00076"></a>00076     <span class="keywordflow">if</span> ( targetDelay_ &lt; delay_ )
-<a name="l00077"></a>00077       delay_ *= 0.99999;
-<a name="l00078"></a>00078     <span class="keywordflow">else</span>
-<a name="l00079"></a>00079       delay_ *= 1.00001;
-<a name="l00080"></a>00080     delayLine_.<a class="code" href="classstk_1_1DelayA.html#83ddc9bdf2f5059159160fdac0e25eda" title="Set the delay-line length.">setDelay</a>( delay_ );
-<a name="l00081"></a>00081   }
-<a name="l00082"></a>00082 
-<a name="l00083"></a>00083   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( loopFilter_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delayLine_.<a class="code" href="classstk_1_1DelayA.html#4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_ ) + 
-<a name="l00084"></a>00084                                 (amGain_ * envelope_.<a class="code" href="classstk_1_1ADSR.html#f2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>() * noise_.<a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>()));
-<a name="l00085"></a>00085   
-<a name="l00086"></a>00086   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00087"></a>00087 }
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 } <span class="comment">// stk namespace</span>
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091 <span class="preprocessor">#endif</span>
-<a name="l00092"></a>00092 <span class="preprocessor"></span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Sitar_8h_source.html b/doc/html/Sitar_8h_source.html
index 0648f99..c237502 100644
--- a/doc/html/Sitar_8h_source.html
+++ b/doc/html/Sitar_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Sitar.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SITAR_H</span>
@@ -30,7 +30,7 @@
 <a name="l00032"></a><a class="code" href="classstk_1_1Sitar.html">00032</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Sitar.html" title="STK sitar string model class.">Sitar</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
 <a name="l00033"></a>00033 {
 <a name="l00034"></a>00034  <span class="keyword">public</span>:
-<a name="l00036"></a>00036   <a class="code" href="classstk_1_1Sitar.html#aa645039b4c1609f979775f5ec7e8bd4b" title="Class constructor, taking the lowest desired playing frequency.">Sitar</a>( StkFloat lowestFrequency = 20 );
+<a name="l00036"></a>00036   <a class="code" href="classstk_1_1Sitar.html#a8a2c996ad8b32f98f2bca14aa742bc29" title="Class constructor, taking the lowest desired playing frequency.">Sitar</a>( StkFloat lowestFrequency = 8.0 );
 <a name="l00037"></a>00037 
 <a name="l00039"></a>00039   <a class="code" href="classstk_1_1Sitar.html#a4bb1d8cd5c1ffc331e6c97e28f6f3000" title="Class destructor.">~Sitar</a>( <span class="keywordtype">void</span> );
 <a name="l00040"></a>00040 
@@ -46,46 +46,76 @@
 <a name="l00055"></a>00055 
 <a name="l00057"></a>00057   StkFloat <a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00058"></a>00058 
-<a name="l00059"></a>00059  <span class="keyword">protected</span>:
 <a name="l00060"></a>00060 
-<a name="l00061"></a>00061   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>  delayLine_;
-<a name="l00062"></a>00062   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> loopFilter_;
-<a name="l00063"></a>00063   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>   noise_;
-<a name="l00064"></a>00064   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>    envelope_;
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066   StkFloat loopGain_;
-<a name="l00067"></a>00067   StkFloat amGain_;
-<a name="l00068"></a>00068   StkFloat delay_;
-<a name="l00069"></a>00069   StkFloat targetDelay_;
+<a name="l00067"></a>00067   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00068"></a>00068 
+<a name="l00069"></a>00069  <span class="keyword">protected</span>:
 <a name="l00070"></a>00070 
-<a name="l00071"></a>00071 };
-<a name="l00072"></a>00072 
-<a name="l00073"></a><a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e">00073</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">Sitar :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00074"></a>00074 {
-<a name="l00075"></a>00075   <span class="keywordflow">if</span> ( fabs(targetDelay_ - delay_) &gt; 0.001 ) {
-<a name="l00076"></a>00076     <span class="keywordflow">if</span> ( targetDelay_ &lt; delay_ )
-<a name="l00077"></a>00077       delay_ *= 0.99999;
-<a name="l00078"></a>00078     <span class="keywordflow">else</span>
-<a name="l00079"></a>00079       delay_ *= 1.00001;
-<a name="l00080"></a>00080     delayLine_.<a class="code" href="classstk_1_1DelayA.html#a83ddc9bdf2f5059159160fdac0e25eda" title="Set the delay-line length.">setDelay</a>( delay_ );
-<a name="l00081"></a>00081   }
+<a name="l00071"></a>00071   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>  delayLine_;
+<a name="l00072"></a>00072   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> loopFilter_;
+<a name="l00073"></a>00073   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>   noise_;
+<a name="l00074"></a>00074   <a class="code" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a>    envelope_;
+<a name="l00075"></a>00075 
+<a name="l00076"></a>00076   StkFloat loopGain_;
+<a name="l00077"></a>00077   StkFloat amGain_;
+<a name="l00078"></a>00078   StkFloat delay_;
+<a name="l00079"></a>00079   StkFloat targetDelay_;
+<a name="l00080"></a>00080 
+<a name="l00081"></a>00081 };
 <a name="l00082"></a>00082 
-<a name="l00083"></a>00083   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( loopFilter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_ ) + 
-<a name="l00084"></a>00084                                 (amGain_ * envelope_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>() * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>()));
-<a name="l00085"></a>00085   
-<a name="l00086"></a>00086   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00087"></a>00087 }
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 } <span class="comment">// stk namespace</span>
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091 <span class="preprocessor">#endif</span>
-<a name="l00092"></a>00092 <span class="preprocessor"></span>
+<a name="l00083"></a><a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e">00083</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">Sitar :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00084"></a>00084 {
+<a name="l00085"></a>00085   <span class="keywordflow">if</span> ( fabs(targetDelay_ - delay_) &gt; 0.001 ) {
+<a name="l00086"></a>00086     <span class="keywordflow">if</span> ( targetDelay_ &lt; delay_ )
+<a name="l00087"></a>00087       delay_ *= 0.99999;
+<a name="l00088"></a>00088     <span class="keywordflow">else</span>
+<a name="l00089"></a>00089       delay_ *= 1.00001;
+<a name="l00090"></a>00090     delayLine_.<a class="code" href="classstk_1_1DelayA.html#a83ddc9bdf2f5059159160fdac0e25eda" title="Set the delay-line length.">setDelay</a>( delay_ );
+<a name="l00091"></a>00091   }
+<a name="l00092"></a>00092 
+<a name="l00093"></a>00093   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( loopFilter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_ ) + 
+<a name="l00094"></a>00094                                 (amGain_ * envelope_.<a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">tick</a>() * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>()));
+<a name="l00095"></a>00095   
+<a name="l00096"></a>00096   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00097"></a>00097 }
+<a name="l00098"></a>00098 
+<a name="l00099"></a><a class="code" href="classstk_1_1Sitar.html#a755cc36fe9cde1942184af0b1ae88f7a">00099</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">Sitar :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00100"></a>00100 {
+<a name="l00101"></a>00101   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00104"></a>00104     oStream_ &lt;&lt; <span class="stringliteral">&quot;Sitar::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00106"></a>00106   }
+<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span>
+<a name="l00109"></a>00109   StkFloat *samples = &amp;frames[channel];
+<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00111"></a>00111   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00112"></a>00112     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00113"></a>00113       *samples++ = <a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">tick</a>();
+<a name="l00114"></a>00114   }
+<a name="l00115"></a>00115   <span class="keywordflow">else</span> {
+<a name="l00116"></a>00116     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00117"></a>00117       *samples++ = <a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">tick</a>();
+<a name="l00118"></a>00118       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00119"></a>00119         *samples++ = lastFrame_[j];
+<a name="l00120"></a>00120     }
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122 
+<a name="l00123"></a>00123   <span class="keywordflow">return</span> frames;
+<a name="l00124"></a>00124 }
+<a name="l00125"></a>00125 
+<a name="l00126"></a>00126 } <span class="comment">// stk namespace</span>
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128 <span class="preprocessor">#endif</span>
+<a name="l00129"></a>00129 <span class="preprocessor"></span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Skini_8h-source.html b/doc/html/Skini_8h-source.html
deleted file mode 100644
index 2222f0e..0000000
--- a/doc/html/Skini_8h-source.html
+++ /dev/null
@@ -1,101 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Skini.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SKINI_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_SKINI_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;vector&gt;</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include &lt;string&gt;</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include &lt;fstream&gt;</span>
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="keyword">namespace </span>stk {
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="comment">/***************************************************/</span>
-<a name="l00036"></a>00036 <span class="comment">/***************************************************/</span>
-<a name="l00037"></a>00037 
-<a name="l00038"></a><a class="code" href="classstk_1_1Skini.html">00038</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Skini.html" title="STK SKINI parsing class.">Skini</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00039"></a>00039 {
-<a name="l00040"></a>00040  <span class="keyword">public</span>:
-<a name="l00041"></a>00041 
-<a name="l00043"></a><a class="code" href="structstk_1_1Skini_1_1Message.html">00043</a>   <span class="keyword">struct </span><a class="code" href="structstk_1_1Skini_1_1Message.html" title="A message structure to store and pass parsed SKINI messages.">Message</a> { 
-<a name="l00044"></a><a class="code" href="structstk_1_1Skini_1_1Message.html#bbc0624b287332dc4fb6bdb2ab60e9c0">00044</a>     <span class="keywordtype">long</span> <a class="code" href="structstk_1_1Skini_1_1Message.html#bbc0624b287332dc4fb6bdb2ab60e9c0">type</a>;                         
-<a name="l00045"></a><a class="code" href="structstk_1_1Skini_1_1Message.html#c1bc8970386267cf1e2ef4158423a674">00045</a>     <span class="keywordtype">long</span> <a class="code" href="structstk_1_1Skini_1_1Message.html#c1bc8970386267cf1e2ef4158423a674">channel</a>;                      
-<a name="l00046"></a><a class="code" href="structstk_1_1Skini_1_1Message.html#edd07a24e5cdb48f813ae09163e37734">00046</a>     StkFloat <a class="code" href="structstk_1_1Skini_1_1Message.html#edd07a24e5cdb48f813ae09163e37734">time</a>;                     
-<a name="l00047"></a><a class="code" href="structstk_1_1Skini_1_1Message.html#8bcc16021f56dbded308672d87f8199e">00047</a>     std::vector&lt;StkFloat&gt; <a class="code" href="structstk_1_1Skini_1_1Message.html#8bcc16021f56dbded308672d87f8199e">floatValues</a>; 
-<a name="l00048"></a><a class="code" href="structstk_1_1Skini_1_1Message.html#18dc93937487044b992468875abdc4dd">00048</a>     std::vector&lt;long&gt; <a class="code" href="structstk_1_1Skini_1_1Message.html#18dc93937487044b992468875abdc4dd">intValues</a>;       
-<a name="l00049"></a><a class="code" href="structstk_1_1Skini_1_1Message.html#3afd9e17a7df379d3b78c72e8c591836">00049</a>     std::string <a class="code" href="structstk_1_1Skini_1_1Message.html#3afd9e17a7df379d3b78c72e8c591836">remainder</a>;             
-<a name="l00051"></a>00051     <span class="comment">// Default constructor.</span>
-<a name="l00052"></a>00052     <a class="code" href="structstk_1_1Skini_1_1Message.html" title="A message structure to store and pass parsed SKINI messages.">Message</a>()
-<a name="l00053"></a>00053       :<a class="code" href="structstk_1_1Skini_1_1Message.html#bbc0624b287332dc4fb6bdb2ab60e9c0">type</a>(0), <a class="code" href="structstk_1_1Skini_1_1Message.html#c1bc8970386267cf1e2ef4158423a674">channel</a>(0), <a class="code" href="structstk_1_1Skini_1_1Message.html#edd07a24e5cdb48f813ae09163e37734">time</a>(0.0), <a class="code" href="structstk_1_1Skini_1_1Message.html#8bcc16021f56dbded308672d87f8199e">floatValues</a>(2), <a class="code" href="structstk_1_1Skini_1_1Message.html#18dc93937487044b992468875abdc4dd">intValues</a>(2) {}
-<a name="l00054"></a>00054   };
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <a class="code" href="classstk_1_1Skini.html#ed904de40a0fa1d22dbb08bc4517f4c8" title="Default constructor.">Skini</a>();
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <a class="code" href="classstk_1_1Skini.html#7c960798afad4b53065ebb26ff00495a" title="Class destructor.">~Skini</a>();
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063 
-<a name="l00067"></a>00067   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1Skini.html#30eb5f5238c552d042b8eb510aa8d241" title="Set a SKINI formatted file for reading.">setFile</a>( std::string fileName );
-<a name="l00068"></a>00068 
-<a name="l00070"></a>00070 
-<a name="l00076"></a>00076   <span class="keywordtype">long</span> <a class="code" href="classstk_1_1Skini.html#675f2a9841c4b84e161de651eed4412d" title="Parse the next file message (if a file is loaded) and return the message type.">nextMessage</a>( <a class="code" href="structstk_1_1Skini_1_1Message.html" title="A message structure to store and pass parsed SKINI messages.">Skini::Message</a>&amp; message );
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079 
-<a name="l00083"></a>00083   <span class="keywordtype">long</span> <a class="code" href="classstk_1_1Skini.html#d3e29f6ca88052e95698137ec2e545ad" title="Attempt to parse the given string and returning the message type.">parseString</a>( std::string&amp; line, <a class="code" href="structstk_1_1Skini_1_1Message.html" title="A message structure to store and pass parsed SKINI messages.">Skini::Message</a>&amp; message );
-<a name="l00084"></a>00084 
-<a name="l00086"></a>00086   <span class="keyword">static</span> std::string <a class="code" href="classstk_1_1Skini.html#fae7977e19f7b7f647ee2c6ade62a199" title="Return the SKINI type string for the given type value.">whatsThisType</a>(<span class="keywordtype">long</span> type);
-<a name="l00087"></a>00087 
-<a name="l00089"></a>00089   <span class="keyword">static</span> std::string <a class="code" href="classstk_1_1Skini.html#30c34ff9ffd7646165155fa4d62dee6c" title="Return the SKINI controller string for the given controller number.">whatsThisController</a>(<span class="keywordtype">long</span> number);
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091  <span class="keyword">protected</span>:
-<a name="l00092"></a>00092 
-<a name="l00093"></a>00093   <span class="keywordtype">void</span> tokenize( <span class="keyword">const</span> std::string&amp; str, std::vector&lt;std::string&gt;&amp; tokens, <span class="keyword">const</span> std::string&amp; delimiters );
-<a name="l00094"></a>00094 
-<a name="l00095"></a>00095   std::ifstream file_;
-<a name="l00096"></a>00096 };
-<a name="l00097"></a>00097 
-<a name="l00098"></a>00098 <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">double</span> Midi2Pitch[129] = {
-<a name="l00099"></a>00099 8.18,8.66,9.18,9.72,10.30,10.91,11.56,12.25,
-<a name="l00100"></a>00100 12.98,13.75,14.57,15.43,16.35,17.32,18.35,19.45,
-<a name="l00101"></a>00101 20.60,21.83,23.12,24.50,25.96,27.50,29.14,30.87,
-<a name="l00102"></a>00102 32.70,34.65,36.71,38.89,41.20,43.65,46.25,49.00,
-<a name="l00103"></a>00103 51.91,55.00,58.27,61.74,65.41,69.30,73.42,77.78,
-<a name="l00104"></a>00104 82.41,87.31,92.50,98.00,103.83,110.00,116.54,123.47,
-<a name="l00105"></a>00105 130.81,138.59,146.83,155.56,164.81,174.61,185.00,196.00,
-<a name="l00106"></a>00106 207.65,220.00,233.08,246.94,261.63,277.18,293.66,311.13,
-<a name="l00107"></a>00107 329.63,349.23,369.99,392.00,415.30,440.00,466.16,493.88,
-<a name="l00108"></a>00108 523.25,554.37,587.33,622.25,659.26,698.46,739.99,783.99,
-<a name="l00109"></a>00109 830.61,880.00,932.33,987.77,1046.50,1108.73,1174.66,1244.51,
-<a name="l00110"></a>00110 1318.51,1396.91,1479.98,1567.98,1661.22,1760.00,1864.66,1975.53,
-<a name="l00111"></a>00111 2093.00,2217.46,2349.32,2489.02,2637.02,2793.83,2959.96,3135.96,
-<a name="l00112"></a>00112 3322.44,3520.00,3729.31,3951.07,4186.01,4434.92,4698.64,4978.03,
-<a name="l00113"></a>00113 5274.04,5587.65,5919.91,6271.93,6644.88,7040.00,7458.62,7902.13,
-<a name="l00114"></a>00114 8372.02,8869.84,9397.27,9956.06,10548.08,11175.30,11839.82,12543.85,
-<a name="l00115"></a>00115 13289.75};
-<a name="l00116"></a>00116 
-<a name="l00117"></a>00117 } <span class="comment">// stk namespace</span>
-<a name="l00118"></a>00118 
-<a name="l00119"></a>00119 <span class="preprocessor">#endif</span>
-<a name="l00120"></a>00120 <span class="preprocessor"></span>
-<a name="l00121"></a>00121 
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Skini_8h_source.html b/doc/html/Skini_8h_source.html
index 496f162..1385adf 100644
--- a/doc/html/Skini_8h_source.html
+++ b/doc/html/Skini_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Skini.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SKINI_H</span>
@@ -65,36 +65,36 @@
 <a name="l00095"></a>00095   std::ifstream file_;
 <a name="l00096"></a>00096 };
 <a name="l00097"></a>00097 
-<a name="l00098"></a>00098 <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">double</span> Midi2Pitch[129] = {
-<a name="l00099"></a>00099 8.18,8.66,9.18,9.72,10.30,10.91,11.56,12.25,
-<a name="l00100"></a>00100 12.98,13.75,14.57,15.43,16.35,17.32,18.35,19.45,
-<a name="l00101"></a>00101 20.60,21.83,23.12,24.50,25.96,27.50,29.14,30.87,
-<a name="l00102"></a>00102 32.70,34.65,36.71,38.89,41.20,43.65,46.25,49.00,
-<a name="l00103"></a>00103 51.91,55.00,58.27,61.74,65.41,69.30,73.42,77.78,
-<a name="l00104"></a>00104 82.41,87.31,92.50,98.00,103.83,110.00,116.54,123.47,
-<a name="l00105"></a>00105 130.81,138.59,146.83,155.56,164.81,174.61,185.00,196.00,
-<a name="l00106"></a>00106 207.65,220.00,233.08,246.94,261.63,277.18,293.66,311.13,
-<a name="l00107"></a>00107 329.63,349.23,369.99,392.00,415.30,440.00,466.16,493.88,
-<a name="l00108"></a>00108 523.25,554.37,587.33,622.25,659.26,698.46,739.99,783.99,
-<a name="l00109"></a>00109 830.61,880.00,932.33,987.77,1046.50,1108.73,1174.66,1244.51,
-<a name="l00110"></a>00110 1318.51,1396.91,1479.98,1567.98,1661.22,1760.00,1864.66,1975.53,
-<a name="l00111"></a>00111 2093.00,2217.46,2349.32,2489.02,2637.02,2793.83,2959.96,3135.96,
-<a name="l00112"></a>00112 3322.44,3520.00,3729.31,3951.07,4186.01,4434.92,4698.64,4978.03,
-<a name="l00113"></a>00113 5274.04,5587.65,5919.91,6271.93,6644.88,7040.00,7458.62,7902.13,
-<a name="l00114"></a>00114 8372.02,8869.84,9397.27,9956.06,10548.08,11175.30,11839.82,12543.85,
-<a name="l00115"></a>00115 13289.75};
-<a name="l00116"></a>00116 
-<a name="l00117"></a>00117 } <span class="comment">// stk namespace</span>
-<a name="l00118"></a>00118 
-<a name="l00119"></a>00119 <span class="preprocessor">#endif</span>
-<a name="l00120"></a>00120 <span class="preprocessor"></span>
-<a name="l00121"></a>00121 
+<a name="l00099"></a>00099 <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">double</span> Midi2Pitch[129] = {
+<a name="l00100"></a>00100   8.176, 8.662, 9.177, 9.723, 10.301, 10.913, 11.562, 12.25,
+<a name="l00101"></a>00101   12.978, 13.75, 14.568, 15.434, 16.352, 17.324, 18.354, 19.445,
+<a name="l00102"></a>00102   20.602, 21.827, 23.125, 24.50, 25.957, 27.50, 29.135, 30.868,
+<a name="l00103"></a>00103   32.703, 34.648, 36.708, 38.891, 41.203, 43.654, 46.249, 49.0,
+<a name="l00104"></a>00104   51.913, 55.0, 58.271, 61.735, 65.406, 69.296, 73.416, 77.782,
+<a name="l00105"></a>00105   82.407, 87.307, 92.499, 97.999, 103.826, 110.0, 116.541, 123.471,
+<a name="l00106"></a>00106   130.813, 138.591, 146.832, 155.563, 164.814, 174.614, 184.997, 195.998,
+<a name="l00107"></a>00107   207.652, 220.0, 233.082, 246.942, 261.626, 277.183, 293.665, 311.127,
+<a name="l00108"></a>00108   329.628, 349.228, 369.994, 391.995, 415.305, 440.0, 466.164, 493.883,
+<a name="l00109"></a>00109   523.251, 554.365, 587.33, 622.254, 659.255, 698.456, 739.989, 783.991,
+<a name="l00110"></a>00110   830.609, 880.0, 932.328, 987.767, 1046.502, 1108.731, 1174.659, 1244.508,
+<a name="l00111"></a>00111   1318.51, 1396.913, 1479.978, 1567.982, 1661.219, 1760.0, 1864.655, 1975.533,
+<a name="l00112"></a>00112   2093.005, 2217.461, 2349.318, 2489.016, 2637.02, 2793.826, 2959.955, 3135.963,
+<a name="l00113"></a>00113   3322.438, 3520.0, 3729.31, 3951.066, 4186.009, 4434.922, 4698.636, 4978.032,
+<a name="l00114"></a>00114   5274.041, 5587.652, 5919.911, 6271.927, 6644.875, 7040.0, 7458.62, 7902.133,
+<a name="l00115"></a>00115   8372.018, 8869.844, 9397.273, 9956.063, 10548.082, 11175.303, 11839.822, 12543.854,
+<a name="l00116"></a>00116   13289.75};
+<a name="l00117"></a>00117 
+<a name="l00118"></a>00118 } <span class="comment">// stk namespace</span>
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120 <span class="preprocessor">#endif</span>
+<a name="l00121"></a>00121 <span class="preprocessor"></span>
+<a name="l00122"></a>00122 
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Socket_8h-source.html b/doc/html/Socket_8h-source.html
deleted file mode 100644
index e65e136..0000000
--- a/doc/html/Socket_8h-source.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Socket.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SOCKET_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_SOCKET_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="preprocessor">#if (defined(__OS_IRIX__) || defined(__OS_LINUX__) || defined(__OS_MACOSX__))</span>
-<a name="l00007"></a>00007 <span class="preprocessor"></span>
-<a name="l00008"></a>00008 <span class="preprocessor">  #include &lt;sys/socket.h&gt;</span>
-<a name="l00009"></a>00009 <span class="preprocessor">  #include &lt;sys/types.h&gt;</span>
-<a name="l00010"></a>00010 <span class="preprocessor">  #include &lt;arpa/inet.h&gt;</span>
-<a name="l00011"></a>00011 <span class="preprocessor">  #include &lt;netdb.h&gt;</span>
-<a name="l00012"></a>00012 <span class="preprocessor">  #include &lt;unistd.h&gt;</span>
-<a name="l00013"></a>00013 <span class="preprocessor">  #include &lt;fcntl.h&gt;</span>
-<a name="l00014"></a>00014 <span class="preprocessor">  #include &lt;netinet/in.h&gt;</span>
-<a name="l00015"></a>00015 <span class="preprocessor">  #include &lt;netinet/tcp.h&gt;</span>
-<a name="l00016"></a>00016 
-<a name="l00017"></a>00017 <span class="preprocessor">#elif defined(__OS_WINDOWS__)</span>
-<a name="l00018"></a>00018 <span class="preprocessor"></span>
-<a name="l00019"></a>00019 <span class="preprocessor">  #include &lt;winsock.h&gt;</span>
-<a name="l00020"></a>00020 
-<a name="l00021"></a>00021 <span class="preprocessor">#endif</span>
-<a name="l00022"></a>00022 <span class="preprocessor"></span>
-<a name="l00023"></a>00023 <span class="keyword">namespace </span>stk {
-<a name="l00024"></a>00024 
-<a name="l00025"></a>00025 <span class="comment">/***************************************************/</span>
-<a name="l00036"></a>00036 <span class="comment">/***************************************************/</span>
-<a name="l00037"></a>00037 
-<a name="l00038"></a><a class="code" href="classstk_1_1Socket.html">00038</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Socket.html" title="STK internet socket abstract base class.">Socket</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00039"></a>00039 {
-<a name="l00040"></a>00040  <span class="keyword">public</span>:
-<a name="l00041"></a>00041 
-<a name="l00042"></a>00042   <span class="keyword">enum</span> ProtocolType {
-<a name="l00043"></a>00043     PROTO_TCP,
-<a name="l00044"></a>00044     PROTO_UDP
-<a name="l00045"></a>00045   };
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <a class="code" href="classstk_1_1Socket.html#2558d3b2001c07eeae9d3e301df399fe" title="Class constructor.">Socket</a>();
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1Socket.html#8fb79fcfba5d1438575e0fb933f8b37b" title="Class destructor.">~Socket</a>();
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Socket.html#816c3dfae2549db692944042821d6019" title="Close the socket.">close</a>( <span class="keywordtype">int</span> socket );
-<a name="l00055"></a>00055 
-<a name="l00057"></a><a class="code" href="classstk_1_1Socket.html#eae0c6721248eecd5dae0b77ea66cb2c">00057</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#eae0c6721248eecd5dae0b77ea66cb2c" title="Return the socket descriptor.">id</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> soket_; };
-<a name="l00058"></a>00058 
-<a name="l00060"></a><a class="code" href="classstk_1_1Socket.html#be3040ecfff6ce921284c6ab4b0500a7">00060</a>   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#be3040ecfff6ce921284c6ab4b0500a7" title="Return the socket port number.">port</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> port_; };
-<a name="l00061"></a>00061 
-<a name="l00063"></a><a class="code" href="classstk_1_1Socket.html#61375099d0d0811bf79c894587cc3724">00063</a>   <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1Socket.html#61375099d0d0811bf79c894587cc3724" title="Returns true if the socket descriptor is valid.">isValid</a>( <span class="keywordtype">int</span> socket ) { <span class="keywordflow">return</span> socket != -1; };
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Socket.html#12f0abb799fbf7d5d2ee6364627cb6ac" title="If enable = false, the socket is set to non-blocking mode. When first created, sockets...">setBlocking</a>( <span class="keywordtype">int</span> socket, <span class="keywordtype">bool</span> enable );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069   <span class="keyword">virtual</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#7938202181552306d0ea74c6c04abf4a" title="Write a buffer over the socket connection. Returns the number of bytes written or...">writeBuffer</a>(<span class="keyword">const</span> <span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> flags = 0) = 0;
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   <span class="keyword">virtual</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#a99d0f4e1c0ebae768a9f3f124364906" title="Read an input buffer, up to length bufferSize. Returns the number of bytes read or...">readBuffer</a>(<span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> flags = 0) = 0;
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075   <span class="keyword">static</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#7938202181552306d0ea74c6c04abf4a" title="Write a buffer over the socket connection. Returns the number of bytes written or...">writeBuffer</a>(<span class="keywordtype">int</span> socket, <span class="keyword">const</span> <span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> flags );
-<a name="l00076"></a>00076 
-<a name="l00078"></a>00078   <span class="keyword">static</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#a99d0f4e1c0ebae768a9f3f124364906" title="Read an input buffer, up to length bufferSize. Returns the number of bytes read or...">readBuffer</a>(<span class="keywordtype">int</span> socket, <span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> flags );
-<a name="l00079"></a>00079 
-<a name="l00080"></a>00080  <span class="keyword">protected</span>:
-<a name="l00081"></a>00081 
-<a name="l00082"></a>00082   <span class="keywordtype">int</span> soket_;
-<a name="l00083"></a>00083   <span class="keywordtype">int</span> port_;
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085 };
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087 } <span class="comment">// stk namespace</span>
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Socket_8h_source.html b/doc/html/Socket_8h_source.html
index d43f7e4..d83ee83 100644
--- a/doc/html/Socket_8h_source.html
+++ b/doc/html/Socket_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Socket.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SOCKET_H</span>
@@ -85,7 +85,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Sphere_8h-source.html b/doc/html/Sphere_8h-source.html
deleted file mode 100644
index c3308c0..0000000
--- a/doc/html/Sphere_8h-source.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Sphere.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SPHERE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_SPHERE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Vector3D.h"</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1Sphere.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Sphere.html" title="STK sphere class.">Sphere</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022 <span class="keyword">public</span>:
-<a name="l00024"></a><a class="code" href="classstk_1_1Sphere.html#73d4fac54fba9aa11a56a34e4198656c">00024</a>   <a class="code" href="classstk_1_1Sphere.html#73d4fac54fba9aa11a56a34e4198656c" title="Constructor taking an initial radius value.">Sphere</a>( StkFloat radius = 1.0 ) { radius_ = radius; mass_ = 1.0; };
-<a name="l00025"></a>00025 
-<a name="l00027"></a><a class="code" href="classstk_1_1Sphere.html#cfa3d4475f9c5ab655276473b1816f39">00027</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sphere.html#cfa3d4475f9c5ab655276473b1816f39" title="Set the 3D center position of the sphere.">setPosition</a>( StkFloat x, StkFloat y, StkFloat z ) { position_.<a class="code" href="classstk_1_1Vector3D.html#65fd03de6d9d42ea53a6cb8418ee7149" title="Set the X, Y, and Z values simultaniously.">setXYZ</a>(x, y, z); };
-<a name="l00028"></a>00028 
-<a name="l00030"></a><a class="code" href="classstk_1_1Sphere.html#c76725a19fe806e9af9841d30faacb11">00030</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sphere.html#c76725a19fe806e9af9841d30faacb11" title="Set the 3D velocity of the sphere.">setVelocity</a>( StkFloat x, StkFloat y, StkFloat z ) { velocity_.<a class="code" href="classstk_1_1Vector3D.html#65fd03de6d9d42ea53a6cb8418ee7149" title="Set the X, Y, and Z values simultaniously.">setXYZ</a>(x, y, z); };
-<a name="l00031"></a>00031 
-<a name="l00033"></a><a class="code" href="classstk_1_1Sphere.html#c3f4f85642307bebe0733662620f0ee2">00033</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sphere.html#c3f4f85642307bebe0733662620f0ee2" title="Set the radius of the sphere.">setRadius</a>( StkFloat radius ) { radius_ = radius; };
-<a name="l00034"></a>00034 
-<a name="l00036"></a><a class="code" href="classstk_1_1Sphere.html#0db842c9f06b377bcd803391b7126d2f">00036</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sphere.html#0db842c9f06b377bcd803391b7126d2f" title="Set the mass of the sphere.">setMass</a>( StkFloat mass ) { mass_ = mass; };
-<a name="l00037"></a>00037 
-<a name="l00039"></a><a class="code" href="classstk_1_1Sphere.html#91a3e710a7ff0cf160e9d46fca373bfd">00039</a>   <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a>* <a class="code" href="classstk_1_1Sphere.html#91a3e710a7ff0cf160e9d46fca373bfd" title="Get the current position of the sphere as a 3D vector.">getPosition</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> &amp;position_; };
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a>* <a class="code" href="classstk_1_1Sphere.html#4cf8f763e732bcf9ca79b8602e8ec24a" title="Get the relative position of the given point to the sphere as a 3D vector.">getRelativePosition</a>( <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> *position );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   StkFloat <a class="code" href="classstk_1_1Sphere.html#43ccf47d5d952f14f1ba0940aa87f4c5" title="Set the velcoity of the sphere as a 3D vector.">getVelocity</a>( <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a>* velocity );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   StkFloat <a class="code" href="classstk_1_1Sphere.html#00bf47b0d5cd06a858d08f37d220ef9f" title="Returns the distance from the sphere boundary to the given position (&amp;lt; 0 if inside)...">isInside</a>( <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> *position );
-<a name="l00049"></a>00049 
-<a name="l00051"></a><a class="code" href="classstk_1_1Sphere.html#03550bbe32d62ead67787651619b8c8b">00051</a>   StkFloat <a class="code" href="classstk_1_1Sphere.html#03550bbe32d62ead67787651619b8c8b" title="Get the current sphere radius.">getRadius</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> radius_; };
-<a name="l00052"></a>00052 
-<a name="l00054"></a><a class="code" href="classstk_1_1Sphere.html#a82d922e0b8513364d9d0d473e6239c6">00054</a>   StkFloat <a class="code" href="classstk_1_1Sphere.html#a82d922e0b8513364d9d0d473e6239c6" title="Get the current sphere mass.">getMass</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> mass_; };
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sphere.html#16666f1e94c6d1e6b1fa35ee6c46331f" title="Increase the current sphere velocity by the given 3D components.">addVelocity</a>( StkFloat x, StkFloat y, StkFloat z );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sphere.html#dc4709622b77fc91ad6f33be98c86344" title="Move the sphere for the given time increment.">tick</a>( StkFloat timeIncrement );
-<a name="l00061"></a>00061    
-<a name="l00062"></a>00062 <span class="keyword">private</span>:
-<a name="l00063"></a>00063   <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> position_;
-<a name="l00064"></a>00064   <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> velocity_;
-<a name="l00065"></a>00065   <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> workingVector_;
-<a name="l00066"></a>00066   StkFloat radius_;
-<a name="l00067"></a>00067   StkFloat mass_;
-<a name="l00068"></a>00068 };
-<a name="l00069"></a>00069 
-<a name="l00070"></a><a class="code" href="classstk_1_1Sphere.html#dc4709622b77fc91ad6f33be98c86344">00070</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Sphere.html#dc4709622b77fc91ad6f33be98c86344" title="Move the sphere for the given time increment.">Sphere::tick</a>( StkFloat timeIncrement )
-<a name="l00071"></a>00071 {
-<a name="l00072"></a>00072   position_.<a class="code" href="classstk_1_1Vector3D.html#9825ba3adb8fb272d2e3ca20740a48c5" title="Set the X value.">setX</a>(position_.<a class="code" href="classstk_1_1Vector3D.html#e4f7cddc34ed1cf80262ff2d5dad65f4" title="Get the current X value.">getX</a>() + (timeIncrement * velocity_.<a class="code" href="classstk_1_1Vector3D.html#e4f7cddc34ed1cf80262ff2d5dad65f4" title="Get the current X value.">getX</a>()));
-<a name="l00073"></a>00073   position_.<a class="code" href="classstk_1_1Vector3D.html#94de5326b083c6cf72f509aa0fc532f3" title="Set the Y value.">setY</a>(position_.<a class="code" href="classstk_1_1Vector3D.html#f83bfbe865d702845e37e14d82f642b6" title="Get the current Y value.">getY</a>() + (timeIncrement * velocity_.<a class="code" href="classstk_1_1Vector3D.html#f83bfbe865d702845e37e14d82f642b6" title="Get the current Y value.">getY</a>()));
-<a name="l00074"></a>00074   position_.<a class="code" href="classstk_1_1Vector3D.html#826f2aa5e7b95a0d91f9432f26bec881" title="Set the Z value.">setZ</a>(position_.<a class="code" href="classstk_1_1Vector3D.html#f1c7389a2b4640cbe594fa33f9e4f805" title="Get the current Z value.">getZ</a>() + (timeIncrement * velocity_.<a class="code" href="classstk_1_1Vector3D.html#f1c7389a2b4640cbe594fa33f9e4f805" title="Get the current Z value.">getZ</a>()));
-<a name="l00075"></a>00075 };
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077 } <span class="comment">// stk namespace</span>
-<a name="l00078"></a>00078 
-<a name="l00079"></a>00079 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Sphere_8h_source.html b/doc/html/Sphere_8h_source.html
index 2692970..09ced5a 100644
--- a/doc/html/Sphere_8h_source.html
+++ b/doc/html/Sphere_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Sphere.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_SPHERE_H</span>
@@ -75,7 +75,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/StifKarp_8h-source.html b/doc/html/StifKarp_8h-source.html
deleted file mode 100644
index b678e4c..0000000
--- a/doc/html/StifKarp_8h-source.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>StifKarp.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_STIFKARP_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_STIFKARP_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "DelayL.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "DelayA.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "OneZero.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "BiQuad.h"</span>
-<a name="l00010"></a>00010 
-<a name="l00011"></a>00011 <span class="keyword">namespace </span>stk {
-<a name="l00012"></a>00012 
-<a name="l00013"></a>00013 <span class="comment">/***************************************************/</span>
-<a name="l00034"></a>00034 <span class="comment">/***************************************************/</span>
-<a name="l00035"></a>00035 
-<a name="l00036"></a><a class="code" href="classstk_1_1StifKarp.html">00036</a> <span class="keyword">class </span><a class="code" href="classstk_1_1StifKarp.html" title="STK plucked stiff string instrument.">StifKarp</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00037"></a>00037 {
-<a name="l00038"></a>00038  <span class="keyword">public</span>:
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1StifKarp.html#946fb588b5b18b12ea2dca221150da66" title="Class constructor, taking the lowest desired playing frequency.">StifKarp</a>( StkFloat lowestFrequency );
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <a class="code" href="classstk_1_1StifKarp.html#37bc5b0bb4fe385eda862622f675bee1" title="Class destructor.">~StifKarp</a>( <span class="keywordtype">void</span> );
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StifKarp.html#d1015fa6d2ac1835d8be7dec0df12f6f" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00047"></a>00047 
-<a name="l00049"></a>00049   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StifKarp.html#51371b8592fc01aba1993ac304962f6e" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00050"></a>00050 
-<a name="l00052"></a>00052   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StifKarp.html#21a9b7407c9d6a0b2ba34c0e41bb0b57" title="Set the stretch &amp;quot;factor&amp;quot; of the string (0.0 - 1.0).">setStretch</a>( StkFloat stretch );
-<a name="l00053"></a>00053 
-<a name="l00055"></a>00055   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StifKarp.html#55ca9e1f3c205e4fb51e6d4a7393db70" title="Set the pluck or &amp;quot;excitation&amp;quot; position along the string (0.0 - 1.0).">setPickupPosition</a>( StkFloat position );
-<a name="l00056"></a>00056 
-<a name="l00058"></a>00058 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StifKarp.html#d1b5de5acf487271d99903cd43e891ce" title="Set the base loop gain.">setBaseLoopGain</a>( StkFloat aGain );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StifKarp.html#016ff5971a1b51ea472f7e7fa2d677ee" title="Pluck the string with the given amplitude using the current frequency.">pluck</a>( StkFloat amplitude );
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StifKarp.html#e2831958f1dd782ccf34c4068c2b7f14" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00070"></a>00070 
-<a name="l00072"></a>00072   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StifKarp.html#1806fb5c05fa5abdcd3ddb4c97d8ea78" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StifKarp.html#27e76ba187140ae575c1bd2e1ba99b03" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00076"></a>00076 
-<a name="l00078"></a>00078   StkFloat <a class="code" href="classstk_1_1StifKarp.html#5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00079"></a>00079 
-<a name="l00080"></a>00080  <span class="keyword">protected</span>:
-<a name="l00081"></a>00081 
-<a name="l00082"></a>00082   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>  delayLine_;
-<a name="l00083"></a>00083   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>  combDelay_;
-<a name="l00084"></a>00084   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> filter_;
-<a name="l00085"></a>00085   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>   noise_;
-<a name="l00086"></a>00086   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>  biquad_[4];
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00089"></a>00089   StkFloat loopGain_;
-<a name="l00090"></a>00090   StkFloat baseLoopGain_;
-<a name="l00091"></a>00091   StkFloat lastFrequency_;
-<a name="l00092"></a>00092   StkFloat lastLength_;
-<a name="l00093"></a>00093   StkFloat stretching_;
-<a name="l00094"></a>00094   StkFloat pluckAmplitude_;
-<a name="l00095"></a>00095   StkFloat pickupPosition_;
-<a name="l00096"></a>00096 
-<a name="l00097"></a>00097 };
-<a name="l00098"></a>00098 
-<a name="l00099"></a><a class="code" href="classstk_1_1StifKarp.html#5cd896c59ee01fa8e21346ebe54365fc">00099</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1StifKarp.html#5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">StifKarp :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00100"></a>00100 {
-<a name="l00101"></a>00101   StkFloat temp = delayLine_.<a class="code" href="classstk_1_1DelayA.html#4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_;
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103   <span class="comment">// Calculate allpass stretching.</span>
-<a name="l00104"></a>00104   <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i=0; i&lt;4; i++)
-<a name="l00105"></a>00105     temp = biquad_[i].<a class="code" href="classstk_1_1StifKarp.html#5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">tick</a>(temp);
-<a name="l00106"></a>00106 
-<a name="l00107"></a>00107   <span class="comment">// Moving average filter.</span>
-<a name="l00108"></a>00108   temp = filter_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#e602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00111"></a>00111   lastFrame_[0] = lastFrame_[0] - combDelay_.<a class="code" href="classstk_1_1DelayL.html#1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( lastFrame_[0] );
-<a name="l00112"></a>00112   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00113"></a>00113 }
-<a name="l00114"></a>00114 
-<a name="l00115"></a>00115 } <span class="comment">// stk namespace</span>
-<a name="l00116"></a>00116 
-<a name="l00117"></a>00117 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/StifKarp_8h_source.html b/doc/html/StifKarp_8h_source.html
index 44447df..70d426d 100644
--- a/doc/html/StifKarp_8h_source.html
+++ b/doc/html/StifKarp_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>StifKarp.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_STIFKARP_H</span>
@@ -30,7 +30,7 @@
 <a name="l00036"></a><a class="code" href="classstk_1_1StifKarp.html">00036</a> <span class="keyword">class </span><a class="code" href="classstk_1_1StifKarp.html" title="STK plucked stiff string instrument.">StifKarp</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
 <a name="l00037"></a>00037 {
 <a name="l00038"></a>00038  <span class="keyword">public</span>:
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1StifKarp.html#a946fb588b5b18b12ea2dca221150da66" title="Class constructor, taking the lowest desired playing frequency.">StifKarp</a>( StkFloat lowestFrequency );
+<a name="l00040"></a>00040   <a class="code" href="classstk_1_1StifKarp.html#a2ac1b3641559e787cf78a017797e9a70" title="Class constructor, taking the lowest desired playing frequency.">StifKarp</a>( StkFloat lowestFrequency = 8.0 );
 <a name="l00041"></a>00041 
 <a name="l00043"></a>00043   <a class="code" href="classstk_1_1StifKarp.html#a37bc5b0bb4fe385eda862622f675bee1" title="Class destructor.">~StifKarp</a>( <span class="keywordtype">void</span> );
 <a name="l00044"></a>00044 
@@ -55,50 +55,80 @@
 <a name="l00076"></a>00076 
 <a name="l00078"></a>00078   StkFloat <a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00079"></a>00079 
-<a name="l00080"></a>00080  <span class="keyword">protected</span>:
 <a name="l00081"></a>00081 
-<a name="l00082"></a>00082   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>  delayLine_;
-<a name="l00083"></a>00083   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>  combDelay_;
-<a name="l00084"></a>00084   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> filter_;
-<a name="l00085"></a>00085   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>   noise_;
-<a name="l00086"></a>00086   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>  biquad_[4];
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
-<a name="l00089"></a>00089   StkFloat loopGain_;
-<a name="l00090"></a>00090   StkFloat baseLoopGain_;
-<a name="l00091"></a>00091   StkFloat lastFrequency_;
-<a name="l00092"></a>00092   StkFloat lastLength_;
-<a name="l00093"></a>00093   StkFloat stretching_;
-<a name="l00094"></a>00094   StkFloat pluckAmplitude_;
-<a name="l00095"></a>00095   StkFloat pickupPosition_;
-<a name="l00096"></a>00096 
-<a name="l00097"></a>00097 };
-<a name="l00098"></a>00098 
-<a name="l00099"></a><a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc">00099</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">StifKarp :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00100"></a>00100 {
-<a name="l00101"></a>00101   StkFloat temp = delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_;
-<a name="l00102"></a>00102 
-<a name="l00103"></a>00103   <span class="comment">// Calculate allpass stretching.</span>
-<a name="l00104"></a>00104   <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i=0; i&lt;4; i++)
-<a name="l00105"></a>00105     temp = biquad_[i].<a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">tick</a>(temp);
+<a name="l00088"></a>00088   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00089"></a>00089 
+<a name="l00090"></a>00090  <span class="keyword">protected</span>:
+<a name="l00091"></a>00091 
+<a name="l00092"></a>00092   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>  delayLine_;
+<a name="l00093"></a>00093   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>  combDelay_;
+<a name="l00094"></a>00094   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a> filter_;
+<a name="l00095"></a>00095   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>   noise_;
+<a name="l00096"></a>00096   <a class="code" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a>  biquad_[4];
+<a name="l00097"></a>00097 
+<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> length_;
+<a name="l00099"></a>00099   StkFloat loopGain_;
+<a name="l00100"></a>00100   StkFloat baseLoopGain_;
+<a name="l00101"></a>00101   StkFloat lastFrequency_;
+<a name="l00102"></a>00102   StkFloat lastLength_;
+<a name="l00103"></a>00103   StkFloat stretching_;
+<a name="l00104"></a>00104   StkFloat pluckAmplitude_;
+<a name="l00105"></a>00105   StkFloat pickupPosition_;
 <a name="l00106"></a>00106 
-<a name="l00107"></a>00107   <span class="comment">// Moving average filter.</span>
-<a name="l00108"></a>00108   temp = filter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00109"></a>00109 
-<a name="l00110"></a>00110   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00111"></a>00111   lastFrame_[0] = lastFrame_[0] - combDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( lastFrame_[0] );
-<a name="l00112"></a>00112   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00113"></a>00113 }
-<a name="l00114"></a>00114 
-<a name="l00115"></a>00115 } <span class="comment">// stk namespace</span>
+<a name="l00107"></a>00107 };
+<a name="l00108"></a>00108 
+<a name="l00109"></a><a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc">00109</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">StifKarp :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00110"></a>00110 {
+<a name="l00111"></a>00111   StkFloat temp = delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() * loopGain_;
+<a name="l00112"></a>00112 
+<a name="l00113"></a>00113   <span class="comment">// Calculate allpass stretching.</span>
+<a name="l00114"></a>00114   <span class="keywordflow">for</span> (<span class="keywordtype">int</span> i=0; i&lt;4; i++)
+<a name="l00115"></a>00115     temp = biquad_[i].<a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">tick</a>(temp);
 <a name="l00116"></a>00116 
-<a name="l00117"></a>00117 <span class="preprocessor">#endif</span>
+<a name="l00117"></a>00117   <span class="comment">// Moving average filter.</span>
+<a name="l00118"></a>00118   temp = filter_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>(temp);
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>(temp);
+<a name="l00121"></a>00121   lastFrame_[0] = lastFrame_[0] - combDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( lastFrame_[0] );
+<a name="l00122"></a>00122   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00123"></a>00123 }
+<a name="l00124"></a>00124 
+<a name="l00125"></a><a class="code" href="classstk_1_1StifKarp.html#a7d4afff257faa7ad9ef630f1db1ed93f">00125</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">StifKarp :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00126"></a>00126 {
+<a name="l00127"></a>00127   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00128"></a>00128 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00129"></a>00129 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00130"></a>00130     oStream_ &lt;&lt; <span class="stringliteral">&quot;StifKarp::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00131"></a>00131     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00132"></a>00132   }
+<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
+<a name="l00134"></a>00134 <span class="preprocessor"></span>
+<a name="l00135"></a>00135   StkFloat *samples = &amp;frames[channel];
+<a name="l00136"></a>00136   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00137"></a>00137   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00138"></a>00138     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00139"></a>00139       *samples++ = <a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">tick</a>();
+<a name="l00140"></a>00140   }
+<a name="l00141"></a>00141   <span class="keywordflow">else</span> {
+<a name="l00142"></a>00142     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00143"></a>00143       *samples++ = <a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">tick</a>();
+<a name="l00144"></a>00144       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00145"></a>00145         *samples++ = lastFrame_[j];
+<a name="l00146"></a>00146     }
+<a name="l00147"></a>00147   }
+<a name="l00148"></a>00148 
+<a name="l00149"></a>00149   <span class="keywordflow">return</span> frames;
+<a name="l00150"></a>00150 }
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152 } <span class="comment">// stk namespace</span>
+<a name="l00153"></a>00153 
+<a name="l00154"></a>00154 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Stk_8h-source.html b/doc/html/Stk_8h-source.html
deleted file mode 100644
index 091f5c8..0000000
--- a/doc/html/Stk_8h-source.html
+++ /dev/null
@@ -1,365 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Stk.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_STK_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_STK_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include &lt;string&gt;</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;iostream&gt;</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include &lt;sstream&gt;</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include &lt;vector&gt;</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include &lt;stdlib.h&gt;</span>
-<a name="l00009"></a>00009 
-<a name="l00016"></a>00016 <span class="keyword">namespace </span>stk {
-<a name="l00017"></a>00017 
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00068"></a>00068 <span class="comment">/***************************************************/</span>
-<a name="l00069"></a>00069 
-<a name="l00070"></a>00070 <span class="comment">//#define _STK_DEBUG_</span>
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072 <span class="comment">// Most data in STK is passed and calculated with the</span>
-<a name="l00073"></a>00073 <span class="comment">// following user-definable floating-point type.  You</span>
-<a name="l00074"></a>00074 <span class="comment">// can change this to "float" if you prefer or perhaps</span>
-<a name="l00075"></a>00075 <span class="comment">// a "long double" in the future.</span>
-<a name="l00076"></a>00076 <span class="keyword">typedef</span> <span class="keywordtype">double</span> StkFloat;
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079 
-<a name="l00084"></a><a class="code" href="classstk_1_1StkError.html">00084</a> <span class="keyword">class </span><a class="code" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a>
-<a name="l00085"></a>00085 {
-<a name="l00086"></a>00086 <span class="keyword">public</span>:
-<a name="l00087"></a>00087   <span class="keyword">enum</span> Type {
-<a name="l00088"></a>00088     STATUS,
-<a name="l00089"></a>00089     WARNING,
-<a name="l00090"></a>00090     DEBUG_WARNING,
-<a name="l00091"></a>00091     MEMORY_ALLOCATION,
-<a name="l00092"></a>00092     MEMORY_ACCESS,
-<a name="l00093"></a>00093     FUNCTION_ARGUMENT,
-<a name="l00094"></a>00094     FILE_NOT_FOUND,
-<a name="l00095"></a>00095     FILE_UNKNOWN_FORMAT,
-<a name="l00096"></a>00096     FILE_ERROR,
-<a name="l00097"></a>00097     PROCESS_THREAD,
-<a name="l00098"></a>00098     PROCESS_SOCKET,
-<a name="l00099"></a>00099     PROCESS_SOCKET_IPADDR,
-<a name="l00100"></a>00100     AUDIO_SYSTEM,
-<a name="l00101"></a>00101     MIDI_SYSTEM,
-<a name="l00102"></a>00102     UNSPECIFIED
-<a name="l00103"></a>00103   };
-<a name="l00104"></a>00104 
-<a name="l00105"></a>00105 <span class="keyword">protected</span>:
-<a name="l00106"></a>00106   std::string message_;
-<a name="l00107"></a>00107   Type type_;
-<a name="l00108"></a>00108 
-<a name="l00109"></a>00109 <span class="keyword">public</span>:
-<a name="l00111"></a><a class="code" href="classstk_1_1StkError.html#b6cbc80df11b385b20d244327fb74abb">00111</a>   <a class="code" href="classstk_1_1StkError.html#b6cbc80df11b385b20d244327fb74abb" title="The constructor.">StkError</a>(<span class="keyword">const</span> std::string&amp; message, Type type = StkError::UNSPECIFIED)
-<a name="l00112"></a>00112     : message_(message), type_(type) {}
-<a name="l00113"></a>00113 
-<a name="l00115"></a><a class="code" href="classstk_1_1StkError.html#b0639b3a9354a0f84a9338d1c9b87464">00115</a>   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkError.html#b0639b3a9354a0f84a9338d1c9b87464" title="The destructor.">~StkError</a>(<span class="keywordtype">void</span>) {};
-<a name="l00116"></a>00116 
-<a name="l00118"></a><a class="code" href="classstk_1_1StkError.html#337437a729f03d48fc56277037ac6fdc">00118</a>   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkError.html#337437a729f03d48fc56277037ac6fdc" title="Prints thrown error message to stderr.">printMessage</a>(<span class="keywordtype">void</span>) { std::cerr &lt;&lt; <span class="charliteral">'\n'</span> &lt;&lt; message_ &lt;&lt; <span class="stringliteral">"\n\n"</span>; }
-<a name="l00119"></a>00119 
-<a name="l00121"></a><a class="code" href="classstk_1_1StkError.html#ae641cf5ed2b756adbf02fc668fac53e">00121</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> Type&amp; <a class="code" href="classstk_1_1StkError.html#ae641cf5ed2b756adbf02fc668fac53e" title="Returns the thrown error message type.">getType</a>(<span class="keywordtype">void</span>) { <span class="keywordflow">return</span> type_; }
-<a name="l00122"></a>00122 
-<a name="l00124"></a><a class="code" href="classstk_1_1StkError.html#c691cbffe442d9e0760978146df5d9fb">00124</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> std::string&amp; <a class="code" href="classstk_1_1StkError.html#c691cbffe442d9e0760978146df5d9fb" title="Returns the thrown error message string.">getMessage</a>(<span class="keywordtype">void</span>) { <span class="keywordflow">return</span> message_; }
-<a name="l00125"></a>00125 
-<a name="l00127"></a><a class="code" href="classstk_1_1StkError.html#e802643199c86a797f7adebe109d84bf">00127</a>   <span class="keyword">virtual</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *<a class="code" href="classstk_1_1StkError.html#e802643199c86a797f7adebe109d84bf" title="Returns the thrown error message as a C string.">getMessageCString</a>(<span class="keywordtype">void</span>) { <span class="keywordflow">return</span> message_.c_str(); }
-<a name="l00128"></a>00128 };
-<a name="l00129"></a>00129 
-<a name="l00130"></a>00130 
-<a name="l00131"></a><a class="code" href="classstk_1_1Stk.html">00131</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00132"></a>00132 {
-<a name="l00133"></a>00133 <span class="keyword">public</span>:
-<a name="l00134"></a>00134 
-<a name="l00135"></a>00135   <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> StkFormat;
-<a name="l00136"></a><a class="code" href="classstk_1_1Stk.html#dec863631653693af8f1ed5c0cfc5c4c">00136</a>   <span class="keyword">static</span> <span class="keyword">const</span> StkFormat <a class="code" href="classstk_1_1Stk.html#dec863631653693af8f1ed5c0cfc5c4c">STK_SINT8</a>;   
-<a name="l00137"></a><a class="code" href="classstk_1_1Stk.html#5a807971b7fc3c8985d97823be079a7b">00137</a>   <span class="keyword">static</span> <span class="keyword">const</span> StkFormat <a class="code" href="classstk_1_1Stk.html#5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a>;  
-<a name="l00138"></a><a class="code" href="classstk_1_1Stk.html#fbe8049756ea88bdd8cebad65305dd52">00138</a>   <span class="keyword">static</span> <span class="keyword">const</span> StkFormat <a class="code" href="classstk_1_1Stk.html#fbe8049756ea88bdd8cebad65305dd52">STK_SINT24</a>;  
-<a name="l00139"></a><a class="code" href="classstk_1_1Stk.html#605c96894e1b0f1f08a80214a08012ad">00139</a>   <span class="keyword">static</span> <span class="keyword">const</span> StkFormat <a class="code" href="classstk_1_1Stk.html#605c96894e1b0f1f08a80214a08012ad">STK_SINT32</a>;  
-<a name="l00140"></a><a class="code" href="classstk_1_1Stk.html#079e62be7093d593498e9d2ba4ac20fa">00140</a>   <span class="keyword">static</span> <span class="keyword">const</span> StkFormat <a class="code" href="classstk_1_1Stk.html#079e62be7093d593498e9d2ba4ac20fa">STK_FLOAT32</a>; 
-<a name="l00141"></a><a class="code" href="classstk_1_1Stk.html#57b00150ae559b6f099be117b2e53af4">00141</a>   <span class="keyword">static</span> <span class="keyword">const</span> StkFormat <a class="code" href="classstk_1_1Stk.html#57b00150ae559b6f099be117b2e53af4">STK_FLOAT64</a>; 
-<a name="l00143"></a>00143 
-<a name="l00144"></a><a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d">00144</a>   <span class="keyword">static</span> StkFloat <a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">sampleRate</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> srate_; }
-<a name="l00145"></a>00145 
-<a name="l00147"></a>00147 
-<a name="l00164"></a>00164   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#46e2f55e5a92c717c3893fe23dde88a5" title="Static method that sets the STK sample rate.">setSampleRate</a>( StkFloat rate );
-<a name="l00165"></a>00165 
-<a name="l00167"></a>00167 
-<a name="l00172"></a><a class="code" href="classstk_1_1Stk.html#b8a52e4897bea5c0f5e66adf37a8e39b">00172</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#b8a52e4897bea5c0f5e66adf37a8e39b" title="A function to enable/disable the automatic updating of class data when the STK sample...">ignoreSampleRateChange</a>( <span class="keywordtype">bool</span> ignore = <span class="keyword">true</span> ) { ignoreSampleRateChange_ = ignore; };
-<a name="l00173"></a>00173 
-<a name="l00175"></a><a class="code" href="classstk_1_1Stk.html#5f3fd05b709788213549fe2cbaf4a52a">00175</a>   <span class="keyword">static</span> std::string <a class="code" href="classstk_1_1Stk.html#5f3fd05b709788213549fe2cbaf4a52a" title="Static method that returns the current rawwave path.">rawwavePath</a>(<span class="keywordtype">void</span>) { <span class="keywordflow">return</span> rawwavepath_; }
-<a name="l00176"></a>00176 
-<a name="l00178"></a>00178   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#4f641ad194f9d8ce1f9d1ae56af5686b" title="Static method that sets the STK rawwave path.">setRawwavePath</a>( std::string path );
-<a name="l00179"></a>00179 
-<a name="l00181"></a>00181   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#b2dc4c9e67317eb0753868a89c8095f6" title="Static method that byte-swaps a 16-bit data type.">swap16</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> *ptr );
-<a name="l00182"></a>00182 
-<a name="l00184"></a>00184   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#820631139e6f7e23d328d387c0f530fd" title="Static method that byte-swaps a 32-bit data type.">swap32</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> *ptr );
-<a name="l00185"></a>00185 
-<a name="l00187"></a>00187   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#5f744eadf29ecbfbeddfdf7ceb5853c9" title="Static method that byte-swaps a 64-bit data type.">swap64</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> *ptr );
-<a name="l00188"></a>00188 
-<a name="l00190"></a>00190   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#d75619ab92a0c19b5a52cb68884511e3" title="Static cross-platform method to sleep for a number of milliseconds.">sleep</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> milliseconds );
-<a name="l00191"></a>00191 
-<a name="l00193"></a>00193   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( <span class="keyword">const</span> <span class="keywordtype">char</span> *message, StkError::Type type );
-<a name="l00194"></a>00194 
-<a name="l00196"></a>00196   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( std::string message, StkError::Type type );
-<a name="l00197"></a>00197 
-<a name="l00199"></a><a class="code" href="classstk_1_1Stk.html#2d8b38b9f808fb7c5e65c228b4b7dbbb">00199</a>   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#2d8b38b9f808fb7c5e65c228b4b7dbbb" title="Toggle display of WARNING and STATUS messages.">showWarnings</a>( <span class="keywordtype">bool</span> status ) { showWarnings_ = status; }
-<a name="l00200"></a>00200 
-<a name="l00202"></a><a class="code" href="classstk_1_1Stk.html#ffb98f8f1f65ddc9e4af8440056b1504">00202</a>   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#ffb98f8f1f65ddc9e4af8440056b1504" title="Toggle display of error messages before throwing exceptions.">printErrors</a>( <span class="keywordtype">bool</span> status ) { printErrors_ = status; }
-<a name="l00203"></a>00203 
-<a name="l00204"></a>00204 <span class="keyword">private</span>:
-<a name="l00205"></a>00205   <span class="keyword">static</span> StkFloat srate_;
-<a name="l00206"></a>00206   <span class="keyword">static</span> std::string rawwavepath_;
-<a name="l00207"></a>00207   <span class="keyword">static</span> <span class="keywordtype">bool</span> showWarnings_;
-<a name="l00208"></a>00208   <span class="keyword">static</span> <span class="keywordtype">bool</span> printErrors_;
-<a name="l00209"></a>00209   <span class="keyword">static</span> std::vector&lt;Stk *&gt; alertList_;
-<a name="l00210"></a>00210 
-<a name="l00211"></a>00211 <span class="keyword">protected</span>:
-<a name="l00212"></a>00212 
-<a name="l00213"></a>00213   std::ostringstream errorString_;
-<a name="l00214"></a>00214   <span class="keywordtype">bool</span> ignoreSampleRateChange_;
-<a name="l00215"></a>00215 
-<a name="l00217"></a>00217   <a class="code" href="classstk_1_1Stk.html#9bff83b5a318ff171f94a218ad52226b" title="Default constructor.">Stk</a>( <span class="keywordtype">void</span> );
-<a name="l00218"></a>00218 
-<a name="l00220"></a>00220   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1Stk.html#d0d5c6ab745ad2841a59032addae3905" title="Class destructor.">~Stk</a>( <span class="keywordtype">void</span> );
-<a name="l00221"></a>00221 
-<a name="l00223"></a>00223   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#740e872daa4b2ad1c918163e7c5ab56b" title="This function should be implemented in subclasses that depend on the sample rate...">sampleRateChanged</a>( StkFloat newRate, StkFloat oldRate );
-<a name="l00224"></a>00224 
-<a name="l00226"></a>00226   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#5ab0e88856708f65887295ad4ad90340" title="Add class pointer to list for sample rate change notification.">addSampleRateAlert</a>( <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a> *ptr );
-<a name="l00227"></a>00227 
-<a name="l00229"></a>00229   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#349865986f712f58087cb72603a6ced8" title="Remove class pointer from list for sample rate change notification.">removeSampleRateAlert</a>( <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a> *ptr );
-<a name="l00230"></a>00230 
-<a name="l00232"></a>00232   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::Type type );
-<a name="l00233"></a>00233 };
-<a name="l00234"></a>00234 
-<a name="l00235"></a>00235 
-<a name="l00236"></a>00236 <span class="comment">/***************************************************/</span>
-<a name="l00259"></a>00259 <span class="comment">/***************************************************/</span>
-<a name="l00260"></a>00260 
-<a name="l00261"></a><a class="code" href="classstk_1_1StkFrames.html">00261</a> <span class="keyword">class </span><a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>
-<a name="l00262"></a>00262 {
-<a name="l00263"></a>00263 <span class="keyword">public</span>:
-<a name="l00264"></a>00264 
-<a name="l00266"></a>00266   <a class="code" href="classstk_1_1StkFrames.html#a9ad14889de633ba4269f1330be8bedf" title="The default constructor initializes the frame data structure to size zero.">StkFrames</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nFrames = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 0 );
-<a name="l00267"></a>00267 
-<a name="l00269"></a>00269   <a class="code" href="classstk_1_1StkFrames.html#a9ad14889de633ba4269f1330be8bedf" title="The default constructor initializes the frame data structure to size zero.">StkFrames</a>( <span class="keyword">const</span> StkFloat&amp; value, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels );
-<a name="l00270"></a>00270 
-<a name="l00272"></a>00272   <a class="code" href="classstk_1_1StkFrames.html#3fa9a0a175de2b18e75d9b68a6387895" title="The destructor.">~StkFrames</a>();
-<a name="l00273"></a>00273 
-<a name="l00274"></a>00274   <span class="comment">// A copy constructor.</span>
-<a name="l00275"></a>00275   <a class="code" href="classstk_1_1StkFrames.html#a9ad14889de633ba4269f1330be8bedf" title="The default constructor initializes the frame data structure to size zero.">StkFrames</a>( <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
-<a name="l00276"></a>00276 
-<a name="l00277"></a>00277   <span class="comment">// Assignment operator that returns a reference to self.</span>
-<a name="l00278"></a>00278   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; operator= ( <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
-<a name="l00279"></a>00279 
-<a name="l00281"></a>00281 
-<a name="l00287"></a>00287   StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">operator[] </a>( <span class="keywordtype">size_t</span> n );
-<a name="l00288"></a>00288 
-<a name="l00290"></a>00290 
-<a name="l00294"></a>00294   StkFloat <a class="code" href="classstk_1_1StkFrames.html#8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">operator[] </a>( <span class="keywordtype">size_t</span> n ) <span class="keyword">const</span>;
-<a name="l00295"></a>00295 
-<a name="l00297"></a>00297 
-<a name="l00302"></a>00302   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#0f6a81d36a8905d782b283b9a05893e6" title="Assignment by sum operator into self.">operator+= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
-<a name="l00303"></a>00303 
-<a name="l00305"></a>00305 
-<a name="l00310"></a>00310   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#049cbfd10908f754a7c48c1dd0da21e0" title="Assignment by product operator into self.">operator*= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
-<a name="l00311"></a>00311 
-<a name="l00313"></a>00313 
-<a name="l00320"></a>00320   StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel );
-<a name="l00321"></a>00321 
-<a name="l00323"></a>00323 
-<a name="l00328"></a>00328   StkFloat <a class="code" href="classstk_1_1StkFrames.html#813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel ) <span class="keyword">const</span>;
-<a name="l00329"></a>00329 
-<a name="l00331"></a>00331 
-<a name="l00337"></a>00337   StkFloat <a class="code" href="classstk_1_1StkFrames.html#4f9402d9be28da418f630b4261b9b386" title="Return an interpolated value at the fractional frame index and channel.">interpolate</a>( StkFloat frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) <span class="keyword">const</span>;
-<a name="l00338"></a>00338 
-<a name="l00340"></a><a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79">00340</a>   <span class="keywordtype">size_t</span> <a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> size_; }; 
-<a name="l00341"></a>00341 
-<a name="l00343"></a>00343   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1StkFrames.html#c6652950830fe907f9158ee891560253" title="Returns true if the object size is zero and false otherwise.">empty</a>() <span class="keyword">const</span>;
-<a name="l00344"></a>00344 
-<a name="l00346"></a>00346 
-<a name="l00353"></a>00353   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( <span class="keywordtype">size_t</span> nFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1 );
-<a name="l00354"></a>00354 
-<a name="l00356"></a>00356 
-<a name="l00363"></a>00363   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( <span class="keywordtype">size_t</span> nFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels, StkFloat value );
-<a name="l00364"></a>00364 
-<a name="l00366"></a><a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870">00366</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> nChannels_; };
-<a name="l00367"></a>00367 
-<a name="l00369"></a><a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9">00369</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> nFrames_; };
-<a name="l00370"></a>00370 
-<a name="l00372"></a>00372 
-<a name="l00376"></a><a class="code" href="classstk_1_1StkFrames.html#d528b1c8ea2866570e7d9c2bac0e8b40">00376</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#d528b1c8ea2866570e7d9c2bac0e8b40" title="Set the sample rate associated with the StkFrames data.">setDataRate</a>( StkFloat rate ) { dataRate_ = rate; };
-<a name="l00377"></a>00377 
-<a name="l00379"></a>00379 
-<a name="l00383"></a><a class="code" href="classstk_1_1StkFrames.html#4dbbcbdc8db39a803e0861976f7f3522">00383</a>   StkFloat <a class="code" href="classstk_1_1StkFrames.html#4dbbcbdc8db39a803e0861976f7f3522" title="Return the sample rate associated with the StkFrames data.">dataRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> dataRate_; };
-<a name="l00384"></a>00384 
-<a name="l00385"></a>00385 <span class="keyword">private</span>:
-<a name="l00386"></a>00386 
-<a name="l00387"></a>00387   StkFloat *data_;
-<a name="l00388"></a>00388   StkFloat dataRate_;
-<a name="l00389"></a>00389   <span class="keywordtype">size_t</span> nFrames_;
-<a name="l00390"></a>00390   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels_;
-<a name="l00391"></a>00391   <span class="keywordtype">size_t</span> size_;
-<a name="l00392"></a>00392   <span class="keywordtype">size_t</span> bufferSize_;
-<a name="l00393"></a>00393 
-<a name="l00394"></a>00394 };
-<a name="l00395"></a>00395 
-<a name="l00396"></a><a class="code" href="classstk_1_1StkFrames.html#c6652950830fe907f9158ee891560253">00396</a> <span class="keyword">inline</span> <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1StkFrames.html#c6652950830fe907f9158ee891560253" title="Returns true if the object size is zero and false otherwise.">StkFrames :: empty</a>()<span class="keyword"> const</span>
-<a name="l00397"></a>00397 <span class="keyword"></span>{
-<a name="l00398"></a>00398   <span class="keywordflow">if</span> ( size_ &gt; 0 ) <span class="keywordflow">return</span> <span class="keyword">false</span>;
-<a name="l00399"></a>00399   <span class="keywordflow">else</span> <span class="keywordflow">return</span> <span class="keyword">true</span>;
-<a name="l00400"></a>00400 }
-<a name="l00401"></a>00401 
-<a name="l00402"></a><a class="code" href="classstk_1_1StkFrames.html#8ed9cc0a4309f786cfe36da9e901fde9">00402</a> <span class="keyword">inline</span> StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">StkFrames :: operator[] </a>( <span class="keywordtype">size_t</span> n )
-<a name="l00403"></a>00403 {
-<a name="l00404"></a>00404 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00405"></a>00405 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( n &gt;= size_ ) {
-<a name="l00406"></a>00406     std::ostringstream error;
-<a name="l00407"></a>00407     error &lt;&lt; <span class="stringliteral">"StkFrames::operator[]: invalid index ("</span> &lt;&lt; n &lt;&lt; <span class="stringliteral">") value!"</span>;
-<a name="l00408"></a>00408     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00409"></a>00409   }
-<a name="l00410"></a>00410 <span class="preprocessor">#endif</span>
-<a name="l00411"></a>00411 <span class="preprocessor"></span>
-<a name="l00412"></a>00412   <span class="keywordflow">return</span> data_[n];
-<a name="l00413"></a>00413 }
-<a name="l00414"></a>00414 
-<a name="l00415"></a><a class="code" href="classstk_1_1StkFrames.html#2d1c8a2b32725ca72e0f3256f9cd8cb6">00415</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1StkFrames.html#8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">StkFrames :: operator[] </a>( <span class="keywordtype">size_t</span> n )<span class="keyword"> const</span>
-<a name="l00416"></a>00416 <span class="keyword"></span>{
-<a name="l00417"></a>00417 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00418"></a>00418 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( n &gt;= size_ ) {
-<a name="l00419"></a>00419     std::ostringstream error;
-<a name="l00420"></a>00420     error &lt;&lt; <span class="stringliteral">"StkFrames::operator[]: invalid index ("</span> &lt;&lt; n &lt;&lt; <span class="stringliteral">") value!"</span>;
-<a name="l00421"></a>00421     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00422"></a>00422   }
-<a name="l00423"></a>00423 <span class="preprocessor">#endif</span>
-<a name="l00424"></a>00424 <span class="preprocessor"></span>
-<a name="l00425"></a>00425   <span class="keywordflow">return</span> data_[n];
-<a name="l00426"></a>00426 }
-<a name="l00427"></a>00427 
-<a name="l00428"></a><a class="code" href="classstk_1_1StkFrames.html#813632277bf0c432bcf81136ccdbbec1">00428</a> <span class="keyword">inline</span> StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">StkFrames :: operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00429"></a>00429 {
-<a name="l00430"></a>00430 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00431"></a>00431 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( frame &gt;= nFrames_ || channel &gt;= nChannels_ ) {
-<a name="l00432"></a>00432     std::ostringstream error;
-<a name="l00433"></a>00433     error &lt;&lt; <span class="stringliteral">"StkFrames::operator(): invalid frame ("</span> &lt;&lt; frame &lt;&lt; <span class="stringliteral">") or channel ("</span> &lt;&lt; channel &lt;&lt; <span class="stringliteral">") value!"</span>;
-<a name="l00434"></a>00434     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00435"></a>00435   }
-<a name="l00436"></a>00436 <span class="preprocessor">#endif</span>
-<a name="l00437"></a>00437 <span class="preprocessor"></span>
-<a name="l00438"></a>00438   <span class="keywordflow">return</span> data_[ frame * nChannels_ + channel ];
-<a name="l00439"></a>00439 }
-<a name="l00440"></a>00440 
-<a name="l00441"></a><a class="code" href="classstk_1_1StkFrames.html#93e7e4c30affc29d0cdc98e7514188de">00441</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1StkFrames.html#813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">StkFrames :: operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )<span class="keyword"> const</span>
-<a name="l00442"></a>00442 <span class="keyword"></span>{
-<a name="l00443"></a>00443 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00444"></a>00444 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( frame &gt;= nFrames_ || channel &gt;= nChannels_ ) {
-<a name="l00445"></a>00445     std::ostringstream error;
-<a name="l00446"></a>00446     error &lt;&lt; <span class="stringliteral">"StkFrames::operator(): invalid frame ("</span> &lt;&lt; frame &lt;&lt; <span class="stringliteral">") or channel ("</span> &lt;&lt; channel &lt;&lt; <span class="stringliteral">") value!"</span>;
-<a name="l00447"></a>00447     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00448"></a>00448   }
-<a name="l00449"></a>00449 <span class="preprocessor">#endif</span>
-<a name="l00450"></a>00450 <span class="preprocessor"></span>
-<a name="l00451"></a>00451   <span class="keywordflow">return</span> data_[ frame * nChannels_ + channel ];
-<a name="l00452"></a>00452 }
-<a name="l00453"></a>00453 
-<a name="l00454"></a><a class="code" href="classstk_1_1StkFrames.html#0f6a81d36a8905d782b283b9a05893e6">00454</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#0f6a81d36a8905d782b283b9a05893e6" title="Assignment by sum operator into self.">StkFrames :: operator+= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f )
-<a name="l00455"></a>00455 {
-<a name="l00456"></a>00456 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00457"></a>00457 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( f.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>() != nFrames_ || f.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() != nChannels_ ) {
-<a name="l00458"></a>00458     std::ostringstream error;
-<a name="l00459"></a>00459     error &lt;&lt; <span class="stringliteral">"StkFrames::operator+=: frames argument must be of equal dimensions!"</span>;
-<a name="l00460"></a>00460     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00461"></a>00461   }
-<a name="l00462"></a>00462 <span class="preprocessor">#endif</span>
-<a name="l00463"></a>00463 <span class="preprocessor"></span>
-<a name="l00464"></a>00464   StkFloat *fptr = &amp;f[0];
-<a name="l00465"></a>00465   StkFloat *dptr = data_;
-<a name="l00466"></a>00466   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;size_; i++ )
-<a name="l00467"></a>00467     *dptr++ += *fptr++;
-<a name="l00468"></a>00468 }
-<a name="l00469"></a>00469 
-<a name="l00470"></a><a class="code" href="classstk_1_1StkFrames.html#049cbfd10908f754a7c48c1dd0da21e0">00470</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#049cbfd10908f754a7c48c1dd0da21e0" title="Assignment by product operator into self.">StkFrames :: operator*= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f )
-<a name="l00471"></a>00471 {
-<a name="l00472"></a>00472 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00473"></a>00473 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( f.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>() != nFrames_ || f.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() != nChannels_ ) {
-<a name="l00474"></a>00474     std::ostringstream error;
-<a name="l00475"></a>00475     error &lt;&lt; <span class="stringliteral">"StkFrames::operator*=: frames argument must be of equal dimensions!"</span>;
-<a name="l00476"></a>00476     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00477"></a>00477   }
-<a name="l00478"></a>00478 <span class="preprocessor">#endif</span>
-<a name="l00479"></a>00479 <span class="preprocessor"></span>
-<a name="l00480"></a>00480   StkFloat *fptr = &amp;f[0];
-<a name="l00481"></a>00481   StkFloat *dptr = data_;
-<a name="l00482"></a>00482   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;size_; i++ )
-<a name="l00483"></a>00483     *dptr++ *= *fptr++;
-<a name="l00484"></a>00484 }
-<a name="l00485"></a>00485 
-<a name="l00486"></a>00486 <span class="comment">// Here are a few other useful typedefs.</span>
-<a name="l00487"></a>00487 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> UINT16;
-<a name="l00488"></a>00488 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> UINT32;
-<a name="l00489"></a>00489 <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">short</span> SINT16;
-<a name="l00490"></a>00490 <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">int</span> SINT32;
-<a name="l00491"></a>00491 <span class="keyword">typedef</span> <span class="keywordtype">float</span> FLOAT32;
-<a name="l00492"></a>00492 <span class="keyword">typedef</span> <span class="keywordtype">double</span> FLOAT64;
-<a name="l00493"></a>00493 
-<a name="l00494"></a>00494 <span class="comment">// The default sampling rate.</span>
-<a name="l00495"></a>00495 <span class="keyword">const</span> StkFloat SRATE = 44100.0;
-<a name="l00496"></a>00496 
-<a name="l00497"></a>00497 <span class="comment">// The default real-time audio input and output buffer size.  If</span>
-<a name="l00498"></a>00498 <span class="comment">// clicks are occuring in the input and/or output sound stream, a</span>
-<a name="l00499"></a>00499 <span class="comment">// larger buffer size may help.  Larger buffer sizes, however, produce</span>
-<a name="l00500"></a>00500 <span class="comment">// more latency.</span>
-<a name="l00501"></a>00501 <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> RT_BUFFER_SIZE = 512;
-<a name="l00502"></a>00502 
-<a name="l00503"></a>00503 <span class="comment">// The default rawwave path value is set with the preprocessor</span>
-<a name="l00504"></a>00504 <span class="comment">// definition RAWWAVE_PATH.  This can be specified as an argument to</span>
-<a name="l00505"></a>00505 <span class="comment">// the configure script, in an integrated development environment, or</span>
-<a name="l00506"></a>00506 <span class="comment">// below.  The global STK rawwave path variable can be dynamically set</span>
-<a name="l00507"></a>00507 <span class="comment">// with the Stk::setRawwavePath() function.  This value is</span>
-<a name="l00508"></a>00508 <span class="comment">// concatenated to the beginning of all references to rawwave files in</span>
-<a name="l00509"></a>00509 <span class="comment">// the various STK core classes (ex. Clarinet.cpp).  If you wish to</span>
-<a name="l00510"></a>00510 <span class="comment">// move the rawwaves directory to a different location in your file</span>
-<a name="l00511"></a>00511 <span class="comment">// system, you will need to set this path definition appropriately.</span>
-<a name="l00512"></a>00512 <span class="preprocessor">#if !defined(RAWWAVE_PATH)</span>
-<a name="l00513"></a>00513 <span class="preprocessor"></span><span class="preprocessor">  #define RAWWAVE_PATH "../../rawwaves/"</span>
-<a name="l00514"></a>00514 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-<a name="l00515"></a>00515 <span class="preprocessor"></span>
-<a name="l00516"></a>00516 <span class="keyword">const</span> StkFloat PI           = 3.14159265358979;
-<a name="l00517"></a>00517 <span class="keyword">const</span> StkFloat TWO_PI       = 2 * PI;
-<a name="l00518"></a>00518 <span class="keyword">const</span> StkFloat ONE_OVER_128 = 0.0078125;
-<a name="l00519"></a>00519 
-<a name="l00520"></a>00520 <span class="preprocessor">#if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__) || defined(__WINDOWS_MM__)</span>
-<a name="l00521"></a>00521 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_WINDOWS__</span>
-<a name="l00522"></a>00522 <span class="preprocessor"></span><span class="preprocessor">  #define __STK_REALTIME__</span>
-<a name="l00523"></a>00523 <span class="preprocessor"></span><span class="preprocessor">#elif defined(__LINUX_OSS__) || defined(__LINUX_ALSA__) || defined(__UNIX_JACK__)</span>
-<a name="l00524"></a>00524 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_LINUX__</span>
-<a name="l00525"></a>00525 <span class="preprocessor"></span><span class="preprocessor">  #define __STK_REALTIME__</span>
-<a name="l00526"></a>00526 <span class="preprocessor"></span><span class="preprocessor">#elif defined(__IRIX_AL__)</span>
-<a name="l00527"></a>00527 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_IRIX__</span>
-<a name="l00528"></a>00528 <span class="preprocessor"></span><span class="preprocessor">#elif defined(__MACOSX_CORE__) || defined(__UNIX_JACK__)</span>
-<a name="l00529"></a>00529 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_MACOSX__</span>
-<a name="l00530"></a>00530 <span class="preprocessor"></span><span class="preprocessor">  #define __STK_REALTIME__</span>
-<a name="l00531"></a>00531 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-<a name="l00532"></a>00532 <span class="preprocessor"></span>
-<a name="l00533"></a>00533 } <span class="comment">// stk namespace</span>
-<a name="l00534"></a>00534 
-<a name="l00535"></a>00535 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Stk_8h_source.html b/doc/html/Stk_8h_source.html
index bbfc78d..2da71ad 100644
--- a/doc/html/Stk_8h_source.html
+++ b/doc/html/Stk_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Stk.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_STK_H</span>
@@ -41,7 +41,7 @@
 <a name="l00087"></a>00087   <span class="keyword">enum</span> Type {
 <a name="l00088"></a>00088     STATUS,
 <a name="l00089"></a>00089     WARNING,
-<a name="l00090"></a>00090     DEBUG_WARNING,
+<a name="l00090"></a>00090     DEBUG_PRINT,
 <a name="l00091"></a>00091     MEMORY_ALLOCATION,
 <a name="l00092"></a>00092     MEMORY_ACCESS,
 <a name="l00093"></a>00093     FUNCTION_ARGUMENT,
@@ -108,257 +108,263 @@
 <a name="l00188"></a>00188 
 <a name="l00190"></a>00190   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#ad75619ab92a0c19b5a52cb68884511e3" title="Static cross-platform method to sleep for a number of milliseconds.">sleep</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> milliseconds );
 <a name="l00191"></a>00191 
-<a name="l00193"></a>00193   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( <span class="keyword">const</span> <span class="keywordtype">char</span> *message, StkError::Type type );
-<a name="l00194"></a>00194 
-<a name="l00196"></a>00196   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( std::string message, StkError::Type type );
-<a name="l00197"></a>00197 
-<a name="l00199"></a><a class="code" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">00199</a>   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb" title="Toggle display of WARNING and STATUS messages.">showWarnings</a>( <span class="keywordtype">bool</span> status ) { showWarnings_ = status; }
-<a name="l00200"></a>00200 
-<a name="l00202"></a><a class="code" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">00202</a>   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504" title="Toggle display of error messages before throwing exceptions.">printErrors</a>( <span class="keywordtype">bool</span> status ) { printErrors_ = status; }
-<a name="l00203"></a>00203 
-<a name="l00204"></a>00204 <span class="keyword">private</span>:
-<a name="l00205"></a>00205   <span class="keyword">static</span> StkFloat srate_;
-<a name="l00206"></a>00206   <span class="keyword">static</span> std::string rawwavepath_;
-<a name="l00207"></a>00207   <span class="keyword">static</span> <span class="keywordtype">bool</span> showWarnings_;
-<a name="l00208"></a>00208   <span class="keyword">static</span> <span class="keywordtype">bool</span> printErrors_;
-<a name="l00209"></a>00209   <span class="keyword">static</span> std::vector&lt;Stk *&gt; alertList_;
+<a name="l00193"></a><a class="code" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">00193</a>   <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e" title="Static method to check whether a value is within a specified range.">inRange</a>( StkFloat value, StkFloat min, StkFloat max ) {
+<a name="l00194"></a>00194     <span class="keywordflow">if</span> ( value &lt; min ) <span class="keywordflow">return</span> <span class="keyword">false</span>;
+<a name="l00195"></a>00195     <span class="keywordflow">else</span> <span class="keywordflow">if</span> ( value &gt; max ) <span class="keywordflow">return</span> <span class="keyword">false</span>;
+<a name="l00196"></a>00196     <span class="keywordflow">else</span> <span class="keywordflow">return</span> <span class="keyword">true</span>;
+<a name="l00197"></a>00197   }
+<a name="l00198"></a>00198 
+<a name="l00200"></a>00200   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( <span class="keyword">const</span> <span class="keywordtype">char</span> *message, StkError::Type type );
+<a name="l00201"></a>00201 
+<a name="l00203"></a>00203   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( std::string message, StkError::Type type );
+<a name="l00204"></a>00204 
+<a name="l00206"></a><a class="code" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">00206</a>   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb" title="Toggle display of WARNING and STATUS messages.">showWarnings</a>( <span class="keywordtype">bool</span> status ) { showWarnings_ = status; }
+<a name="l00207"></a>00207 
+<a name="l00209"></a><a class="code" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">00209</a>   <span class="keyword">static</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504" title="Toggle display of error messages before throwing exceptions.">printErrors</a>( <span class="keywordtype">bool</span> status ) { printErrors_ = status; }
 <a name="l00210"></a>00210 
-<a name="l00211"></a>00211 <span class="keyword">protected</span>:
-<a name="l00212"></a>00212 
-<a name="l00213"></a>00213   std::ostringstream errorString_;
-<a name="l00214"></a>00214   <span class="keywordtype">bool</span> ignoreSampleRateChange_;
-<a name="l00215"></a>00215 
-<a name="l00217"></a>00217   <a class="code" href="classstk_1_1Stk.html#a9bff83b5a318ff171f94a218ad52226b" title="Default constructor.">Stk</a>( <span class="keywordtype">void</span> );
-<a name="l00218"></a>00218 
-<a name="l00220"></a>00220   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905" title="Class destructor.">~Stk</a>( <span class="keywordtype">void</span> );
-<a name="l00221"></a>00221 
-<a name="l00223"></a>00223   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a740e872daa4b2ad1c918163e7c5ab56b" title="This function should be implemented in subclasses that depend on the sample rate...">sampleRateChanged</a>( StkFloat newRate, StkFloat oldRate );
-<a name="l00224"></a>00224 
-<a name="l00226"></a>00226   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340" title="Add class pointer to list for sample rate change notification.">addSampleRateAlert</a>( <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a> *ptr );
-<a name="l00227"></a>00227 
-<a name="l00229"></a>00229   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8" title="Remove class pointer from list for sample rate change notification.">removeSampleRateAlert</a>( <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a> *ptr );
-<a name="l00230"></a>00230 
-<a name="l00232"></a>00232   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::Type type );
-<a name="l00233"></a>00233 };
+<a name="l00211"></a>00211 <span class="keyword">private</span>:
+<a name="l00212"></a>00212   <span class="keyword">static</span> StkFloat srate_;
+<a name="l00213"></a>00213   <span class="keyword">static</span> std::string rawwavepath_;
+<a name="l00214"></a>00214   <span class="keyword">static</span> <span class="keywordtype">bool</span> showWarnings_;
+<a name="l00215"></a>00215   <span class="keyword">static</span> <span class="keywordtype">bool</span> printErrors_;
+<a name="l00216"></a>00216   <span class="keyword">static</span> std::vector&lt;Stk *&gt; alertList_;
+<a name="l00217"></a>00217 
+<a name="l00218"></a>00218 <span class="keyword">protected</span>:
+<a name="l00219"></a>00219 
+<a name="l00220"></a>00220   <span class="keyword">static</span> std::ostringstream oStream_;
+<a name="l00221"></a>00221   <span class="keywordtype">bool</span> ignoreSampleRateChange_;
+<a name="l00222"></a>00222 
+<a name="l00224"></a>00224   <a class="code" href="classstk_1_1Stk.html#a9bff83b5a318ff171f94a218ad52226b" title="Default constructor.">Stk</a>( <span class="keywordtype">void</span> );
+<a name="l00225"></a>00225 
+<a name="l00227"></a>00227   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905" title="Class destructor.">~Stk</a>( <span class="keywordtype">void</span> );
+<a name="l00228"></a>00228 
+<a name="l00230"></a>00230   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a740e872daa4b2ad1c918163e7c5ab56b" title="This function should be implemented in subclasses that depend on the sample rate...">sampleRateChanged</a>( StkFloat newRate, StkFloat oldRate );
+<a name="l00231"></a>00231 
+<a name="l00233"></a>00233   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340" title="Add class pointer to list for sample rate change notification.">addSampleRateAlert</a>( <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a> *ptr );
 <a name="l00234"></a>00234 
-<a name="l00235"></a>00235 
-<a name="l00236"></a>00236 <span class="comment">/***************************************************/</span>
-<a name="l00259"></a>00259 <span class="comment">/***************************************************/</span>
-<a name="l00260"></a>00260 
-<a name="l00261"></a><a class="code" href="classstk_1_1StkFrames.html">00261</a> <span class="keyword">class </span><a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>
-<a name="l00262"></a>00262 {
-<a name="l00263"></a>00263 <span class="keyword">public</span>:
-<a name="l00264"></a>00264 
-<a name="l00266"></a>00266   <a class="code" href="classstk_1_1StkFrames.html#aa9ad14889de633ba4269f1330be8bedf" title="The default constructor initializes the frame data structure to size zero.">StkFrames</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nFrames = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 0 );
-<a name="l00267"></a>00267 
-<a name="l00269"></a>00269   <a class="code" href="classstk_1_1StkFrames.html#aa9ad14889de633ba4269f1330be8bedf" title="The default constructor initializes the frame data structure to size zero.">StkFrames</a>( <span class="keyword">const</span> StkFloat&amp; value, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels );
+<a name="l00236"></a>00236   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8" title="Remove class pointer from list for sample rate change notification.">removeSampleRateAlert</a>( <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a> *ptr );
+<a name="l00237"></a>00237 
+<a name="l00239"></a>00239   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::Type type );
+<a name="l00240"></a>00240 };
+<a name="l00241"></a>00241 
+<a name="l00242"></a>00242 
+<a name="l00243"></a>00243 <span class="comment">/***************************************************/</span>
+<a name="l00269"></a>00269 <span class="comment">/***************************************************/</span>
 <a name="l00270"></a>00270 
-<a name="l00272"></a>00272   <a class="code" href="classstk_1_1StkFrames.html#a3fa9a0a175de2b18e75d9b68a6387895" title="The destructor.">~StkFrames</a>();
-<a name="l00273"></a>00273 
-<a name="l00274"></a>00274   <span class="comment">// A copy constructor.</span>
-<a name="l00275"></a>00275   <a class="code" href="classstk_1_1StkFrames.html#aa9ad14889de633ba4269f1330be8bedf" title="The default constructor initializes the frame data structure to size zero.">StkFrames</a>( <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
-<a name="l00276"></a>00276 
-<a name="l00277"></a>00277   <span class="comment">// Assignment operator that returns a reference to self.</span>
-<a name="l00278"></a>00278   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; operator= ( <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
-<a name="l00279"></a>00279 
-<a name="l00281"></a>00281 
-<a name="l00287"></a>00287   StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#a8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">operator[] </a>( <span class="keywordtype">size_t</span> n );
-<a name="l00288"></a>00288 
-<a name="l00290"></a>00290 
-<a name="l00294"></a>00294   StkFloat <a class="code" href="classstk_1_1StkFrames.html#a8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">operator[] </a>( <span class="keywordtype">size_t</span> n ) <span class="keyword">const</span>;
-<a name="l00295"></a>00295 
-<a name="l00297"></a>00297 
-<a name="l00302"></a>00302   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a0f6a81d36a8905d782b283b9a05893e6" title="Assignment by sum operator into self.">operator+= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
-<a name="l00303"></a>00303 
+<a name="l00271"></a><a class="code" href="classstk_1_1StkFrames.html">00271</a> <span class="keyword">class </span><a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>
+<a name="l00272"></a>00272 {
+<a name="l00273"></a>00273 <span class="keyword">public</span>:
+<a name="l00274"></a>00274 
+<a name="l00276"></a>00276   <a class="code" href="classstk_1_1StkFrames.html#aa9ad14889de633ba4269f1330be8bedf" title="The default constructor initializes the frame data structure to size zero.">StkFrames</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nFrames = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 0 );
+<a name="l00277"></a>00277 
+<a name="l00279"></a>00279   <a class="code" href="classstk_1_1StkFrames.html#aa9ad14889de633ba4269f1330be8bedf" title="The default constructor initializes the frame data structure to size zero.">StkFrames</a>( <span class="keyword">const</span> StkFloat&amp; value, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels );
+<a name="l00280"></a>00280 
+<a name="l00282"></a>00282   <a class="code" href="classstk_1_1StkFrames.html#a3fa9a0a175de2b18e75d9b68a6387895" title="The destructor.">~StkFrames</a>();
+<a name="l00283"></a>00283 
+<a name="l00284"></a>00284   <span class="comment">// A copy constructor.</span>
+<a name="l00285"></a>00285   <a class="code" href="classstk_1_1StkFrames.html#aa9ad14889de633ba4269f1330be8bedf" title="The default constructor initializes the frame data structure to size zero.">StkFrames</a>( <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
+<a name="l00286"></a>00286 
+<a name="l00287"></a>00287   <span class="comment">// Assignment operator that returns a reference to self.</span>
+<a name="l00288"></a>00288   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; operator= ( <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
+<a name="l00289"></a>00289 
+<a name="l00291"></a>00291 
+<a name="l00297"></a>00297   StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#a8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">operator[] </a>( <span class="keywordtype">size_t</span> n );
+<a name="l00298"></a>00298 
+<a name="l00300"></a>00300 
+<a name="l00304"></a>00304   StkFloat <a class="code" href="classstk_1_1StkFrames.html#a8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">operator[] </a>( <span class="keywordtype">size_t</span> n ) <span class="keyword">const</span>;
 <a name="l00305"></a>00305 
-<a name="l00310"></a>00310   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a049cbfd10908f754a7c48c1dd0da21e0" title="Assignment by product operator into self.">operator*= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
-<a name="l00311"></a>00311 
+<a name="l00307"></a>00307 
+<a name="l00312"></a>00312   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a0f6a81d36a8905d782b283b9a05893e6" title="Assignment by sum operator into self.">operator+= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
 <a name="l00313"></a>00313 
-<a name="l00320"></a>00320   StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#a813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel );
+<a name="l00315"></a>00315 
+<a name="l00320"></a>00320   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a049cbfd10908f754a7c48c1dd0da21e0" title="Assignment by product operator into self.">operator*= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f );
 <a name="l00321"></a>00321 
 <a name="l00323"></a>00323 
-<a name="l00328"></a>00328   StkFloat <a class="code" href="classstk_1_1StkFrames.html#a813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel ) <span class="keyword">const</span>;
-<a name="l00329"></a>00329 
+<a name="l00330"></a>00330   StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#a813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel );
 <a name="l00331"></a>00331 
-<a name="l00337"></a>00337   StkFloat <a class="code" href="classstk_1_1StkFrames.html#a4f9402d9be28da418f630b4261b9b386" title="Return an interpolated value at the fractional frame index and channel.">interpolate</a>( StkFloat frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) <span class="keyword">const</span>;
-<a name="l00338"></a>00338 
-<a name="l00340"></a><a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79">00340</a>   <span class="keywordtype">size_t</span> <a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> size_; }; 
+<a name="l00333"></a>00333 
+<a name="l00338"></a>00338   StkFloat <a class="code" href="classstk_1_1StkFrames.html#a813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel ) <span class="keyword">const</span>;
+<a name="l00339"></a>00339 
 <a name="l00341"></a>00341 
-<a name="l00343"></a>00343   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1StkFrames.html#ac6652950830fe907f9158ee891560253" title="Returns true if the object size is zero and false otherwise.">empty</a>() <span class="keyword">const</span>;
-<a name="l00344"></a>00344 
-<a name="l00346"></a>00346 
-<a name="l00353"></a>00353   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( <span class="keywordtype">size_t</span> nFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1 );
+<a name="l00347"></a>00347   StkFloat <a class="code" href="classstk_1_1StkFrames.html#a4f9402d9be28da418f630b4261b9b386" title="Return an interpolated value at the fractional frame index and channel.">interpolate</a>( StkFloat frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) <span class="keyword">const</span>;
+<a name="l00348"></a>00348 
+<a name="l00350"></a><a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79">00350</a>   <span class="keywordtype">size_t</span> <a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>()<span class="keyword"> const </span>{ <span class="keywordflow">return</span> size_; }; 
+<a name="l00351"></a>00351 
+<a name="l00353"></a>00353   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1StkFrames.html#ac6652950830fe907f9158ee891560253" title="Returns true if the object size is zero and false otherwise.">empty</a>() <span class="keyword">const</span>;
 <a name="l00354"></a>00354 
 <a name="l00356"></a>00356 
-<a name="l00363"></a>00363   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( <span class="keywordtype">size_t</span> nFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels, StkFloat value );
+<a name="l00363"></a>00363   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( <span class="keywordtype">size_t</span> nFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = 1 );
 <a name="l00364"></a>00364 
-<a name="l00366"></a><a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870">00366</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> nChannels_; };
-<a name="l00367"></a>00367 
-<a name="l00369"></a><a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9">00369</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> nFrames_; };
-<a name="l00370"></a>00370 
-<a name="l00372"></a>00372 
-<a name="l00376"></a><a class="code" href="classstk_1_1StkFrames.html#ad528b1c8ea2866570e7d9c2bac0e8b40">00376</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#ad528b1c8ea2866570e7d9c2bac0e8b40" title="Set the sample rate associated with the StkFrames data.">setDataRate</a>( StkFloat rate ) { dataRate_ = rate; };
+<a name="l00366"></a>00366 
+<a name="l00373"></a>00373   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a386e1b86cf48f7a8117313f9e41fc0fe" title="Resize self to represent the specified number of channels and frames.">resize</a>( <span class="keywordtype">size_t</span> nFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels, StkFloat value );
+<a name="l00374"></a>00374 
+<a name="l00376"></a><a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870">00376</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> nChannels_; };
 <a name="l00377"></a>00377 
-<a name="l00379"></a>00379 
-<a name="l00383"></a><a class="code" href="classstk_1_1StkFrames.html#a4dbbcbdc8db39a803e0861976f7f3522">00383</a>   StkFloat <a class="code" href="classstk_1_1StkFrames.html#a4dbbcbdc8db39a803e0861976f7f3522" title="Return the sample rate associated with the StkFrames data.">dataRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> dataRate_; };
-<a name="l00384"></a>00384 
-<a name="l00385"></a>00385 <span class="keyword">private</span>:
-<a name="l00386"></a>00386 
-<a name="l00387"></a>00387   StkFloat *data_;
-<a name="l00388"></a>00388   StkFloat dataRate_;
-<a name="l00389"></a>00389   <span class="keywordtype">size_t</span> nFrames_;
-<a name="l00390"></a>00390   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels_;
-<a name="l00391"></a>00391   <span class="keywordtype">size_t</span> size_;
-<a name="l00392"></a>00392   <span class="keywordtype">size_t</span> bufferSize_;
-<a name="l00393"></a>00393 
-<a name="l00394"></a>00394 };
-<a name="l00395"></a>00395 
-<a name="l00396"></a><a class="code" href="classstk_1_1StkFrames.html#ac6652950830fe907f9158ee891560253">00396</a> <span class="keyword">inline</span> <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1StkFrames.html#ac6652950830fe907f9158ee891560253" title="Returns true if the object size is zero and false otherwise.">StkFrames :: empty</a>()<span class="keyword"> const</span>
-<a name="l00397"></a>00397 <span class="keyword"></span>{
-<a name="l00398"></a>00398   <span class="keywordflow">if</span> ( size_ &gt; 0 ) <span class="keywordflow">return</span> <span class="keyword">false</span>;
-<a name="l00399"></a>00399   <span class="keywordflow">else</span> <span class="keywordflow">return</span> <span class="keyword">true</span>;
-<a name="l00400"></a>00400 }
-<a name="l00401"></a>00401 
-<a name="l00402"></a><a class="code" href="classstk_1_1StkFrames.html#a8ed9cc0a4309f786cfe36da9e901fde9">00402</a> <span class="keyword">inline</span> StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#a8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">StkFrames :: operator[] </a>( <span class="keywordtype">size_t</span> n )
-<a name="l00403"></a>00403 {
-<a name="l00404"></a>00404 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00405"></a>00405 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( n &gt;= size_ ) {
-<a name="l00406"></a>00406     std::ostringstream error;
-<a name="l00407"></a>00407     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator[]: invalid index (&quot;</span> &lt;&lt; n &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
-<a name="l00408"></a>00408     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00409"></a>00409   }
-<a name="l00410"></a>00410 <span class="preprocessor">#endif</span>
-<a name="l00411"></a>00411 <span class="preprocessor"></span>
-<a name="l00412"></a>00412   <span class="keywordflow">return</span> data_[n];
-<a name="l00413"></a>00413 }
-<a name="l00414"></a>00414 
-<a name="l00415"></a><a class="code" href="classstk_1_1StkFrames.html#a2d1c8a2b32725ca72e0f3256f9cd8cb6">00415</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1StkFrames.html#a8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">StkFrames :: operator[] </a>( <span class="keywordtype">size_t</span> n )<span class="keyword"> const</span>
-<a name="l00416"></a>00416 <span class="keyword"></span>{
-<a name="l00417"></a>00417 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00418"></a>00418 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( n &gt;= size_ ) {
-<a name="l00419"></a>00419     std::ostringstream error;
-<a name="l00420"></a>00420     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator[]: invalid index (&quot;</span> &lt;&lt; n &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
-<a name="l00421"></a>00421     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00422"></a>00422   }
-<a name="l00423"></a>00423 <span class="preprocessor">#endif</span>
-<a name="l00424"></a>00424 <span class="preprocessor"></span>
-<a name="l00425"></a>00425   <span class="keywordflow">return</span> data_[n];
-<a name="l00426"></a>00426 }
-<a name="l00427"></a>00427 
-<a name="l00428"></a><a class="code" href="classstk_1_1StkFrames.html#a813632277bf0c432bcf81136ccdbbec1">00428</a> <span class="keyword">inline</span> StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#a813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">StkFrames :: operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00429"></a>00429 {
-<a name="l00430"></a>00430 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00431"></a>00431 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( frame &gt;= nFrames_ || channel &gt;= nChannels_ ) {
-<a name="l00432"></a>00432     std::ostringstream error;
-<a name="l00433"></a>00433     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator(): invalid frame (&quot;</span> &lt;&lt; frame &lt;&lt; <span class="stringliteral">&quot;) or channel (&quot;</span> &lt;&lt; channel &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
-<a name="l00434"></a>00434     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00435"></a>00435   }
-<a name="l00436"></a>00436 <span class="preprocessor">#endif</span>
-<a name="l00437"></a>00437 <span class="preprocessor"></span>
-<a name="l00438"></a>00438   <span class="keywordflow">return</span> data_[ frame * nChannels_ + channel ];
-<a name="l00439"></a>00439 }
-<a name="l00440"></a>00440 
-<a name="l00441"></a><a class="code" href="classstk_1_1StkFrames.html#a93e7e4c30affc29d0cdc98e7514188de">00441</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1StkFrames.html#a813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">StkFrames :: operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )<span class="keyword"> const</span>
-<a name="l00442"></a>00442 <span class="keyword"></span>{
-<a name="l00443"></a>00443 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00444"></a>00444 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( frame &gt;= nFrames_ || channel &gt;= nChannels_ ) {
-<a name="l00445"></a>00445     std::ostringstream error;
-<a name="l00446"></a>00446     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator(): invalid frame (&quot;</span> &lt;&lt; frame &lt;&lt; <span class="stringliteral">&quot;) or channel (&quot;</span> &lt;&lt; channel &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
-<a name="l00447"></a>00447     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00448"></a>00448   }
-<a name="l00449"></a>00449 <span class="preprocessor">#endif</span>
-<a name="l00450"></a>00450 <span class="preprocessor"></span>
-<a name="l00451"></a>00451   <span class="keywordflow">return</span> data_[ frame * nChannels_ + channel ];
-<a name="l00452"></a>00452 }
-<a name="l00453"></a>00453 
-<a name="l00454"></a><a class="code" href="classstk_1_1StkFrames.html#a0f6a81d36a8905d782b283b9a05893e6">00454</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a0f6a81d36a8905d782b283b9a05893e6" title="Assignment by sum operator into self.">StkFrames :: operator+= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f )
-<a name="l00455"></a>00455 {
-<a name="l00456"></a>00456 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00457"></a>00457 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( f.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>() != nFrames_ || f.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() != nChannels_ ) {
-<a name="l00458"></a>00458     std::ostringstream error;
-<a name="l00459"></a>00459     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator+=: frames argument must be of equal dimensions!&quot;</span>;
-<a name="l00460"></a>00460     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00461"></a>00461   }
-<a name="l00462"></a>00462 <span class="preprocessor">#endif</span>
-<a name="l00463"></a>00463 <span class="preprocessor"></span>
-<a name="l00464"></a>00464   StkFloat *fptr = &amp;f[0];
-<a name="l00465"></a>00465   StkFloat *dptr = data_;
-<a name="l00466"></a>00466   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;size_; i++ )
-<a name="l00467"></a>00467     *dptr++ += *fptr++;
-<a name="l00468"></a>00468 }
-<a name="l00469"></a>00469 
-<a name="l00470"></a><a class="code" href="classstk_1_1StkFrames.html#a049cbfd10908f754a7c48c1dd0da21e0">00470</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a049cbfd10908f754a7c48c1dd0da21e0" title="Assignment by product operator into self.">StkFrames :: operator*= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f )
-<a name="l00471"></a>00471 {
-<a name="l00472"></a>00472 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00473"></a>00473 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( f.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>() != nFrames_ || f.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() != nChannels_ ) {
-<a name="l00474"></a>00474     std::ostringstream error;
-<a name="l00475"></a>00475     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator*=: frames argument must be of equal dimensions!&quot;</span>;
-<a name="l00476"></a>00476     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
-<a name="l00477"></a>00477   }
-<a name="l00478"></a>00478 <span class="preprocessor">#endif</span>
-<a name="l00479"></a>00479 <span class="preprocessor"></span>
-<a name="l00480"></a>00480   StkFloat *fptr = &amp;f[0];
-<a name="l00481"></a>00481   StkFloat *dptr = data_;
-<a name="l00482"></a>00482   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;size_; i++ )
-<a name="l00483"></a>00483     *dptr++ *= *fptr++;
-<a name="l00484"></a>00484 }
-<a name="l00485"></a>00485 
-<a name="l00486"></a>00486 <span class="comment">// Here are a few other useful typedefs.</span>
-<a name="l00487"></a>00487 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> UINT16;
-<a name="l00488"></a>00488 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> UINT32;
-<a name="l00489"></a>00489 <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">short</span> SINT16;
-<a name="l00490"></a>00490 <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">int</span> SINT32;
-<a name="l00491"></a>00491 <span class="keyword">typedef</span> <span class="keywordtype">float</span> FLOAT32;
-<a name="l00492"></a>00492 <span class="keyword">typedef</span> <span class="keywordtype">double</span> FLOAT64;
-<a name="l00493"></a>00493 
-<a name="l00494"></a>00494 <span class="comment">// The default sampling rate.</span>
-<a name="l00495"></a>00495 <span class="keyword">const</span> StkFloat SRATE = 44100.0;
-<a name="l00496"></a>00496 
-<a name="l00497"></a>00497 <span class="comment">// The default real-time audio input and output buffer size.  If</span>
-<a name="l00498"></a>00498 <span class="comment">// clicks are occuring in the input and/or output sound stream, a</span>
-<a name="l00499"></a>00499 <span class="comment">// larger buffer size may help.  Larger buffer sizes, however, produce</span>
-<a name="l00500"></a>00500 <span class="comment">// more latency.</span>
-<a name="l00501"></a>00501 <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> RT_BUFFER_SIZE = 512;
-<a name="l00502"></a>00502 
-<a name="l00503"></a>00503 <span class="comment">// The default rawwave path value is set with the preprocessor</span>
-<a name="l00504"></a>00504 <span class="comment">// definition RAWWAVE_PATH.  This can be specified as an argument to</span>
-<a name="l00505"></a>00505 <span class="comment">// the configure script, in an integrated development environment, or</span>
-<a name="l00506"></a>00506 <span class="comment">// below.  The global STK rawwave path variable can be dynamically set</span>
-<a name="l00507"></a>00507 <span class="comment">// with the Stk::setRawwavePath() function.  This value is</span>
-<a name="l00508"></a>00508 <span class="comment">// concatenated to the beginning of all references to rawwave files in</span>
-<a name="l00509"></a>00509 <span class="comment">// the various STK core classes (ex. Clarinet.cpp).  If you wish to</span>
-<a name="l00510"></a>00510 <span class="comment">// move the rawwaves directory to a different location in your file</span>
-<a name="l00511"></a>00511 <span class="comment">// system, you will need to set this path definition appropriately.</span>
-<a name="l00512"></a>00512 <span class="preprocessor">#if !defined(RAWWAVE_PATH)</span>
-<a name="l00513"></a>00513 <span class="preprocessor"></span><span class="preprocessor">  #define RAWWAVE_PATH &quot;../../rawwaves/&quot;</span>
-<a name="l00514"></a>00514 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-<a name="l00515"></a>00515 <span class="preprocessor"></span>
-<a name="l00516"></a>00516 <span class="keyword">const</span> StkFloat PI           = 3.14159265358979;
-<a name="l00517"></a>00517 <span class="keyword">const</span> StkFloat TWO_PI       = 2 * PI;
-<a name="l00518"></a>00518 <span class="keyword">const</span> StkFloat ONE_OVER_128 = 0.0078125;
-<a name="l00519"></a>00519 
-<a name="l00520"></a>00520 <span class="preprocessor">#if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__) || defined(__WINDOWS_MM__)</span>
-<a name="l00521"></a>00521 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_WINDOWS__</span>
-<a name="l00522"></a>00522 <span class="preprocessor"></span><span class="preprocessor">  #define __STK_REALTIME__</span>
-<a name="l00523"></a>00523 <span class="preprocessor"></span><span class="preprocessor">#elif defined(__LINUX_OSS__) || defined(__LINUX_ALSA__) || defined(__UNIX_JACK__)</span>
-<a name="l00524"></a>00524 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_LINUX__</span>
-<a name="l00525"></a>00525 <span class="preprocessor"></span><span class="preprocessor">  #define __STK_REALTIME__</span>
-<a name="l00526"></a>00526 <span class="preprocessor"></span><span class="preprocessor">#elif defined(__IRIX_AL__)</span>
-<a name="l00527"></a>00527 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_IRIX__</span>
-<a name="l00528"></a>00528 <span class="preprocessor"></span><span class="preprocessor">#elif defined(__MACOSX_CORE__) || defined(__UNIX_JACK__)</span>
-<a name="l00529"></a>00529 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_MACOSX__</span>
-<a name="l00530"></a>00530 <span class="preprocessor"></span><span class="preprocessor">  #define __STK_REALTIME__</span>
-<a name="l00531"></a>00531 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
-<a name="l00532"></a>00532 <span class="preprocessor"></span>
-<a name="l00533"></a>00533 } <span class="comment">// stk namespace</span>
-<a name="l00534"></a>00534 
-<a name="l00535"></a>00535 <span class="preprocessor">#endif</span>
+<a name="l00379"></a><a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9">00379</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> nFrames_; };
+<a name="l00380"></a>00380 
+<a name="l00382"></a>00382 
+<a name="l00386"></a><a class="code" href="classstk_1_1StkFrames.html#ad528b1c8ea2866570e7d9c2bac0e8b40">00386</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#ad528b1c8ea2866570e7d9c2bac0e8b40" title="Set the sample rate associated with the StkFrames data.">setDataRate</a>( StkFloat rate ) { dataRate_ = rate; };
+<a name="l00387"></a>00387 
+<a name="l00389"></a>00389 
+<a name="l00393"></a><a class="code" href="classstk_1_1StkFrames.html#a4dbbcbdc8db39a803e0861976f7f3522">00393</a>   StkFloat <a class="code" href="classstk_1_1StkFrames.html#a4dbbcbdc8db39a803e0861976f7f3522" title="Return the sample rate associated with the StkFrames data.">dataRate</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> dataRate_; };
+<a name="l00394"></a>00394 
+<a name="l00395"></a>00395 <span class="keyword">private</span>:
+<a name="l00396"></a>00396 
+<a name="l00397"></a>00397   StkFloat *data_;
+<a name="l00398"></a>00398   StkFloat dataRate_;
+<a name="l00399"></a>00399   <span class="keywordtype">size_t</span> nFrames_;
+<a name="l00400"></a>00400   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels_;
+<a name="l00401"></a>00401   <span class="keywordtype">size_t</span> size_;
+<a name="l00402"></a>00402   <span class="keywordtype">size_t</span> bufferSize_;
+<a name="l00403"></a>00403 
+<a name="l00404"></a>00404 };
+<a name="l00405"></a>00405 
+<a name="l00406"></a><a class="code" href="classstk_1_1StkFrames.html#ac6652950830fe907f9158ee891560253">00406</a> <span class="keyword">inline</span> <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1StkFrames.html#ac6652950830fe907f9158ee891560253" title="Returns true if the object size is zero and false otherwise.">StkFrames :: empty</a>()<span class="keyword"> const</span>
+<a name="l00407"></a>00407 <span class="keyword"></span>{
+<a name="l00408"></a>00408   <span class="keywordflow">if</span> ( size_ &gt; 0 ) <span class="keywordflow">return</span> <span class="keyword">false</span>;
+<a name="l00409"></a>00409   <span class="keywordflow">else</span> <span class="keywordflow">return</span> <span class="keyword">true</span>;
+<a name="l00410"></a>00410 }
+<a name="l00411"></a>00411 
+<a name="l00412"></a><a class="code" href="classstk_1_1StkFrames.html#a8ed9cc0a4309f786cfe36da9e901fde9">00412</a> <span class="keyword">inline</span> StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#a8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">StkFrames :: operator[] </a>( <span class="keywordtype">size_t</span> n )
+<a name="l00413"></a>00413 {
+<a name="l00414"></a>00414 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00415"></a>00415 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( n &gt;= size_ ) {
+<a name="l00416"></a>00416     std::ostringstream error;
+<a name="l00417"></a>00417     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator[]: invalid index (&quot;</span> &lt;&lt; n &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
+<a name="l00418"></a>00418     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00419"></a>00419   }
+<a name="l00420"></a>00420 <span class="preprocessor">#endif</span>
+<a name="l00421"></a>00421 <span class="preprocessor"></span>
+<a name="l00422"></a>00422   <span class="keywordflow">return</span> data_[n];
+<a name="l00423"></a>00423 }
+<a name="l00424"></a>00424 
+<a name="l00425"></a><a class="code" href="classstk_1_1StkFrames.html#a2d1c8a2b32725ca72e0f3256f9cd8cb6">00425</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1StkFrames.html#a8ed9cc0a4309f786cfe36da9e901fde9" title="Subscript operator that returns a reference to element n of self.">StkFrames :: operator[] </a>( <span class="keywordtype">size_t</span> n )<span class="keyword"> const</span>
+<a name="l00426"></a>00426 <span class="keyword"></span>{
+<a name="l00427"></a>00427 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00428"></a>00428 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( n &gt;= size_ ) {
+<a name="l00429"></a>00429     std::ostringstream error;
+<a name="l00430"></a>00430     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator[]: invalid index (&quot;</span> &lt;&lt; n &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
+<a name="l00431"></a>00431     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00432"></a>00432   }
+<a name="l00433"></a>00433 <span class="preprocessor">#endif</span>
+<a name="l00434"></a>00434 <span class="preprocessor"></span>
+<a name="l00435"></a>00435   <span class="keywordflow">return</span> data_[n];
+<a name="l00436"></a>00436 }
+<a name="l00437"></a>00437 
+<a name="l00438"></a><a class="code" href="classstk_1_1StkFrames.html#a813632277bf0c432bcf81136ccdbbec1">00438</a> <span class="keyword">inline</span> StkFloat&amp; <a class="code" href="classstk_1_1StkFrames.html#a813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">StkFrames :: operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00439"></a>00439 {
+<a name="l00440"></a>00440 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00441"></a>00441 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( frame &gt;= nFrames_ || channel &gt;= nChannels_ ) {
+<a name="l00442"></a>00442     std::ostringstream error;
+<a name="l00443"></a>00443     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator(): invalid frame (&quot;</span> &lt;&lt; frame &lt;&lt; <span class="stringliteral">&quot;) or channel (&quot;</span> &lt;&lt; channel &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
+<a name="l00444"></a>00444     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00445"></a>00445   }
+<a name="l00446"></a>00446 <span class="preprocessor">#endif</span>
+<a name="l00447"></a>00447 <span class="preprocessor"></span>
+<a name="l00448"></a>00448   <span class="keywordflow">return</span> data_[ frame * nChannels_ + channel ];
+<a name="l00449"></a>00449 }
+<a name="l00450"></a>00450 
+<a name="l00451"></a><a class="code" href="classstk_1_1StkFrames.html#a93e7e4c30affc29d0cdc98e7514188de">00451</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1StkFrames.html#a813632277bf0c432bcf81136ccdbbec1" title="Channel / frame subscript operator that returns a reference.">StkFrames :: operator() </a>( <span class="keywordtype">size_t</span> frame, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )<span class="keyword"> const</span>
+<a name="l00452"></a>00452 <span class="keyword"></span>{
+<a name="l00453"></a>00453 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00454"></a>00454 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( frame &gt;= nFrames_ || channel &gt;= nChannels_ ) {
+<a name="l00455"></a>00455     std::ostringstream error;
+<a name="l00456"></a>00456     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator(): invalid frame (&quot;</span> &lt;&lt; frame &lt;&lt; <span class="stringliteral">&quot;) or channel (&quot;</span> &lt;&lt; channel &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
+<a name="l00457"></a>00457     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00458"></a>00458   }
+<a name="l00459"></a>00459 <span class="preprocessor">#endif</span>
+<a name="l00460"></a>00460 <span class="preprocessor"></span>
+<a name="l00461"></a>00461   <span class="keywordflow">return</span> data_[ frame * nChannels_ + channel ];
+<a name="l00462"></a>00462 }
+<a name="l00463"></a>00463 
+<a name="l00464"></a><a class="code" href="classstk_1_1StkFrames.html#a0f6a81d36a8905d782b283b9a05893e6">00464</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a0f6a81d36a8905d782b283b9a05893e6" title="Assignment by sum operator into self.">StkFrames :: operator+= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f )
+<a name="l00465"></a>00465 {
+<a name="l00466"></a>00466 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00467"></a>00467 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( f.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>() != nFrames_ || f.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() != nChannels_ ) {
+<a name="l00468"></a>00468     std::ostringstream error;
+<a name="l00469"></a>00469     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator+=: frames argument must be of equal dimensions!&quot;</span>;
+<a name="l00470"></a>00470     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00471"></a>00471   }
+<a name="l00472"></a>00472 <span class="preprocessor">#endif</span>
+<a name="l00473"></a>00473 <span class="preprocessor"></span>
+<a name="l00474"></a>00474   StkFloat *fptr = &amp;f[0];
+<a name="l00475"></a>00475   StkFloat *dptr = data_;
+<a name="l00476"></a>00476   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;size_; i++ )
+<a name="l00477"></a>00477     *dptr++ += *fptr++;
+<a name="l00478"></a>00478 }
+<a name="l00479"></a>00479 
+<a name="l00480"></a><a class="code" href="classstk_1_1StkFrames.html#a049cbfd10908f754a7c48c1dd0da21e0">00480</a> <span class="keyword">inline</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1StkFrames.html#a049cbfd10908f754a7c48c1dd0da21e0" title="Assignment by product operator into self.">StkFrames :: operator*= </a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; f )
+<a name="l00481"></a>00481 {
+<a name="l00482"></a>00482 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00483"></a>00483 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( f.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>() != nFrames_ || f.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() != nChannels_ ) {
+<a name="l00484"></a>00484     std::ostringstream error;
+<a name="l00485"></a>00485     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator*=: frames argument must be of equal dimensions!&quot;</span>;
+<a name="l00486"></a>00486     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00487"></a>00487   }
+<a name="l00488"></a>00488 <span class="preprocessor">#endif</span>
+<a name="l00489"></a>00489 <span class="preprocessor"></span>
+<a name="l00490"></a>00490   StkFloat *fptr = &amp;f[0];
+<a name="l00491"></a>00491   StkFloat *dptr = data_;
+<a name="l00492"></a>00492   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;size_; i++ )
+<a name="l00493"></a>00493     *dptr++ *= *fptr++;
+<a name="l00494"></a>00494 }
+<a name="l00495"></a>00495 
+<a name="l00496"></a>00496 <span class="comment">// Here are a few other useful typedefs.</span>
+<a name="l00497"></a>00497 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">short</span> UINT16;
+<a name="l00498"></a>00498 <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> UINT32;
+<a name="l00499"></a>00499 <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">short</span> SINT16;
+<a name="l00500"></a>00500 <span class="keyword">typedef</span> <span class="keywordtype">signed</span> <span class="keywordtype">int</span> SINT32;
+<a name="l00501"></a>00501 <span class="keyword">typedef</span> <span class="keywordtype">float</span> FLOAT32;
+<a name="l00502"></a>00502 <span class="keyword">typedef</span> <span class="keywordtype">double</span> FLOAT64;
+<a name="l00503"></a>00503 
+<a name="l00504"></a>00504 <span class="comment">// The default sampling rate.</span>
+<a name="l00505"></a>00505 <span class="keyword">const</span> StkFloat SRATE = 44100.0;
+<a name="l00506"></a>00506 
+<a name="l00507"></a>00507 <span class="comment">// The default real-time audio input and output buffer size.  If</span>
+<a name="l00508"></a>00508 <span class="comment">// clicks are occuring in the input and/or output sound stream, a</span>
+<a name="l00509"></a>00509 <span class="comment">// larger buffer size may help.  Larger buffer sizes, however, produce</span>
+<a name="l00510"></a>00510 <span class="comment">// more latency.</span>
+<a name="l00511"></a>00511 <span class="keyword">const</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> RT_BUFFER_SIZE = 512;
+<a name="l00512"></a>00512 
+<a name="l00513"></a>00513 <span class="comment">// The default rawwave path value is set with the preprocessor</span>
+<a name="l00514"></a>00514 <span class="comment">// definition RAWWAVE_PATH.  This can be specified as an argument to</span>
+<a name="l00515"></a>00515 <span class="comment">// the configure script, in an integrated development environment, or</span>
+<a name="l00516"></a>00516 <span class="comment">// below.  The global STK rawwave path variable can be dynamically set</span>
+<a name="l00517"></a>00517 <span class="comment">// with the Stk::setRawwavePath() function.  This value is</span>
+<a name="l00518"></a>00518 <span class="comment">// concatenated to the beginning of all references to rawwave files in</span>
+<a name="l00519"></a>00519 <span class="comment">// the various STK core classes (ex. Clarinet.cpp).  If you wish to</span>
+<a name="l00520"></a>00520 <span class="comment">// move the rawwaves directory to a different location in your file</span>
+<a name="l00521"></a>00521 <span class="comment">// system, you will need to set this path definition appropriately.</span>
+<a name="l00522"></a>00522 <span class="preprocessor">#if !defined(RAWWAVE_PATH)</span>
+<a name="l00523"></a>00523 <span class="preprocessor"></span><span class="preprocessor">  #define RAWWAVE_PATH &quot;../../rawwaves/&quot;</span>
+<a name="l00524"></a>00524 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00525"></a>00525 <span class="preprocessor"></span>
+<a name="l00526"></a>00526 <span class="keyword">const</span> StkFloat PI           = 3.14159265358979;
+<a name="l00527"></a>00527 <span class="keyword">const</span> StkFloat TWO_PI       = 2 * PI;
+<a name="l00528"></a>00528 <span class="keyword">const</span> StkFloat ONE_OVER_128 = 0.0078125;
+<a name="l00529"></a>00529 
+<a name="l00530"></a>00530 <span class="preprocessor">#if defined(__WINDOWS_DS__) || defined(__WINDOWS_ASIO__) || defined(__WINDOWS_MM__)</span>
+<a name="l00531"></a>00531 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_WINDOWS__</span>
+<a name="l00532"></a>00532 <span class="preprocessor"></span><span class="preprocessor">  #define __STK_REALTIME__</span>
+<a name="l00533"></a>00533 <span class="preprocessor"></span><span class="preprocessor">#elif defined(__LINUX_OSS__) || defined(__LINUX_ALSA__) || defined(__UNIX_JACK__)</span>
+<a name="l00534"></a>00534 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_LINUX__</span>
+<a name="l00535"></a>00535 <span class="preprocessor"></span><span class="preprocessor">  #define __STK_REALTIME__</span>
+<a name="l00536"></a>00536 <span class="preprocessor"></span><span class="preprocessor">#elif defined(__IRIX_AL__)</span>
+<a name="l00537"></a>00537 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_IRIX__</span>
+<a name="l00538"></a>00538 <span class="preprocessor"></span><span class="preprocessor">#elif defined(__MACOSX_CORE__) || defined(__UNIX_JACK__)</span>
+<a name="l00539"></a>00539 <span class="preprocessor"></span><span class="preprocessor">  #define __OS_MACOSX__</span>
+<a name="l00540"></a>00540 <span class="preprocessor"></span><span class="preprocessor">  #define __STK_REALTIME__</span>
+<a name="l00541"></a>00541 <span class="preprocessor"></span><span class="preprocessor">#endif</span>
+<a name="l00542"></a>00542 <span class="preprocessor"></span>
+<a name="l00543"></a>00543 } <span class="comment">// stk namespace</span>
+<a name="l00544"></a>00544 
+<a name="l00545"></a>00545 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/TapDelay_8h-source.html b/doc/html/TapDelay_8h-source.html
deleted file mode 100644
index 5ff445a..0000000
--- a/doc/html/TapDelay_8h-source.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>TapDelay.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TAPDELAY_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_TAPDELAY_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00022"></a>00022 <span class="comment">/***************************************************/</span>
-<a name="l00023"></a>00023 
-<a name="l00024"></a><a class="code" href="classstk_1_1TapDelay.html">00024</a> <span class="keyword">class </span><a class="code" href="classstk_1_1TapDelay.html" title="STK non-interpolating tapped delay line class.">TapDelay</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00025"></a>00025 {
-<a name="l00026"></a>00026  <span class="keyword">public</span>:
-<a name="l00027"></a>00027 
-<a name="l00029"></a>00029 
-<a name="l00034"></a>00034   <a class="code" href="classstk_1_1TapDelay.html#24913411dff23e05995979e42cc51ecc" title="The default constructor creates a delay-line with maximum length of 4095 samples...">TapDelay</a>( std::vector&lt;unsigned long&gt; taps = std::vector&lt;unsigned long&gt;( 1, 0 ), <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> maxDelay = 4095 );
-<a name="l00035"></a>00035 
-<a name="l00037"></a>00037   <a class="code" href="classstk_1_1TapDelay.html#6980be10c3d3cb9633af1733b40e49cc" title="Class destructor.">~TapDelay</a>();
-<a name="l00038"></a>00038 
-<a name="l00040"></a>00040 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TapDelay.html#104b7bd81435a38191e1e43a24cb471d" title="Set the maximum delay-line length.">setMaximumDelay</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TapDelay.html#a2bbab19ae277dc3689471d4250f00ad" title="Set the delay-line tap lengths.">setTapDelays</a>( std::vector&lt;unsigned long&gt; taps );
-<a name="l00054"></a>00054 
-<a name="l00056"></a><a class="code" href="classstk_1_1TapDelay.html#ad3736becdec6059f2986f873d69b971">00056</a>   std::vector&lt;unsigned long&gt; <a class="code" href="classstk_1_1TapDelay.html#ad3736becdec6059f2986f873d69b971" title="Return the current delay-line length.">getTapDelays</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> delays_; };
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059 
-<a name="l00067"></a>00067   StkFloat <a class="code" href="classstk_1_1TapDelay.html#517399ddf52455ef083481cbb77c0b5c" title="Return the specified tap value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> tap = 0 ) <span class="keyword">const</span>;
-<a name="l00068"></a>00068 
-<a name="l00070"></a>00070 
-<a name="l00079"></a>00079   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TapDelay.html#add431e206dd1e4133e2ff0d49aa639b" title="Input one sample to the delayline and return outputs at all tap positions.">tick</a>( StkFloat input, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; outputs );
-<a name="l00080"></a>00080 
-<a name="l00082"></a>00082 
-<a name="l00091"></a>00091   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TapDelay.html#add431e206dd1e4133e2ff0d49aa639b" title="Input one sample to the delayline and return outputs at all tap positions.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00092"></a>00092 
-<a name="l00094"></a>00094 
-<a name="l00105"></a>00105   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TapDelay.html#add431e206dd1e4133e2ff0d49aa639b" title="Input one sample to the delayline and return outputs at all tap positions.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0 );
-<a name="l00106"></a>00106 
-<a name="l00107"></a>00107  <span class="keyword">protected</span>:
-<a name="l00108"></a>00108 
-<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> inPoint_;
-<a name="l00110"></a>00110   std::vector&lt;unsigned long&gt; outPoint_;
-<a name="l00111"></a>00111   std::vector&lt;unsigned long&gt; delays_;
-<a name="l00112"></a>00112 
-<a name="l00113"></a>00113 };
-<a name="l00114"></a>00114 
-<a name="l00115"></a><a class="code" href="classstk_1_1TapDelay.html#517399ddf52455ef083481cbb77c0b5c">00115</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1TapDelay.html#517399ddf52455ef083481cbb77c0b5c" title="Return the specified tap value of the last computed frame.">TapDelay :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> tap )<span class="keyword"> const</span>
-<a name="l00116"></a>00116 <span class="keyword"></span>{
-<a name="l00117"></a>00117 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00118"></a>00118 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( tap &gt;= lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) ) {
-<a name="l00119"></a>00119     errorString_ &lt;&lt; <span class="stringliteral">"TapDelay::lastOut(): tap argument and number of taps are incompatible!"</span>;
-<a name="l00120"></a>00120     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00121"></a>00121   }
-<a name="l00122"></a>00122 <span class="preprocessor">#endif</span>
-<a name="l00123"></a>00123 <span class="preprocessor"></span>
-<a name="l00124"></a>00124   <span class="keywordflow">return</span> lastFrame_[tap];
-<a name="l00125"></a>00125 }
-<a name="l00126"></a>00126 
-<a name="l00127"></a><a class="code" href="classstk_1_1TapDelay.html#add431e206dd1e4133e2ff0d49aa639b">00127</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TapDelay.html#add431e206dd1e4133e2ff0d49aa639b" title="Input one sample to the delayline and return outputs at all tap positions.">TapDelay :: tick</a>( StkFloat input, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; outputs )
-<a name="l00128"></a>00128 {
-<a name="l00129"></a>00129 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00130"></a>00130 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( outputs.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() &lt; outPoint_.size() ) {
-<a name="l00131"></a>00131     errorString_ &lt;&lt; <span class="stringliteral">"TapDelay::tick(): number of taps &gt; channels in StkFrames argument!"</span>;
-<a name="l00132"></a>00132     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00133"></a>00133   }
-<a name="l00134"></a>00134 <span class="preprocessor">#endif</span>
-<a name="l00135"></a>00135 <span class="preprocessor"></span>
-<a name="l00136"></a>00136   inputs_[inPoint_++] = input * gain_;
-<a name="l00137"></a>00137 
-<a name="l00138"></a>00138   <span class="comment">// Check for end condition</span>
-<a name="l00139"></a>00139   <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00140"></a>00140     inPoint_ = 0;
-<a name="l00141"></a>00141 
-<a name="l00142"></a>00142   <span class="comment">// Read out next values</span>
-<a name="l00143"></a>00143   StkFloat *outs = &amp;outputs[0];
-<a name="l00144"></a>00144   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;outPoint_.size(); i++ ) {
-<a name="l00145"></a>00145     *outs++ = inputs_[outPoint_[i]];
-<a name="l00146"></a>00146     lastFrame_[i] = *outs;
-<a name="l00147"></a>00147     <span class="keywordflow">if</span> ( ++outPoint_[i] == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() )
-<a name="l00148"></a>00148       outPoint_[i] = 0;
-<a name="l00149"></a>00149   }
-<a name="l00150"></a>00150 
-<a name="l00151"></a>00151   <span class="keywordflow">return</span> outputs;
-<a name="l00152"></a>00152 }
-<a name="l00153"></a>00153 
-<a name="l00154"></a><a class="code" href="classstk_1_1TapDelay.html#9255a00f0d7588ba5b51a12ba5db08c0">00154</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TapDelay.html#add431e206dd1e4133e2ff0d49aa639b" title="Input one sample to the delayline and return outputs at all tap positions.">TapDelay :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00155"></a>00155 {
-<a name="l00156"></a>00156 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00157"></a>00157 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00158"></a>00158     errorString_ &lt;&lt; <span class="stringliteral">"TapDelay::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00159"></a>00159     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00160"></a>00160   }
-<a name="l00161"></a>00161   <span class="keywordflow">if</span> ( frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() &lt; outPoint_.size() ) {
-<a name="l00162"></a>00162     errorString_ &lt;&lt; <span class="stringliteral">"TapDelay::tick(): number of taps &gt; channels in StkFrames argument!"</span>;
-<a name="l00163"></a>00163     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00164"></a>00164   }
-<a name="l00165"></a>00165 <span class="preprocessor">#endif</span>
-<a name="l00166"></a>00166 <span class="preprocessor"></span>
-<a name="l00167"></a>00167   StkFloat *iSamples = &amp;frames[channel];
-<a name="l00168"></a>00168   StkFloat *oSamples = &amp;frames[0];
-<a name="l00169"></a>00169   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, iHop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - outPoint_.size();
-<a name="l00170"></a>00170   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00171"></a>00171     inputs_[inPoint_++] = *iSamples * gain_;
-<a name="l00172"></a>00172     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00173"></a>00173     <span class="keywordflow">for</span> ( j=0; j&lt;outPoint_.size(); j++ ) {
-<a name="l00174"></a>00174       *oSamples++ = inputs_[outPoint_[j]];
-<a name="l00175"></a>00175       <span class="keywordflow">if</span> ( ++outPoint_[j] == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_[j] = 0;
-<a name="l00176"></a>00176     }
-<a name="l00177"></a>00177   }
-<a name="l00178"></a>00178 
-<a name="l00179"></a>00179   oSamples -= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00180"></a>00180   <span class="keywordflow">for</span> ( j=0; j&lt;outPoint_.size(); j++ ) lastFrame_[j] = *oSamples++;
-<a name="l00181"></a>00181   <span class="keywordflow">return</span> frames;
-<a name="l00182"></a>00182 }
-<a name="l00183"></a>00183 
-<a name="l00184"></a><a class="code" href="classstk_1_1TapDelay.html#d8250d2802326bd3778c00642266d201">00184</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TapDelay.html#add431e206dd1e4133e2ff0d49aa639b" title="Input one sample to the delayline and return outputs at all tap positions.">TapDelay :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel )
-<a name="l00185"></a>00185 {
-<a name="l00186"></a>00186 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00187"></a>00187 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00188"></a>00188     errorString_ &lt;&lt; <span class="stringliteral">"TapDelay::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00189"></a>00189     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00190"></a>00190   }
-<a name="l00191"></a>00191   <span class="keywordflow">if</span> ( oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() &lt; outPoint_.size() ) {
-<a name="l00192"></a>00192     errorString_ &lt;&lt; <span class="stringliteral">"TapDelay::tick(): number of taps &gt; channels in output StkFrames argument!"</span>;
-<a name="l00193"></a>00193     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00194"></a>00194   }
-<a name="l00195"></a>00195 <span class="preprocessor">#endif</span>
-<a name="l00196"></a>00196 <span class="preprocessor"></span>
-<a name="l00197"></a>00197   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00198"></a>00198   StkFloat *oSamples = &amp;oFrames[0];
-<a name="l00199"></a>00199   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - outPoint_.size();
-<a name="l00200"></a>00200   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00201"></a>00201     inputs_[inPoint_++] = *iSamples * gain_;
-<a name="l00202"></a>00202     <span class="keywordflow">if</span> ( inPoint_ == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) inPoint_ = 0;
-<a name="l00203"></a>00203     <span class="keywordflow">for</span> ( j=0; j&lt;outPoint_.size(); j++ ) {
-<a name="l00204"></a>00204       *oSamples++ = inputs_[outPoint_[j]];
-<a name="l00205"></a>00205       <span class="keywordflow">if</span> ( ++outPoint_[j] == inputs_.<a class="code" href="classstk_1_1StkFrames.html#5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) outPoint_[j] = 0;
-<a name="l00206"></a>00206     }
-<a name="l00207"></a>00207   }
-<a name="l00208"></a>00208 
-<a name="l00209"></a>00209   oSamples -= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00210"></a>00210   <span class="keywordflow">for</span> ( j=0; j&lt;outPoint_.size(); j++ ) lastFrame_[j] = *oSamples++;
-<a name="l00211"></a>00211   <span class="keywordflow">return</span> iFrames;
-<a name="l00212"></a>00212 }
-<a name="l00213"></a>00213 
-<a name="l00214"></a>00214 <span class="preprocessor">#endif</span>
-<a name="l00215"></a>00215 <span class="preprocessor"></span>
-<a name="l00216"></a>00216 } <span class="comment">// stk namespace</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/TapDelay_8h_source.html b/doc/html/TapDelay_8h_source.html
index b7b2067..ea54cf7 100644
--- a/doc/html/TapDelay_8h_source.html
+++ b/doc/html/TapDelay_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>TapDelay.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TAPDELAY_H</span>
@@ -63,7 +63,7 @@
 <a name="l00116"></a>00116 <span class="keyword"></span>{
 <a name="l00117"></a>00117 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00118"></a>00118 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( tap &gt;= lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79" title="Returns the total number of audio samples represented by the object.">size</a>() ) ) {
-<a name="l00119"></a>00119     errorString_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::lastOut(): tap argument and number of taps are incompatible!&quot;</span>;
+<a name="l00119"></a>00119     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::lastOut(): tap argument and number of taps are incompatible!&quot;</span>;
 <a name="l00120"></a>00120     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00121"></a>00121   }
 <a name="l00122"></a>00122 <span class="preprocessor">#endif</span>
@@ -75,7 +75,7 @@
 <a name="l00128"></a>00128 {
 <a name="l00129"></a>00129 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00130"></a>00130 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( outputs.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() &lt; outPoint_.size() ) {
-<a name="l00131"></a>00131     errorString_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): number of taps &gt; channels in StkFrames argument!&quot;</span>;
+<a name="l00131"></a>00131     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): number of taps &gt; channels in StkFrames argument!&quot;</span>;
 <a name="l00132"></a>00132     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00133"></a>00133   }
 <a name="l00134"></a>00134 <span class="preprocessor">#endif</span>
@@ -102,11 +102,11 @@
 <a name="l00155"></a>00155 {
 <a name="l00156"></a>00156 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00157"></a>00157 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00158"></a>00158     errorString_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00158"></a>00158     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00159"></a>00159     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00160"></a>00160   }
 <a name="l00161"></a>00161   <span class="keywordflow">if</span> ( frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() &lt; outPoint_.size() ) {
-<a name="l00162"></a>00162     errorString_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): number of taps &gt; channels in StkFrames argument!&quot;</span>;
+<a name="l00162"></a>00162     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): number of taps &gt; channels in StkFrames argument!&quot;</span>;
 <a name="l00163"></a>00163     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00164"></a>00164   }
 <a name="l00165"></a>00165 <span class="preprocessor">#endif</span>
@@ -132,11 +132,11 @@
 <a name="l00185"></a>00185 {
 <a name="l00186"></a>00186 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00187"></a>00187 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00188"></a>00188     errorString_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00188"></a>00188     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00189"></a>00189     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00190"></a>00190   }
 <a name="l00191"></a>00191   <span class="keywordflow">if</span> ( oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() &lt; outPoint_.size() ) {
-<a name="l00192"></a>00192     errorString_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): number of taps &gt; channels in output StkFrames argument!&quot;</span>;
+<a name="l00192"></a>00192     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): number of taps &gt; channels in output StkFrames argument!&quot;</span>;
 <a name="l00193"></a>00193     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00194"></a>00194   }
 <a name="l00195"></a>00195 <span class="preprocessor">#endif</span>
@@ -166,7 +166,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/TcpClient_8h-source.html b/doc/html/TcpClient_8h-source.html
deleted file mode 100644
index d70124d..0000000
--- a/doc/html/TcpClient_8h-source.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>TcpClient.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TCPCLIENT_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_TCPCLIENT_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Socket.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00031"></a>00031 <span class="comment">/***************************************************/</span>
-<a name="l00032"></a>00032 
-<a name="l00033"></a><a class="code" href="classstk_1_1TcpClient.html">00033</a> <span class="keyword">class </span><a class="code" href="classstk_1_1TcpClient.html" title="STK TCP socket client class.">TcpClient</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Socket.html" title="STK internet socket abstract base class.">Socket</a>
-<a name="l00034"></a>00034 {
-<a name="l00035"></a>00035  <span class="keyword">public</span>:
-<a name="l00037"></a>00037 
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1TcpClient.html#1e1e2cf0981774147d516efcaf12e786" title="Default class constructor creates a socket client connection to the specified host...">TcpClient</a>( <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#be3040ecfff6ce921284c6ab4b0500a7" title="Return the socket port number.">port</a>, std::string hostname = <span class="stringliteral">"localhost"</span> );
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <a class="code" href="classstk_1_1TcpClient.html#e4d515e14471f5d65730c6ccccb6f653" title="The class destructor closes the socket instance, breaking any existing connections...">~TcpClient</a>();
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046 
-<a name="l00051"></a>00051   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1TcpClient.html#46ff34075ef3a0342c396af5fe1aedda" title="Connect the socket client to the specified host and port and returns the resulting...">connect</a>( <span class="keywordtype">int</span> port, std::string hostname = <span class="stringliteral">"localhost"</span> );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1TcpClient.html#f101788bd77c2026cc3ade330caf7fc5" title="Write a buffer over the socket connection. Returns the number of bytes written or...">writeBuffer</a>(<span class="keyword">const</span> <span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> flags = 0);
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1TcpClient.html#f0c6f44c9f3d3812a7d0cb79f94eba5f" title="Read a buffer from the socket connection, up to length bufferSize. Returns the number...">readBuffer</a>(<span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> flags = 0);
-<a name="l00058"></a>00058 
-<a name="l00059"></a>00059  <span class="keyword">protected</span>:
-<a name="l00060"></a>00060 
-<a name="l00061"></a>00061 };
-<a name="l00062"></a>00062 
-<a name="l00063"></a>00063 } <span class="comment">// stk namespace</span>
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/TcpClient_8h_source.html b/doc/html/TcpClient_8h_source.html
index 05b5477..4ea44b3 100644
--- a/doc/html/TcpClient_8h_source.html
+++ b/doc/html/TcpClient_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>TcpClient.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TCPCLIENT_H</span>
@@ -49,7 +49,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/TcpServer_8h-source.html b/doc/html/TcpServer_8h-source.html
deleted file mode 100644
index ddc014e..0000000
--- a/doc/html/TcpServer_8h-source.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>TcpServer.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TCPSERVER_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_TCPSERVER_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Socket.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00031"></a>00031 <span class="comment">/***************************************************/</span>
-<a name="l00032"></a>00032 
-<a name="l00033"></a><a class="code" href="classstk_1_1TcpServer.html">00033</a> <span class="keyword">class </span><a class="code" href="classstk_1_1TcpServer.html" title="STK TCP socket server class.">TcpServer</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Socket.html" title="STK internet socket abstract base class.">Socket</a>
-<a name="l00034"></a>00034 {
-<a name="l00035"></a>00035  <span class="keyword">public</span>:
-<a name="l00037"></a>00037 
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1TcpServer.html#0fc92fd76f406ab8eeabbeb27ba9a2fc" title="Default constructor creates a local socket server on port 2006 (or the specified...">TcpServer</a>( <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#be3040ecfff6ce921284c6ab4b0500a7" title="Return the socket port number.">port</a> = 2006 );
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <a class="code" href="classstk_1_1TcpServer.html#07ccec68a41a10fbe9f1e9e9db3a85bd" title="The class destructor closes the socket instance, breaking any existing connections...">~TcpServer</a>();
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046 
-<a name="l00051"></a>00051   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1TcpServer.html#421e255c3a250c5ac5d9e9642049cb9e" title="Extract the first pending connection request from the queue and create a new connection...">accept</a>( <span class="keywordtype">void</span> );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1TcpServer.html#4294c5eac74ee54c5367c41e1ee01741" title="Write a buffer over the socket connection. Returns the number of bytes written or...">writeBuffer</a>(<span class="keyword">const</span> <span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> flags = 0);
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1TcpServer.html#afdf74764425a3044093647661ed1927" title="Read a buffer from the socket connection, up to length bufferSize. Returns the number...">readBuffer</a>(<span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> flags = 0);
-<a name="l00058"></a>00058 
-<a name="l00059"></a>00059  <span class="keyword">protected</span>:
-<a name="l00060"></a>00060 
-<a name="l00061"></a>00061 };
-<a name="l00062"></a>00062 
-<a name="l00063"></a>00063 } <span class="comment">// stk namespace</span>
-<a name="l00064"></a>00064 
-<a name="l00065"></a>00065 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/TcpServer_8h_source.html b/doc/html/TcpServer_8h_source.html
index f4794e5..3b4325e 100644
--- a/doc/html/TcpServer_8h_source.html
+++ b/doc/html/TcpServer_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>TcpServer.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TCPSERVER_H</span>
@@ -49,7 +49,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Thread_8h-source.html b/doc/html/Thread_8h-source.html
deleted file mode 100644
index bf45ed4..0000000
--- a/doc/html/Thread_8h-source.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Thread.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_THREAD_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_THREAD_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="preprocessor">#if (defined(__OS_IRIX__) || defined(__OS_LINUX__) || defined(__OS_MACOSX__))</span>
-<a name="l00007"></a>00007 <span class="preprocessor"></span>
-<a name="l00008"></a>00008 <span class="preprocessor">  #include &lt;pthread.h&gt;</span>
-<a name="l00009"></a>00009 <span class="preprocessor">  #define THREAD_TYPE</span>
-<a name="l00010"></a>00010 <span class="preprocessor"></span>  <span class="keyword">typedef</span> pthread_t THREAD_HANDLE;
-<a name="l00011"></a>00011   <span class="keyword">typedef</span> <span class="keywordtype">void</span> * THREAD_RETURN;
-<a name="l00012"></a>00012   <span class="keyword">typedef</span> <span class="keywordtype">void</span> * (*THREAD_FUNCTION)(<span class="keywordtype">void</span> *);
-<a name="l00013"></a>00013 
-<a name="l00014"></a>00014 <span class="preprocessor">#elif defined(__OS_WINDOWS__)</span>
-<a name="l00015"></a>00015 <span class="preprocessor"></span>
-<a name="l00016"></a>00016 <span class="preprocessor">  #include &lt;windows.h&gt;</span>
-<a name="l00017"></a>00017 <span class="preprocessor">  #include &lt;process.h&gt;</span>
-<a name="l00018"></a>00018 <span class="preprocessor">  #define THREAD_TYPE __stdcall</span>
-<a name="l00019"></a>00019 <span class="preprocessor"></span>  <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> THREAD_HANDLE;
-<a name="l00020"></a>00020   <span class="keyword">typedef</span> <span class="keywordtype">unsigned</span> THREAD_RETURN;
-<a name="l00021"></a>00021   <span class="keyword">typedef</span> unsigned (__stdcall *THREAD_FUNCTION)(<span class="keywordtype">void</span> *);
-<a name="l00022"></a>00022 
-<a name="l00023"></a>00023 <span class="preprocessor">#endif</span>
-<a name="l00024"></a>00024 <span class="preprocessor"></span>
-<a name="l00025"></a>00025 <span class="keyword">namespace </span>stk {
-<a name="l00026"></a>00026 
-<a name="l00027"></a>00027 <span class="comment">/***************************************************/</span>
-<a name="l00047"></a>00047 <span class="comment">/***************************************************/</span>
-<a name="l00048"></a>00048 
-<a name="l00049"></a><a class="code" href="classstk_1_1Thread.html">00049</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Thread.html" title="STK thread class.">Thread</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00050"></a>00050 {
-<a name="l00051"></a>00051  <span class="keyword">public</span>:
-<a name="l00053"></a>00053   <a class="code" href="classstk_1_1Thread.html#550db7efe16cd4ef223d9ca69dda384b" title="Default constructor.">Thread</a>();
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <a class="code" href="classstk_1_1Thread.html#f3a6c8bcfebeeda352286f46afda00b3" title="The class destructor does not attempt to cancel or join a thread.">~Thread</a>();
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059 
-<a name="l00064"></a>00064   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1Thread.html#bcafe21595d9c6ac52b1ae872b34a531" title="Begin execution of the thread routine. Upon success, true is returned.">start</a>( THREAD_FUNCTION routine, <span class="keywordtype">void</span> * ptr = NULL );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067 
-<a name="l00074"></a>00074   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1Thread.html#7187695295a7e5faf780ca13b0c07d4e" title="Signal cancellation of a thread routine, returning true on success.">cancel</a>(<span class="keywordtype">void</span>);
-<a name="l00075"></a>00075 
-<a name="l00077"></a>00077 
-<a name="l00080"></a>00080   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1Thread.html#cce21fd2b9b62cd8116fefe499c8431f" title="Block the calling routine indefinitely until the thread terminates.">wait</a>(<span class="keywordtype">void</span>);
-<a name="l00081"></a>00081 
-<a name="l00083"></a>00083 
-<a name="l00088"></a>00088   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Thread.html#351cf3ad12622606ea2d984ae2e29380" title="Create a cancellation point within a thread routine.">testCancel</a>(<span class="keywordtype">void</span>);
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090  <span class="keyword">protected</span>:
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092   THREAD_HANDLE thread_;
-<a name="l00093"></a>00093 
-<a name="l00094"></a>00094 };
-<a name="l00095"></a>00095 
-<a name="l00096"></a>00096 } <span class="comment">// stk namespace</span>
-<a name="l00097"></a>00097 
-<a name="l00098"></a>00098 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Thread_8h_source.html b/doc/html/Thread_8h_source.html
index 86bb0f4..53e59f6 100644
--- a/doc/html/Thread_8h_source.html
+++ b/doc/html/Thread_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Thread.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_THREAD_H</span>
@@ -74,7 +74,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/TubeBell_8h-source.html b/doc/html/TubeBell_8h-source.html
deleted file mode 100644
index 6e327d7..0000000
--- a/doc/html/TubeBell_8h-source.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>TubeBell.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TUBEBELL_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_TUBEBELL_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "FM.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00038"></a>00038 <span class="comment">/***************************************************/</span>
-<a name="l00039"></a>00039 
-<a name="l00040"></a><a class="code" href="classstk_1_1TubeBell.html">00040</a> <span class="keyword">class </span><a class="code" href="classstk_1_1TubeBell.html" title="STK tubular bell (orchestral chime) FM synthesis instrument.">TubeBell</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a>
-<a name="l00041"></a>00041 {
-<a name="l00042"></a>00042  <span class="keyword">public</span>:
-<a name="l00044"></a>00044 
-<a name="l00047"></a>00047   <a class="code" href="classstk_1_1TubeBell.html#7b5de1d681fcb5c2899094dc1ffe0453" title="Class constructor.">TubeBell</a>( <span class="keywordtype">void</span> );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <a class="code" href="classstk_1_1TubeBell.html#b841ecb52b7be3b896d92b968364b529" title="Class destructor.">~TubeBell</a>( <span class="keywordtype">void</span> );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TubeBell.html#a141536c51b4918dd5fae222e5cb6aa3" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   StkFloat <a class="code" href="classstk_1_1TubeBell.html#fa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00057"></a>00057 
-<a name="l00058"></a>00058  <span class="keyword">protected</span>:
-<a name="l00059"></a>00059 
-<a name="l00060"></a>00060 };
-<a name="l00061"></a>00061 
-<a name="l00062"></a><a class="code" href="classstk_1_1TubeBell.html#fa7422b2a7361f2ebe60ebff887ef36f">00062</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1TubeBell.html#fa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">TubeBell :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00063"></a>00063 {
-<a name="l00064"></a>00064   StkFloat temp, temp2;
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066   temp = gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00067"></a>00067   temp = temp * control1_;
-<a name="l00068"></a>00068 
-<a name="l00069"></a>00069   waves_[0]-&gt;addPhaseOffset( temp );
-<a name="l00070"></a>00070   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#e9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00071"></a>00071   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00072"></a>00072   twozero_.<a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( temp );
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074   waves_[2]-&gt;addPhaseOffset( temp );
-<a name="l00075"></a>00075   temp = ( 1.0 - (control2_ * 0.5)) * gains_[0] * adsr_[0]-&gt;<a class="code" href="classstk_1_1TubeBell.html#fa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">tick</a>() * waves_[0]-&gt;tick();
-<a name="l00076"></a>00076   temp += control2_ * 0.5 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078   <span class="comment">// Calculate amplitude modulation and apply it to output.</span>
-<a name="l00079"></a>00079   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_;
-<a name="l00080"></a>00080   temp = temp * (1.0 + temp2);
-<a name="l00081"></a>00081     
-<a name="l00082"></a>00082   lastFrame_[0] = temp * 0.5;
-<a name="l00083"></a>00083   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00084"></a>00084 }
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086 } <span class="comment">// stk namespace</span>
-<a name="l00087"></a>00087 
-<a name="l00088"></a>00088 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/TubeBell_8h_source.html b/doc/html/TubeBell_8h_source.html
index 4e9d059..fc9d483 100644
--- a/doc/html/TubeBell_8h_source.html
+++ b/doc/html/TubeBell_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>TubeBell.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TUBEBELL_H</span>
@@ -34,43 +34,73 @@
 <a name="l00054"></a>00054 
 <a name="l00056"></a>00056   StkFloat <a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00057"></a>00057 
-<a name="l00058"></a>00058  <span class="keyword">protected</span>:
 <a name="l00059"></a>00059 
-<a name="l00060"></a>00060 };
-<a name="l00061"></a>00061 
-<a name="l00062"></a><a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f">00062</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">TubeBell :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00063"></a>00063 {
-<a name="l00064"></a>00064   StkFloat temp, temp2;
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066   temp = gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00067"></a>00067   temp = temp * control1_;
-<a name="l00068"></a>00068 
-<a name="l00069"></a>00069   waves_[0]-&gt;addPhaseOffset( temp );
-<a name="l00070"></a>00070   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00071"></a>00071   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00072"></a>00072   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( temp );
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074   waves_[2]-&gt;addPhaseOffset( temp );
-<a name="l00075"></a>00075   temp = ( 1.0 - (control2_ * 0.5)) * gains_[0] * adsr_[0]-&gt;<a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">tick</a>() * waves_[0]-&gt;tick();
-<a name="l00076"></a>00076   temp += control2_ * 0.5 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078   <span class="comment">// Calculate amplitude modulation and apply it to output.</span>
-<a name="l00079"></a>00079   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_;
-<a name="l00080"></a>00080   temp = temp * (1.0 + temp2);
-<a name="l00081"></a>00081     
-<a name="l00082"></a>00082   lastFrame_[0] = temp * 0.5;
-<a name="l00083"></a>00083   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00084"></a>00084 }
-<a name="l00085"></a>00085 
-<a name="l00086"></a>00086 } <span class="comment">// stk namespace</span>
+<a name="l00066"></a>00066   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00067"></a>00067 
+<a name="l00068"></a>00068  <span class="keyword">protected</span>:
+<a name="l00069"></a>00069 
+<a name="l00070"></a>00070 };
+<a name="l00071"></a>00071 
+<a name="l00072"></a><a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f">00072</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">TubeBell :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00073"></a>00073 {
+<a name="l00074"></a>00074   StkFloat temp, temp2;
+<a name="l00075"></a>00075 
+<a name="l00076"></a>00076   temp = gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
+<a name="l00077"></a>00077   temp = temp * control1_;
+<a name="l00078"></a>00078 
+<a name="l00079"></a>00079   waves_[0]-&gt;addPhaseOffset( temp );
+<a name="l00080"></a>00080   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
+<a name="l00081"></a>00081   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
+<a name="l00082"></a>00082   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( temp );
+<a name="l00083"></a>00083 
+<a name="l00084"></a>00084   waves_[2]-&gt;addPhaseOffset( temp );
+<a name="l00085"></a>00085   temp = ( 1.0 - (control2_ * 0.5)) * gains_[0] * adsr_[0]-&gt;<a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">tick</a>() * waves_[0]-&gt;tick();
+<a name="l00086"></a>00086   temp += control2_ * 0.5 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
 <a name="l00087"></a>00087 
-<a name="l00088"></a>00088 <span class="preprocessor">#endif</span>
+<a name="l00088"></a>00088   <span class="comment">// Calculate amplitude modulation and apply it to output.</span>
+<a name="l00089"></a>00089   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_;
+<a name="l00090"></a>00090   temp = temp * (1.0 + temp2);
+<a name="l00091"></a>00091     
+<a name="l00092"></a>00092   lastFrame_[0] = temp * 0.5;
+<a name="l00093"></a>00093   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00094"></a>00094 }
+<a name="l00095"></a>00095 
+<a name="l00096"></a><a class="code" href="classstk_1_1TubeBell.html#a664cede881352aea1d300ca93ba416ac">00096</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">TubeBell :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00097"></a>00097 {
+<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00099"></a>00099 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00100"></a>00100 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00101"></a>00101     oStream_ &lt;&lt; <span class="stringliteral">&quot;TubeBell::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00102"></a>00102     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00103"></a>00103   }
+<a name="l00104"></a>00104 <span class="preprocessor">#endif</span>
+<a name="l00105"></a>00105 <span class="preprocessor"></span>
+<a name="l00106"></a>00106   StkFloat *samples = &amp;frames[channel];
+<a name="l00107"></a>00107   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00108"></a>00108   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00109"></a>00109     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00110"></a>00110       *samples++ = <a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">tick</a>();
+<a name="l00111"></a>00111   }
+<a name="l00112"></a>00112   <span class="keywordflow">else</span> {
+<a name="l00113"></a>00113     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00114"></a>00114       *samples++ = <a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">tick</a>();
+<a name="l00115"></a>00115       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00116"></a>00116         *samples++ = lastFrame_[j];
+<a name="l00117"></a>00117     }
+<a name="l00118"></a>00118   }
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   <span class="keywordflow">return</span> frames;
+<a name="l00121"></a>00121 }
+<a name="l00122"></a>00122 
+<a name="l00123"></a>00123 } <span class="comment">// stk namespace</span>
+<a name="l00124"></a>00124 
+<a name="l00125"></a>00125 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Twang_8h_source.html b/doc/html/Twang_8h_source.html
new file mode 100644
index 0000000..32675a4
--- /dev/null
+++ b/doc/html/Twang_8h_source.html
@@ -0,0 +1,127 @@
+<HTML>
+<HEAD>
+<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
+<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+<CENTER>
+<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
+<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
+<HR>
+<!-- Generated by Doxygen 1.6.2 -->
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
+  </div>
+<div class="contents">
+<h1>Twang.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TWANG_H</span>
+<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_TWANG_H</span>
+<a name="l00003"></a>00003 <span class="preprocessor"></span>
+<a name="l00004"></a>00004 <span class="preprocessor">#include &quot;Stk.h&quot;</span>
+<a name="l00005"></a>00005 <span class="preprocessor">#include &quot;DelayA.h&quot;</span>
+<a name="l00006"></a>00006 <span class="preprocessor">#include &quot;DelayL.h&quot;</span>
+<a name="l00007"></a>00007 <span class="preprocessor">#include &quot;Fir.h&quot;</span>
+<a name="l00008"></a>00008 
+<a name="l00009"></a>00009 <span class="keyword">namespace </span>stk {
+<a name="l00010"></a>00010 
+<a name="l00011"></a>00011 <span class="comment">/***************************************************/</span>
+<a name="l00032"></a>00032 <span class="comment">/***************************************************/</span>
+<a name="l00033"></a>00033 
+<a name="l00034"></a><a class="code" href="classstk_1_1Twang.html">00034</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Twang.html" title="STK enhanced plucked string class.">Twang</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
+<a name="l00035"></a>00035 {
+<a name="l00036"></a>00036  <span class="keyword">public</span>:
+<a name="l00038"></a>00038   <a class="code" href="classstk_1_1Twang.html#a813e99ee79974707a3afbfcab963c086" title="Class constructor, taking the lowest desired playing frequency.">Twang</a>( StkFloat lowestFrequency = 50.0 );
+<a name="l00039"></a>00039 
+<a name="l00041"></a>00041   <a class="code" href="classstk_1_1Twang.html#adae2759ef254101f91aa3a0a5c3fba39" title="Class destructor.">~Twang</a>( <span class="keywordtype">void</span> );
+<a name="l00042"></a>00042 
+<a name="l00044"></a>00044   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Twang.html#a7cdd4bf2e486239429f6d4f0f277cea9" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
+<a name="l00045"></a>00045 
+<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Twang.html#ae27aa429cbf49f0dd60f0cc6ef41c832" title="Set the delayline parameters to allow frequencies as low as specified.">setLowestFrequency</a>( StkFloat frequency );
+<a name="l00048"></a>00048 
+<a name="l00050"></a>00050   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Twang.html#a0043b9d374b73b6660ec2d79475d602c" title="Set the delayline parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
+<a name="l00051"></a>00051 
+<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Twang.html#a48008e3cd55dad6ee846b47ab32f993f" title="Set the pluck or &amp;quot;excitation&amp;quot; position along the string (0.0 - 1.0).">setPluckPosition</a>( StkFloat position );
+<a name="l00054"></a>00054 
+<a name="l00056"></a>00056 
+<a name="l00062"></a>00062   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Twang.html#ad7921c51f38b4e6e32d7db48cc101068" title="Set the nominal loop gain.">setLoopGain</a>( StkFloat loopGain );
+<a name="l00063"></a>00063 
+<a name="l00065"></a>00065 
+<a name="l00070"></a>00070   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Twang.html#a7076c25dd3a06262b3bf927bc64bf89e" title="Set the loop filter coefficients.">setLoopFilter</a>( std::vector&lt;StkFloat&gt; coefficients );
+<a name="l00071"></a>00071 
+<a name="l00073"></a><a class="code" href="classstk_1_1Twang.html#ab54245fcb75144a8ffcc879789abc952">00073</a>   <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Twang.html#ab54245fcb75144a8ffcc879789abc952" title="Return an StkFrames reference to the last output sample frame.">lastFrame</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_; };
+<a name="l00074"></a>00074 
+<a name="l00076"></a>00076   StkFloat <a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">tick</a>( StkFloat input );
+<a name="l00077"></a>00077 
+<a name="l00079"></a>00079 
+<a name="l00087"></a>00087   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00088"></a>00088 
+<a name="l00090"></a>00090 
+<a name="l00098"></a>00098   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
+<a name="l00099"></a>00099 
+<a name="l00100"></a>00100  <span class="keyword">protected</span>:  
+<a name="l00101"></a>00101 
+<a name="l00102"></a>00102   <a class="code" href="classstk_1_1DelayA.html" title="STK allpass interpolating delay line class.">DelayA</a>   delayLine_;
+<a name="l00103"></a>00103   <a class="code" href="classstk_1_1DelayL.html" title="STK linear interpolating delay line class.">DelayL</a>   combDelay_;
+<a name="l00104"></a>00104   <a class="code" href="classstk_1_1Fir.html" title="STK general finite impulse response filter class.">Fir</a>      loopFilter_;
+<a name="l00105"></a>00105 
+<a name="l00106"></a>00106   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> lastFrame_;
+<a name="l00107"></a>00107   StkFloat frequency_;
+<a name="l00108"></a>00108   StkFloat loopGain_;
+<a name="l00109"></a>00109   StkFloat pluckPosition_;
+<a name="l00110"></a>00110 };
+<a name="l00111"></a>00111 
+<a name="l00112"></a><a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9">00112</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">Twang :: tick</a>( StkFloat input )
+<a name="l00113"></a>00113 {
+<a name="l00114"></a>00114   lastFrame_[0] = delayLine_.<a class="code" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick</a>( input + loopFilter_.<a class="code" href="classstk_1_1Fir.html#afc5fd95f6bf72edaf4ee3060ca947793" title="Input one sample to the filter and return one output.">tick</a>( delayLine_.<a class="code" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566" title="Return the last computed output value.">lastOut</a>() ) );
+<a name="l00115"></a>00115   lastFrame_[0] -= combDelay_.<a class="code" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick</a>( lastFrame_[0] ); <span class="comment">// comb filtering on output</span>
+<a name="l00116"></a>00116 
+<a name="l00117"></a>00117   <span class="keywordflow">return</span> lastFrame_[0] * 0.5;
+<a name="l00118"></a>00118 }
+<a name="l00119"></a>00119 
+<a name="l00120"></a><a class="code" href="classstk_1_1Twang.html#ae9e770c446e1459a5e89c0bc8285f5e3">00120</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">Twang :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00121"></a>00121 {
+<a name="l00122"></a>00122 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00123"></a>00123 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00124"></a>00124     oStream_ &lt;&lt; <span class="stringliteral">&quot;Twang::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00125"></a>00125     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00126"></a>00126   }
+<a name="l00127"></a>00127 <span class="preprocessor">#endif</span>
+<a name="l00128"></a>00128 <span class="preprocessor"></span>
+<a name="l00129"></a>00129   StkFloat *samples = &amp;frames[channel];
+<a name="l00130"></a>00130   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00131"></a>00131   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00132"></a>00132     *samples = <a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">tick</a>( *samples );
+<a name="l00133"></a>00133 
+<a name="l00134"></a>00134   <span class="keywordflow">return</span> frames;
+<a name="l00135"></a>00135 }
+<a name="l00136"></a>00136 
+<a name="l00137"></a><a class="code" href="classstk_1_1Twang.html#a089ff55338a22647d94665d6adbeb7ae">00137</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">Twang :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00138"></a>00138 {
+<a name="l00139"></a>00139 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00140"></a>00140 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00141"></a>00141     oStream_ &lt;&lt; <span class="stringliteral">&quot;Twang::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00142"></a>00142     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00143"></a>00143   }
+<a name="l00144"></a>00144 <span class="preprocessor">#endif</span>
+<a name="l00145"></a>00145 <span class="preprocessor"></span>
+<a name="l00146"></a>00146   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00147"></a>00147   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00148"></a>00148   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00149"></a>00149   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop )
+<a name="l00150"></a>00150     *oSamples = <a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">tick</a>( *iSamples );
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152   <span class="keywordflow">return</span> iFrames;
+<a name="l00153"></a>00153 }
+<a name="l00154"></a>00154 
+<a name="l00155"></a>00155 } <span class="comment">// stk namespace</span>
+<a name="l00156"></a>00156 
+<a name="l00157"></a>00157 <span class="preprocessor">#endif</span>
+<a name="l00158"></a>00158 <span class="preprocessor"></span>
+</pre></div></div>
+<HR>
+
+<table>
+  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+</table>
+
+</BODY>
+</HTML>
diff --git a/doc/html/TwoPole_8h-source.html b/doc/html/TwoPole_8h-source.html
deleted file mode 100644
index 5d4a680..0000000
--- a/doc/html/TwoPole_8h-source.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>TwoPole.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TWOPOLE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_TWOPOLE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1TwoPole.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1TwoPole.html" title="STK two-pole filter class.">TwoPole</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022  <span class="keyword">public</span>:
-<a name="l00023"></a>00023 
-<a name="l00025"></a>00025   <a class="code" href="classstk_1_1TwoPole.html#01a2b3b3d286e00a097918ec5f8a287b" title="Default constructor creates a second-order pass-through filter.">TwoPole</a>( <span class="keywordtype">void</span> );
-<a name="l00026"></a>00026 
-<a name="l00028"></a>00028   <a class="code" href="classstk_1_1TwoPole.html#abc2e1046f8f908fc78a53b50b00ed9f" title="Class destructor.">~TwoPole</a>();
-<a name="l00029"></a>00029 
-<a name="l00031"></a><a class="code" href="classstk_1_1TwoPole.html#d0a3ac1b5d4e651a7ff1efb1d5362c0b">00031</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoPole.html#d0a3ac1b5d4e651a7ff1efb1d5362c0b" title="A function to enable/disable the automatic updating of class data when the STK sample...">ignoreSampleRateChange</a>( <span class="keywordtype">bool</span> ignore = <span class="keyword">true</span> ) { ignoreSampleRateChange_ = ignore; };
-<a name="l00032"></a>00032 
-<a name="l00034"></a><a class="code" href="classstk_1_1TwoPole.html#0a5bfc68061c1dbaa40bfbb9ddb67b7d">00034</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoPole.html#0a5bfc68061c1dbaa40bfbb9ddb67b7d" title="Set the b[0] coefficient value.">setB0</a>( StkFloat b0 ) { b_[0] = b0; };
-<a name="l00035"></a>00035 
-<a name="l00037"></a><a class="code" href="classstk_1_1TwoPole.html#d0c2f8ddc09ca1eb864515d816ebacdd">00037</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoPole.html#d0c2f8ddc09ca1eb864515d816ebacdd" title="Set the a[1] coefficient value.">setA1</a>( StkFloat a1 ) { a_[1] = a1; };
-<a name="l00038"></a>00038 
-<a name="l00040"></a><a class="code" href="classstk_1_1TwoPole.html#309960a8b2cf6858f43f43dc739146ea">00040</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoPole.html#309960a8b2cf6858f43f43dc739146ea" title="Set the a[2] coefficient value.">setA2</a>( StkFloat a2 ) { a_[2] = a2; };
-<a name="l00041"></a>00041 
-<a name="l00043"></a>00043   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoPole.html#f9b68df9cc424a09e3ecb7f078bcacd3" title="Set all filter coefficients.">setCoefficients</a>( StkFloat b0, StkFloat a1, StkFloat a2, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
-<a name="l00044"></a>00044 
-<a name="l00046"></a>00046 
-<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoPole.html#00997b12a1cf0a04888124eaf85c565d" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>(StkFloat frequency, StkFloat radius, <span class="keywordtype">bool</span> normalize = <span class="keyword">false</span>);
-<a name="l00060"></a>00060 
-<a name="l00062"></a><a class="code" href="classstk_1_1TwoPole.html#8a4fb4afe3e06c689827ecaec478aad1">00062</a>   StkFloat <a class="code" href="classstk_1_1TwoPole.html#8a4fb4afe3e06c689827ecaec478aad1" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00063"></a>00063 
-<a name="l00065"></a>00065   StkFloat <a class="code" href="classstk_1_1TwoPole.html#d4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00066"></a>00066 
-<a name="l00068"></a>00068 
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#d4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079 
-<a name="l00087"></a>00087   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#d4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089  <span class="keyword">protected</span>:
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091   <span class="keyword">virtual</span> <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00092"></a>00092 };
-<a name="l00093"></a>00093 
-<a name="l00094"></a><a class="code" href="classstk_1_1TwoPole.html#d4612f9b6f971a4dd76b23bb2b9fefbc">00094</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1TwoPole.html#d4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">TwoPole :: tick</a>( StkFloat input )
-<a name="l00095"></a>00095 {
-<a name="l00096"></a>00096   inputs_[0] = gain_ * input;
-<a name="l00097"></a>00097   lastFrame_[0] = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
-<a name="l00098"></a>00098   outputs_[2] = outputs_[1];
-<a name="l00099"></a>00099   outputs_[1] = lastFrame_[0];
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00102"></a>00102 }
-<a name="l00103"></a>00103 
-<a name="l00104"></a><a class="code" href="classstk_1_1TwoPole.html#9e8bd9ed925a1c4966fbc0b0799ce46b">00104</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#d4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">TwoPole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00105"></a>00105 {
-<a name="l00106"></a>00106 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00107"></a>00107 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00108"></a>00108     errorString_ &lt;&lt; <span class="stringliteral">"TwoPole::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00109"></a>00109     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00110"></a>00110   }
-<a name="l00111"></a>00111 <span class="preprocessor">#endif</span>
-<a name="l00112"></a>00112 <span class="preprocessor"></span>
-<a name="l00113"></a>00113   StkFloat *samples = &amp;frames[channel];
-<a name="l00114"></a>00114   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00115"></a>00115   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00116"></a>00116     inputs_[0] = gain_ * *samples;
-<a name="l00117"></a>00117     *samples = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
-<a name="l00118"></a>00118     outputs_[2] = outputs_[1];
-<a name="l00119"></a>00119     outputs_[1] = *samples;
-<a name="l00120"></a>00120   }
-<a name="l00121"></a>00121 
-<a name="l00122"></a>00122   lastFrame_[0] = outputs_[1];
-<a name="l00123"></a>00123   <span class="keywordflow">return</span> frames;
-<a name="l00124"></a>00124 }
-<a name="l00125"></a>00125 
-<a name="l00126"></a><a class="code" href="classstk_1_1TwoPole.html#5c9b52082c0d2845a5ca01ca276fe8f8">00126</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#d4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">TwoPole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00127"></a>00127 {
-<a name="l00128"></a>00128 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00129"></a>00129 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00130"></a>00130     errorString_ &lt;&lt; <span class="stringliteral">"TwoPole::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00131"></a>00131     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00132"></a>00132   }
-<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
-<a name="l00134"></a>00134 <span class="preprocessor"></span>
-<a name="l00135"></a>00135   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00136"></a>00136   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00137"></a>00137   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00138"></a>00138   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00139"></a>00139     inputs_[0] = gain_ * *iSamples;
-<a name="l00140"></a>00140     *oSamples = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
-<a name="l00141"></a>00141     outputs_[2] = outputs_[1];
-<a name="l00142"></a>00142     outputs_[1] = *oSamples;
-<a name="l00143"></a>00143   }
-<a name="l00144"></a>00144 
-<a name="l00145"></a>00145   lastFrame_[0] = outputs_[1];
-<a name="l00146"></a>00146   <span class="keywordflow">return</span> iFrames;
-<a name="l00147"></a>00147 }
-<a name="l00148"></a>00148 
-<a name="l00149"></a>00149 } <span class="comment">// stk namespace</span>
-<a name="l00150"></a>00150 
-<a name="l00151"></a>00151 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/TwoPole_8h_source.html b/doc/html/TwoPole_8h_source.html
index ead1144..cb1c1e7 100644
--- a/doc/html/TwoPole_8h_source.html
+++ b/doc/html/TwoPole_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>TwoPole.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TWOPOLE_H</span>
@@ -41,87 +41,87 @@
 <a name="l00043"></a>00043   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoPole.html#af9b68df9cc424a09e3ecb7f078bcacd3" title="Set all filter coefficients.">setCoefficients</a>( StkFloat b0, StkFloat a1, StkFloat a2, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
 <a name="l00044"></a>00044 
 <a name="l00046"></a>00046 
-<a name="l00059"></a>00059   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoPole.html#a00997b12a1cf0a04888124eaf85c565d" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>(StkFloat frequency, StkFloat radius, <span class="keywordtype">bool</span> normalize = <span class="keyword">false</span>);
-<a name="l00060"></a>00060 
-<a name="l00062"></a><a class="code" href="classstk_1_1TwoPole.html#a8a4fb4afe3e06c689827ecaec478aad1">00062</a>   StkFloat <a class="code" href="classstk_1_1TwoPole.html#a8a4fb4afe3e06c689827ecaec478aad1" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00063"></a>00063 
-<a name="l00065"></a>00065   StkFloat <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00066"></a>00066 
+<a name="l00061"></a>00061   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoPole.html#a00997b12a1cf0a04888124eaf85c565d" title="Sets the filter coefficients for a resonance at frequency (in Hz).">setResonance</a>(StkFloat frequency, StkFloat radius, <span class="keywordtype">bool</span> normalize = <span class="keyword">false</span>);
+<a name="l00062"></a>00062 
+<a name="l00064"></a><a class="code" href="classstk_1_1TwoPole.html#a8a4fb4afe3e06c689827ecaec478aad1">00064</a>   StkFloat <a class="code" href="classstk_1_1TwoPole.html#a8a4fb4afe3e06c689827ecaec478aad1" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
+<a name="l00065"></a>00065 
+<a name="l00067"></a>00067   StkFloat <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
 <a name="l00068"></a>00068 
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00077"></a>00077 
+<a name="l00070"></a>00070 
+<a name="l00078"></a>00078   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00079"></a>00079 
-<a name="l00087"></a>00087   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089  <span class="keyword">protected</span>:
+<a name="l00081"></a>00081 
+<a name="l00089"></a>00089   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
 <a name="l00090"></a>00090 
-<a name="l00091"></a>00091   <span class="keyword">virtual</span> <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00092"></a>00092 };
-<a name="l00093"></a>00093 
-<a name="l00094"></a><a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc">00094</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">TwoPole :: tick</a>( StkFloat input )
-<a name="l00095"></a>00095 {
-<a name="l00096"></a>00096   inputs_[0] = gain_ * input;
-<a name="l00097"></a>00097   lastFrame_[0] = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
-<a name="l00098"></a>00098   outputs_[2] = outputs_[1];
-<a name="l00099"></a>00099   outputs_[1] = lastFrame_[0];
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00102"></a>00102 }
-<a name="l00103"></a>00103 
-<a name="l00104"></a><a class="code" href="classstk_1_1TwoPole.html#a9e8bd9ed925a1c4966fbc0b0799ce46b">00104</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">TwoPole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00105"></a>00105 {
-<a name="l00106"></a>00106 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00107"></a>00107 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00108"></a>00108     errorString_ &lt;&lt; <span class="stringliteral">&quot;TwoPole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00109"></a>00109     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00110"></a>00110   }
-<a name="l00111"></a>00111 <span class="preprocessor">#endif</span>
-<a name="l00112"></a>00112 <span class="preprocessor"></span>
-<a name="l00113"></a>00113   StkFloat *samples = &amp;frames[channel];
-<a name="l00114"></a>00114   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00115"></a>00115   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00116"></a>00116     inputs_[0] = gain_ * *samples;
-<a name="l00117"></a>00117     *samples = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
-<a name="l00118"></a>00118     outputs_[2] = outputs_[1];
-<a name="l00119"></a>00119     outputs_[1] = *samples;
-<a name="l00120"></a>00120   }
-<a name="l00121"></a>00121 
-<a name="l00122"></a>00122   lastFrame_[0] = outputs_[1];
-<a name="l00123"></a>00123   <span class="keywordflow">return</span> frames;
-<a name="l00124"></a>00124 }
-<a name="l00125"></a>00125 
-<a name="l00126"></a><a class="code" href="classstk_1_1TwoPole.html#a5c9b52082c0d2845a5ca01ca276fe8f8">00126</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">TwoPole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00127"></a>00127 {
-<a name="l00128"></a>00128 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00129"></a>00129 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00130"></a>00130     errorString_ &lt;&lt; <span class="stringliteral">&quot;TwoPole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00131"></a>00131     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00132"></a>00132   }
-<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
-<a name="l00134"></a>00134 <span class="preprocessor"></span>
-<a name="l00135"></a>00135   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00136"></a>00136   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00137"></a>00137   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00138"></a>00138   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00139"></a>00139     inputs_[0] = gain_ * *iSamples;
-<a name="l00140"></a>00140     *oSamples = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
-<a name="l00141"></a>00141     outputs_[2] = outputs_[1];
-<a name="l00142"></a>00142     outputs_[1] = *oSamples;
-<a name="l00143"></a>00143   }
-<a name="l00144"></a>00144 
-<a name="l00145"></a>00145   lastFrame_[0] = outputs_[1];
-<a name="l00146"></a>00146   <span class="keywordflow">return</span> iFrames;
-<a name="l00147"></a>00147 }
-<a name="l00148"></a>00148 
-<a name="l00149"></a>00149 } <span class="comment">// stk namespace</span>
+<a name="l00091"></a>00091  <span class="keyword">protected</span>:
+<a name="l00092"></a>00092 
+<a name="l00093"></a>00093   <span class="keyword">virtual</span> <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
+<a name="l00094"></a>00094 };
+<a name="l00095"></a>00095 
+<a name="l00096"></a><a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc">00096</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">TwoPole :: tick</a>( StkFloat input )
+<a name="l00097"></a>00097 {
+<a name="l00098"></a>00098   inputs_[0] = gain_ * input;
+<a name="l00099"></a>00099   lastFrame_[0] = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
+<a name="l00100"></a>00100   outputs_[2] = outputs_[1];
+<a name="l00101"></a>00101   outputs_[1] = lastFrame_[0];
+<a name="l00102"></a>00102 
+<a name="l00103"></a>00103   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00104"></a>00104 }
+<a name="l00105"></a>00105 
+<a name="l00106"></a><a class="code" href="classstk_1_1TwoPole.html#a9e8bd9ed925a1c4966fbc0b0799ce46b">00106</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">TwoPole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00107"></a>00107 {
+<a name="l00108"></a>00108 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00110"></a>00110     oStream_ &lt;&lt; <span class="stringliteral">&quot;TwoPole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00111"></a>00111     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00112"></a>00112   }
+<a name="l00113"></a>00113 <span class="preprocessor">#endif</span>
+<a name="l00114"></a>00114 <span class="preprocessor"></span>
+<a name="l00115"></a>00115   StkFloat *samples = &amp;frames[channel];
+<a name="l00116"></a>00116   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00117"></a>00117   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00118"></a>00118     inputs_[0] = gain_ * *samples;
+<a name="l00119"></a>00119     *samples = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
+<a name="l00120"></a>00120     outputs_[2] = outputs_[1];
+<a name="l00121"></a>00121     outputs_[1] = *samples;
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124   lastFrame_[0] = outputs_[1];
+<a name="l00125"></a>00125   <span class="keywordflow">return</span> frames;
+<a name="l00126"></a>00126 }
+<a name="l00127"></a>00127 
+<a name="l00128"></a><a class="code" href="classstk_1_1TwoPole.html#a5c9b52082c0d2845a5ca01ca276fe8f8">00128</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoPole.html#ad4612f9b6f971a4dd76b23bb2b9fefbc" title="Input one sample to the filter and return one output.">TwoPole :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00129"></a>00129 {
+<a name="l00130"></a>00130 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00131"></a>00131 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00132"></a>00132     oStream_ &lt;&lt; <span class="stringliteral">&quot;TwoPole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00133"></a>00133     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00134"></a>00134   }
+<a name="l00135"></a>00135 <span class="preprocessor">#endif</span>
+<a name="l00136"></a>00136 <span class="preprocessor"></span>
+<a name="l00137"></a>00137   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00138"></a>00138   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00140"></a>00140   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00141"></a>00141     inputs_[0] = gain_ * *iSamples;
+<a name="l00142"></a>00142     *oSamples = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
+<a name="l00143"></a>00143     outputs_[2] = outputs_[1];
+<a name="l00144"></a>00144     outputs_[1] = *oSamples;
+<a name="l00145"></a>00145   }
+<a name="l00146"></a>00146 
+<a name="l00147"></a>00147   lastFrame_[0] = outputs_[1];
+<a name="l00148"></a>00148   <span class="keywordflow">return</span> iFrames;
+<a name="l00149"></a>00149 }
 <a name="l00150"></a>00150 
-<a name="l00151"></a>00151 <span class="preprocessor">#endif</span>
+<a name="l00151"></a>00151 } <span class="comment">// stk namespace</span>
+<a name="l00152"></a>00152 
+<a name="l00153"></a>00153 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/TwoZero_8h-source.html b/doc/html/TwoZero_8h-source.html
deleted file mode 100644
index fbe14fa..0000000
--- a/doc/html/TwoZero_8h-source.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>TwoZero.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TWOZERO_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_TWOZERO_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Filter.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 <span class="comment">/***************************************************/</span>
-<a name="l00019"></a>00019 
-<a name="l00020"></a><a class="code" href="classstk_1_1TwoZero.html">00020</a> <span class="keyword">class </span><a class="code" href="classstk_1_1TwoZero.html" title="STK two-zero filter class.">TwoZero</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Filter.html" title="STK abstract filter class.">Filter</a>
-<a name="l00021"></a>00021 {
-<a name="l00022"></a>00022  <span class="keyword">public</span>:
-<a name="l00024"></a>00024   <a class="code" href="classstk_1_1TwoZero.html#5dabe7ec659bedf76a8f8d975f36dcd9" title="Default constructor creates a second-order pass-through filter.">TwoZero</a>();
-<a name="l00025"></a>00025 
-<a name="l00027"></a>00027   <a class="code" href="classstk_1_1TwoZero.html#b9890b28f0770485494b05639a4b2140" title="Class destructor.">~TwoZero</a>();
-<a name="l00028"></a>00028 
-<a name="l00030"></a><a class="code" href="classstk_1_1TwoZero.html#a1a1568aae3cd3d53011b3fc344cb086">00030</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoZero.html#a1a1568aae3cd3d53011b3fc344cb086" title="A function to enable/disable the automatic updating of class data when the STK sample...">ignoreSampleRateChange</a>( <span class="keywordtype">bool</span> ignore = <span class="keyword">true</span> ) { ignoreSampleRateChange_ = ignore; };
-<a name="l00031"></a>00031 
-<a name="l00033"></a><a class="code" href="classstk_1_1TwoZero.html#5ac82173333659fc31ca86cd2e134413">00033</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoZero.html#5ac82173333659fc31ca86cd2e134413" title="Set the b[0] coefficient value.">setB0</a>( StkFloat b0 ) { b_[0] = b0; };
-<a name="l00034"></a>00034 
-<a name="l00036"></a><a class="code" href="classstk_1_1TwoZero.html#1f090992845b9c85f3de15dfba583891">00036</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoZero.html#1f090992845b9c85f3de15dfba583891" title="Set the b[1] coefficient value.">setB1</a>( StkFloat b1 ) { b_[1] = b1; };
-<a name="l00037"></a>00037 
-<a name="l00039"></a><a class="code" href="classstk_1_1TwoZero.html#98a7d6d1615753f338f75409d850a9b4">00039</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoZero.html#98a7d6d1615753f338f75409d850a9b4" title="Set the b[2] coefficient value.">setB2</a>( StkFloat b2 ) { b_[2] = b2; };
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoZero.html#3c8449660561108eb1873ca6b820a939" title="Set all filter coefficients.">setCoefficients</a>( StkFloat b0, StkFloat b1, StkFloat b2, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045 
-<a name="l00055"></a>00055   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoZero.html#3a89facd2b94bbcfc2f06d8766a46329" title="Sets the filter coefficients for a &amp;quot;notch&amp;quot; at frequency (in Hz).">setNotch</a>( StkFloat frequency, StkFloat radius );
-<a name="l00056"></a>00056 
-<a name="l00058"></a><a class="code" href="classstk_1_1TwoZero.html#e9808b0152902d0067ea24ccfba0b4ba">00058</a>   StkFloat <a class="code" href="classstk_1_1TwoZero.html#e9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061   StkFloat <a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064 
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00073"></a>00073 
-<a name="l00075"></a>00075 
-<a name="l00083"></a>00083   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085  <span class="keyword">protected</span>:
-<a name="l00086"></a>00086 
-<a name="l00087"></a>00087   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00088"></a>00088 };
-<a name="l00089"></a>00089 
-<a name="l00090"></a><a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82">00090</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">TwoZero :: tick</a>( StkFloat input )
-<a name="l00091"></a>00091 {
-<a name="l00092"></a>00092   inputs_[0] = gain_ * input;
-<a name="l00093"></a>00093   lastFrame_[0] = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
-<a name="l00094"></a>00094   inputs_[2] = inputs_[1];
-<a name="l00095"></a>00095   inputs_[1] = inputs_[0];
-<a name="l00096"></a>00096 
-<a name="l00097"></a>00097   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00098"></a>00098 }
-<a name="l00099"></a>00099 
-<a name="l00100"></a><a class="code" href="classstk_1_1TwoZero.html#26e2a1e21831ccb414dbede864afc63c">00100</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">TwoZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00101"></a>00101 {
-<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00104"></a>00104     errorString_ &lt;&lt; <span class="stringliteral">"TwoZero::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00106"></a>00106   }
-<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
-<a name="l00108"></a>00108 <span class="preprocessor"></span>
-<a name="l00109"></a>00109   StkFloat *samples = &amp;frames[channel];
-<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00111"></a>00111   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00112"></a>00112     inputs_[0] = gain_ * *samples;
-<a name="l00113"></a>00113     *samples = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
-<a name="l00114"></a>00114     inputs_[2] = inputs_[1];
-<a name="l00115"></a>00115     inputs_[1] = inputs_[0];
-<a name="l00116"></a>00116   }
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   lastFrame_[0] = *(samples-hop);
-<a name="l00119"></a>00119   <span class="keywordflow">return</span> frames;
-<a name="l00120"></a>00120 }
-<a name="l00121"></a>00121 
-<a name="l00122"></a><a class="code" href="classstk_1_1TwoZero.html#0ef9deab4fbc7e64511d4b6d38afd185">00122</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">TwoZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00123"></a>00123 {
-<a name="l00124"></a>00124 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00125"></a>00125 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00126"></a>00126     errorString_ &lt;&lt; <span class="stringliteral">"TwoZero::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00127"></a>00127     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00128"></a>00128   }
-<a name="l00129"></a>00129 <span class="preprocessor">#endif</span>
-<a name="l00130"></a>00130 <span class="preprocessor"></span>
-<a name="l00131"></a>00131   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00132"></a>00132   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00133"></a>00133   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00134"></a>00134   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00135"></a>00135     inputs_[0] = gain_ * *iSamples;
-<a name="l00136"></a>00136     *oSamples = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
-<a name="l00137"></a>00137     inputs_[2] = inputs_[1];
-<a name="l00138"></a>00138     inputs_[1] = inputs_[0];
-<a name="l00139"></a>00139   }
-<a name="l00140"></a>00140 
-<a name="l00141"></a>00141   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00142"></a>00142   <span class="keywordflow">return</span> iFrames;
-<a name="l00143"></a>00143 }
-<a name="l00144"></a>00144 
-<a name="l00145"></a>00145 } <span class="comment">// stk namespace</span>
-<a name="l00146"></a>00146 
-<a name="l00147"></a>00147 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/TwoZero_8h_source.html b/doc/html/TwoZero_8h_source.html
index 4044850..12e3066 100644
--- a/doc/html/TwoZero_8h_source.html
+++ b/doc/html/TwoZero_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>TwoZero.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_TWOZERO_H</span>
@@ -40,87 +40,87 @@
 <a name="l00042"></a>00042   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoZero.html#a3c8449660561108eb1873ca6b820a939" title="Set all filter coefficients.">setCoefficients</a>( StkFloat b0, StkFloat b1, StkFloat b2, <span class="keywordtype">bool</span> clearState = <span class="keyword">false</span> );
 <a name="l00043"></a>00043 
 <a name="l00045"></a>00045 
-<a name="l00055"></a>00055   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoZero.html#a3a89facd2b94bbcfc2f06d8766a46329" title="Sets the filter coefficients for a &amp;quot;notch&amp;quot; at frequency (in Hz).">setNotch</a>( StkFloat frequency, StkFloat radius );
-<a name="l00056"></a>00056 
-<a name="l00058"></a><a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba">00058</a>   StkFloat <a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
-<a name="l00059"></a>00059 
-<a name="l00061"></a>00061   StkFloat <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
-<a name="l00062"></a>00062 
+<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1TwoZero.html#a3a89facd2b94bbcfc2f06d8766a46329" title="Sets the filter coefficients for a &amp;quot;notch&amp;quot; at frequency (in Hz).">setNotch</a>( StkFloat frequency, StkFloat radius );
+<a name="l00058"></a>00058 
+<a name="l00060"></a><a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba">00060</a>   StkFloat <a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_[0]; };
+<a name="l00061"></a>00061 
+<a name="l00063"></a>00063   StkFloat <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( StkFloat input );
 <a name="l00064"></a>00064 
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00073"></a>00073 
+<a name="l00066"></a>00066 
+<a name="l00074"></a>00074   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00075"></a>00075 
-<a name="l00083"></a>00083   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085  <span class="keyword">protected</span>:
+<a name="l00077"></a>00077 
+<a name="l00085"></a>00085   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> &amp;oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel = 0, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel = 0 );
 <a name="l00086"></a>00086 
-<a name="l00087"></a>00087   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
-<a name="l00088"></a>00088 };
-<a name="l00089"></a>00089 
-<a name="l00090"></a><a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82">00090</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">TwoZero :: tick</a>( StkFloat input )
-<a name="l00091"></a>00091 {
-<a name="l00092"></a>00092   inputs_[0] = gain_ * input;
-<a name="l00093"></a>00093   lastFrame_[0] = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
-<a name="l00094"></a>00094   inputs_[2] = inputs_[1];
-<a name="l00095"></a>00095   inputs_[1] = inputs_[0];
-<a name="l00096"></a>00096 
-<a name="l00097"></a>00097   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00098"></a>00098 }
-<a name="l00099"></a>00099 
-<a name="l00100"></a><a class="code" href="classstk_1_1TwoZero.html#a26e2a1e21831ccb414dbede864afc63c">00100</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">TwoZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00101"></a>00101 {
-<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00104"></a>00104     errorString_ &lt;&lt; <span class="stringliteral">&quot;TwoZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00106"></a>00106   }
-<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
-<a name="l00108"></a>00108 <span class="preprocessor"></span>
-<a name="l00109"></a>00109   StkFloat *samples = &amp;frames[channel];
-<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00111"></a>00111   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00112"></a>00112     inputs_[0] = gain_ * *samples;
-<a name="l00113"></a>00113     *samples = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
-<a name="l00114"></a>00114     inputs_[2] = inputs_[1];
-<a name="l00115"></a>00115     inputs_[1] = inputs_[0];
-<a name="l00116"></a>00116   }
-<a name="l00117"></a>00117 
-<a name="l00118"></a>00118   lastFrame_[0] = *(samples-hop);
-<a name="l00119"></a>00119   <span class="keywordflow">return</span> frames;
-<a name="l00120"></a>00120 }
-<a name="l00121"></a>00121 
-<a name="l00122"></a><a class="code" href="classstk_1_1TwoZero.html#a0ef9deab4fbc7e64511d4b6d38afd185">00122</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">TwoZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
-<a name="l00123"></a>00123 {
-<a name="l00124"></a>00124 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00125"></a>00125 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00126"></a>00126     errorString_ &lt;&lt; <span class="stringliteral">&quot;TwoZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
-<a name="l00127"></a>00127     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00128"></a>00128   }
-<a name="l00129"></a>00129 <span class="preprocessor">#endif</span>
-<a name="l00130"></a>00130 <span class="preprocessor"></span>
-<a name="l00131"></a>00131   StkFloat *iSamples = &amp;iFrames[iChannel];
-<a name="l00132"></a>00132   StkFloat *oSamples = &amp;oFrames[oChannel];
-<a name="l00133"></a>00133   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00134"></a>00134   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
-<a name="l00135"></a>00135     inputs_[0] = gain_ * *iSamples;
-<a name="l00136"></a>00136     *oSamples = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
-<a name="l00137"></a>00137     inputs_[2] = inputs_[1];
-<a name="l00138"></a>00138     inputs_[1] = inputs_[0];
-<a name="l00139"></a>00139   }
-<a name="l00140"></a>00140 
-<a name="l00141"></a>00141   lastFrame_[0] = *(oSamples-oHop);
-<a name="l00142"></a>00142   <span class="keywordflow">return</span> iFrames;
-<a name="l00143"></a>00143 }
-<a name="l00144"></a>00144 
-<a name="l00145"></a>00145 } <span class="comment">// stk namespace</span>
+<a name="l00087"></a>00087  <span class="keyword">protected</span>:
+<a name="l00088"></a>00088 
+<a name="l00089"></a>00089   <span class="keywordtype">void</span> sampleRateChanged( StkFloat newRate, StkFloat oldRate );
+<a name="l00090"></a>00090 };
+<a name="l00091"></a>00091 
+<a name="l00092"></a><a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82">00092</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">TwoZero :: tick</a>( StkFloat input )
+<a name="l00093"></a>00093 {
+<a name="l00094"></a>00094   inputs_[0] = gain_ * input;
+<a name="l00095"></a>00095   lastFrame_[0] = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
+<a name="l00096"></a>00096   inputs_[2] = inputs_[1];
+<a name="l00097"></a>00097   inputs_[1] = inputs_[0];
+<a name="l00098"></a>00098 
+<a name="l00099"></a>00099   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00100"></a>00100 }
+<a name="l00101"></a>00101 
+<a name="l00102"></a><a class="code" href="classstk_1_1TwoZero.html#a26e2a1e21831ccb414dbede864afc63c">00102</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">TwoZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00103"></a>00103 {
+<a name="l00104"></a>00104 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00105"></a>00105 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00106"></a>00106     oStream_ &lt;&lt; <span class="stringliteral">&quot;TwoZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00107"></a>00107     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00108"></a>00108   }
+<a name="l00109"></a>00109 <span class="preprocessor">#endif</span>
+<a name="l00110"></a>00110 <span class="preprocessor"></span>
+<a name="l00111"></a>00111   StkFloat *samples = &amp;frames[channel];
+<a name="l00112"></a>00112   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00113"></a>00113   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00114"></a>00114     inputs_[0] = gain_ * *samples;
+<a name="l00115"></a>00115     *samples = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
+<a name="l00116"></a>00116     inputs_[2] = inputs_[1];
+<a name="l00117"></a>00117     inputs_[1] = inputs_[0];
+<a name="l00118"></a>00118   }
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   lastFrame_[0] = *(samples-hop);
+<a name="l00121"></a>00121   <span class="keywordflow">return</span> frames;
+<a name="l00122"></a>00122 }
+<a name="l00123"></a>00123 
+<a name="l00124"></a><a class="code" href="classstk_1_1TwoZero.html#a0ef9deab4fbc7e64511d4b6d38afd185">00124</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">TwoZero :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; iFrames, <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; oFrames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iChannel, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> oChannel )
+<a name="l00125"></a>00125 {
+<a name="l00126"></a>00126 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00127"></a>00127 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() || oChannel &gt;= oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
+<a name="l00128"></a>00128     oStream_ &lt;&lt; <span class="stringliteral">&quot;TwoZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00129"></a>00129     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00130"></a>00130   }
+<a name="l00131"></a>00131 <span class="preprocessor">#endif</span>
+<a name="l00132"></a>00132 <span class="preprocessor"></span>
+<a name="l00133"></a>00133   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00134"></a>00134   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00135"></a>00135   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(), oHop = oFrames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00136"></a>00136   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00137"></a>00137     inputs_[0] = gain_ * *iSamples;
+<a name="l00138"></a>00138     *oSamples = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
+<a name="l00139"></a>00139     inputs_[2] = inputs_[1];
+<a name="l00140"></a>00140     inputs_[1] = inputs_[0];
+<a name="l00141"></a>00141   }
+<a name="l00142"></a>00142 
+<a name="l00143"></a>00143   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00144"></a>00144   <span class="keywordflow">return</span> iFrames;
+<a name="l00145"></a>00145 }
 <a name="l00146"></a>00146 
-<a name="l00147"></a>00147 <span class="preprocessor">#endif</span>
+<a name="l00147"></a>00147 } <span class="comment">// stk namespace</span>
+<a name="l00148"></a>00148 
+<a name="l00149"></a>00149 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/UdpSocket_8h-source.html b/doc/html/UdpSocket_8h-source.html
deleted file mode 100644
index a887643..0000000
--- a/doc/html/UdpSocket_8h-source.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>UdpSocket.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_UDPSOCKET_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_UDPSOCKET_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Socket.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00029"></a>00029 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 
-<a name="l00031"></a><a class="code" href="classstk_1_1UdpSocket.html">00031</a> <span class="keyword">class </span><a class="code" href="classstk_1_1UdpSocket.html" title="STK UDP socket server/client class.">UdpSocket</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Socket.html" title="STK internet socket abstract base class.">Socket</a>
-<a name="l00032"></a>00032 {
-<a name="l00033"></a>00033  <span class="keyword">public</span>:
-<a name="l00035"></a>00035 
-<a name="l00038"></a>00038   <a class="code" href="classstk_1_1UdpSocket.html#aad5171c74b4ab7c2155cd63ef30a271" title="Default constructor creates a local UDP socket on port 2006 (or the specified port...">UdpSocket</a>( <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#be3040ecfff6ce921284c6ab4b0500a7" title="Return the socket port number.">port</a> = 2006 );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041   <a class="code" href="classstk_1_1UdpSocket.html#9b54f5d058c01c04dc266f117da7ee2a" title="The class destructor closes the socket instance.">~UdpSocket</a>();
-<a name="l00042"></a>00042 
-<a name="l00044"></a>00044 
-<a name="l00047"></a>00047   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1UdpSocket.html#4267442661257aae2a0f6b48d367fea1" title="Set the address for subsequent outgoing data sent via the writeBuffer() function...">setDestination</a>( <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#be3040ecfff6ce921284c6ab4b0500a7" title="Return the socket port number.">port</a> = 2006, std::string hostname = <span class="stringliteral">"localhost"</span> );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050 
-<a name="l00053"></a>00053   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1UdpSocket.html#a9d3d734b4e9c811724eff626e849cb8" title="Send a buffer to the address specified with the setDestination() function. Returns...">writeBuffer</a>(<span class="keyword">const</span> <span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> flags = 0);
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1UdpSocket.html#1f66fdcc40b07f9d56e472be9684adcb" title="Read an input buffer, up to length bufferSize. Returns the number of bytes read or...">readBuffer</a>(<span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> flags = 0);
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059   <span class="keywordtype">int</span> <a class="code" href="classstk_1_1UdpSocket.html#85f74161d2d3697593f08bda9dcb8963" title="Write a buffer to the specified socket. Returns the number of bytes written or -1...">writeBufferTo</a>(<span class="keyword">const</span> <span class="keywordtype">void</span> *buffer, <span class="keywordtype">long</span> bufferSize, <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Socket.html#be3040ecfff6ce921284c6ab4b0500a7" title="Return the socket port number.">port</a>, std::string hostname = <span class="stringliteral">"localhost"</span>, <span class="keywordtype">int</span> flags = 0 );
-<a name="l00060"></a>00060 
-<a name="l00061"></a>00061  <span class="keyword">protected</span>:
-<a name="l00062"></a>00062 
-<a name="l00064"></a>00064 
-<a name="l00067"></a>00067   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1UdpSocket.html#785594fd882b76d4c280b72a016f026d" title="A protected function for use in writing a socket address structure.">setAddress</a>( <span class="keyword">struct</span> sockaddr_in *address, <span class="keywordtype">int</span> port = 2006, std::string hostname = <span class="stringliteral">"localhost"</span> );
-<a name="l00068"></a>00068 
-<a name="l00069"></a>00069   <span class="keyword">struct </span>sockaddr_in address_;
-<a name="l00070"></a>00070   <span class="keywordtype">bool</span> validAddress_;
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072 };
-<a name="l00073"></a>00073 
-<a name="l00074"></a>00074 } <span class="comment">// stk namespace</span>
-<a name="l00075"></a>00075 
-<a name="l00076"></a>00076 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/UdpSocket_8h_source.html b/doc/html/UdpSocket_8h_source.html
index c821724..6382333 100644
--- a/doc/html/UdpSocket_8h_source.html
+++ b/doc/html/UdpSocket_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>UdpSocket.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_UDPSOCKET_H</span>
@@ -58,7 +58,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Vector3D_8h-source.html b/doc/html/Vector3D_8h-source.html
deleted file mode 100644
index a04e2c6..0000000
--- a/doc/html/Vector3D_8h-source.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Vector3D.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_VECTOR3D_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_VECTOR3D_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;cmath&gt;</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00017"></a>00017 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 
-<a name="l00019"></a><a class="code" href="classstk_1_1Vector3D.html">00019</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00020"></a>00020 {
-<a name="l00021"></a>00021 
-<a name="l00022"></a>00022 <span class="keyword">public</span>:
-<a name="l00024"></a><a class="code" href="classstk_1_1Vector3D.html#2e5ae76645aa8a89a8ab0640d3ce5292">00024</a>   <a class="code" href="classstk_1_1Vector3D.html#2e5ae76645aa8a89a8ab0640d3ce5292" title="Default constructor taking optional initial X, Y, and Z values.">Vector3D</a>( StkFloat x = 0.0, StkFloat y = 0.0, StkFloat z = 0.0 ) { <a class="code" href="classstk_1_1Vector3D.html#65fd03de6d9d42ea53a6cb8418ee7149" title="Set the X, Y, and Z values simultaniously.">setXYZ</a>( x, y, z ); };
-<a name="l00025"></a>00025 
-<a name="l00027"></a><a class="code" href="classstk_1_1Vector3D.html#e4f7cddc34ed1cf80262ff2d5dad65f4">00027</a>   StkFloat <a class="code" href="classstk_1_1Vector3D.html#e4f7cddc34ed1cf80262ff2d5dad65f4" title="Get the current X value.">getX</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> X_; };
-<a name="l00028"></a>00028 
-<a name="l00030"></a><a class="code" href="classstk_1_1Vector3D.html#f83bfbe865d702845e37e14d82f642b6">00030</a>   StkFloat <a class="code" href="classstk_1_1Vector3D.html#f83bfbe865d702845e37e14d82f642b6" title="Get the current Y value.">getY</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> Y_; };
-<a name="l00031"></a>00031 
-<a name="l00033"></a><a class="code" href="classstk_1_1Vector3D.html#f1c7389a2b4640cbe594fa33f9e4f805">00033</a>   StkFloat <a class="code" href="classstk_1_1Vector3D.html#f1c7389a2b4640cbe594fa33f9e4f805" title="Get the current Z value.">getZ</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> Z_; };
-<a name="l00034"></a>00034 
-<a name="l00036"></a>00036   StkFloat <a class="code" href="classstk_1_1Vector3D.html#61b078f252c597feff6d98a5646b03fd" title="Calculate the vector length.">getLength</a>( <span class="keywordtype">void</span> );
-<a name="l00037"></a>00037 
-<a name="l00039"></a><a class="code" href="classstk_1_1Vector3D.html#65fd03de6d9d42ea53a6cb8418ee7149">00039</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Vector3D.html#65fd03de6d9d42ea53a6cb8418ee7149" title="Set the X, Y, and Z values simultaniously.">setXYZ</a>( StkFloat x, StkFloat y, StkFloat z ) { X_ = x; Y_ = y; Z_ = z; };
-<a name="l00040"></a>00040 
-<a name="l00042"></a><a class="code" href="classstk_1_1Vector3D.html#9825ba3adb8fb272d2e3ca20740a48c5">00042</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Vector3D.html#9825ba3adb8fb272d2e3ca20740a48c5" title="Set the X value.">setX</a>( StkFloat x ) { X_ = x; };
-<a name="l00043"></a>00043 
-<a name="l00045"></a><a class="code" href="classstk_1_1Vector3D.html#94de5326b083c6cf72f509aa0fc532f3">00045</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Vector3D.html#94de5326b083c6cf72f509aa0fc532f3" title="Set the Y value.">setY</a>( StkFloat y ) { Y_ = y; };
-<a name="l00046"></a>00046 
-<a name="l00048"></a><a class="code" href="classstk_1_1Vector3D.html#826f2aa5e7b95a0d91f9432f26bec881">00048</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Vector3D.html#826f2aa5e7b95a0d91f9432f26bec881" title="Set the Z value.">setZ</a>( StkFloat z ) { Z_ = z; };
-<a name="l00049"></a>00049 
-<a name="l00050"></a>00050 <span class="keyword">protected</span>:
-<a name="l00051"></a>00051   StkFloat X_;
-<a name="l00052"></a>00052   StkFloat Y_;
-<a name="l00053"></a>00053   StkFloat Z_;
-<a name="l00054"></a>00054 };
-<a name="l00055"></a>00055 
-<a name="l00056"></a><a class="code" href="classstk_1_1Vector3D.html#61b078f252c597feff6d98a5646b03fd">00056</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Vector3D.html#61b078f252c597feff6d98a5646b03fd" title="Calculate the vector length.">Vector3D :: getLength</a>( <span class="keywordtype">void</span> )
-<a name="l00057"></a>00057 {
-<a name="l00058"></a>00058   StkFloat temp;
-<a name="l00059"></a>00059   temp = X_ * X_;
-<a name="l00060"></a>00060   temp += Y_ * Y_;
-<a name="l00061"></a>00061   temp += Z_ * Z_;
-<a name="l00062"></a>00062   temp = sqrt( temp );
-<a name="l00063"></a>00063   <span class="keywordflow">return</span> temp;
-<a name="l00064"></a>00064 }
-<a name="l00065"></a>00065 
-<a name="l00066"></a>00066 } <span class="comment">// stk namespace</span>
-<a name="l00067"></a>00067 
-<a name="l00068"></a>00068 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Vector3D_8h_source.html b/doc/html/Vector3D_8h_source.html
index 0198b5d..aeb92ba 100644
--- a/doc/html/Vector3D_8h_source.html
+++ b/doc/html/Vector3D_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Vector3D.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_VECTOR3D_H</span>
@@ -69,7 +69,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/VoicForm_8h-source.html b/doc/html/VoicForm_8h-source.html
deleted file mode 100644
index 6fd95f0..0000000
--- a/doc/html/VoicForm_8h-source.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>VoicForm.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_VOICFORM_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_VOICFORM_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Envelope.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "SingWave.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "FormSwep.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00010"></a>00010 <span class="preprocessor">#include "OneZero.h"</span>
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="keyword">namespace </span>stk {
-<a name="l00013"></a>00013 
-<a name="l00014"></a>00014 <span class="comment">/***************************************************/</span>
-<a name="l00039"></a>00039 <span class="comment">/***************************************************/</span>
-<a name="l00040"></a>00040 
-<a name="l00041"></a><a class="code" href="classstk_1_1VoicForm.html">00041</a> <span class="keyword">class </span><a class="code" href="classstk_1_1VoicForm.html" title="Four formant synthesis instrument.">VoicForm</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00042"></a>00042 {
-<a name="l00043"></a>00043   <span class="keyword">public</span>:
-<a name="l00045"></a>00045 
-<a name="l00048"></a>00048   <a class="code" href="classstk_1_1VoicForm.html#9462c5ba6b627f5508c336153510de4c" title="Class constructor.">VoicForm</a>( <span class="keywordtype">void</span> );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <a class="code" href="classstk_1_1VoicForm.html#298da1434bf38e6bf83c2f9db78f01ac" title="Class destructor.">~VoicForm</a>( <span class="keywordtype">void</span> );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#d62987970200d4e9720190b884fb689d" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#eb2b7ffe130e016c847cd7aebfd628ee" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1VoicForm.html#6ee860f09b9598c1251a9653b50139bb" title="Set instrument parameters for the given phoneme. Returns false if phoneme not found...">setPhoneme</a>( <span class="keyword">const</span> <span class="keywordtype">char</span>* phoneme );
-<a name="l00061"></a>00061 
-<a name="l00063"></a><a class="code" href="classstk_1_1VoicForm.html#cd504d4d29134a778b08b2229dd0c0c9">00063</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#cd504d4d29134a778b08b2229dd0c0c9" title="Set the voiced component gain.">setVoiced</a>( StkFloat vGain ) { voiced_-&gt;<a class="code" href="classstk_1_1SingWave.html#c248b298dd095bd7c9ed2c84a229a55f" title="Set the gain target value.">setGainTarget</a>(vGain); };
-<a name="l00064"></a>00064 
-<a name="l00066"></a><a class="code" href="classstk_1_1VoicForm.html#a4fa86def4ded3698f75c0e4bdbdf638">00066</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#a4fa86def4ded3698f75c0e4bdbdf638" title="Set the unvoiced component gain.">setUnVoiced</a>( StkFloat nGain ) { noiseEnv_.<a class="code" href="classstk_1_1Envelope.html#5269bc5dc1d56161ab82b677b5462a3e" title="Set the target value.">setTarget</a>(nGain); };
-<a name="l00067"></a>00067 
-<a name="l00069"></a>00069   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#14d8323edda6e8c82ab39d633b8064a8" title="Set the sweep rate for a particular formant filter (0-3).">setFilterSweepRate</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> whichOne, StkFloat rate );
-<a name="l00070"></a>00070 
-<a name="l00072"></a><a class="code" href="classstk_1_1VoicForm.html#2e4adfe6542f6103a8ac85c7ea2f2ce5">00072</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#2e4adfe6542f6103a8ac85c7ea2f2ce5" title="Set voiced component pitch sweep rate.">setPitchSweepRate</a>( StkFloat rate ) { voiced_-&gt;<a class="code" href="classstk_1_1SingWave.html#b80c50b3c8fc05f056221452504aa150" title="Set the sweep rate.">setSweepRate</a>(rate); };
-<a name="l00073"></a>00073 
-<a name="l00075"></a><a class="code" href="classstk_1_1VoicForm.html#425c88ad505e260604771cfe3de6ed47">00075</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#425c88ad505e260604771cfe3de6ed47" title="Start the voice.">speak</a>( <span class="keywordtype">void</span> ) { voiced_-&gt;<a class="code" href="classstk_1_1SingWave.html#9bd638590605e5b5eb679467506e42ff" title="Start a note.">noteOn</a>(); };
-<a name="l00076"></a>00076 
-<a name="l00078"></a>00078   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#33cacda32d42f3282312043c54b3cee7" title="Stop the voice.">quiet</a>( <span class="keywordtype">void</span> );
-<a name="l00079"></a>00079 
-<a name="l00081"></a>00081   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#9f8431ef3c7588c0d032e821d4dd1ad9" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00082"></a>00082 
-<a name="l00084"></a><a class="code" href="classstk_1_1VoicForm.html#b9e54927b3bec7b9727c32791bbb9b19">00084</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#b9e54927b3bec7b9727c32791bbb9b19" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude ) { this-&gt;<a class="code" href="classstk_1_1VoicForm.html#33cacda32d42f3282312043c54b3cee7" title="Stop the voice.">quiet</a>(); };
-<a name="l00085"></a>00085 
-<a name="l00087"></a>00087   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1VoicForm.html#427ca45d3e44e093c11f16e30fc2b550" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00088"></a>00088 
-<a name="l00090"></a>00090   StkFloat <a class="code" href="classstk_1_1VoicForm.html#c12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00091"></a>00091 
-<a name="l00092"></a>00092 <span class="keyword">protected</span>:
-<a name="l00093"></a>00093 
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1SingWave.html" title="STK &amp;quot;singing&amp;quot; looped soundfile class.">SingWave</a> *voiced_;
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> noiseEnv_;
-<a name="l00097"></a>00097   <a class="code" href="classstk_1_1FormSwep.html" title="STK sweepable formant filter class.">FormSwep</a> filters_[4];
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  onepole_;
-<a name="l00099"></a>00099   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>  onezero_;
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101 };
-<a name="l00102"></a>00102 
-<a name="l00103"></a><a class="code" href="classstk_1_1VoicForm.html#c12629d2730f582e405b221e1d7b6f29">00103</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1VoicForm.html#c12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">VoicForm :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00104"></a>00104 {
-<a name="l00105"></a>00105   StkFloat temp;
-<a name="l00106"></a>00106   temp = onepole_.<a class="code" href="classstk_1_1OnePole.html#3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( onezero_.<a class="code" href="classstk_1_1OneZero.html#9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( voiced_-&gt;<a class="code" href="classstk_1_1SingWave.html#45136f9bf5b6f58433d4d65864d9db78" title="Compute and return one output sample.">tick</a>() ) );
-<a name="l00107"></a>00107   temp += noiseEnv_.<a class="code" href="classstk_1_1Envelope.html#8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>() * noise_.<a class="code" href="classstk_1_1Noise.html#8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00108"></a>00108   lastFrame_[0] = filters_[0].<a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
-<a name="l00109"></a>00109   lastFrame_[0] += filters_[1].<a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
-<a name="l00110"></a>00110   lastFrame_[0] += filters_[2].<a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
-<a name="l00111"></a>00111   lastFrame_[0] += filters_[3].<a class="code" href="classstk_1_1FormSwep.html#ba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
-<a name="l00112"></a>00112   <span class="comment">/*</span>
-<a name="l00113"></a>00113 <span class="comment">    temp  += noiseEnv_.tick() * noise_.tick();</span>
-<a name="l00114"></a>00114 <span class="comment">    lastFrame_[0]  = filters_[0].tick(temp);</span>
-<a name="l00115"></a>00115 <span class="comment">    lastFrame_[0]  = filters_[1].tick(lastFrame_[0]);</span>
-<a name="l00116"></a>00116 <span class="comment">    lastFrame_[0]  = filters_[2].tick(lastFrame_[0]);</span>
-<a name="l00117"></a>00117 <span class="comment">    lastFrame_[0]  = filters_[3].tick(lastFrame_[0]);</span>
-<a name="l00118"></a>00118 <span class="comment">  */</span>
-<a name="l00119"></a>00119   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00120"></a>00120 }
-<a name="l00121"></a>00121 
-<a name="l00122"></a>00122 } <span class="comment">// stk namespace</span>
-<a name="l00123"></a>00123 
-<a name="l00124"></a>00124 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/VoicForm_8h_source.html b/doc/html/VoicForm_8h_source.html
index 7281878..ec7815c 100644
--- a/doc/html/VoicForm_8h_source.html
+++ b/doc/html/VoicForm_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>VoicForm.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_VOICFORM_H</span>
@@ -62,45 +62,75 @@
 <a name="l00088"></a>00088 
 <a name="l00090"></a>00090   StkFloat <a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00091"></a>00091 
-<a name="l00092"></a>00092 <span class="keyword">protected</span>:
 <a name="l00093"></a>00093 
-<a name="l00094"></a>00094   <a class="code" href="classstk_1_1SingWave.html" title="STK &amp;quot;singing&amp;quot; looped soundfile class.">SingWave</a> *voiced_;
-<a name="l00095"></a>00095   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
-<a name="l00096"></a>00096   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> noiseEnv_;
-<a name="l00097"></a>00097   <a class="code" href="classstk_1_1FormSwep.html" title="STK sweepable formant filter class.">FormSwep</a> filters_[4];
-<a name="l00098"></a>00098   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  onepole_;
-<a name="l00099"></a>00099   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>  onezero_;
-<a name="l00100"></a>00100 
-<a name="l00101"></a>00101 };
-<a name="l00102"></a>00102 
-<a name="l00103"></a><a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29">00103</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">VoicForm :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00104"></a>00104 {
-<a name="l00105"></a>00105   StkFloat temp;
-<a name="l00106"></a>00106   temp = onepole_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( onezero_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( voiced_-&gt;<a class="code" href="classstk_1_1SingWave.html#a45136f9bf5b6f58433d4d65864d9db78" title="Compute and return one output sample.">tick</a>() ) );
-<a name="l00107"></a>00107   temp += noiseEnv_.<a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>() * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
-<a name="l00108"></a>00108   lastFrame_[0] = filters_[0].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
-<a name="l00109"></a>00109   lastFrame_[0] += filters_[1].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
-<a name="l00110"></a>00110   lastFrame_[0] += filters_[2].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
-<a name="l00111"></a>00111   lastFrame_[0] += filters_[3].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
-<a name="l00112"></a>00112   <span class="comment">/*</span>
-<a name="l00113"></a>00113 <span class="comment">    temp  += noiseEnv_.tick() * noise_.tick();</span>
-<a name="l00114"></a>00114 <span class="comment">    lastFrame_[0]  = filters_[0].tick(temp);</span>
-<a name="l00115"></a>00115 <span class="comment">    lastFrame_[0]  = filters_[1].tick(lastFrame_[0]);</span>
-<a name="l00116"></a>00116 <span class="comment">    lastFrame_[0]  = filters_[2].tick(lastFrame_[0]);</span>
-<a name="l00117"></a>00117 <span class="comment">    lastFrame_[0]  = filters_[3].tick(lastFrame_[0]);</span>
-<a name="l00118"></a>00118 <span class="comment">  */</span>
-<a name="l00119"></a>00119   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00120"></a>00120 }
-<a name="l00121"></a>00121 
-<a name="l00122"></a>00122 } <span class="comment">// stk namespace</span>
-<a name="l00123"></a>00123 
-<a name="l00124"></a>00124 <span class="preprocessor">#endif</span>
+<a name="l00100"></a>00100   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00101"></a>00101 
+<a name="l00102"></a>00102 <span class="keyword">protected</span>:
+<a name="l00103"></a>00103 
+<a name="l00104"></a>00104   <a class="code" href="classstk_1_1SingWave.html" title="STK &amp;quot;singing&amp;quot; looped soundfile class.">SingWave</a> *voiced_;
+<a name="l00105"></a>00105   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a>    noise_;
+<a name="l00106"></a>00106   <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> noiseEnv_;
+<a name="l00107"></a>00107   <a class="code" href="classstk_1_1FormSwep.html" title="STK sweepable formant filter class.">FormSwep</a> filters_[4];
+<a name="l00108"></a>00108   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a>  onepole_;
+<a name="l00109"></a>00109   <a class="code" href="classstk_1_1OneZero.html" title="STK one-zero filter class.">OneZero</a>  onezero_;
+<a name="l00110"></a>00110 
+<a name="l00111"></a>00111 };
+<a name="l00112"></a>00112 
+<a name="l00113"></a><a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29">00113</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">VoicForm :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00114"></a>00114 {
+<a name="l00115"></a>00115   StkFloat temp;
+<a name="l00116"></a>00116   temp = onepole_.<a class="code" href="classstk_1_1OnePole.html#a3c83b6d43f76bec06f11caa9de76881e" title="Input one sample to the filter and return one output.">tick</a>( onezero_.<a class="code" href="classstk_1_1OneZero.html#a9f52fa395257b15cb7351c6ccb2199da" title="Input one sample to the filter and return one output.">tick</a>( voiced_-&gt;<a class="code" href="classstk_1_1SingWave.html#a45136f9bf5b6f58433d4d65864d9db78" title="Compute and return one output sample.">tick</a>() ) );
+<a name="l00117"></a>00117   temp += noiseEnv_.<a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>() * noise_.<a class="code" href="classstk_1_1Noise.html#a8ac40f69475eb744e803d557e8438a6d" title="Compute and return one output sample.">tick</a>();
+<a name="l00118"></a>00118   lastFrame_[0] = filters_[0].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
+<a name="l00119"></a>00119   lastFrame_[0] += filters_[1].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
+<a name="l00120"></a>00120   lastFrame_[0] += filters_[2].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
+<a name="l00121"></a>00121   lastFrame_[0] += filters_[3].<a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>(temp);
+<a name="l00122"></a>00122   <span class="comment">/*</span>
+<a name="l00123"></a>00123 <span class="comment">    temp  += noiseEnv_.tick() * noise_.tick();</span>
+<a name="l00124"></a>00124 <span class="comment">    lastFrame_[0]  = filters_[0].tick(temp);</span>
+<a name="l00125"></a>00125 <span class="comment">    lastFrame_[0]  = filters_[1].tick(lastFrame_[0]);</span>
+<a name="l00126"></a>00126 <span class="comment">    lastFrame_[0]  = filters_[2].tick(lastFrame_[0]);</span>
+<a name="l00127"></a>00127 <span class="comment">    lastFrame_[0]  = filters_[3].tick(lastFrame_[0]);</span>
+<a name="l00128"></a>00128 <span class="comment">  */</span>
+<a name="l00129"></a>00129   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00130"></a>00130 }
+<a name="l00131"></a>00131 
+<a name="l00132"></a><a class="code" href="classstk_1_1VoicForm.html#a619d2995894216181c2dc38fd863fe33">00132</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">VoicForm :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00133"></a>00133 {
+<a name="l00134"></a>00134   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00135"></a>00135 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00136"></a>00136 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00137"></a>00137     oStream_ &lt;&lt; <span class="stringliteral">&quot;VoicForm::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00138"></a>00138     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00139"></a>00139   }
+<a name="l00140"></a>00140 <span class="preprocessor">#endif</span>
+<a name="l00141"></a>00141 <span class="preprocessor"></span>
+<a name="l00142"></a>00142   StkFloat *samples = &amp;frames[channel];
+<a name="l00143"></a>00143   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00144"></a>00144   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00145"></a>00145     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00146"></a>00146       *samples++ = <a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">tick</a>();
+<a name="l00147"></a>00147   }
+<a name="l00148"></a>00148   <span class="keywordflow">else</span> {
+<a name="l00149"></a>00149     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00150"></a>00150       *samples++ = <a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">tick</a>();
+<a name="l00151"></a>00151       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00152"></a>00152         *samples++ = lastFrame_[j];
+<a name="l00153"></a>00153     }
+<a name="l00154"></a>00154   }
+<a name="l00155"></a>00155 
+<a name="l00156"></a>00156   <span class="keywordflow">return</span> frames;
+<a name="l00157"></a>00157 }
+<a name="l00158"></a>00158 
+<a name="l00159"></a>00159 } <span class="comment">// stk namespace</span>
+<a name="l00160"></a>00160 
+<a name="l00161"></a>00161 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Voicer_8h-source.html b/doc/html/Voicer_8h-source.html
deleted file mode 100644
index 2917e3c..0000000
--- a/doc/html/Voicer_8h-source.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Voicer.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_VOICER_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_VOICER_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include &lt;vector&gt;</span>
-<a name="l00006"></a>00006 
-<a name="l00007"></a>00007 <span class="keyword">namespace </span>stk {
-<a name="l00008"></a>00008 
-<a name="l00009"></a>00009 <span class="comment">/***************************************************/</span>
-<a name="l00032"></a>00032 <span class="comment">/***************************************************/</span>
-<a name="l00033"></a>00033 
-<a name="l00034"></a><a class="code" href="classstk_1_1Voicer.html">00034</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Voicer.html" title="STK voice manager class.">Voicer</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00035"></a>00035 {
-<a name="l00036"></a>00036  <span class="keyword">public</span>:
-<a name="l00038"></a>00038   <a class="code" href="classstk_1_1Voicer.html#4b2eb777e91f0dd33403ec23c68bb43f" title="Class constructor taking an optional note decay time (in seconds).">Voicer</a>( StkFloat decayTime = 0.2 );
-<a name="l00039"></a>00039 
-<a name="l00041"></a>00041 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#ff9fc9304ef6ae9f7aa1e15611728b8c" title="Add an instrument with an optional group number to the voice manager.">addInstrument</a>( <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a> *instrument, <span class="keywordtype">int</span> group=0 );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#c5190f84fb8507cac2a18dece242d4d8" title="Remove the given instrument pointer from the voice manager&amp;#39;s control.">removeInstrument</a>( <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a> *instrument );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056 
-<a name="l00064"></a>00064   <span class="keywordtype">long</span> <a class="code" href="classstk_1_1Voicer.html#bd09d3a8e935fe36776f165038e33176" title="Initiate a noteOn event with the given note number and amplitude and return a unique...">noteOn</a>( StkFloat noteNumber, StkFloat amplitude, <span class="keywordtype">int</span> group=0 );
-<a name="l00065"></a>00065 
-<a name="l00067"></a>00067 
-<a name="l00070"></a>00070   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#4843895d8e4c0fffdd165aa480e2dcde" title="Send a noteOff to all voices having the given noteNumber and optional group (default...">noteOff</a>( StkFloat noteNumber, StkFloat amplitude, <span class="keywordtype">int</span> group=0 );
-<a name="l00071"></a>00071 
-<a name="l00073"></a>00073 
-<a name="l00076"></a>00076   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#4843895d8e4c0fffdd165aa480e2dcde" title="Send a noteOff to all voices having the given noteNumber and optional group (default...">noteOff</a>( <span class="keywordtype">long</span> tag, StkFloat amplitude );
-<a name="l00077"></a>00077 
-<a name="l00079"></a>00079 
-<a name="l00082"></a>00082   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#5ee3f8a17e031430486e030520709acf" title="Send a frequency update message to all voices assigned to the optional group argument...">setFrequency</a>( StkFloat noteNumber, <span class="keywordtype">int</span> group=0 );
-<a name="l00083"></a>00083 
-<a name="l00085"></a>00085 
-<a name="l00088"></a>00088   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#5ee3f8a17e031430486e030520709acf" title="Send a frequency update message to all voices assigned to the optional group argument...">setFrequency</a>( <span class="keywordtype">long</span> tag, StkFloat noteNumber );
-<a name="l00089"></a>00089 
-<a name="l00091"></a>00091   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#e2ab6a6804960c686509d7f919829ad4" title="Send a pitchBend message to all voices assigned to the optional group argument (default...">pitchBend</a>( StkFloat value, <span class="keywordtype">int</span> group=0 );
-<a name="l00092"></a>00092 
-<a name="l00094"></a>00094   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#e2ab6a6804960c686509d7f919829ad4" title="Send a pitchBend message to all voices assigned to the optional group argument (default...">pitchBend</a>( <span class="keywordtype">long</span> tag, StkFloat value );
-<a name="l00095"></a>00095 
-<a name="l00097"></a>00097   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#b5fe99a639a872c90aed2541417cc896" title="Send a controlChange to all instruments assigned to the optional group argument (default...">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value, <span class="keywordtype">int</span> group=0 );
-<a name="l00098"></a>00098 
-<a name="l00100"></a>00100   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#b5fe99a639a872c90aed2541417cc896" title="Send a controlChange to all instruments assigned to the optional group argument (default...">controlChange</a>( <span class="keywordtype">long</span> tag, <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00101"></a>00101 
-<a name="l00103"></a>00103   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Voicer.html#238f0936f6c0b54c7eb756ad3ac1f019" title="Send a noteOff message to all existing voices.">silence</a>( <span class="keywordtype">void</span> );
-<a name="l00104"></a>00104 
-<a name="l00106"></a><a class="code" href="classstk_1_1Voicer.html#35230ae97772ae581fb9658a5f4d57b6">00106</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1Voicer.html#35230ae97772ae581fb9658a5f4d57b6" title="Return the current number of output channels.">channelsOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(); };
-<a name="l00107"></a>00107 
-<a name="l00109"></a><a class="code" href="classstk_1_1Voicer.html#50caec57c6a566e4836181774adf5e7b">00109</a>   <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Voicer.html#50caec57c6a566e4836181774adf5e7b" title="Return an StkFrames reference to the last output sample frame.">lastFrame</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_; };
-<a name="l00110"></a>00110 
-<a name="l00112"></a>00112 
-<a name="l00120"></a>00120   StkFloat <a class="code" href="classstk_1_1Voicer.html#98d843fa1f9fd2ad9a9fb03538dba03a" title="Return the specified channel value of the last computed frame.">lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00121"></a>00121 
-<a name="l00123"></a>00123 
-<a name="l00131"></a>00131   StkFloat <a class="code" href="classstk_1_1Voicer.html#3e504b3a6b896772b0f94a12faf0ee70" title="Mix one sample frame of all sounding voices and return the specified channel value...">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00132"></a>00132 
-<a name="l00134"></a>00134 
-<a name="l00142"></a>00142   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Voicer.html#3e504b3a6b896772b0f94a12faf0ee70" title="Mix one sample frame of all sounding voices and return the specified channel value...">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00143"></a>00143 
-<a name="l00144"></a>00144  <span class="keyword">protected</span>:
-<a name="l00145"></a>00145 
-<a name="l00146"></a>00146   <span class="keyword">struct </span>Voice {
-<a name="l00147"></a>00147     <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a> *instrument;
-<a name="l00148"></a>00148     <span class="keywordtype">long</span> tag;
-<a name="l00149"></a>00149     StkFloat noteNumber;
-<a name="l00150"></a>00150     StkFloat frequency;
-<a name="l00151"></a>00151     <span class="keywordtype">int</span> sounding;
-<a name="l00152"></a>00152     <span class="keywordtype">int</span> group;
-<a name="l00153"></a>00153 
-<a name="l00154"></a>00154     <span class="comment">// Default constructor.</span>
-<a name="l00155"></a>00155     Voice()
-<a name="l00156"></a>00156       :instrument(0), tag(0), noteNumber(-1.0), frequency(0.0), sounding(0), group(0) {}
-<a name="l00157"></a>00157   };
-<a name="l00158"></a>00158 
-<a name="l00159"></a>00159   std::vector&lt;Voice&gt; voices_;
-<a name="l00160"></a>00160   <span class="keywordtype">long</span> tags_;
-<a name="l00161"></a>00161   <span class="keywordtype">int</span> muteTime_;
-<a name="l00162"></a>00162   StkFrames lastFrame_;
-<a name="l00163"></a>00163 };
-<a name="l00164"></a>00164 
-<a name="l00165"></a><a class="code" href="classstk_1_1Voicer.html#98d843fa1f9fd2ad9a9fb03538dba03a">00165</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Voicer.html#98d843fa1f9fd2ad9a9fb03538dba03a" title="Return the specified channel value of the last computed frame.">Voicer :: lastOut</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00166"></a>00166 {
-<a name="l00167"></a>00167 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00168"></a>00168 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00169"></a>00169     errorString_ &lt;&lt; <span class="stringliteral">"Voicer::lastOut(): channel argument is invalid!"</span>;
-<a name="l00170"></a>00170     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00171"></a>00171   }
-<a name="l00172"></a>00172 <span class="preprocessor">#endif</span>
-<a name="l00173"></a>00173 <span class="preprocessor"></span>
-<a name="l00174"></a>00174   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00175"></a>00175 }
-<a name="l00176"></a>00176 
-<a name="l00177"></a>00177 
-<a name="l00178"></a><a class="code" href="classstk_1_1Voicer.html#3e504b3a6b896772b0f94a12faf0ee70">00178</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Voicer.html#3e504b3a6b896772b0f94a12faf0ee70" title="Mix one sample frame of all sounding voices and return the specified channel value...">Voicer :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00179"></a>00179 {
-<a name="l00180"></a>00180   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j;
-<a name="l00181"></a>00181   <span class="keywordflow">for</span> ( j=0; j&lt;lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(); j++ ) lastFrame_[j] = 0.0;
-<a name="l00182"></a>00182   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;voices_.size(); i++ ) {
-<a name="l00183"></a>00183     <span class="keywordflow">if</span> ( voices_[i].sounding != 0 ) {
-<a name="l00184"></a>00184       voices_[i].instrument-&gt;tick();
-<a name="l00185"></a>00185       <span class="keywordflow">for</span> ( j=0; j&lt;voices_[i].instrument-&gt;channelsOut(); j++ ) lastFrame_[j] += voices_[i].instrument-&gt;lastOut( j );
-<a name="l00186"></a>00186     }
-<a name="l00187"></a>00187     <span class="keywordflow">if</span> ( voices_[i].sounding &lt; 0 ) {
-<a name="l00188"></a>00188       voices_[i].sounding++;
-<a name="l00189"></a>00189       <span class="keywordflow">if</span> ( voices_[i].sounding == 0 )
-<a name="l00190"></a>00190         voices_[i].noteNumber = -1;
-<a name="l00191"></a>00191     }
-<a name="l00192"></a>00192   }
-<a name="l00193"></a>00193 
-<a name="l00194"></a>00194   <span class="keywordflow">return</span> lastFrame_[channel];
-<a name="l00195"></a>00195 }
-<a name="l00196"></a>00196 
-<a name="l00197"></a><a class="code" href="classstk_1_1Voicer.html#3fd795b0fce684c470484936ef39aa16">00197</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Voicer.html#3e504b3a6b896772b0f94a12faf0ee70" title="Mix one sample frame of all sounding voices and return the specified channel value...">Voicer :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
-<a name="l00198"></a>00198 {
-<a name="l00199"></a>00199   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
-<a name="l00200"></a>00200 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
-<a name="l00201"></a>00201 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
-<a name="l00202"></a>00202     errorString_ &lt;&lt; <span class="stringliteral">"Voicer::tick(): channel and StkFrames arguments are incompatible!"</span>;
-<a name="l00203"></a>00203     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
-<a name="l00204"></a>00204   }
-<a name="l00205"></a>00205 <span class="preprocessor">#endif</span>
-<a name="l00206"></a>00206 <span class="preprocessor"></span>
-<a name="l00207"></a>00207   StkFloat *samples = &amp;frames[channel];
-<a name="l00208"></a>00208   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
-<a name="l00209"></a>00209   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
-<a name="l00210"></a>00210     <a class="code" href="classstk_1_1Voicer.html#3e504b3a6b896772b0f94a12faf0ee70" title="Mix one sample frame of all sounding voices and return the specified channel value...">tick</a>();
-<a name="l00211"></a>00211     <span class="keywordflow">for</span> ( j=0; j&lt;nChannels; j++ )
-<a name="l00212"></a>00212       *samples++ = lastFrame_[j];
-<a name="l00213"></a>00213   }
-<a name="l00214"></a>00214 
-<a name="l00215"></a>00215   <span class="keywordflow">return</span> frames;
-<a name="l00216"></a>00216 }
-<a name="l00217"></a>00217 
-<a name="l00218"></a>00218 } <span class="comment">// stk namespace</span>
-<a name="l00219"></a>00219 
-<a name="l00220"></a>00220 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Voicer_8h_source.html b/doc/html/Voicer_8h_source.html
index afdec6a..750592a 100644
--- a/doc/html/Voicer_8h_source.html
+++ b/doc/html/Voicer_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Voicer.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_VOICER_H</span>
@@ -97,7 +97,7 @@
 <a name="l00166"></a>00166 {
 <a name="l00167"></a>00167 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00168"></a>00168 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() ) {
-<a name="l00169"></a>00169     errorString_ &lt;&lt; <span class="stringliteral">&quot;Voicer::lastOut(): channel argument is invalid!&quot;</span>;
+<a name="l00169"></a>00169     oStream_ &lt;&lt; <span class="stringliteral">&quot;Voicer::lastOut(): channel argument is invalid!&quot;</span>;
 <a name="l00170"></a>00170     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00171"></a>00171   }
 <a name="l00172"></a>00172 <span class="preprocessor">#endif</span>
@@ -129,7 +129,7 @@
 <a name="l00198"></a>00198   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
 <a name="l00199"></a>00199 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
 <a name="l00200"></a>00200 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
-<a name="l00201"></a>00201     errorString_ &lt;&lt; <span class="stringliteral">&quot;Voicer::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00201"></a>00201     oStream_ &lt;&lt; <span class="stringliteral">&quot;Voicer::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
 <a name="l00202"></a>00202     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
 <a name="l00203"></a>00203   }
 <a name="l00204"></a>00204 <span class="preprocessor">#endif</span>
@@ -153,7 +153,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Whistle_8h-source.html b/doc/html/Whistle_8h-source.html
deleted file mode 100644
index 51e2c17..0000000
--- a/doc/html/Whistle_8h-source.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Whistle.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_WHISTLE_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_WHISTLE_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Instrmnt.h"</span>
-<a name="l00005"></a>00005 <span class="preprocessor">#include "Sphere.h"</span>
-<a name="l00006"></a>00006 <span class="preprocessor">#include "Vector3D.h"</span>
-<a name="l00007"></a>00007 <span class="preprocessor">#include "Noise.h"</span>
-<a name="l00008"></a>00008 <span class="preprocessor">#include "SineWave.h"</span>
-<a name="l00009"></a>00009 <span class="preprocessor">#include "OnePole.h"</span>
-<a name="l00010"></a>00010 <span class="preprocessor">#include "Envelope.h"</span>
-<a name="l00011"></a>00011 
-<a name="l00012"></a>00012 <span class="keyword">namespace </span>stk {
-<a name="l00013"></a>00013 
-<a name="l00014"></a>00014 <span class="comment">/***************************************************/</span>
-<a name="l00030"></a>00030 <span class="comment">/***************************************************/</span>
-<a name="l00031"></a>00031 
-<a name="l00032"></a><a class="code" href="classstk_1_1Whistle.html">00032</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Whistle.html" title="STK police/referee whistle instrument class.">Whistle</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Instrmnt.html" title="STK instrument abstract base class.">Instrmnt</a>
-<a name="l00033"></a>00033 {
-<a name="l00034"></a>00034 <span class="keyword">public</span>:
-<a name="l00036"></a>00036 
-<a name="l00039"></a>00039   <a class="code" href="classstk_1_1Whistle.html#e577e98aaf1957164155e4247f39a604" title="Class constructor.">Whistle</a>( <span class="keywordtype">void</span> );
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042   <a class="code" href="classstk_1_1Whistle.html#b44c607efebd6d6d53bf06b95636a90b" title="Class destructor.">~Whistle</a>( <span class="keywordtype">void</span> );
-<a name="l00043"></a>00043 
-<a name="l00045"></a>00045   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Whistle.html#8551209b9079d3bc626702e0745b2eb8" title="Reset and clear all internal state.">clear</a>( <span class="keywordtype">void</span> );
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Whistle.html#6fd2ded34c6bfda618d80d7068e829d4" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00049"></a>00049 
-<a name="l00051"></a>00051   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Whistle.html#de1532d8b10e8b3ce7dfecba86514eaa" title="Apply breath velocity to instrument with given amplitude and rate of increase.">startBlowing</a>( StkFloat amplitude, StkFloat rate );
-<a name="l00052"></a>00052 
-<a name="l00054"></a>00054   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Whistle.html#6f529770c888caca50fc35f454c98898" title="Decrease breath velocity with given rate of decrease.">stopBlowing</a>( StkFloat rate );
-<a name="l00055"></a>00055 
-<a name="l00057"></a>00057   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Whistle.html#b8b80cab3827a6cf2bb95393c522c58b" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00058"></a>00058 
-<a name="l00060"></a>00060   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Whistle.html#50c5a97cebe6f7dbb6615ab3e76e41e0" title="Stop a note with the given amplitude (speed of decay).">noteOff</a>( StkFloat amplitude );
-<a name="l00061"></a>00061 
-<a name="l00063"></a>00063   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Whistle.html#7d5d2d24fb0103aae0fb8c6308e2a663" title="Perform the control change specified by number and value (0.0 - 128.0).">controlChange</a>( <span class="keywordtype">int</span> number, StkFloat value );
-<a name="l00064"></a>00064 
-<a name="l00066"></a>00066   StkFloat <a class="code" href="classstk_1_1Whistle.html#3835e290dae97acfe79e1f7458a39cda" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00067"></a>00067 
-<a name="l00068"></a>00068 <span class="keyword">protected</span>:
-<a name="l00069"></a>00069 
-<a name="l00070"></a>00070          <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> *tempVectorP_;
-<a name="l00071"></a>00071   <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> tempVector_;
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a> onepole_;
-<a name="l00073"></a>00073   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise_;
-<a name="l00074"></a>00074          <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> envelope_;
-<a name="l00075"></a>00075   <a class="code" href="classstk_1_1Sphere.html" title="STK sphere class.">Sphere</a> can_;           <span class="comment">// Declare a Spherical "can".</span>
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1Sphere.html" title="STK sphere class.">Sphere</a> pea_, bumper_;  <span class="comment">// One spherical "pea", and a spherical "bumper".</span>
-<a name="l00077"></a>00077 
-<a name="l00078"></a>00078   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> sine_;
-<a name="l00079"></a>00079 
-<a name="l00080"></a>00080   StkFloat baseFrequency_;
-<a name="l00081"></a>00081   StkFloat noiseGain_;
-<a name="l00082"></a>00082   StkFloat fippleFreqMod_;
-<a name="l00083"></a>00083          StkFloat fippleGainMod_;
-<a name="l00084"></a>00084          StkFloat blowFreqMod_;
-<a name="l00085"></a>00085          StkFloat tickSize_;
-<a name="l00086"></a>00086          StkFloat canLoss_;
-<a name="l00087"></a>00087          <span class="keywordtype">int</span> subSample_, subSampCount_;
-<a name="l00088"></a>00088 };
-<a name="l00089"></a>00089 
-<a name="l00090"></a>00090 } <span class="comment">// stk namespace</span>
-<a name="l00091"></a>00091 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Whistle_8h_source.html b/doc/html/Whistle_8h_source.html
index aa6125f..fbe1c08 100644
--- a/doc/html/Whistle_8h_source.html
+++ b/doc/html/Whistle_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Whistle.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_WHISTLE_H</span>
@@ -52,36 +52,66 @@
 <a name="l00064"></a>00064 
 <a name="l00066"></a>00066   StkFloat <a class="code" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00067"></a>00067 
-<a name="l00068"></a>00068 <span class="keyword">protected</span>:
 <a name="l00069"></a>00069 
-<a name="l00070"></a>00070          <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> *tempVectorP_;
-<a name="l00071"></a>00071   <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> tempVector_;
-<a name="l00072"></a>00072   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a> onepole_;
-<a name="l00073"></a>00073   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise_;
-<a name="l00074"></a>00074          <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> envelope_;
-<a name="l00075"></a>00075   <a class="code" href="classstk_1_1Sphere.html" title="STK sphere class.">Sphere</a> can_;           <span class="comment">// Declare a Spherical &quot;can&quot;.</span>
-<a name="l00076"></a>00076   <a class="code" href="classstk_1_1Sphere.html" title="STK sphere class.">Sphere</a> pea_, bumper_;  <span class="comment">// One spherical &quot;pea&quot;, and a spherical &quot;bumper&quot;.</span>
+<a name="l00076"></a>00076   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00077"></a>00077 
-<a name="l00078"></a>00078   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> sine_;
+<a name="l00078"></a>00078 <span class="keyword">protected</span>:
 <a name="l00079"></a>00079 
-<a name="l00080"></a>00080   StkFloat baseFrequency_;
-<a name="l00081"></a>00081   StkFloat noiseGain_;
-<a name="l00082"></a>00082   StkFloat fippleFreqMod_;
-<a name="l00083"></a>00083          StkFloat fippleGainMod_;
-<a name="l00084"></a>00084          StkFloat blowFreqMod_;
-<a name="l00085"></a>00085          StkFloat tickSize_;
-<a name="l00086"></a>00086          StkFloat canLoss_;
-<a name="l00087"></a>00087          <span class="keywordtype">int</span> subSample_, subSampCount_;
-<a name="l00088"></a>00088 };
+<a name="l00080"></a>00080          <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> *tempVectorP_;
+<a name="l00081"></a>00081   <a class="code" href="classstk_1_1Vector3D.html" title="STK 3D vector class.">Vector3D</a> tempVector_;
+<a name="l00082"></a>00082   <a class="code" href="classstk_1_1OnePole.html" title="STK one-pole filter class.">OnePole</a> onepole_;
+<a name="l00083"></a>00083   <a class="code" href="classstk_1_1Noise.html" title="STK noise generator.">Noise</a> noise_;
+<a name="l00084"></a>00084          <a class="code" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> envelope_;
+<a name="l00085"></a>00085   <a class="code" href="classstk_1_1Sphere.html" title="STK sphere class.">Sphere</a> can_;           <span class="comment">// Declare a Spherical &quot;can&quot;.</span>
+<a name="l00086"></a>00086   <a class="code" href="classstk_1_1Sphere.html" title="STK sphere class.">Sphere</a> pea_, bumper_;  <span class="comment">// One spherical &quot;pea&quot;, and a spherical &quot;bumper&quot;.</span>
+<a name="l00087"></a>00087 
+<a name="l00088"></a>00088   <a class="code" href="classstk_1_1SineWave.html" title="STK sinusoid oscillator class.">SineWave</a> sine_;
 <a name="l00089"></a>00089 
-<a name="l00090"></a>00090 } <span class="comment">// stk namespace</span>
-<a name="l00091"></a>00091 <span class="preprocessor">#endif</span>
+<a name="l00090"></a>00090   StkFloat baseFrequency_;
+<a name="l00091"></a>00091   StkFloat noiseGain_;
+<a name="l00092"></a>00092   StkFloat fippleFreqMod_;
+<a name="l00093"></a>00093          StkFloat fippleGainMod_;
+<a name="l00094"></a>00094          StkFloat blowFreqMod_;
+<a name="l00095"></a>00095          StkFloat tickSize_;
+<a name="l00096"></a>00096          StkFloat canLoss_;
+<a name="l00097"></a>00097          <span class="keywordtype">int</span> subSample_, subSampCount_;
+<a name="l00098"></a>00098 };
+<a name="l00099"></a>00099 
+<a name="l00100"></a><a class="code" href="classstk_1_1Whistle.html#a46135035da33d0825e3ff0db04b857d4">00100</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda" title="Compute and return one output sample.">Whistle :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00101"></a>00101 {
+<a name="l00102"></a>00102   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00103"></a>00103 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00104"></a>00104 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00105"></a>00105     oStream_ &lt;&lt; <span class="stringliteral">&quot;Whistle::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00106"></a>00106     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00107"></a>00107   }
+<a name="l00108"></a>00108 <span class="preprocessor">#endif</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span>
+<a name="l00110"></a>00110   StkFloat *samples = &amp;frames[channel];
+<a name="l00111"></a>00111   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00112"></a>00112   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00113"></a>00113     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00114"></a>00114       *samples++ = <a class="code" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda" title="Compute and return one output sample.">tick</a>();
+<a name="l00115"></a>00115   }
+<a name="l00116"></a>00116   <span class="keywordflow">else</span> {
+<a name="l00117"></a>00117     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00118"></a>00118       *samples++ = <a class="code" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda" title="Compute and return one output sample.">tick</a>();
+<a name="l00119"></a>00119       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00120"></a>00120         *samples++ = lastFrame_[j];
+<a name="l00121"></a>00121     }
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124   <span class="keywordflow">return</span> frames;
+<a name="l00125"></a>00125 }
+<a name="l00126"></a>00126 
+<a name="l00127"></a>00127 } <span class="comment">// stk namespace</span>
+<a name="l00128"></a>00128 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/Wurley_8h-source.html b/doc/html/Wurley_8h-source.html
deleted file mode 100644
index ca3d74b..0000000
--- a/doc/html/Wurley_8h-source.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>Wurley.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_WURLEY_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_WURLEY_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "FM.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00038"></a>00038 <span class="comment">/***************************************************/</span>
-<a name="l00039"></a>00039 
-<a name="l00040"></a><a class="code" href="classstk_1_1Wurley.html">00040</a> <span class="keyword">class </span><a class="code" href="classstk_1_1Wurley.html" title="STK Wurlitzer electric piano FM synthesis instrument.">Wurley</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a>
-<a name="l00041"></a>00041 {
-<a name="l00042"></a>00042  <span class="keyword">public</span>:
-<a name="l00044"></a>00044 
-<a name="l00047"></a>00047   <a class="code" href="classstk_1_1Wurley.html#fb2a68449dcd9902f0f037504387c52f" title="Class constructor.">Wurley</a>( <span class="keywordtype">void</span> );
-<a name="l00048"></a>00048 
-<a name="l00050"></a>00050   <a class="code" href="classstk_1_1Wurley.html#6d79b2fbf627fa4f6c60f3c9d421c470" title="Class destructor.">~Wurley</a>( <span class="keywordtype">void</span> );
-<a name="l00051"></a>00051 
-<a name="l00053"></a>00053   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Wurley.html#f00b42ac4011cacc724bf4c9cf16fba4" title="Set instrument parameters for a particular frequency.">setFrequency</a>( StkFloat frequency );
-<a name="l00054"></a>00054 
-<a name="l00056"></a>00056   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1Wurley.html#3cca87fdccde2306beb49a19dd19c414" title="Start a note with the given frequency and amplitude.">noteOn</a>( StkFloat frequency, StkFloat amplitude );
-<a name="l00057"></a>00057 
-<a name="l00059"></a>00059   StkFloat <a class="code" href="classstk_1_1Wurley.html#2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
-<a name="l00060"></a>00060 
-<a name="l00061"></a>00061  <span class="keyword">protected</span>:
-<a name="l00062"></a>00062 
-<a name="l00063"></a>00063 };
-<a name="l00064"></a>00064 
-<a name="l00065"></a><a class="code" href="classstk_1_1Wurley.html#2019cfe262eb755ac939c98bda0383bd">00065</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Wurley.html#2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">Wurley :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00066"></a>00066 {
-<a name="l00067"></a>00067   StkFloat temp, temp2;
-<a name="l00068"></a>00068 
-<a name="l00069"></a>00069   temp = gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00070"></a>00070   temp = temp * control1_;
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072   waves_[0]-&gt;addPhaseOffset( temp );
-<a name="l00073"></a>00073   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#e9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00074"></a>00074   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00075"></a>00075   twozero_.<a class="code" href="classstk_1_1TwoZero.html#cf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077   waves_[2]-&gt;addPhaseOffset( temp );
-<a name="l00078"></a>00078   temp = ( 1.0 - (control2_ * 0.5)) * gains_[0] * adsr_[0]-&gt;<a class="code" href="classstk_1_1Wurley.html#2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">tick</a>() * waves_[0]-&gt;tick();
-<a name="l00079"></a>00079   temp += control2_ * 0.5 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081   <span class="comment">// Calculate amplitude modulation and apply it to output.</span>
-<a name="l00082"></a>00082   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_;
-<a name="l00083"></a>00083   temp = temp * (1.0 + temp2);
-<a name="l00084"></a>00084     
-<a name="l00085"></a>00085   lastFrame_[0] = temp * 0.5;
-<a name="l00086"></a>00086   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00087"></a>00087 }
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 } <span class="comment">// stk namespace</span>
-<a name="l00090"></a>00090 
-<a name="l00091"></a>00091 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/Wurley_8h_source.html b/doc/html/Wurley_8h_source.html
index 94dbe61..f7c63c6 100644
--- a/doc/html/Wurley_8h_source.html
+++ b/doc/html/Wurley_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>Wurley.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_WURLEY_H</span>
@@ -36,43 +36,73 @@
 <a name="l00057"></a>00057 
 <a name="l00059"></a>00059   StkFloat <a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
 <a name="l00060"></a>00060 
-<a name="l00061"></a>00061  <span class="keyword">protected</span>:
 <a name="l00062"></a>00062 
-<a name="l00063"></a>00063 };
-<a name="l00064"></a>00064 
-<a name="l00065"></a><a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd">00065</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">Wurley :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
-<a name="l00066"></a>00066 {
-<a name="l00067"></a>00067   StkFloat temp, temp2;
-<a name="l00068"></a>00068 
-<a name="l00069"></a>00069   temp = gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
-<a name="l00070"></a>00070   temp = temp * control1_;
-<a name="l00071"></a>00071 
-<a name="l00072"></a>00072   waves_[0]-&gt;addPhaseOffset( temp );
-<a name="l00073"></a>00073   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
-<a name="l00074"></a>00074   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
-<a name="l00075"></a>00075   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
-<a name="l00076"></a>00076 
-<a name="l00077"></a>00077   waves_[2]-&gt;addPhaseOffset( temp );
-<a name="l00078"></a>00078   temp = ( 1.0 - (control2_ * 0.5)) * gains_[0] * adsr_[0]-&gt;<a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">tick</a>() * waves_[0]-&gt;tick();
-<a name="l00079"></a>00079   temp += control2_ * 0.5 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
-<a name="l00080"></a>00080 
-<a name="l00081"></a>00081   <span class="comment">// Calculate amplitude modulation and apply it to output.</span>
-<a name="l00082"></a>00082   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_;
-<a name="l00083"></a>00083   temp = temp * (1.0 + temp2);
-<a name="l00084"></a>00084     
-<a name="l00085"></a>00085   lastFrame_[0] = temp * 0.5;
-<a name="l00086"></a>00086   <span class="keywordflow">return</span> lastFrame_[0];
-<a name="l00087"></a>00087 }
-<a name="l00088"></a>00088 
-<a name="l00089"></a>00089 } <span class="comment">// stk namespace</span>
+<a name="l00069"></a>00069   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 );
+<a name="l00070"></a>00070 
+<a name="l00071"></a>00071  <span class="keyword">protected</span>:
+<a name="l00072"></a>00072 
+<a name="l00073"></a>00073 };
+<a name="l00074"></a>00074 
+<a name="l00075"></a><a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd">00075</a> <span class="keyword">inline</span> StkFloat <a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">Wurley :: tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> )
+<a name="l00076"></a>00076 {
+<a name="l00077"></a>00077   StkFloat temp, temp2;
+<a name="l00078"></a>00078 
+<a name="l00079"></a>00079   temp = gains_[1] * adsr_[1]-&gt;tick() * waves_[1]-&gt;tick();
+<a name="l00080"></a>00080   temp = temp * control1_;
+<a name="l00081"></a>00081 
+<a name="l00082"></a>00082   waves_[0]-&gt;addPhaseOffset( temp );
+<a name="l00083"></a>00083   waves_[3]-&gt;addPhaseOffset( twozero_.<a class="code" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba" title="Return the last computed output value.">lastOut</a>() );
+<a name="l00084"></a>00084   temp = gains_[3] * adsr_[3]-&gt;tick() * waves_[3]-&gt;tick();
+<a name="l00085"></a>00085   twozero_.<a class="code" href="classstk_1_1TwoZero.html#acf92a66aeb2024cfcdb9d71ecadf3d82" title="Input one sample to the filter and return one output.">tick</a>(temp);
+<a name="l00086"></a>00086 
+<a name="l00087"></a>00087   waves_[2]-&gt;addPhaseOffset( temp );
+<a name="l00088"></a>00088   temp = ( 1.0 - (control2_ * 0.5)) * gains_[0] * adsr_[0]-&gt;<a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">tick</a>() * waves_[0]-&gt;tick();
+<a name="l00089"></a>00089   temp += control2_ * 0.5 * gains_[2] * adsr_[2]-&gt;tick() * waves_[2]-&gt;tick();
 <a name="l00090"></a>00090 
-<a name="l00091"></a>00091 <span class="preprocessor">#endif</span>
+<a name="l00091"></a>00091   <span class="comment">// Calculate amplitude modulation and apply it to output.</span>
+<a name="l00092"></a>00092   temp2 = vibrato_.<a class="code" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda" title="Compute and return one output sample.">tick</a>() * modDepth_;
+<a name="l00093"></a>00093   temp = temp * (1.0 + temp2);
+<a name="l00094"></a>00094     
+<a name="l00095"></a>00095   lastFrame_[0] = temp * 0.5;
+<a name="l00096"></a>00096   <span class="keywordflow">return</span> lastFrame_[0];
+<a name="l00097"></a>00097 }
+<a name="l00098"></a>00098 
+<a name="l00099"></a><a class="code" href="classstk_1_1Wurley.html#a505f7e6499761f64d0cc4b6419d945c3">00099</a> <span class="keyword">inline</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">Wurley :: tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames, <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel )
+<a name="l00100"></a>00100 {
+<a name="l00101"></a>00101   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>();
+<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels ) {
+<a name="l00104"></a>00104     oStream_ &lt;&lt; <span class="stringliteral">&quot;Wurley::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00106"></a>00106   }
+<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span>
+<a name="l00109"></a>00109   StkFloat *samples = &amp;frames[channel];
+<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.<a class="code" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>() - nChannels;
+<a name="l00111"></a>00111   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00112"></a>00112     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop )
+<a name="l00113"></a>00113       *samples++ = <a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">tick</a>();
+<a name="l00114"></a>00114   }
+<a name="l00115"></a>00115   <span class="keywordflow">else</span> {
+<a name="l00116"></a>00116     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.<a class="code" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames</a>(); i++, samples += hop ) {
+<a name="l00117"></a>00117       *samples++ = <a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">tick</a>();
+<a name="l00118"></a>00118       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00119"></a>00119         *samples++ = lastFrame_[j];
+<a name="l00120"></a>00120     }
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122 
+<a name="l00123"></a>00123   <span class="keywordflow">return</span> frames;
+<a name="l00124"></a>00124 }
+<a name="l00125"></a>00125 
+<a name="l00126"></a>00126 } <span class="comment">// stk namespace</span>
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128 <span class="preprocessor">#endif</span>
 </pre></div></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/WvIn_8h-source.html b/doc/html/WvIn_8h-source.html
deleted file mode 100644
index f33f35a..0000000
--- a/doc/html/WvIn_8h-source.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>WvIn.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_WVIN_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_WVIN_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00017"></a>00017 <span class="comment">/***************************************************/</span>
-<a name="l00018"></a>00018 
-<a name="l00019"></a><a class="code" href="classstk_1_1WvIn.html">00019</a> <span class="keyword">class </span><a class="code" href="classstk_1_1WvIn.html" title="STK audio input abstract base class.">WvIn</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00020"></a>00020 {
-<a name="l00021"></a>00021 <span class="keyword">public</span>:
-<a name="l00023"></a><a class="code" href="classstk_1_1WvIn.html#2ce05e5c8087e483236961335e8abf04">00023</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> <a class="code" href="classstk_1_1WvIn.html#2ce05e5c8087e483236961335e8abf04" title="Return the number of audio channels in the data or stream.">channelsOut</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> data_.<a class="code" href="classstk_1_1StkFrames.html#ec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels</a>(); };
-<a name="l00024"></a>00024 
-<a name="l00026"></a>00026 
-<a name="l00029"></a><a class="code" href="classstk_1_1WvIn.html#3ab86e33eff9f962c9ef7b41e3ccb77e">00029</a>   <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1WvIn.html#3ab86e33eff9f962c9ef7b41e3ccb77e" title="Return an StkFrames reference to the last computed sample frame.">lastFrame</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> lastFrame_; };
-<a name="l00030"></a>00030 
-<a name="l00032"></a>00032   <span class="keyword">virtual</span> StkFloat <a class="code" href="classstk_1_1WvIn.html#0eda243730408a434856fffed776931e" title="Compute one sample frame and return the specified channel value.">tick</a>( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> channel = 0 ) = 0;
-<a name="l00033"></a>00033 
-<a name="l00035"></a>00035   <span class="keyword">virtual</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; <a class="code" href="classstk_1_1WvIn.html#0eda243730408a434856fffed776931e" title="Compute one sample frame and return the specified channel value.">tick</a>( <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames ) = 0;
-<a name="l00036"></a>00036 
-<a name="l00037"></a>00037 <span class="keyword">protected</span>:
-<a name="l00038"></a>00038 
-<a name="l00039"></a>00039   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> data_;
-<a name="l00040"></a>00040   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> lastFrame_;
-<a name="l00041"></a>00041 
-<a name="l00042"></a>00042 };
-<a name="l00043"></a>00043 
-<a name="l00044"></a>00044 } <span class="comment">// stk namespace</span>
-<a name="l00045"></a>00045 
-<a name="l00046"></a>00046 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/WvIn_8h_source.html b/doc/html/WvIn_8h_source.html
index 3ced55d..e789727 100644
--- a/doc/html/WvIn_8h_source.html
+++ b/doc/html/WvIn_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>WvIn.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_WVIN_H</span>
@@ -49,7 +49,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/WvOut_8h-source.html b/doc/html/WvOut_8h-source.html
deleted file mode 100644
index dd31006..0000000
--- a/doc/html/WvOut_8h-source.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>WvOut.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_WVOUT_H</span>
-<a name="l00002"></a>00002 <span class="preprocessor"></span><span class="preprocessor">#define STK_WVOUT_H</span>
-<a name="l00003"></a>00003 <span class="preprocessor"></span>
-<a name="l00004"></a>00004 <span class="preprocessor">#include "Stk.h"</span>
-<a name="l00005"></a>00005 
-<a name="l00006"></a>00006 <span class="keyword">namespace </span>stk {
-<a name="l00007"></a>00007 
-<a name="l00008"></a>00008 <span class="comment">/***************************************************/</span>
-<a name="l00020"></a>00020 <span class="comment">/***************************************************/</span>
-<a name="l00021"></a>00021 
-<a name="l00022"></a><a class="code" href="classstk_1_1WvOut.html">00022</a> <span class="keyword">class </span><a class="code" href="classstk_1_1WvOut.html" title="STK audio output abstract base class.">WvOut</a> : <span class="keyword">public</span> <a class="code" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>
-<a name="l00023"></a>00023 {
-<a name="l00024"></a>00024  <span class="keyword">public</span>:
-<a name="l00025"></a>00025 
-<a name="l00027"></a><a class="code" href="classstk_1_1WvOut.html#4337bc4efb010ce57af3543dc5ed6f66">00027</a>   <a class="code" href="classstk_1_1WvOut.html#4337bc4efb010ce57af3543dc5ed6f66" title="Default constructor.">WvOut</a>( <span class="keywordtype">void</span> ) : frameCounter_(0), clipping_(false) {};
-<a name="l00028"></a>00028 
-<a name="l00030"></a><a class="code" href="classstk_1_1WvOut.html#a0ef107e58e0b470cbb47de292251a5e">00030</a>   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <a class="code" href="classstk_1_1WvOut.html#a0ef107e58e0b470cbb47de292251a5e" title="Return the number of sample frames output.">getFrameCount</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> frameCounter_; };
-<a name="l00031"></a>00031 
-<a name="l00033"></a><a class="code" href="classstk_1_1WvOut.html#ca11b8991f281beb2b1c4d562c7ff43b">00033</a>   StkFloat <a class="code" href="classstk_1_1WvOut.html#ca11b8991f281beb2b1c4d562c7ff43b" title="Return the number of seconds of data output.">getTime</a>( <span class="keywordtype">void</span> )<span class="keyword"> const </span>{ <span class="keywordflow">return</span> (StkFloat) frameCounter_ / <a class="code" href="classstk_1_1Stk.html#5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>(); };
-<a name="l00034"></a>00034 
-<a name="l00036"></a><a class="code" href="classstk_1_1WvOut.html#ed503fe979c33eb8240901f005cb48d5">00036</a>   <span class="keywordtype">bool</span> <a class="code" href="classstk_1_1WvOut.html#ed503fe979c33eb8240901f005cb48d5" title="Returns true if clipping has been detected during output since instantiation or the...">clipStatus</a>( <span class="keywordtype">void</span> ) { <span class="keywordflow">return</span> clipping_; };
-<a name="l00037"></a>00037 
-<a name="l00039"></a><a class="code" href="classstk_1_1WvOut.html#73f7143c2a574afd0a6c7934a92e7bf3">00039</a>   <span class="keywordtype">void</span> <a class="code" href="classstk_1_1WvOut.html#73f7143c2a574afd0a6c7934a92e7bf3" title="Reset the clipping status to false.">resetClipStatus</a>( <span class="keywordtype">void</span> ) { clipping_ = <span class="keyword">false</span>; };
-<a name="l00040"></a>00040 
-<a name="l00042"></a>00042 
-<a name="l00045"></a>00045   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1WvOut.html#7fe517928a0043353ebc2a852b49953c" title="Output a single sample to all channels in a sample frame.">tick</a>( <span class="keyword">const</span> StkFloat sample ) = 0;
-<a name="l00046"></a>00046 
-<a name="l00048"></a>00048   <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classstk_1_1WvOut.html#7fe517928a0043353ebc2a852b49953c" title="Output a single sample to all channels in a sample frame.">tick</a>( <span class="keyword">const</span> <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a>&amp; frames ) = 0;
-<a name="l00049"></a>00049 
-<a name="l00050"></a>00050  <span class="keyword">protected</span>:
-<a name="l00051"></a>00051 
-<a name="l00052"></a>00052   <span class="comment">// Check for sample clipping and clamp.</span>
-<a name="l00053"></a>00053   StkFloat&amp; clipTest( StkFloat&amp; sample );
-<a name="l00054"></a>00054 
-<a name="l00055"></a>00055   <a class="code" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> data_;
-<a name="l00056"></a>00056   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> frameCounter_;
-<a name="l00057"></a>00057   <span class="keywordtype">bool</span> clipping_;
-<a name="l00058"></a>00058 
-<a name="l00059"></a>00059 };
-<a name="l00060"></a>00060 
-<a name="l00061"></a>00061 <span class="keyword">inline</span> StkFloat&amp; WvOut :: clipTest( StkFloat&amp; sample )
-<a name="l00062"></a>00062 {
-<a name="l00063"></a>00063   <span class="keywordtype">bool</span> clip = <span class="keyword">false</span>;
-<a name="l00064"></a>00064   <span class="keywordflow">if</span> ( sample &gt; 1.0 ) {
-<a name="l00065"></a>00065     sample = 1.0;
-<a name="l00066"></a>00066     clip = <span class="keyword">true</span>;
-<a name="l00067"></a>00067   }
-<a name="l00068"></a>00068   <span class="keywordflow">else</span> <span class="keywordflow">if</span> ( sample &lt; -1.0 ) {
-<a name="l00069"></a>00069     sample = -1.0;
-<a name="l00070"></a>00070     clip = <span class="keyword">true</span>;
-<a name="l00071"></a>00071   }
-<a name="l00072"></a>00072 
-<a name="l00073"></a>00073   <span class="keywordflow">if</span> ( clip == <span class="keyword">true</span> &amp;&amp; clipping_ == <span class="keyword">false</span> ) {
-<a name="l00074"></a>00074     <span class="comment">// First occurrence of clipping since instantiation or reset.</span>
-<a name="l00075"></a>00075     clipping_ = <span class="keyword">true</span>;
-<a name="l00076"></a>00076     errorString_ &lt;&lt; <span class="stringliteral">"WvOut: data value(s) outside +-1.0 detected ... clamping at outer bound!"</span>;
-<a name="l00077"></a>00077     <a class="code" href="classstk_1_1Stk.html#48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
-<a name="l00078"></a>00078   }
-<a name="l00079"></a>00079 
-<a name="l00080"></a>00080   <span class="keywordflow">return</span> sample;
-<a name="l00081"></a>00081 }
-<a name="l00082"></a>00082 
-<a name="l00083"></a>00083 } <span class="comment">// stk namespace</span>
-<a name="l00084"></a>00084 
-<a name="l00085"></a>00085 <span class="preprocessor">#endif</span>
-</pre></div></div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/WvOut_8h_source.html b/doc/html/WvOut_8h_source.html
index 81c09e9..6b48ffe 100644
--- a/doc/html/WvOut_8h_source.html
+++ b/doc/html/WvOut_8h_source.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>WvOut.h</h1><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="preprocessor">#ifndef STK_WVOUT_H</span>
@@ -67,7 +67,7 @@
 <a name="l00073"></a>00073   <span class="keywordflow">if</span> ( clip == <span class="keyword">true</span> &amp;&amp; clipping_ == <span class="keyword">false</span> ) {
 <a name="l00074"></a>00074     <span class="comment">// First occurrence of clipping since instantiation or reset.</span>
 <a name="l00075"></a>00075     clipping_ = <span class="keyword">true</span>;
-<a name="l00076"></a>00076     errorString_ &lt;&lt; <span class="stringliteral">&quot;WvOut: data value(s) outside +-1.0 detected ... clamping at outer bound!&quot;</span>;
+<a name="l00076"></a>00076     oStream_ &lt;&lt; <span class="stringliteral">&quot;WvOut: data value(s) outside +-1.0 detected ... clamping at outer bound!&quot;</span>;
 <a name="l00077"></a>00077     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING );
 <a name="l00078"></a>00078   }
 <a name="l00079"></a>00079 
@@ -82,7 +82,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/_formulas.tex b/doc/html/_formulas.tex
new file mode 100644
index 0000000..f7927c5
--- /dev/null
+++ b/doc/html/_formulas.tex
@@ -0,0 +1,8 @@
+\documentclass{article}
+\usepackage{epsfig}
+\pagestyle{empty}
+\begin{document}
+$output = gain * (a1 * input + a2 * input^2 + a3 * input^3)$
+\pagebreak
+
+\end{document}
diff --git a/doc/html/annotated.html b/doc/html/annotated.html
index d0e5451..8cf66b8 100644
--- a/doc/html/annotated.html
+++ b/doc/html/annotated.html
@@ -26,6 +26,7 @@
   <tr><td class="indexkey"><a class="el" href="classstk_1_1Brass.html">stk::Brass</a></td><td class="indexvalue">STK simple brass instrument class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1Chorus.html">stk::Chorus</a></td><td class="indexvalue">STK chorus effect class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1Clarinet.html">stk::Clarinet</a></td><td class="indexvalue">STK clarinet physical model class </td></tr>
+  <tr><td class="indexkey"><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></td><td class="indexvalue">STK cubic non-linearity class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td class="indexvalue">STK non-interpolating delay line class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td class="indexvalue">STK allpass interpolating delay line class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td class="indexvalue">STK linear interpolating delay line class </td></tr>
@@ -73,8 +74,7 @@
   <tr><td class="indexkey"><a class="el" href="classstk_1_1PercFlut.html">stk::PercFlut</a></td><td class="indexvalue">STK percussive flute <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis instrument </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1Phonemes.html">stk::Phonemes</a></td><td class="indexvalue">STK phonemes table </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1PitShift.html">stk::PitShift</a></td><td class="indexvalue">STK simple pitch shifter effect class </td></tr>
-  <tr><td class="indexkey"><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></td><td class="indexvalue">STK plucked string model class </td></tr>
-  <tr><td class="indexkey"><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td class="indexvalue">STK enhanced plucked string model class </td></tr>
+  <tr><td class="indexkey"><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></td><td class="indexvalue">STK basic plucked string class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1PoleZero.html">stk::PoleZero</a></td><td class="indexvalue">STK one-pole, one-zero filter class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1PRCRev.html">stk::PRCRev</a></td><td class="indexvalue">Perry's simple reverberator class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1ReedTable.html">stk::ReedTable</a></td><td class="indexvalue">STK reed table class </td></tr>
@@ -108,6 +108,7 @@
   <tr><td class="indexkey"><a class="el" href="classstk_1_1TcpServer.html">stk::TcpServer</a></td><td class="indexvalue">STK TCP socket server class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1Thread.html">stk::Thread</a></td><td class="indexvalue">STK thread class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1TubeBell.html">stk::TubeBell</a></td><td class="indexvalue">STK tubular bell (orchestral chime) <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis instrument </td></tr>
+  <tr><td class="indexkey"><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td class="indexvalue">STK enhanced plucked string class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1TwoPole.html">stk::TwoPole</a></td><td class="indexvalue">STK two-pole filter class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1TwoZero.html">stk::TwoZero</a></td><td class="indexvalue">STK two-zero filter class </td></tr>
   <tr><td class="indexkey"><a class="el" href="classstk_1_1UdpSocket.html">stk::UdpSocket</a></td><td class="indexvalue">STK UDP socket server/client class </td></tr>
@@ -124,7 +125,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classRtAudio-members.html b/doc/html/classRtAudio-members.html
index 586476f..ed916c1 100644
--- a/doc/html/classRtAudio-members.html
+++ b/doc/html/classRtAudio-members.html
@@ -44,7 +44,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classRtAudio.html b/doc/html/classRtAudio.html
index 43b00e3..445d74c 100644
--- a/doc/html/classRtAudio.html
+++ b/doc/html/classRtAudio.html
@@ -89,7 +89,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Realtime audio i/o C++ classes. </p>
 <p><a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> provides a common API (Application Programming Interface) for realtime audio input/output across Linux (native ALSA, Jack, and OSS), Macintosh OS X (CoreAudio and Jack), and Windows (DirectSound and ASIO) operating systems.</p>
 <p><a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> WWW site: <a href="http://www.music.mcgill.ca/~gary/rtaudio/">http://www.music.mcgill.ca/~gary/rtaudio/</a></p>
-<p><a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>: realtime audio i/o C++ classes Copyright (c) 2001-2010 Gary P. Scavone</p>
+<p><a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>: realtime audio i/o C++ classes Copyright (c) 2001-2011 Gary P. Scavone</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
 <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
 <p>Any person wishing to distribute modifications to the Software is asked to send the modifications to the original developer so that they can be incorporated into the canonical version. This is, however, not a binding provision of this license.</p>
@@ -136,6 +136,18 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 </dd>
 </dl>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00210"></a>00210            {
+<a name="l00211"></a>00211     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa49af3ac767106158bc6cad74fb214ae">UNSPECIFIED</a>,    
+<a name="l00212"></a>00212     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849aa7a2ba095c2806caa893b6fb8fc3a1a8">LINUX_ALSA</a>,     
+<a name="l00213"></a>00213     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a39c84615e61de75e6a4e865596d62c82">LINUX_OSS</a>,      
+<a name="l00214"></a>00214     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a4767e17c6edfbd827f91763915df4105">UNIX_JACK</a>,      
+<a name="l00215"></a>00215     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a9fec92b8272244a87a6a11a717bd662d">MACOSX_CORE</a>,    
+<a name="l00216"></a>00216     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a219517d1df90f94d07758481155bd469">WINDOWS_ASIO</a>,   
+<a name="l00217"></a>00217     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849a28478830f42c2fd61e6c7ad498901931">WINDOWS_DS</a>,     
+<a name="l00218"></a>00218     <a class="code" href="classRtAudio.html#ac9b6f625da88249d08a8409a9db0d849ab06b8fd88bf18c9a2b8271f6961ae2d1">RTAUDIO_DUMMY</a>   
+<a name="l00219"></a>00219   };
+</pre></div></p>
+
 </div>
 </div>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
@@ -222,6 +234,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>A public function that queries for the number of audio devices available. </p>
 <p>This function performs a system query of available devices each time it is called, thus supporting devices connected <em>after</em> instantiation. If a system error occurs during processing, a warning will be issued. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00716"></a>00716 { <span class="keywordflow">return</span> rtapi_-&gt;getDeviceCount(); }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a02d7ff44ad1d7eae22283a052f3dfda8"></a><!-- doxytag: member="RtAudio::getDeviceInfo" ref="a02d7ff44ad1d7eae22283a052f3dfda8" args="(unsigned int device)" -->
@@ -243,6 +258,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Return an <a class="el" href="structRtAudio_1_1DeviceInfo.html" title="The public device information structure for returning queried values.">RtAudio::DeviceInfo</a> structure for a specified device number. </p>
 <p>Any device integer between 0 and <a class="el" href="classRtAudio.html#a747ce2d73803641bbb66d6e78092aa1a" title="A public function that queries for the number of audio devices available.">getDeviceCount()</a> - 1 is valid. If an invalid argument is provided, an <a class="el" href="classRtError.html" title="Exception handling class for RtAudio &amp; RtMidi.">RtError</a> (type = INVALID_USE) will be thrown. If a device is busy or otherwise unavailable, the structure member "probed" will have a value of "false" and all other members are undefined. If the specified device is the current default input or output device, the corresponding "isDefault" member will have a value of "true". </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00717"></a>00717 { <span class="keywordflow">return</span> rtapi_-&gt;getDeviceInfo( device ); }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a3a3f3dbe13ea696b521e49cdaaa357bc"></a><!-- doxytag: member="RtAudio::getDefaultOutputDevice" ref="a3a3f3dbe13ea696b521e49cdaaa357bc" args="(void)" -->
@@ -265,6 +283,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>If the underlying audio API does not provide a "default
     device", or if no devices are available, the return value will be 0. Note that this is a valid device identifier and it is the client's responsibility to verify that a device is available before attempting to open a stream. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00719"></a>00719 { <span class="keywordflow">return</span> rtapi_-&gt;getDefaultOutputDevice(); }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="aad8b94edd3cd379ee300b125750ac6ce"></a><!-- doxytag: member="RtAudio::getDefaultInputDevice" ref="aad8b94edd3cd379ee300b125750ac6ce" args="(void)" -->
@@ -287,6 +308,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>If the underlying audio API does not provide a "default
     device", or if no devices are available, the return value will be 0. Note that this is a valid device identifier and it is the client's responsibility to verify that a device is available before attempting to open a stream. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00718"></a>00718 { <span class="keywordflow">return</span> rtapi_-&gt;getDefaultInputDevice(); }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="afacc99740fa4c5606fb35467cdea6da8"></a><!-- doxytag: member="RtAudio::openStream" ref="afacc99740fa4c5606fb35467cdea6da8" args="(RtAudio::StreamParameters *outputParameters, RtAudio::StreamParameters *inputParameters, RtAudioFormat format, unsigned int sampleRate, unsigned int *bufferFrames, RtAudioCallback callback, void *userData=NULL, RtAudio::StreamOptions *options=NULL)" -->
@@ -387,6 +411,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>A function that closes a stream and frees any associated stream memory. </p>
 <p>If a stream is not open, this function issues a warning and returns (no exception is thrown). </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00720"></a>00720 { <span class="keywordflow">return</span> rtapi_-&gt;closeStream(); }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="aec017a89629ccef66a90b60be22a2f80"></a><!-- doxytag: member="RtAudio::startStream" ref="aec017a89629ccef66a90b60be22a2f80" args="(void)" -->
@@ -408,6 +435,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>A function that starts a stream. </p>
 <p>An <a class="el" href="classRtError.html" title="Exception handling class for RtAudio &amp; RtMidi.">RtError</a> (type = SYSTEM_ERROR) is thrown if an error occurs during processing. An <a class="el" href="classRtError.html" title="Exception handling class for RtAudio &amp; RtMidi.">RtError</a> (type = INVALID_USE) is thrown if a stream is not open. A warning is issued if the stream is already running. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00721"></a>00721 { <span class="keywordflow">return</span> rtapi_-&gt;startStream(); }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="af4c241ff86936ecc8108f0d9dfe3efdd"></a><!-- doxytag: member="RtAudio::stopStream" ref="af4c241ff86936ecc8108f0d9dfe3efdd" args="(void)" -->
@@ -429,6 +459,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Stop a stream, allowing any samples remaining in the output queue to be played. </p>
 <p>An <a class="el" href="classRtError.html" title="Exception handling class for RtAudio &amp; RtMidi.">RtError</a> (type = SYSTEM_ERROR) is thrown if an error occurs during processing. An <a class="el" href="classRtError.html" title="Exception handling class for RtAudio &amp; RtMidi.">RtError</a> (type = INVALID_USE) is thrown if a stream is not open. A warning is issued if the stream is already stopped. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00722"></a>00722 { <span class="keywordflow">return</span> rtapi_-&gt;stopStream(); }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ad0586b47cd6bb9591a80b4052815991f"></a><!-- doxytag: member="RtAudio::abortStream" ref="ad0586b47cd6bb9591a80b4052815991f" args="(void)" -->
@@ -450,6 +483,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Stop a stream, discarding any samples remaining in the input/output queue. </p>
 <p>An <a class="el" href="classRtError.html" title="Exception handling class for RtAudio &amp; RtMidi.">RtError</a> (type = SYSTEM_ERROR) is thrown if an error occurs during processing. An <a class="el" href="classRtError.html" title="Exception handling class for RtAudio &amp; RtMidi.">RtError</a> (type = INVALID_USE) is thrown if a stream is not open. A warning is issued if the stream is already stopped. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00723"></a>00723 { <span class="keywordflow">return</span> rtapi_-&gt;abortStream(); }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a344e59a62353c5791db4621b985cb2ca"></a><!-- doxytag: member="RtAudio::getStreamTime" ref="a344e59a62353c5791db4621b985cb2ca" args="(void)" -->
@@ -471,6 +507,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Returns the number of elapsed seconds since the stream was started. </p>
 <p>If a stream is not open, an <a class="el" href="classRtError.html" title="Exception handling class for RtAudio &amp; RtMidi.">RtError</a> (type = INVALID_USE) will be thrown. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00728"></a>00728 { <span class="keywordflow">return</span> rtapi_-&gt;getStreamTime(); }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a843c989d9f501c71bc2f2c5ca18df9f3"></a><!-- doxytag: member="RtAudio::getStreamLatency" ref="a843c989d9f501c71bc2f2c5ca18df9f3" args="(void)" -->
@@ -492,6 +531,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Returns the internal stream latency in sample frames. </p>
 <p>The stream latency refers to delay in audio input and/or output caused by internal buffering by the audio system and/or hardware. For duplex streams, the returned value will represent the sum of the input and output latencies. If a stream is not open, an <a class="el" href="classRtError.html" title="Exception handling class for RtAudio &amp; RtMidi.">RtError</a> (type = INVALID_USE) will be thrown. If the API does not report latency, the return value will be zero. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00726"></a>00726 { <span class="keywordflow">return</span> rtapi_-&gt;getStreamLatency(); }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a28214b8b05d60b45c24ee6fae7b2a0b5"></a><!-- doxytag: member="RtAudio::getStreamSampleRate" ref="a28214b8b05d60b45c24ee6fae7b2a0b5" args="(void)" -->
@@ -513,6 +555,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Returns actual sample rate in use by the stream. </p>
 <p>On some systems, the sample rate used may be slightly different than that specified in the stream parameters. If a stream is not open, an <a class="el" href="classRtError.html" title="Exception handling class for RtAudio &amp; RtMidi.">RtError</a> (type = INVALID_USE) will be thrown. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00727"></a>00727 { <span class="keywordflow">return</span> rtapi_-&gt;getStreamSampleRate(); };
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -523,7 +568,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classRtError-members.html b/doc/html/classRtError-members.html
index 2e93ad6..45f1c13 100644
--- a/doc/html/classRtError-members.html
+++ b/doc/html/classRtError-members.html
@@ -13,14 +13,14 @@
 <h1>RtError Member List</h1>This is the complete list of members for <a class="el" href="classRtError.html">RtError</a>, including all inherited members.<table>
   <tr class="memlist"><td><a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca20e5a369394d19b704ace17002007eba">DEBUG_WARNING</a> enum value</td><td><a class="el" href="classRtError.html">RtError</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca995e97ecf6beeedaba525022a63aec6b">DRIVER_ERROR</a> enum value</td><td><a class="el" href="classRtError.html">RtError</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classRtError.html#ac7f467788e29d246333d7af050801164">getMessage</a>(void)</td><td><a class="el" href="classRtError.html">RtError</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classRtError.html#a4ee7df9728d73f533afbaddcd9ca4d9c">getType</a>(void)</td><td><a class="el" href="classRtError.html">RtError</a></td><td><code> [inline, virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classRtError.html#afd067ba6b46edd37f989cad02cd70b50">getMessage</a>(void) const </td><td><a class="el" href="classRtError.html">RtError</a></td><td><code> [inline, virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classRtError.html#a3e316dc9b9b41fe2f64cabf34beb4fe7">getType</a>(void) const </td><td><a class="el" href="classRtError.html">RtError</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acad6064062066fffdba258237a7c2159b1">INVALID_DEVICE</a> enum value</td><td><a class="el" href="classRtError.html">RtError</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acaa3eabf0f71120beaba94148a1b78fed6">INVALID_PARAMETER</a> enum value</td><td><a class="el" href="classRtError.html">RtError</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca8e65f51a3fbdc1a4a1552b3260df36bc">INVALID_USE</a> enum value</td><td><a class="el" href="classRtError.html">RtError</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acab4f813e5a36905c89d4081a59497432e">MEMORY_ERROR</a> enum value</td><td><a class="el" href="classRtError.html">RtError</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acaf267eb2d710f33d649ba840eeab6ff82">NO_DEVICES_FOUND</a> enum value</td><td><a class="el" href="classRtError.html">RtError</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943">printMessage</a>(void)</td><td><a class="el" href="classRtError.html">RtError</a></td><td><code> [inline, virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc">printMessage</a>(void) const </td><td><a class="el" href="classRtError.html">RtError</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtError.html#aa479a305ccbe56be0fd9137b9b405a37">RtError</a>(const std::string &amp;message, Type type=RtError::UNSPECIFIED)</td><td><a class="el" href="classRtError.html">RtError</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca8947d0a2e2a84ecf3646271844e06a6b">SYSTEM_ERROR</a> enum value</td><td><a class="el" href="classRtError.html">RtError</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acaeb6282f991e2d93ab294a4272fc3f6c6">THREAD_ERROR</a> enum value</td><td><a class="el" href="classRtError.html">RtError</a></td><td></td></tr>
@@ -34,7 +34,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classRtError.html b/doc/html/classRtError.html
index e7932a4..eab8ef7 100644
--- a/doc/html/classRtError.html
+++ b/doc/html/classRtError.html
@@ -10,12 +10,14 @@
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
 <div class="contents">
-<h1>RtError Class Reference</h1><!-- doxytag: class="RtError" -->
+<h1>RtError Class Reference</h1><!-- doxytag: class="RtError" --><!-- doxytag: inherits="std::exception" -->
 <p>Exception handling class for <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> &amp; <a class="el" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>.  
 <a href="#_details">More...</a></p>
 
 <p><code>#include &lt;<a class="el" href="RtError_8h_source.html">RtError.h</a>&gt;</code></p>
 
+<p>Inherits std::exception.</p>
+
 <p><a href="classRtError-members.html">List of all members.</a></p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td colspan="2"><h2>Public Types</h2></td></tr>
@@ -44,14 +46,14 @@
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6793e03386e7e69ffafb65a296dfa48c"></a><!-- doxytag: member="RtError::~RtError" ref="a6793e03386e7e69ffafb65a296dfa48c" args="(void)" -->
 virtual&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtError.html#a6793e03386e7e69ffafb65a296dfa48c">~RtError</a> (void)  throw ()</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The destructor. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ada41f7472122f45bc5b4677f066e0943"></a><!-- doxytag: member="RtError::printMessage" ref="ada41f7472122f45bc5b4677f066e0943" args="(void)" -->
-virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943">printMessage</a> (void)  throw ()</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a251dcdac396c998c91706dd2dd3b8bfc"></a><!-- doxytag: member="RtError::printMessage" ref="a251dcdac396c998c91706dd2dd3b8bfc" args="(void) const " -->
+virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc">printMessage</a> (void) const   throw ()</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Prints thrown error message to stderr. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4ee7df9728d73f533afbaddcd9ca4d9c"></a><!-- doxytag: member="RtError::getType" ref="a4ee7df9728d73f533afbaddcd9ca4d9c" args="(void)" -->
-virtual const <a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903ac">Type</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtError.html#a4ee7df9728d73f533afbaddcd9ca4d9c">getType</a> (void)  throw ()</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3e316dc9b9b41fe2f64cabf34beb4fe7"></a><!-- doxytag: member="RtError::getType" ref="a3e316dc9b9b41fe2f64cabf34beb4fe7" args="(void) const " -->
+virtual const <a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903ac">Type</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtError.html#a3e316dc9b9b41fe2f64cabf34beb4fe7">getType</a> (void) const   throw ()</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns the thrown error message type. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac7f467788e29d246333d7af050801164"></a><!-- doxytag: member="RtError::getMessage" ref="ac7f467788e29d246333d7af050801164" args="(void)" -->
-virtual const std::string &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtError.html#ac7f467788e29d246333d7af050801164">getMessage</a> (void)  throw ()</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afd067ba6b46edd37f989cad02cd70b50"></a><!-- doxytag: member="RtError::getMessage" ref="afd067ba6b46edd37f989cad02cd70b50" args="(void) const " -->
+virtual const std::string &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtError.html#afd067ba6b46edd37f989cad02cd70b50">getMessage</a> (void) const   throw ()</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns the thrown error message string. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aeb843b7a7785d66061c61ebfc29e7e9d"></a><!-- doxytag: member="RtError::what" ref="aeb843b7a7785d66061c61ebfc29e7e9d" args="(void) const " -->
 virtual const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtError.html#aeb843b7a7785d66061c61ebfc29e7e9d">what</a> (void) const   throw ()</td></tr>
@@ -111,6 +113,21 @@ virtual const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class
 </dd>
 </dl>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00023"></a>00023             {
+<a name="l00024"></a>00024     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca3a1603c24a56cbdaf5f8ae4ddcb86398">WARNING</a>,           
+<a name="l00025"></a>00025     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca20e5a369394d19b704ace17002007eba">DEBUG_WARNING</a>,     
+<a name="l00026"></a>00026     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca444efd3ccf774b2ba9f9bde70ec71cd6">UNSPECIFIED</a>,       
+<a name="l00027"></a>00027     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acaf267eb2d710f33d649ba840eeab6ff82">NO_DEVICES_FOUND</a>,  
+<a name="l00028"></a>00028     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acad6064062066fffdba258237a7c2159b1">INVALID_DEVICE</a>,    
+<a name="l00029"></a>00029     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acab4f813e5a36905c89d4081a59497432e">MEMORY_ERROR</a>,      
+<a name="l00030"></a>00030     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acaa3eabf0f71120beaba94148a1b78fed6">INVALID_PARAMETER</a>, 
+<a name="l00031"></a>00031     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca8e65f51a3fbdc1a4a1552b3260df36bc">INVALID_USE</a>,       
+<a name="l00032"></a>00032     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca995e97ecf6beeedaba525022a63aec6b">DRIVER_ERROR</a>,      
+<a name="l00033"></a>00033     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca8947d0a2e2a84ecf3646271844e06a6b">SYSTEM_ERROR</a>,      
+<a name="l00034"></a>00034     <a class="code" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acaeb6282f991e2d93ab294a4272fc3f6c6">THREAD_ERROR</a>       
+<a name="l00035"></a>00035   };
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -121,7 +138,7 @@ virtual const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classRtMidi-members.html b/doc/html/classRtMidi-members.html
index 1b53f71..a8e4221 100644
--- a/doc/html/classRtMidi-members.html
+++ b/doc/html/classRtMidi-members.html
@@ -21,7 +21,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classRtMidi.html b/doc/html/classRtMidi.html
index e9948fc..77b627f 100644
--- a/doc/html/classRtMidi.html
+++ b/doc/html/classRtMidi.html
@@ -50,7 +50,7 @@ virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>An abstract base class for realtime MIDI input/output. </p>
 <p>This class implements some common functionality for the realtime MIDI input/output subclasses <a class="el" href="classRtMidiIn.html" title="A realtime MIDI input class.">RtMidiIn</a> and <a class="el" href="classRtMidiOut.html" title="A realtime MIDI output class.">RtMidiOut</a>.</p>
 <p><a class="el" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a> WWW site: <a href="http://music.mcgill.ca/~gary/rtmidi/">http://music.mcgill.ca/~gary/rtmidi/</a></p>
-<p><a class="el" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>: realtime MIDI i/o C++ classes Copyright (c) 2003-2010 Gary P. Scavone</p>
+<p><a class="el" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>: realtime MIDI i/o C++ classes Copyright (c) 2003-2011 Gary P. Scavone</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
 <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
 <p>Any person wishing to distribute modifications to the Software is requested to send the modifications to the original developer so that they can be incorporated into the canonical version.</p>
@@ -63,7 +63,7 @@ virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classRtMidiIn-members.html b/doc/html/classRtMidiIn-members.html
index 668dd98..2618522 100644
--- a/doc/html/classRtMidiIn-members.html
+++ b/doc/html/classRtMidiIn-members.html
@@ -20,16 +20,15 @@
   <tr class="memlist"><td><a class="el" href="classRtMidiIn.html#a7e853661b1056083e07318d67c51f6fd">openPort</a>(unsigned int portNumber=0, const std::string Portname=std::string(&quot;RtMidi Input&quot;))</td><td><a class="el" href="classRtMidiIn.html">RtMidiIn</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtMidiIn.html#a245261b3f12ce727faed18fcfeef18c2">openVirtualPort</a>(const std::string portName=std::string(&quot;RtMidi Input&quot;))</td><td><a class="el" href="classRtMidiIn.html">RtMidiIn</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtMidiIn.html#a297d2eb3c3420b437970a6fc59d89cbf">RtMidiCallback</a> typedef</td><td><a class="el" href="classRtMidiIn.html">RtMidiIn</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classRtMidiIn.html#a31abb996e5fdc4a8f9dc5a50848e2ee5">RtMidiIn</a>(const std::string clientName=std::string(&quot;RtMidi Input Client&quot;))</td><td><a class="el" href="classRtMidiIn.html">RtMidiIn</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classRtMidiIn.html#a1d70da3ef18d24c5b3f0cc01888e093d">RtMidiIn</a>(const std::string clientName=std::string(&quot;RtMidi Input Client&quot;), unsigned int queueSizeLimit=100)</td><td><a class="el" href="classRtMidiIn.html">RtMidiIn</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtMidiIn.html#a7590563461c7467608a4b3806406b32d">setCallback</a>(RtMidiCallback callback, void *userData=0)</td><td><a class="el" href="classRtMidiIn.html">RtMidiIn</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classRtMidiIn.html#a2e15868916737039e0a34d47bffdf188">setQueueSizeLimit</a>(unsigned int queueSize)</td><td><a class="el" href="classRtMidiIn.html">RtMidiIn</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classRtMidiIn.html#af865d88c154b6fdadc640da5dc278d40">~RtMidiIn</a>()</td><td><a class="el" href="classRtMidiIn.html">RtMidiIn</a></td><td></td></tr>
 </table></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classRtMidiIn.html b/doc/html/classRtMidiIn.html
index 558a7fe..4173ac2 100644
--- a/doc/html/classRtMidiIn.html
+++ b/doc/html/classRtMidiIn.html
@@ -33,8 +33,8 @@ Inheritance diagram for RtMidiIn:</div>
 typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtMidiIn.html#a297d2eb3c3420b437970a6fc59d89cbf">RtMidiCallback</a> )(double timeStamp, std::vector&lt; unsigned char &gt; *message, void *userData)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">User callback function type definition. <br/></td></tr>
 <tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtMidiIn.html#a31abb996e5fdc4a8f9dc5a50848e2ee5">RtMidiIn</a> (const std::string clientName=std::string(&quot;RtMidi Input Client&quot;))</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Default constructor that allows an optional client name.  <a href="#a31abb996e5fdc4a8f9dc5a50848e2ee5"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtMidiIn.html#a1d70da3ef18d24c5b3f0cc01888e093d">RtMidiIn</a> (const std::string clientName=std::string(&quot;RtMidi Input Client&quot;), unsigned int queueSizeLimit=100)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Default constructor that allows an optional client name and queue size.  <a href="#a1d70da3ef18d24c5b3f0cc01888e093d"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af865d88c154b6fdadc640da5dc278d40"></a><!-- doxytag: member="RtMidiIn::~RtMidiIn" ref="af865d88c154b6fdadc640da5dc278d40" args="()" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtMidiIn.html#af865d88c154b6fdadc640da5dc278d40">~RtMidiIn</a> ()</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">If a MIDI connection is still open, it will be closed by the destructor. <br/></td></tr>
@@ -54,8 +54,6 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the number of available MIDI input ports. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">std::string&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtMidiIn.html#af2961fff09fa01a3d5bc0f0c5a042aaf">getPortName</a> (unsigned int portNumber=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return a string identifier for the specified MIDI input port number.  <a href="#af2961fff09fa01a3d5bc0f0c5a042aaf"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtMidiIn.html#a2e15868916737039e0a34d47bffdf188">setQueueSizeLimit</a> (unsigned int queueSize)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the maximum number of MIDI messages to be saved in the queue.  <a href="#a2e15868916737039e0a34d47bffdf188"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtMidiIn.html#af9507125aaa42276ccc01df576fc3533">ignoreTypes</a> (bool midiSysex=true, bool midiTime=true, bool midiSense=true)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Specify whether certain MIDI message types should be queued or ignored during input.  <a href="#af9507125aaa42276ccc01df576fc3533"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classRtMidiIn.html#a1ba10ecd276b30a8579c7d60a9c890eb">getMessage</a> (std::vector&lt; unsigned char &gt; *message)</td></tr>
@@ -66,7 +64,7 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>This class provides a common, platform-independent API for realtime MIDI input. It allows access to a single MIDI input port. Incoming MIDI messages are either saved to a queue for retrieval using the <a class="el" href="classRtMidiIn.html#a1ba10ecd276b30a8579c7d60a9c890eb" title="Fill the user-provided vector with the data bytes for the next available MIDI message...">getMessage()</a> function or immediately passed to a user-specified callback function. Create multiple instances of this class to connect to more than one MIDI device at the same time. With the OS-X and Linux ALSA MIDI APIs, it is also possible to open a virtual input port to which other MIDI software clients can connect.</p>
 <p>by Gary P. Scavone, 2003-2008. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
-<a class="anchor" id="a31abb996e5fdc4a8f9dc5a50848e2ee5"></a><!-- doxytag: member="RtMidiIn::RtMidiIn" ref="a31abb996e5fdc4a8f9dc5a50848e2ee5" args="(const std::string clientName=std::string(&quot;RtMidi Input Client&quot;))" -->
+<a class="anchor" id="a1d70da3ef18d24c5b3f0cc01888e093d"></a><!-- doxytag: member="RtMidiIn::RtMidiIn" ref="a1d70da3ef18d24c5b3f0cc01888e093d" args="(const std::string clientName=std::string(&quot;RtMidi Input Client&quot;), unsigned int queueSizeLimit=100)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -74,16 +72,25 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
           <td class="memname">RtMidiIn::RtMidiIn </td>
           <td>(</td>
           <td class="paramtype">const std::string&nbsp;</td>
-          <td class="paramname"> <em>clientName</em> = <code>std::string(&quot;RtMidi&nbsp;Input&nbsp;Client&quot;)</code></td>
-          <td>&nbsp;)&nbsp;</td>
+          <td class="paramname"> <em>clientName</em> = <code>std::string(&quot;RtMidi&nbsp;Input&nbsp;Client&quot;)</code>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
           <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>queueSizeLimit</em> = <code>100</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td></td>
         </tr>
       </table>
 </div>
 <div class="memdoc">
 
-<p>Default constructor that allows an optional client name. </p>
-<p>An exception will be thrown if a MIDI system initialization error occurs. </p>
+<p>Default constructor that allows an optional client name and queue size. </p>
+<p>An exception will be thrown if a MIDI system initialization error occurs. The queue size defines the maximum number of messages that can be held in the MIDI queue (when not using a callback function). If the queue size limit is reached, incoming messages will be ignored. </p>
 
 </div>
 </div>
@@ -210,31 +217,10 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <div class="memdoc">
 
 <p>Return a string identifier for the specified MIDI input port number. </p>
-<p>An exception is thrown if an invalid port specifier is provided. </p>
+<p>An empty string is returned if an invalid port specifier is provided. </p>
 
 <p>Implements <a class="el" href="classRtMidi.html#a799e2b9f4df39b298518f2b394db3391">RtMidi</a>.</p>
 
-</div>
-</div>
-<a class="anchor" id="a2e15868916737039e0a34d47bffdf188"></a><!-- doxytag: member="RtMidiIn::setQueueSizeLimit" ref="a2e15868916737039e0a34d47bffdf188" args="(unsigned int queueSize)" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void RtMidiIn::setQueueSizeLimit </td>
-          <td>(</td>
-          <td class="paramtype">unsigned int&nbsp;</td>
-          <td class="paramname"> <em>queueSize</em></td>
-          <td>&nbsp;)&nbsp;</td>
-          <td></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>Set the maximum number of MIDI messages to be saved in the queue. </p>
-<p>If the queue size limit is reached, incoming messages will be ignored. The default limit is 1024. </p>
-
 </div>
 </div>
 <a class="anchor" id="af9507125aaa42276ccc01df576fc3533"></a><!-- doxytag: member="RtMidiIn::ignoreTypes" ref="af9507125aaa42276ccc01df576fc3533" args="(bool midiSysex=true, bool midiTime=true, bool midiSense=true)" -->
@@ -269,7 +255,7 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <div class="memdoc">
 
 <p>Specify whether certain MIDI message types should be queued or ignored during input. </p>
-<p>By default, MIDI timing and active sensing messages are ignored during message input because of their relative high data rates. MIDI sysex messages are ignored by default as well. Variable values of "true" imply that the respective message type will be ignored. </p>
+<p>o By default, MIDI timing and active sensing messages are ignored during message input because of their relative high data rates. MIDI sysex messages are ignored by default as well. Variable values of "true" imply that the respective message type will be ignored. </p>
 
 </div>
 </div>
@@ -302,7 +288,7 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classRtMidiOut-members.html b/doc/html/classRtMidiOut-members.html
index bdfc004..71b5c8e 100644
--- a/doc/html/classRtMidiOut-members.html
+++ b/doc/html/classRtMidiOut-members.html
@@ -24,7 +24,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classRtMidiOut.html b/doc/html/classRtMidiOut.html
index c62b44d..01e033e 100644
--- a/doc/html/classRtMidiOut.html
+++ b/doc/html/classRtMidiOut.html
@@ -148,7 +148,7 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <div class="memdoc">
 
 <p>Return a string identifier for the specified MIDI port type and number. </p>
-<p>An exception is thrown if an invalid port specifier is provided. </p>
+<p>An empty string is returned if an invalid port specifier is provided. </p>
 
 <p>Implements <a class="el" href="classRtMidi.html#a799e2b9f4df39b298518f2b394db3391">RtMidi</a>.</p>
 
@@ -183,7 +183,7 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classes.html b/doc/html/classes.html
index feca178..c653eb7 100644
--- a/doc/html/classes.html
+++ b/doc/html/classes.html
@@ -13,33 +13,33 @@
 <h1>Class Index</h1><div class="qindex"><a class="qindex" href="#letter_A">A</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_B">B</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_C">C</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_E">E</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_F">F</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_G">G</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_H">H</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_I">I</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_J">J</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_L">L</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_M">M</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_N">N</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_O">O</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_P">P</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_R">R</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_T">T</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_U">U</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_V">V</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_W">W</a></div>
 <table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
 <tr><td><a name="letter_A"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;A&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1Effect.html">Effect</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1JCRev.html">JCRev</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1PluckTwo.html">PluckTwo</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1StifKarp.html">StifKarp</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1ADSR.html">ADSR</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Envelope.html">Envelope</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1JetTable.html">JetTable</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1PoleZero.html">PoleZero</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Stk.html">Stk</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Asymp.html">Asymp</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_F"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;F&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="classstk_1_1Echo.html">Echo</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_J"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;J&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="classstk_1_1Plucked.html">Plucked</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Stk.html">Stk</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1ADSR.html">ADSR</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Effect.html">Effect</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1JCRev.html">JCRev</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1PoleZero.html">PoleZero</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1StkError.html">StkError</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Asymp.html">Asymp</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Envelope.html">Envelope</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1JetTable.html">JetTable</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1PRCRev.html">PRCRev</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_B"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;B&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a name="letter_F"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;F&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a name="letter_L"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;L&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1PRCRev.html">PRCRev</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1StkError.html">StkError</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_B"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;B&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1FileLoop.html">FileLoop</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1LentPitShift.html">LentPitShift</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_R"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;R&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BandedWG.html">BandedWG</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FileRead.html">FileRead</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_M"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;M&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1ReedTable.html">ReedTable</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structRtAudio_1_1StreamOptions.html">RtAudio::StreamOptions</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BeeThree.html">BeeThree</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FileWrite.html">FileWrite</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Mandolin.html">Mandolin</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Resonate.html">Resonate</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structRtAudio_1_1StreamParameters.html">RtAudio::StreamParameters</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BiQuad.html">BiQuad</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FileWvIn.html">FileWvIn</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Mesh2D.html">Mesh2D</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Rhodey.html">Rhodey</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_T"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;T&nbsp;&nbsp;</div></td></tr></table>
-</td></tr><tr><td><a class="el" href="classstk_1_1Blit.html">Blit</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FileWvOut.html">FileWvOut</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstk_1_1Skini_1_1Message.html">Skini::Message</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classRtAudio.html">RtAudio</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TapDelay.html">TapDelay</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BlitSaw.html">BlitSaw</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Filter.html">Filter</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Messager.html">Messager</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classRtError.html">RtError</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TcpClient.html">TcpClient</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BlitSquare.html">BlitSquare</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Fir.html">Fir</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1MidiFileIn.html">MidiFileIn</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classRtMidi.html">RtMidi</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TcpServer.html">TcpServer</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BlowBotl.html">BlowBotl</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Flute.html">Flute</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Modal.html">Modal</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classRtMidiIn.html">RtMidiIn</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Thread.html">Thread</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BlowHole.html">BlowHole</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FM.html">FM</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1ModalBar.html">ModalBar</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classRtMidiOut.html">RtMidiOut</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TubeBell.html">TubeBell</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Bowed.html">Bowed</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FMVoices.html">FMVoices</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Modulate.html">Modulate</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1RtWvIn.html">RtWvIn</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TwoPole.html">TwoPole</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BowTable.html">BowTable</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FormSwep.html">FormSwep</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Moog.html">Moog</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1RtWvOut.html">RtWvOut</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TwoZero.html">TwoZero</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Brass.html">Brass</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Function.html">Function</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Mutex.html">Mutex</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a name="letter_R"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;R&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="structRtAudio_1_1StreamOptions.html">RtAudio::StreamOptions</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BandedWG.html">BandedWG</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FileLoop.html">FileLoop</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1LentPitShift.html">LentPitShift</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1ReedTable.html">ReedTable</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structRtAudio_1_1StreamParameters.html">RtAudio::StreamParameters</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BeeThree.html">BeeThree</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FileRead.html">FileRead</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_M"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;M&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="classstk_1_1Resonate.html">Resonate</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_T"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;T&nbsp;&nbsp;</div></td></tr></table>
+</td></tr><tr><td><a class="el" href="classstk_1_1BiQuad.html">BiQuad</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FileWrite.html">FileWrite</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Mandolin.html">Mandolin</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Rhodey.html">Rhodey</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TapDelay.html">TapDelay</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Blit.html">Blit</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FileWvIn.html">FileWvIn</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Mesh2D.html">Mesh2D</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classRtAudio.html">RtAudio</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TcpClient.html">TcpClient</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BlitSaw.html">BlitSaw</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FileWvOut.html">FileWvOut</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstk_1_1Skini_1_1Message.html">Skini::Message</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classRtError.html">RtError</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TcpServer.html">TcpServer</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BlitSquare.html">BlitSquare</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Filter.html">Filter</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Messager.html">Messager</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classRtMidi.html">RtMidi</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Thread.html">Thread</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BlowBotl.html">BlowBotl</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Fir.html">Fir</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1MidiFileIn.html">MidiFileIn</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classRtMidiIn.html">RtMidiIn</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TubeBell.html">TubeBell</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BlowHole.html">BlowHole</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Flute.html">Flute</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Modal.html">Modal</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classRtMidiOut.html">RtMidiOut</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Twang.html">Twang</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Bowed.html">Bowed</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FM.html">FM</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1ModalBar.html">ModalBar</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1RtWvIn.html">RtWvIn</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TwoPole.html">TwoPole</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1BowTable.html">BowTable</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FMVoices.html">FMVoices</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Modulate.html">Modulate</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1RtWvOut.html">RtWvOut</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1TwoZero.html">TwoZero</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Brass.html">Brass</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1FormSwep.html">FormSwep</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Moog.html">Moog</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a name="letter_U"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;U&nbsp;&nbsp;</div></td></tr></table>
 </td></tr><tr><td><a name="letter_C"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;C&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a name="letter_G"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;G&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="classstk_1_1Function.html">Function</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Mutex.html">Mutex</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Sampler.html">Sampler</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1UdpSocket.html">UdpSocket</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Chorus.html">Chorus</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_G"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;G&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a name="letter_N"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;N&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1Sampler.html">Sampler</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1UdpSocket.html">UdpSocket</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Chorus.html">Chorus</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Generator.html">Generator</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Noise.html">Noise</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Saxofony.html">Saxofony</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_V"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;V&nbsp;&nbsp;</div></td></tr></table>
-</td></tr><tr><td><a class="el" href="classstk_1_1Clarinet.html">Clarinet</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Granulate.html">Granulate</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1NRev.html">NRev</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Shakers.html">Shakers</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Vector3D.html">Vector3D</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;D&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="classstk_1_1Saxofony.html">Saxofony</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_V"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;V&nbsp;&nbsp;</div></td></tr></table>
+</td></tr><tr><td><a class="el" href="classstk_1_1Clarinet.html">Clarinet</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Generator.html">Generator</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Noise.html">Noise</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Shakers.html">Shakers</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Vector3D.html">Vector3D</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Cubic.html">Cubic</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Granulate.html">Granulate</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1NRev.html">NRev</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Simple.html">Simple</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Voicer.html">Voicer</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;D&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a name="letter_H"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;H&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a name="letter_O"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;O&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1Simple.html">Simple</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Voicer.html">Voicer</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Delay.html">Delay</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1HevyMetl.html">HevyMetl</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1OnePole.html">OnePole</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1SineWave.html">SineWave</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1VoicForm.html">VoicForm</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1DelayA.html">DelayA</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_I"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;I&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1OneZero.html">OneZero</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1SingWave.html">SingWave</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_W"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;W&nbsp;&nbsp;</div></td></tr></table>
-</td></tr><tr><td><a class="el" href="classstk_1_1DelayL.html">DelayL</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Iir.html">Iir</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_P"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;P&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1Sitar.html">Sitar</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Whistle.html">Whistle</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structRtAudio_1_1DeviceInfo.html">RtAudio::DeviceInfo</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1InetWvIn.html">InetWvIn</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1PercFlut.html">PercFlut</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Skini.html">Skini</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Wurley.html">Wurley</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Drummer.html">Drummer</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1InetWvOut.html">InetWvOut</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Phonemes.html">Phonemes</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Socket.html">Socket</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1WvIn.html">WvIn</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_E"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;E&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1Instrmnt.html">Instrmnt</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1PitShift.html">PitShift</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Sphere.html">Sphere</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1WvOut.html">WvOut</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Echo.html">Echo</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_J"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;J&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="classstk_1_1Plucked.html">Plucked</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr></table><div class="qindex"><a class="qindex" href="#letter_A">A</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_B">B</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_C">C</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_E">E</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_F">F</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_G">G</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_H">H</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_I">I</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_J">J</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_L">L</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_M">M</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_N">N</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_O">O</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_P">P</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_R">R</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_T">T</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_U">U</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_V">V</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_W">W</a></div>
+</td><td><a class="el" href="classstk_1_1SineWave.html">SineWave</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1VoicForm.html">VoicForm</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Delay.html">Delay</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1HevyMetl.html">HevyMetl</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1OnePole.html">OnePole</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1SingWave.html">SingWave</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_W"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;W&nbsp;&nbsp;</div></td></tr></table>
+</td></tr><tr><td><a class="el" href="classstk_1_1DelayA.html">DelayA</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_I"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;I&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="classstk_1_1OneZero.html">OneZero</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Sitar.html">Sitar</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Whistle.html">Whistle</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1DelayL.html">DelayL</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Iir.html">Iir</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a name="letter_P"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;P&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="classstk_1_1Skini.html">Skini</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Wurley.html">Wurley</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structRtAudio_1_1DeviceInfo.html">RtAudio::DeviceInfo</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1InetWvIn.html">InetWvIn</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1PercFlut.html">PercFlut</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Socket.html">Socket</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1WvIn.html">WvIn</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classstk_1_1Drummer.html">Drummer</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1InetWvOut.html">InetWvOut</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Phonemes.html">Phonemes</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1Sphere.html">Sphere</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1WvOut.html">WvOut</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_E"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;E&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="classstk_1_1Instrmnt.html">Instrmnt</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1PitShift.html">PitShift</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classstk_1_1StifKarp.html">StifKarp</a> (<a class="el" href="namespacestk.html">stk</a>)&nbsp;&nbsp;&nbsp;</td></tr></table><div class="qindex"><a class="qindex" href="#letter_A">A</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_B">B</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_C">C</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_E">E</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_F">F</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_G">G</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_H">H</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_I">I</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_J">J</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_L">L</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_M">M</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_N">N</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_O">O</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_P">P</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_R">R</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_T">T</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_U">U</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_V">V</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_W">W</a></div>
 </div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1ADSR-members.html b/doc/html/classstk_1_1ADSR-members.html
index 6b2fb4b..d5083c0 100644
--- a/doc/html/classstk_1_1ADSR-members.html
+++ b/doc/html/classstk_1_1ADSR-members.html
@@ -16,13 +16,14 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa9518c737b76795fa49f997c09e074c8e">ATTACK</a> enum value</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a9f9de4c495217ef8490a9d2d1fdabe11">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">DECAY</a> enum value</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baac9fd188b8e5ad469e002f7ba3498028b">DONE</a> enum value</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#ac7f11d287fb903b04985c2f81dbf9a5d">Generator</a>(void)</td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#a87f9918cfa4104a841dc5b44f26f8904">getState</a>(void) const </td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a>(const char *message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8">IDLE</a> enum value</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#a9400e04b313ab8900a3ba9b693f448e6">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#aad03e82009a20cfb49c1f04bae791631">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
@@ -34,6 +35,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d">sampleRate</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#a3567b02a0e8ab82d18eb949d362f9708">setAllTimes</a>(StkFloat aTime, StkFloat dTime, StkFloat sLevel, StkFloat rTime)</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#aff18347235fd52ce307c4b5de18a9c62">setAttackRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#ae0af300e39f83f79776c04a3e83a85b1">setAttackTarget</a>(StkFloat target)</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#a48885319b8175cd4d6312fdf7980f116">setAttackTime</a>(StkFloat time)</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#a285f500b1e149aed48dba2a155b95cdd">setDecayRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1ADSR.html#a450703c45384ae27eb766551843ce82d">setDecayTime</a>(StkFloat time)</td><td><a class="el" href="classstk_1_1ADSR.html">stk::ADSR</a></td><td></td></tr>
@@ -66,7 +68,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1ADSR.gif b/doc/html/classstk_1_1ADSR.gif
deleted file mode 100644
index d3dfe58..0000000
Binary files a/doc/html/classstk_1_1ADSR.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1ADSR.html b/doc/html/classstk_1_1ADSR.html
index b730805..3c8cbe4 100644
--- a/doc/html/classstk_1_1ADSR.html
+++ b/doc/html/classstk_1_1ADSR.html
@@ -38,7 +38,7 @@ Inheritance diagram for stk::ADSR:</div>
 <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa139dc35648a28ddc99a7a606e185f6ad">SUSTAIN</a>, 
 <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756">RELEASE</a>, 
 <br/>
-&nbsp;&nbsp;<a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baac9fd188b8e5ad469e002f7ba3498028b">DONE</a>
+&nbsp;&nbsp;<a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8">IDLE</a>
 <br/>
  }</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight"><p><a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> envelope states. </p>
@@ -59,6 +59,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aff18347235fd52ce307c4b5de18a9c62"></a><!-- doxytag: member="stk::ADSR::setAttackRate" ref="aff18347235fd52ce307c4b5de18a9c62" args="(StkFloat rate)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1ADSR.html#aff18347235fd52ce307c4b5de18a9c62">setAttackRate</a> (StkFloat rate)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the attack rate. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae0af300e39f83f79776c04a3e83a85b1"></a><!-- doxytag: member="stk::ADSR::setAttackTarget" ref="ae0af300e39f83f79776c04a3e83a85b1" args="(StkFloat target)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1ADSR.html#ae0af300e39f83f79776c04a3e83a85b1">setAttackTarget</a> (StkFloat target)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the target value for the attack (default = 1.0). <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a285f500b1e149aed48dba2a155b95cdd"></a><!-- doxytag: member="stk::ADSR::setDecayRate" ref="a285f500b1e149aed48dba2a155b95cdd" args="(StkFloat rate)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1ADSR.html#a285f500b1e149aed48dba2a155b95cdd">setDecayRate</a> (StkFloat rate)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the decay rate. <br/></td></tr>
@@ -73,19 +76,19 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the attack rate based on a time duration. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a450703c45384ae27eb766551843ce82d"></a><!-- doxytag: member="stk::ADSR::setDecayTime" ref="a450703c45384ae27eb766551843ce82d" args="(StkFloat time)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1ADSR.html#a450703c45384ae27eb766551843ce82d">setDecayTime</a> (StkFloat time)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the decay rate based on a time duration. <br/></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the decay rate based on a time duration (seconds). <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a91c14442557cb65286a327f8b297237a"></a><!-- doxytag: member="stk::ADSR::setReleaseTime" ref="a91c14442557cb65286a327f8b297237a" args="(StkFloat time)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1ADSR.html#a91c14442557cb65286a327f8b297237a">setReleaseTime</a> (StkFloat time)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the release rate based on a time duration. <br/></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the release rate based on a time duration (seconds). <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3567b02a0e8ab82d18eb949d362f9708"></a><!-- doxytag: member="stk::ADSR::setAllTimes" ref="a3567b02a0e8ab82d18eb949d362f9708" args="(StkFloat aTime, StkFloat dTime, StkFloat sLevel, StkFloat rTime)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1ADSR.html#a3567b02a0e8ab82d18eb949d362f9708">setAllTimes</a> (StkFloat aTime, StkFloat dTime, StkFloat sLevel, StkFloat rTime)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set sustain level and attack, decay, and release time durations. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a428eebd510e464ccd7bb4e5728f80d63"></a><!-- doxytag: member="stk::ADSR::setTarget" ref="a428eebd510e464ccd7bb4e5728f80d63" args="(StkFloat target)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1ADSR.html#a428eebd510e464ccd7bb4e5728f80d63">setTarget</a> (StkFloat target)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the target value. <br/></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a sustain target value and attack or decay from current value to target. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a87f9918cfa4104a841dc5b44f26f8904"></a><!-- doxytag: member="stk::ADSR::getState" ref="a87f9918cfa4104a841dc5b44f26f8904" args="(void) const " -->
 int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1ADSR.html#a87f9918cfa4104a841dc5b44f26f8904">getState</a> (void) const </td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the current envelope <em>state</em> (ATTACK, DECAY, SUSTAIN, RELEASE, DONE). <br/></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the current envelope <em>state</em> (ATTACK, DECAY, SUSTAIN, RELEASE, IDLE). <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa99bf5fca3885bf8d99a3edc4072a4b5"></a><!-- doxytag: member="stk::ADSR::setValue" ref="aa99bf5fca3885bf8d99a3edc4072a4b5" args="(StkFloat value)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1ADSR.html#aa99bf5fca3885bf8d99a3edc4072a4b5">setValue</a> (StkFloat value)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set to state = <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa139dc35648a28ddc99a7a606e185f6ad">ADSR::SUSTAIN</a> with current and target values of <em>value</em>. <br/></td></tr>
@@ -100,8 +103,8 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK <a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> envelope class. </p>
-<p>This class implements a traditional <a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> (Attack, Decay, Sustain, Release) envelope. It responds to simple keyOn and keyOff messages, keeping track of its state. The <em>state</em> = <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baac9fd188b8e5ad469e002f7ba3498028b">ADSR::DONE</a> after the envelope value reaches 0.0 in the <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756">ADSR::RELEASE</a> state.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>This class implements a traditional <a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> (Attack, Decay, Sustain, Release) envelope. It responds to simple keyOn and keyOff messages, keeping track of its state. The <em>state</em> = <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8">ADSR::IDLE</a> before being triggered and after the envelope value reaches 0.0 in the <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756">ADSR::RELEASE</a> state. All rate, target and level settings must be non-negative. All time settings must be positive.</p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Enumeration Documentation</h2>
 <a class="anchor" id="ae1cdd1f2886d69a76fcd5b1e0e9154ba"></a><!-- doxytag: member="stk::ADSR::@0" ref="ae1cdd1f2886d69a76fcd5b1e0e9154ba" args="" -->
 <div class="memitem">
@@ -128,13 +131,22 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <tr><td valign="top"><em><a class="anchor" id="ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756"></a><!-- doxytag: member="RELEASE" ref="ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756" args="" -->RELEASE</em>&nbsp;</td><td>
 <p>Release </p>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" id="ae1cdd1f2886d69a76fcd5b1e0e9154baac9fd188b8e5ad469e002f7ba3498028b"></a><!-- doxytag: member="DONE" ref="ae1cdd1f2886d69a76fcd5b1e0e9154baac9fd188b8e5ad469e002f7ba3498028b" args="" -->DONE</em>&nbsp;</td><td>
-<p>End of release </p>
+<tr><td valign="top"><em><a class="anchor" id="ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8"></a><!-- doxytag: member="IDLE" ref="ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8" args="" -->IDLE</em>&nbsp;</td><td>
+<p>Before attack / after release </p>
 </td></tr>
 </table>
 </dd>
 </dl>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00028"></a>00028        {
+<a name="l00029"></a>00029     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa9518c737b76795fa49f997c09e074c8e">ATTACK</a>,   
+<a name="l00030"></a>00030     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">DECAY</a>,    
+<a name="l00031"></a>00031     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa139dc35648a28ddc99a7a606e185f6ad">SUSTAIN</a>,  
+<a name="l00032"></a>00032     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa7efc189b0b53e581201fd64f357a1756">RELEASE</a>,  
+<a name="l00033"></a>00033     <a class="code" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8">IDLE</a>      
+<a name="l00034"></a>00034   };
+</pre></div></p>
+
 </div>
 </div>
 <hr/><h2>Member Function Documentation</h2>
@@ -168,6 +180,23 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00160"></a>00160 {
+<a name="l00161"></a>00161 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00162"></a>00162 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00163"></a>00163     oStream_ &lt;&lt; <span class="stringliteral">&quot;ADSR::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00164"></a>00164     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00165"></a>00165   }
+<a name="l00166"></a>00166 <span class="preprocessor">#endif</span>
+<a name="l00167"></a>00167 <span class="preprocessor"></span>
+<a name="l00168"></a>00168   StkFloat *samples = &amp;frames[channel];
+<a name="l00169"></a>00169   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00170"></a>00170   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00171"></a>00171     *samples = <a class="code" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975" title="Compute and return one output sample.">ADSR::tick</a>();
+<a name="l00172"></a>00172 
+<a name="l00173"></a>00173   <span class="keywordflow">return</span> frames;
+<a name="l00174"></a>00174 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -178,7 +207,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Asymp-members.html b/doc/html/classstk_1_1Asymp-members.html
index 764bd02..5889b28 100644
--- a/doc/html/classstk_1_1Asymp-members.html
+++ b/doc/html/classstk_1_1Asymp-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Asymp.html#a082e765dc3bd6b452e92b602af7a1042">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1Asymp.html">stk::Asymp</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Asymp.html#a51f0aad846eb6bda4c20eb63534786e2">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1Asymp.html">stk::Asymp</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
@@ -30,6 +31,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d">sampleRate</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Asymp.html#afa6fcf4bf3060c0c6092701e409d5fbf">setT60</a>(StkFloat t60)</td><td><a class="el" href="classstk_1_1Asymp.html">stk::Asymp</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Asymp.html#a7b0f7025ba5f268f1e5ce097b209f0ec">setTarget</a>(StkFloat target)</td><td><a class="el" href="classstk_1_1Asymp.html">stk::Asymp</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Asymp.html#aebd8ebaf6f6c9570d3ee78e1bcbbcbd2">setTau</a>(StkFloat tau)</td><td><a class="el" href="classstk_1_1Asymp.html">stk::Asymp</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Asymp.html#aca998e9c4ae86b4958da59fc9433268c">setTime</a>(StkFloat time)</td><td><a class="el" href="classstk_1_1Asymp.html">stk::Asymp</a></td><td></td></tr>
@@ -55,7 +57,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Asymp.gif b/doc/html/classstk_1_1Asymp.gif
deleted file mode 100644
index 564e2b5..0000000
Binary files a/doc/html/classstk_1_1Asymp.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Asymp.html b/doc/html/classstk_1_1Asymp.html
index b7e5ffe..7400f08 100644
--- a/doc/html/classstk_1_1Asymp.html
+++ b/doc/html/classstk_1_1Asymp.html
@@ -49,6 +49,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aca998e9c4ae86b4958da59fc9433268c"></a><!-- doxytag: member="stk::Asymp::setTime" ref="aca998e9c4ae86b4958da59fc9433268c" args="(StkFloat time)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Asymp.html#aca998e9c4ae86b4958da59fc9433268c">setTime</a> (StkFloat time)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the asymptotic rate based on a time duration (must be &gt; 0). <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afa6fcf4bf3060c0c6092701e409d5fbf"></a><!-- doxytag: member="stk::Asymp::setT60" ref="afa6fcf4bf3060c0c6092701e409d5fbf" args="(StkFloat t60)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Asymp.html#afa6fcf4bf3060c0c6092701e409d5fbf">setT60</a> (StkFloat t60)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the asymptotic rate such that the target value is perceptually reached (to within -60dB of the target) in <em>t60</em> seconds. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7b0f7025ba5f268f1e5ce097b209f0ec"></a><!-- doxytag: member="stk::Asymp::setTarget" ref="a7b0f7025ba5f268f1e5ce097b209f0ec" args="(StkFloat target)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Asymp.html#a7b0f7025ba5f268f1e5ce097b209f0ec">setTarget</a> (StkFloat target)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the target value. <br/></td></tr>
@@ -72,7 +75,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>This class implements a simple envelope generator which asymptotically approaches a target value. The algorithm used is of the form:</p>
 <p>y[n] = a y[n-1] + (1-a) target,</p>
 <p>where a = exp(-T/tau), T is the sample period, and tau is a time constant. The user can set the time constant (default value = 0.3) and target value. Theoretically, this recursion never reaches its target, though the calculations in this class are stopped when the current value gets within a small threshold value of the target (at which time the current value is set to the target). It responds to <em>keyOn</em> and <em>keyOff</em> messages by ramping to 1.0 on keyOn and to 0.0 on keyOff.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="aebd8ebaf6f6c9570d3ee78e1bcbbcbd2"></a><!-- doxytag: member="stk::Asymp::setTau" ref="aebd8ebaf6f6c9570d3ee78e1bcbbcbd2" args="(StkFloat tau)" -->
 <div class="memitem">
@@ -125,6 +128,23 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00128"></a>00128 {
+<a name="l00129"></a>00129 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00130"></a>00130 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00131"></a>00131     oStream_ &lt;&lt; <span class="stringliteral">&quot;Asymp::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00132"></a>00132     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00133"></a>00133   }
+<a name="l00134"></a>00134 <span class="preprocessor">#endif</span>
+<a name="l00135"></a>00135 <span class="preprocessor"></span>
+<a name="l00136"></a>00136   StkFloat *samples = &amp;frames[channel];
+<a name="l00137"></a>00137   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00138"></a>00138   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00139"></a>00139     *samples = <a class="code" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e" title="Compute and return one output sample.">Asymp::tick</a>();
+<a name="l00140"></a>00140 
+<a name="l00141"></a>00141   <span class="keywordflow">return</span> frames;
+<a name="l00142"></a>00142 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -135,7 +155,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BandedWG-members.html b/doc/html/classstk_1_1BandedWG-members.html
index c943b7b..930c437 100644
--- a/doc/html/classstk_1_1BandedWG-members.html
+++ b/doc/html/classstk_1_1BandedWG-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -51,7 +52,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1BandedWG.html">stk::BandedWG</a></td><td><code> [virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1BandedWG.html#a6c2ebb66862b173c4835add6847801c9">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1BandedWG.html">stk::BandedWG</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BandedWG.html#ac4044055c28bad672c9537b985d18289">~BandedWG</a>(void)</td><td><a class="el" href="classstk_1_1BandedWG.html">stk::BandedWG</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -59,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BandedWG.gif b/doc/html/classstk_1_1BandedWG.gif
deleted file mode 100644
index cab6316..0000000
Binary files a/doc/html/classstk_1_1BandedWG.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1BandedWG.html b/doc/html/classstk_1_1BandedWG.html
index 6a5095a..3eaf7f7 100644
--- a/doc/html/classstk_1_1BandedWG.html
+++ b/doc/html/classstk_1_1BandedWG.html
@@ -71,6 +71,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a44f37146d33354afb085806bd8340497"></a><!-- doxytag: member="stk::BandedWG::tick" ref="a44f37146d33354afb085806bd8340497" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BandedWG.html#a6c2ebb66862b173c4835add6847801c9">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a6c2ebb66862b173c4835add6847801c9"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>Banded waveguide modeling class. </p>
@@ -93,6 +95,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 </li>
 </ul>
 <p>by Georg Essl, 1999 - 2004. Modified for STK 4.0 by Gary Scavone. </p>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a6c2ebb66862b173c4835add6847801c9"></a><!-- doxytag: member="stk::BandedWG::tick" ref="a6c2ebb66862b173c4835add6847801c9" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::BandedWG::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00125"></a>00125 {
+<a name="l00126"></a>00126   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00127"></a>00127 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00128"></a>00128 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00129"></a>00129     oStream_ &lt;&lt; <span class="stringliteral">&quot;BandedWG::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00130"></a>00130     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00131"></a>00131   }
+<a name="l00132"></a>00132 <span class="preprocessor">#endif</span>
+<a name="l00133"></a>00133 <span class="preprocessor"></span>
+<a name="l00134"></a>00134   StkFloat *samples = &amp;frames[channel];
+<a name="l00135"></a>00135   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00136"></a>00136   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00137"></a>00137     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00138"></a>00138       *samples++ = <a class="code" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497" title="Compute and return one output sample.">tick</a>();
+<a name="l00139"></a>00139   }
+<a name="l00140"></a>00140   <span class="keywordflow">else</span> {
+<a name="l00141"></a>00141     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00142"></a>00142       *samples++ = <a class="code" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497" title="Compute and return one output sample.">tick</a>();
+<a name="l00143"></a>00143       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00144"></a>00144         *samples++ = lastFrame_[j];
+<a name="l00145"></a>00145     }
+<a name="l00146"></a>00146   }
+<a name="l00147"></a>00147 
+<a name="l00148"></a>00148   <span class="keywordflow">return</span> frames;
+<a name="l00149"></a>00149 }
+</pre></div></p>
+
+</div>
+</div>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="BandedWG_8h_source.html">BandedWG.h</a></li>
 </ul>
@@ -101,7 +163,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BeeThree-members.html b/doc/html/classstk_1_1BeeThree-members.html
index fe29d91..2a44e9f 100644
--- a/doc/html/classstk_1_1BeeThree-members.html
+++ b/doc/html/classstk_1_1BeeThree-members.html
@@ -21,6 +21,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#a7235e94a153df135330a591511269f7c">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#afc46280177d770404919f20ccf88e4ff">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
@@ -56,7 +57,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1BeeThree.html">stk::BeeThree</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1BeeThree.html#a30520efff3fac0674d3c7ab95ac35999">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1BeeThree.html">stk::BeeThree</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BeeThree.html#af2a0c982731438cf6200b3e5642a288d">~BeeThree</a>(void)</td><td><a class="el" href="classstk_1_1BeeThree.html">stk::BeeThree</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#aaba7e8bff02d105e146f8b62b20a27b9">~FM</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
@@ -65,7 +66,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BeeThree.gif b/doc/html/classstk_1_1BeeThree.gif
deleted file mode 100644
index 99a03a7..0000000
Binary files a/doc/html/classstk_1_1BeeThree.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1BeeThree.html b/doc/html/classstk_1_1BeeThree.html
index b9cd9b0..f8511dd 100644
--- a/doc/html/classstk_1_1BeeThree.html
+++ b/doc/html/classstk_1_1BeeThree.html
@@ -44,6 +44,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4649b9471bde3b978c20fcafcbef0fc7"></a><!-- doxytag: member="stk::BeeThree::tick" ref="a4649b9471bde3b978c20fcafcbef0fc7" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BeeThree.html#a30520efff3fac0674d3c7ab95ac35999">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a30520efff3fac0674d3c7ab95ac35999"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK Hammond-oid organ <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis instrument. </p>
@@ -63,7 +65,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li><a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> 2 &amp; 4 Target = 128</li>
 </ul>
 <p>The basic Chowning/Stanford <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> patent expired in 1995, but there exist follow-on patents, mostly assigned to Yamaha. If you are of the type who should worry about this (making money) worry away.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="ab4534210b85a2c4798bf1c88b348c20a"></a><!-- doxytag: member="stk::BeeThree::BeeThree" ref="ab4534210b85a2c4798bf1c88b348c20a" args="(void)" -->
 <div class="memitem">
@@ -84,6 +86,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a30520efff3fac0674d3c7ab95ac35999"></a><!-- doxytag: member="stk::BeeThree::tick" ref="a30520efff3fac0674d3c7ab95ac35999" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::BeeThree::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">stk::FM</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00099"></a>00099 {
+<a name="l00100"></a>00100   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00101"></a>00101 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00102"></a>00102 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00103"></a>00103     oStream_ &lt;&lt; <span class="stringliteral">&quot;BeeThree::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00104"></a>00104     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106 <span class="preprocessor">#endif</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span>
+<a name="l00108"></a>00108   StkFloat *samples = &amp;frames[channel];
+<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00110"></a>00110   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00111"></a>00111     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00112"></a>00112       *samples++ = <a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">tick</a>();
+<a name="l00113"></a>00113   }
+<a name="l00114"></a>00114   <span class="keywordflow">else</span> {
+<a name="l00115"></a>00115     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00116"></a>00116       *samples++ = <a class="code" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7" title="Compute and return one output sample.">tick</a>();
+<a name="l00117"></a>00117       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00118"></a>00118         *samples++ = lastFrame_[j];
+<a name="l00119"></a>00119     }
+<a name="l00120"></a>00120   }
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122   <span class="keywordflow">return</span> frames;
+<a name="l00123"></a>00123 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -94,7 +156,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BiQuad-members.html b/doc/html/classstk_1_1BiQuad-members.html
index 15bb371..46892e4 100644
--- a/doc/html/classstk_1_1BiQuad-members.html
+++ b/doc/html/classstk_1_1BiQuad-members.html
@@ -22,8 +22,10 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BiQuad.html#aab468cd1aa79b95442b15bb04d8bb211">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1BiQuad.html">stk::BiQuad</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1BiQuad.html">stk::BiQuad</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -62,7 +64,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BiQuad.gif b/doc/html/classstk_1_1BiQuad.gif
deleted file mode 100644
index 2a9c939..0000000
Binary files a/doc/html/classstk_1_1BiQuad.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1BiQuad.html b/doc/html/classstk_1_1BiQuad.html
index 87f7ca0..279ce08 100644
--- a/doc/html/classstk_1_1BiQuad.html
+++ b/doc/html/classstk_1_1BiQuad.html
@@ -79,7 +79,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK biquad (two-pole, two-zero) filter class. </p>
 <p>This class implements a two-pole, two-zero digital filter. Methods are provided for creating a resonance or notch in the frequency response while maintaining a constant filter gain.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a55aaa01fd4156f1fac1168f526e3d969"></a><!-- doxytag: member="stk::BiQuad::setResonance" ref="a55aaa01fd4156f1fac1168f526e3d969" args="(StkFloat frequency, StkFloat radius, bool normalize=false)" -->
 <div class="memitem">
@@ -113,7 +113,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Sets the filter coefficients for a resonance at <em>frequency</em> (in Hz). </p>
-<p>This method determines the filter coefficients corresponding to two complex-conjugate poles with the given <em>frequency</em> (in Hz) and <em>radius</em> from the z-plane origin. If <em>normalize</em> is true, the filter zeros are placed at z = 1, z = -1, and the coefficients are then normalized to produce a constant unity peak gain (independent of the filter <em>gain</em> parameter). The resulting filter frequency response has a resonance at the given <em>frequency</em>. The closer the poles are to the unit-circle (<em>radius</em> close to one), the narrower the resulting resonance width. </p>
+<p>This method determines the filter coefficients corresponding to two complex-conjugate poles with the given <em>frequency</em> (in Hz) and <em>radius</em> from the z-plane origin. If <em>normalize</em> is true, the filter zeros are placed at z = 1, z = -1, and the coefficients are then normalized to produce a constant unity peak gain (independent of the filter <em>gain</em> parameter). The resulting filter frequency response has a resonance at the given <em>frequency</em>. The closer the poles are to the unit-circle (<em>radius</em> close to one), the narrower the resulting resonance width. An unstable filter will result for <em>radius</em> &gt;= 1.0. The <em>frequency</em> value should be between zero and half the sample rate. </p>
 
 </div>
 </div>
@@ -143,7 +143,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Set the filter coefficients for a notch at <em>frequency</em> (in Hz). </p>
-<p>This method determines the filter coefficients corresponding to two complex-conjugate zeros with the given <em>frequency</em> (in Hz) and <em>radius</em> from the z-plane origin. No filter normalization is attempted. </p>
+<p>This method determines the filter coefficients corresponding to two complex-conjugate zeros with the given <em>frequency</em> (in Hz) and <em>radius</em> from the z-plane origin. No filter normalization is attempted. The <em>frequency</em> value should be between zero and half the sample rate. The <em>radius</em> value should be positive. </p>
 
 </div>
 </div>
@@ -198,6 +198,31 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00133"></a>00133 {
+<a name="l00134"></a>00134 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00135"></a>00135 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00136"></a>00136     oStream_ &lt;&lt; <span class="stringliteral">&quot;BiQuad::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00137"></a>00137     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00138"></a>00138   }
+<a name="l00139"></a>00139 <span class="preprocessor">#endif</span>
+<a name="l00140"></a>00140 <span class="preprocessor"></span>
+<a name="l00141"></a>00141   StkFloat *samples = &amp;frames[channel];
+<a name="l00142"></a>00142   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00143"></a>00143   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00144"></a>00144     inputs_[0] = gain_ * *samples;
+<a name="l00145"></a>00145     *samples = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
+<a name="l00146"></a>00146     *samples -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
+<a name="l00147"></a>00147     inputs_[2] = inputs_[1];
+<a name="l00148"></a>00148     inputs_[1] = inputs_[0];
+<a name="l00149"></a>00149     outputs_[2] = outputs_[1];
+<a name="l00150"></a>00150     outputs_[1] = *samples;
+<a name="l00151"></a>00151   }
+<a name="l00152"></a>00152 
+<a name="l00153"></a>00153   lastFrame_[0] = outputs_[1];
+<a name="l00154"></a>00154   <span class="keywordflow">return</span> frames;
+<a name="l00155"></a>00155 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ac9836f0e074ea9516727f27eb9b411aa"></a><!-- doxytag: member="stk::BiQuad::tick" ref="ac9836f0e074ea9516727f27eb9b411aa" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -240,6 +265,32 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00158"></a>00158 {
+<a name="l00159"></a>00159 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00160"></a>00160 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00161"></a>00161     oStream_ &lt;&lt; <span class="stringliteral">&quot;BiQuad::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00162"></a>00162     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00163"></a>00163   }
+<a name="l00164"></a>00164 <span class="preprocessor">#endif</span>
+<a name="l00165"></a>00165 <span class="preprocessor"></span>
+<a name="l00166"></a>00166   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00167"></a>00167   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00168"></a>00168   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00169"></a>00169   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00170"></a>00170     inputs_[0] = gain_ * *iSamples;
+<a name="l00171"></a>00171     *oSamples = b_[0] * inputs_[0] + b_[1] * inputs_[1] + b_[2] * inputs_[2];
+<a name="l00172"></a>00172     *oSamples -= a_[2] * outputs_[2] + a_[1] * outputs_[1];
+<a name="l00173"></a>00173     inputs_[2] = inputs_[1];
+<a name="l00174"></a>00174     inputs_[1] = inputs_[0];
+<a name="l00175"></a>00175     outputs_[2] = outputs_[1];
+<a name="l00176"></a>00176     outputs_[1] = *oSamples;
+<a name="l00177"></a>00177   }
+<a name="l00178"></a>00178 
+<a name="l00179"></a>00179   lastFrame_[0] = outputs_[1];
+<a name="l00180"></a>00180   <span class="keywordflow">return</span> iFrames;
+<a name="l00181"></a>00181 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -250,7 +301,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Blit-members.html b/doc/html/classstk_1_1Blit-members.html
index e3c807b..10d1683 100644
--- a/doc/html/classstk_1_1Blit-members.html
+++ b/doc/html/classstk_1_1Blit-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Blit.html#a530af82a27731734af4f4b58bce283de">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Blit.html">stk::Blit</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -54,7 +55,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Blit.gif b/doc/html/classstk_1_1Blit.gif
deleted file mode 100644
index df9521a..0000000
Binary files a/doc/html/classstk_1_1Blit.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Blit.html b/doc/html/classstk_1_1Blit.html
index 19b9b43..65c6fe9 100644
--- a/doc/html/classstk_1_1Blit.html
+++ b/doc/html/classstk_1_1Blit.html
@@ -86,6 +86,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Set the phase of the signal. </p>
 <p>Set the phase of the signal, in the range 0 to 1. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00049"></a>00049 { phase_ = PI * phase; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a01fb40970e8905e47b7f39a1fb01589f"></a><!-- doxytag: member="stk::Blit::getPhase" ref="a01fb40970e8905e47b7f39a1fb01589f" args="() const " -->
@@ -106,6 +109,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Get the current phase of the signal. </p>
 <p>Get the phase of the signal, in the range [0 to 1.0). </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00055"></a>00055 { <span class="keywordflow">return</span> phase_ / PI; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a5a1fd506ab12ae614afaf0e402d24d30"></a><!-- doxytag: member="stk::Blit::setHarmonics" ref="a5a1fd506ab12ae614afaf0e402d24d30" args="(unsigned int nHarmonics=0)" -->
@@ -159,6 +165,23 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00133"></a>00133 {
+<a name="l00134"></a>00134 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00135"></a>00135 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00136"></a>00136     oStream_ &lt;&lt; <span class="stringliteral">&quot;Blit::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00137"></a>00137     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00138"></a>00138   }
+<a name="l00139"></a>00139 <span class="preprocessor">#endif</span>
+<a name="l00140"></a>00140 <span class="preprocessor"></span>
+<a name="l00141"></a>00141   StkFloat *samples = &amp;frames[channel];
+<a name="l00142"></a>00142   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00143"></a>00143   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00144"></a>00144     *samples = <a class="code" href="classstk_1_1Blit.html#a528b8dc95499b11d6173cf065d62c717" title="Compute and return one output sample.">Blit::tick</a>();
+<a name="l00145"></a>00145 
+<a name="l00146"></a>00146   <span class="keywordflow">return</span> frames;
+<a name="l00147"></a>00147 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -169,7 +192,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BlitSaw-members.html b/doc/html/classstk_1_1BlitSaw-members.html
index b8378b1..c487de6 100644
--- a/doc/html/classstk_1_1BlitSaw-members.html
+++ b/doc/html/classstk_1_1BlitSaw-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BlitSaw.html#a254758ecd4166cc4e7d6fced5650a198">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1BlitSaw.html">stk::BlitSaw</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -52,7 +53,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BlitSaw.gif b/doc/html/classstk_1_1BlitSaw.gif
deleted file mode 100644
index 950e70b..0000000
Binary files a/doc/html/classstk_1_1BlitSaw.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1BlitSaw.html b/doc/html/classstk_1_1BlitSaw.html
index 85d9e90..d675384 100644
--- a/doc/html/classstk_1_1BlitSaw.html
+++ b/doc/html/classstk_1_1BlitSaw.html
@@ -113,6 +113,24 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00129"></a>00129 {
+<a name="l00130"></a>00130 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00131"></a>00131 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00132"></a>00132     oStream_ &lt;&lt; <span class="stringliteral">&quot;BlitSaw::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00133"></a>00133     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00134"></a>00134   }
+<a name="l00135"></a>00135 <span class="preprocessor">#endif</span>
+<a name="l00136"></a>00136 <span class="preprocessor"></span>
+<a name="l00137"></a>00137 
+<a name="l00138"></a>00138   StkFloat *samples = &amp;frames[channel];
+<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00140"></a>00140   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00141"></a>00141     *samples = <a class="code" href="classstk_1_1BlitSaw.html#a03536a1f1823ea41649b4a62ba98007c" title="Compute and return one output sample.">BlitSaw::tick</a>();
+<a name="l00142"></a>00142 
+<a name="l00143"></a>00143   <span class="keywordflow">return</span> frames;
+<a name="l00144"></a>00144 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -123,7 +141,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BlitSquare-members.html b/doc/html/classstk_1_1BlitSquare-members.html
index 32e092a..ef48c3b 100644
--- a/doc/html/classstk_1_1BlitSquare-members.html
+++ b/doc/html/classstk_1_1BlitSquare-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BlitSquare.html#a77972e4e1c53600bf80cf692601ccae1">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1BlitSquare.html">stk::BlitSquare</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -54,7 +55,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BlitSquare.gif b/doc/html/classstk_1_1BlitSquare.gif
deleted file mode 100644
index 7bafba7..0000000
Binary files a/doc/html/classstk_1_1BlitSquare.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1BlitSquare.html b/doc/html/classstk_1_1BlitSquare.html
index af7149f..ae1e50f 100644
--- a/doc/html/classstk_1_1BlitSquare.html
+++ b/doc/html/classstk_1_1BlitSquare.html
@@ -85,6 +85,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Set the phase of the signal. </p>
 <p>Set the phase of the signal, in the range 0 to 1. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00058"></a>00058 { phase_ = PI * phase; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="abbda8cb84bcd36fc6d96130e9832a6af"></a><!-- doxytag: member="stk::BlitSquare::getPhase" ref="abbda8cb84bcd36fc6d96130e9832a6af" args="() const " -->
@@ -105,6 +108,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Get the current phase of the signal. </p>
 <p>Get the phase of the signal, in the range [0 to 1.0). </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00064"></a>00064 { <span class="keywordflow">return</span> phase_ / PI; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a94521b4224d0873f5e783c721c123b21"></a><!-- doxytag: member="stk::BlitSquare::setHarmonics" ref="a94521b4224d0873f5e783c721c123b21" args="(unsigned int nHarmonics=0)" -->
@@ -158,6 +164,23 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00152"></a>00152 {
+<a name="l00153"></a>00153 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00154"></a>00154 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00155"></a>00155     oStream_ &lt;&lt; <span class="stringliteral">&quot;BlitSquare::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00156"></a>00156     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00157"></a>00157   }
+<a name="l00158"></a>00158 <span class="preprocessor">#endif</span>
+<a name="l00159"></a>00159 <span class="preprocessor"></span>
+<a name="l00160"></a>00160   StkFloat *samples = &amp;frames[channel];
+<a name="l00161"></a>00161   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00162"></a>00162   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00163"></a>00163     *samples = <a class="code" href="classstk_1_1BlitSquare.html#a04366d55cecb4c8a726ea0519683d817" title="Compute and return one output sample.">BlitSquare::tick</a>();
+<a name="l00164"></a>00164 
+<a name="l00165"></a>00165   <span class="keywordflow">return</span> frames;
+<a name="l00166"></a>00166 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -168,7 +191,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BlowBotl-members.html b/doc/html/classstk_1_1BlowBotl-members.html
index 0fe9fc1..e8f1493 100644
--- a/doc/html/classstk_1_1BlowBotl-members.html
+++ b/doc/html/classstk_1_1BlowBotl-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -48,7 +49,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1BlowBotl.html">stk::BlowBotl</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1BlowBotl.html#a49e1f536d821a8b2bf133533cb4bc93e">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1BlowBotl.html">stk::BlowBotl</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BlowBotl.html#adae826b0487471da1779761b0f885cb8">~BlowBotl</a>(void)</td><td><a class="el" href="classstk_1_1BlowBotl.html">stk::BlowBotl</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -56,7 +57,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BlowBotl.gif b/doc/html/classstk_1_1BlowBotl.gif
deleted file mode 100644
index cb20ce0..0000000
Binary files a/doc/html/classstk_1_1BlowBotl.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1BlowBotl.html b/doc/html/classstk_1_1BlowBotl.html
index 835bf64..be5a0da 100644
--- a/doc/html/classstk_1_1BlowBotl.html
+++ b/doc/html/classstk_1_1BlowBotl.html
@@ -61,6 +61,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a68501c2422994c8dca50086b3d944119"></a><!-- doxytag: member="stk::BlowBotl::tick" ref="a68501c2422994c8dca50086b3d944119" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BlowBotl.html#a49e1f536d821a8b2bf133533cb4bc93e">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a49e1f536d821a8b2bf133533cb4bc93e"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK blown bottle instrument class. </p>
@@ -72,7 +74,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Vibrato Gain = 1</li>
 <li>Volume = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="aa505b4fc32ffe974b5840163395c321c"></a><!-- doxytag: member="stk::BlowBotl::BlowBotl" ref="aa505b4fc32ffe974b5840163395c321c" args="(void)" -->
 <div class="memitem">
@@ -93,6 +95,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a49e1f536d821a8b2bf133533cb4bc93e"></a><!-- doxytag: member="stk::BlowBotl::tick" ref="a49e1f536d821a8b2bf133533cb4bc93e" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::BlowBotl::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00116"></a>00116 {
+<a name="l00117"></a>00117   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00118"></a>00118 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00119"></a>00119 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00120"></a>00120     oStream_ &lt;&lt; <span class="stringliteral">&quot;BlowBotl::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00121"></a>00121     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 <span class="preprocessor">#endif</span>
+<a name="l00124"></a>00124 <span class="preprocessor"></span>
+<a name="l00125"></a>00125   StkFloat *samples = &amp;frames[channel];
+<a name="l00126"></a>00126   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00127"></a>00127   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00128"></a>00128     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00129"></a>00129       *samples++ = <a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">tick</a>();
+<a name="l00130"></a>00130   }
+<a name="l00131"></a>00131   <span class="keywordflow">else</span> {
+<a name="l00132"></a>00132     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00133"></a>00133       *samples++ = <a class="code" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119" title="Compute and return one output sample.">tick</a>();
+<a name="l00134"></a>00134       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00135"></a>00135         *samples++ = lastFrame_[j];
+<a name="l00136"></a>00136     }
+<a name="l00137"></a>00137   }
+<a name="l00138"></a>00138 
+<a name="l00139"></a>00139   <span class="keywordflow">return</span> frames;
+<a name="l00140"></a>00140 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -103,7 +165,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BlowHole-members.html b/doc/html/classstk_1_1BlowHole-members.html
index 40b678f..3ef5a2d 100644
--- a/doc/html/classstk_1_1BlowHole-members.html
+++ b/doc/html/classstk_1_1BlowHole-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -50,7 +51,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1BlowHole.html">stk::BlowHole</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1BlowHole.html#ad220cd597fa5f6edd043c0783bdc2ec7">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1BlowHole.html">stk::BlowHole</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BlowHole.html#a691a14023e9283d12b0105dd886fba86">~BlowHole</a>(void)</td><td><a class="el" href="classstk_1_1BlowHole.html">stk::BlowHole</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -58,7 +59,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BlowHole.gif b/doc/html/classstk_1_1BlowHole.gif
deleted file mode 100644
index f36a6a0..0000000
Binary files a/doc/html/classstk_1_1BlowHole.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1BlowHole.html b/doc/html/classstk_1_1BlowHole.html
index 9146863..dd5a4fa 100644
--- a/doc/html/classstk_1_1BlowHole.html
+++ b/doc/html/classstk_1_1BlowHole.html
@@ -67,6 +67,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3438c72b975481dae7d51f33f6f6fd94"></a><!-- doxytag: member="stk::BlowHole::tick" ref="a3438c72b975481dae7d51f33f6f6fd94" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BlowHole.html#ad220cd597fa5f6edd043c0783bdc2ec7">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#ad220cd597fa5f6edd043c0783bdc2ec7"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK clarinet physical model with one register hole and one tonehole. </p>
@@ -81,7 +83,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Register State = 1</li>
 <li>Breath Pressure = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a7f0aed9f79544d930c7f91dfa3e0efd9"></a><!-- doxytag: member="stk::BlowHole::BlowHole" ref="a7f0aed9f79544d930c7f91dfa3e0efd9" args="(StkFloat lowestFrequency)" -->
 <div class="memitem">
@@ -102,6 +104,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="ad220cd597fa5f6edd043c0783bdc2ec7"></a><!-- doxytag: member="stk::BlowHole::tick" ref="ad220cd597fa5f6edd043c0783bdc2ec7" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::BlowHole::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00157"></a>00157 {
+<a name="l00158"></a>00158   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00159"></a>00159 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00160"></a>00160 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00161"></a>00161     oStream_ &lt;&lt; <span class="stringliteral">&quot;BlowHole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00162"></a>00162     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00163"></a>00163   }
+<a name="l00164"></a>00164 <span class="preprocessor">#endif</span>
+<a name="l00165"></a>00165 <span class="preprocessor"></span>
+<a name="l00166"></a>00166   StkFloat *samples = &amp;frames[channel];
+<a name="l00167"></a>00167   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00168"></a>00168   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00169"></a>00169     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00170"></a>00170       *samples++ = <a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">tick</a>();
+<a name="l00171"></a>00171   }
+<a name="l00172"></a>00172   <span class="keywordflow">else</span> {
+<a name="l00173"></a>00173     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00174"></a>00174       *samples++ = <a class="code" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94" title="Compute and return one output sample.">tick</a>();
+<a name="l00175"></a>00175       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00176"></a>00176         *samples++ = lastFrame_[j];
+<a name="l00177"></a>00177     }
+<a name="l00178"></a>00178   }
+<a name="l00179"></a>00179 
+<a name="l00180"></a>00180   <span class="keywordflow">return</span> frames;
+<a name="l00181"></a>00181 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -112,7 +174,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BowTable-members.html b/doc/html/classstk_1_1BowTable-members.html
index 96636eb..bf8c7d8 100644
--- a/doc/html/classstk_1_1BowTable-members.html
+++ b/doc/html/classstk_1_1BowTable-members.html
@@ -18,12 +18,15 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Function.html#ae79bd6d0c9f53693b4ca28948d94fc25">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Function.html">stk::Function</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d">sampleRate</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a740e872daa4b2ad1c918163e7c5ab56b">sampleRateChanged</a>(StkFloat newRate, StkFloat oldRate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1BowTable.html#a634d5063eba886445f4057c823b00ff7">setMaxOutput</a>(StkFloat maximum)</td><td><a class="el" href="classstk_1_1BowTable.html">stk::BowTable</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1BowTable.html#a9540d5c56cfd4556ab25c25f0612b25d">setMinOutput</a>(StkFloat minimum)</td><td><a class="el" href="classstk_1_1BowTable.html">stk::BowTable</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1BowTable.html#a9adcc3c36085b73d3b877828071a3b2c">setOffset</a>(StkFloat offset)</td><td><a class="el" href="classstk_1_1BowTable.html">stk::BowTable</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
@@ -49,7 +52,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1BowTable.gif b/doc/html/classstk_1_1BowTable.gif
deleted file mode 100644
index 59097fe..0000000
Binary files a/doc/html/classstk_1_1BowTable.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1BowTable.html b/doc/html/classstk_1_1BowTable.html
index 361e3b4..8b60c80 100644
--- a/doc/html/classstk_1_1BowTable.html
+++ b/doc/html/classstk_1_1BowTable.html
@@ -39,6 +39,12 @@ Inheritance diagram for stk::BowTable:</div>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the table offset value.  <a href="#a9adcc3c36085b73d3b877828071a3b2c"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BowTable.html#ad8391e46941ff9f49b78bf4f77c35143">setSlope</a> (StkFloat slope)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the table slope value.  <a href="#ad8391e46941ff9f49b78bf4f77c35143"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9540d5c56cfd4556ab25c25f0612b25d"></a><!-- doxytag: member="stk::BowTable::setMinOutput" ref="a9540d5c56cfd4556ab25c25f0612b25d" args="(StkFloat minimum)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BowTable.html#a9540d5c56cfd4556ab25c25f0612b25d">setMinOutput</a> (StkFloat minimum)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the minimum table output value (0.0 - 1.0). <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a634d5063eba886445f4057c823b00ff7"></a><!-- doxytag: member="stk::BowTable::setMaxOutput" ref="a634d5063eba886445f4057c823b00ff7" args="(StkFloat maximum)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BowTable.html#a634d5063eba886445f4057c823b00ff7">setMaxOutput</a> (StkFloat maximum)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the maximum table output value (0.0 - 1.0). <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8dc58c69ecda1471dce6d142cb5f4b19"></a><!-- doxytag: member="stk::BowTable::tick" ref="a8dc58c69ecda1471dce6d142cb5f4b19" args="(StkFloat input)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19">tick</a> (StkFloat input)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Take one sample input and map to one sample of output. <br/></td></tr>
@@ -49,8 +55,8 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK bowed string table class. </p>
-<p>This class implements a simple bowed string non-linear function, as described by Smith (1986).</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>This class implements a simple bowed string non-linear function, as described by Smith (1986). The output is an instantaneous reflection coefficient value.</p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a9adcc3c36085b73d3b877828071a3b2c"></a><!-- doxytag: member="stk::BowTable::setOffset" ref="a9adcc3c36085b73d3b877828071a3b2c" args="(StkFloat offset)" -->
 <div class="memitem">
@@ -71,6 +77,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Set the table offset value. </p>
 <p>The table offset is a bias which controls the symmetry of the friction. If you want the friction to vary with direction, use a non-zero value for the offset. The default value is zero. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00035"></a>00035 { offset_ = offset; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ad8391e46941ff9f49b78bf4f77c35143"></a><!-- doxytag: member="stk::BowTable::setSlope" ref="ad8391e46941ff9f49b78bf4f77c35143" args="(StkFloat slope)" -->
@@ -92,6 +101,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Set the table slope value. </p>
 <p>The table slope controls the width of the friction pulse, which is related to bow force. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00042"></a>00042 { slope_ = slope; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a8ad2766def014b62dcbbd8765e133246"></a><!-- doxytag: member="stk::BowTable::tick" ref="a8ad2766def014b62dcbbd8765e133246" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -122,6 +134,29 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object as inputs to the table and replace with corresponding outputs. </p>
 <p>The <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument reference is returned. The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00102"></a>00102 {
+<a name="l00103"></a>00103 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00104"></a>00104 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00105"></a>00105     oStream_ &lt;&lt; <span class="stringliteral">&quot;BowTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00106"></a>00106     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00107"></a>00107   }
+<a name="l00108"></a>00108 <span class="preprocessor">#endif</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span>
+<a name="l00110"></a>00110   StkFloat *samples = &amp;frames[channel];
+<a name="l00111"></a>00111   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00112"></a>00112   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00113"></a>00113     *samples = *samples + offset_;
+<a name="l00114"></a>00114     *samples *= slope_;
+<a name="l00115"></a>00115     *samples = (StkFloat) fabs( (<span class="keywordtype">double</span>) *samples ) + 0.75;
+<a name="l00116"></a>00116     *samples = (StkFloat) pow( *samples, (StkFloat) -4.0 );
+<a name="l00117"></a>00117     <span class="keywordflow">if</span> ( *samples &gt; 1.0) *samples = 1.0;
+<a name="l00118"></a>00118   }
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   lastFrame_[0] = *(samples-hop);
+<a name="l00121"></a>00121   <span class="keywordflow">return</span> frames;
+<a name="l00122"></a>00122 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="aaf72f823f210b18f417337ac7181cde5"></a><!-- doxytag: member="stk::BowTable::tick" ref="aaf72f823f210b18f417337ac7181cde5" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -164,6 +199,30 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the table and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00125"></a>00125 {
+<a name="l00126"></a>00126 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00127"></a>00127 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00128"></a>00128     oStream_ &lt;&lt; <span class="stringliteral">&quot;BowTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00129"></a>00129     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00130"></a>00130   }
+<a name="l00131"></a>00131 <span class="preprocessor">#endif</span>
+<a name="l00132"></a>00132 <span class="preprocessor"></span>
+<a name="l00133"></a>00133   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00134"></a>00134   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00135"></a>00135   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00136"></a>00136   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00137"></a>00137     *oSamples = *iSamples + offset_;
+<a name="l00138"></a>00138     *oSamples *= slope_;
+<a name="l00139"></a>00139     *oSamples = (StkFloat) fabs( (<span class="keywordtype">double</span>) *oSamples ) + 0.75;
+<a name="l00140"></a>00140     *oSamples = (StkFloat) pow( *oSamples, (StkFloat) -4.0 );
+<a name="l00141"></a>00141     <span class="keywordflow">if</span> ( *oSamples &gt; 1.0) *oSamples = 1.0;
+<a name="l00142"></a>00142   }
+<a name="l00143"></a>00143 
+<a name="l00144"></a>00144   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00145"></a>00145   <span class="keywordflow">return</span> iFrames;
+<a name="l00146"></a>00146 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -174,7 +233,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Bowed-members.html b/doc/html/classstk_1_1Bowed-members.html
index 21238d8..4482e81 100644
--- a/doc/html/classstk_1_1Bowed-members.html
+++ b/doc/html/classstk_1_1Bowed-members.html
@@ -12,7 +12,7 @@
 <div class="contents">
 <h1>stk::Bowed Member List</h1>This is the complete list of members for <a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a>, including all inherited members.<table>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340">addSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#ab776c34c271de25c0cd036946d764158">Bowed</a>(StkFloat lowestFrequency)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#a1b442f60bbec3d07d2dd322ff761c767">Bowed</a>(StkFloat lowestFrequency=8.0)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a32564b611598653fce5e708821b3fcb4">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#a8d522c36a35b86f90a06cf135fc83b11">clear</a>(void)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#ad066af9bb1340b6fcf9002d6922021f4">controlChange</a>(int number, StkFloat value)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td><code> [virtual]</code></td></tr>
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -33,7 +34,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#a02dbcfbd0766fee8a2e75a8df809e62c">setFrequency</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#a7cf229e206a61259d381cf153a1c5096">setVibrato</a>(StkFloat gain)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#a7cf229e206a61259d381cf153a1c5096">setVibrato</a>(StkFloat gain)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">showWarnings</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad75619ab92a0c19b5a52cb68884511e3">sleep</a>(unsigned long milliseconds)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#a519d511ddcc1cf23e897aeacdfe45020">startBowing</a>(StkFloat amplitude, StkFloat rate)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td></td></tr>
@@ -49,7 +50,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#ab7985e95058016201d16f3717039e1cd">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Bowed.html#a8067e4808bf7576922be4698f853c96c">~Bowed</a>(void)</td><td><a class="el" href="classstk_1_1Bowed.html">stk::Bowed</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -57,7 +58,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Bowed.gif b/doc/html/classstk_1_1Bowed.gif
deleted file mode 100644
index 851ee97..0000000
Binary files a/doc/html/classstk_1_1Bowed.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Bowed.html b/doc/html/classstk_1_1Bowed.html
index e418a19..6715ee7 100644
--- a/doc/html/classstk_1_1Bowed.html
+++ b/doc/html/classstk_1_1Bowed.html
@@ -32,8 +32,8 @@ Inheritance diagram for stk::Bowed:</div>
 <p><a href="classstk_1_1Bowed-members.html">List of all members.</a></p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab776c34c271de25c0cd036946d764158"></a><!-- doxytag: member="stk::Bowed::Bowed" ref="ab776c34c271de25c0cd036946d764158" args="(StkFloat lowestFrequency)" -->
-&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Bowed.html#ab776c34c271de25c0cd036946d764158">Bowed</a> (StkFloat lowestFrequency)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a1b442f60bbec3d07d2dd322ff761c767"></a><!-- doxytag: member="stk::Bowed::Bowed" ref="a1b442f60bbec3d07d2dd322ff761c767" args="(StkFloat lowestFrequency=8.0)" -->
+&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Bowed.html#a1b442f60bbec3d07d2dd322ff761c767">Bowed</a> (StkFloat lowestFrequency=8.0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the lowest desired playing frequency. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8067e4808bf7576922be4698f853c96c"></a><!-- doxytag: member="stk::Bowed::~Bowed" ref="a8067e4808bf7576922be4698f853c96c" args="(void)" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Bowed.html#a8067e4808bf7576922be4698f853c96c">~Bowed</a> (void)</td></tr>
@@ -65,6 +65,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4d583369f0b22335fff8cee3ce6f2750"></a><!-- doxytag: member="stk::Bowed::tick" ref="a4d583369f0b22335fff8cee3ce6f2750" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Bowed.html#ab7985e95058016201d16f3717039e1cd">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#ab7985e95058016201d16f3717039e1cd"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK bowed string instrument class. </p>
@@ -76,9 +78,71 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Bow Position = 4</li>
 <li>Vibrato Frequency = 11</li>
 <li>Vibrato Gain = 1</li>
+<li>Bow Velocity = 100</li>
+<li>Frequency = 101</li>
 <li>Volume = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. Contributions by Esteban Maestre, 2011. </p>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="ab7985e95058016201d16f3717039e1cd"></a><!-- doxytag: member="stk::Bowed::tick" ref="ab7985e95058016201d16f3717039e1cd" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Bowed::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00129"></a>00129 {
+<a name="l00130"></a>00130   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00131"></a>00131 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00132"></a>00132 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00133"></a>00133     oStream_ &lt;&lt; <span class="stringliteral">&quot;Bowed::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00134"></a>00134     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00135"></a>00135   }
+<a name="l00136"></a>00136 <span class="preprocessor">#endif</span>
+<a name="l00137"></a>00137 <span class="preprocessor"></span>
+<a name="l00138"></a>00138   StkFloat *samples = &amp;frames[channel];
+<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00140"></a>00140   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00141"></a>00141     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00142"></a>00142       *samples++ = <a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>();
+<a name="l00143"></a>00143   }
+<a name="l00144"></a>00144   <span class="keywordflow">else</span> {
+<a name="l00145"></a>00145     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00146"></a>00146       *samples++ = <a class="code" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750" title="Compute and return one output sample.">tick</a>();
+<a name="l00147"></a>00147       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00148"></a>00148         *samples++ = lastFrame_[j];
+<a name="l00149"></a>00149     }
+<a name="l00150"></a>00150   }
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152   <span class="keywordflow">return</span> frames;
+<a name="l00153"></a>00153 }
+</pre></div></p>
+
+</div>
+</div>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Bowed_8h_source.html">Bowed.h</a></li>
 </ul>
@@ -87,7 +151,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Brass-members.html b/doc/html/classstk_1_1Brass-members.html
index 9253b4e..7f0ea15 100644
--- a/doc/html/classstk_1_1Brass-members.html
+++ b/doc/html/classstk_1_1Brass-members.html
@@ -12,7 +12,7 @@
 <div class="contents">
 <h1>stk::Brass Member List</h1>This is the complete list of members for <a class="el" href="classstk_1_1Brass.html">stk::Brass</a>, including all inherited members.<table>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340">addSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Brass.html#a96b223221f536efdaad4e724db01f11b">Brass</a>(StkFloat lowestFrequency)</td><td><a class="el" href="classstk_1_1Brass.html">stk::Brass</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Brass.html#a5bf59263a54250be84c027198c7d2d1d">Brass</a>(StkFloat lowestFrequency=8.0)</td><td><a class="el" href="classstk_1_1Brass.html">stk::Brass</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a32564b611598653fce5e708821b3fcb4">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Brass.html#a64e48334efdc8f2508c29c5ea4281f2d">clear</a>()</td><td><a class="el" href="classstk_1_1Brass.html">stk::Brass</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Brass.html#a4d75ac361d11fcc870a330d393dbad80">controlChange</a>(int number, StkFloat value)</td><td><a class="el" href="classstk_1_1Brass.html">stk::Brass</a></td><td><code> [virtual]</code></td></tr>
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -49,7 +50,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Brass.html">stk::Brass</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Brass.html#a10334fc5573b68f2b5c2819bdba786b8">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Brass.html">stk::Brass</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Brass.html#a474528a75bd4fb88cdb9c783d73df8f6">~Brass</a>()</td><td><a class="el" href="classstk_1_1Brass.html">stk::Brass</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -57,7 +58,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Brass.gif b/doc/html/classstk_1_1Brass.gif
deleted file mode 100644
index 0e64c2b..0000000
Binary files a/doc/html/classstk_1_1Brass.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Brass.html b/doc/html/classstk_1_1Brass.html
index 34113bb..abc8cc1 100644
--- a/doc/html/classstk_1_1Brass.html
+++ b/doc/html/classstk_1_1Brass.html
@@ -32,8 +32,8 @@ Inheritance diagram for stk::Brass:</div>
 <p><a href="classstk_1_1Brass-members.html">List of all members.</a></p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Brass.html#a96b223221f536efdaad4e724db01f11b">Brass</a> (StkFloat lowestFrequency)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the lowest desired playing frequency.  <a href="#a96b223221f536efdaad4e724db01f11b"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Brass.html#a5bf59263a54250be84c027198c7d2d1d">Brass</a> (StkFloat lowestFrequency=8.0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the lowest desired playing frequency.  <a href="#a5bf59263a54250be84c027198c7d2d1d"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a474528a75bd4fb88cdb9c783d73df8f6"></a><!-- doxytag: member="stk::Brass::~Brass" ref="a474528a75bd4fb88cdb9c783d73df8f6" args="()" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Brass.html#a474528a75bd4fb88cdb9c783d73df8f6">~Brass</a> ()</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class destructor. <br/></td></tr>
@@ -64,6 +64,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4af1b7c4c1b374b65e04ccaa90886321"></a><!-- doxytag: member="stk::Brass::tick" ref="a4af1b7c4c1b374b65e04ccaa90886321" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Brass.html#a10334fc5573b68f2b5c2819bdba786b8">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a10334fc5573b68f2b5c2819bdba786b8"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK simple brass instrument class. </p>
@@ -77,9 +79,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Vibrato Gain = 1</li>
 <li>Volume = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
-<a class="anchor" id="a96b223221f536efdaad4e724db01f11b"></a><!-- doxytag: member="stk::Brass::Brass" ref="a96b223221f536efdaad4e724db01f11b" args="(StkFloat lowestFrequency)" -->
+<a class="anchor" id="a5bf59263a54250be84c027198c7d2d1d"></a><!-- doxytag: member="stk::Brass::Brass" ref="a5bf59263a54250be84c027198c7d2d1d" args="(StkFloat lowestFrequency=8.0)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -87,7 +89,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
           <td class="memname">stk::Brass::Brass </td>
           <td>(</td>
           <td class="paramtype">StkFloat&nbsp;</td>
-          <td class="paramname"> <em>lowestFrequency</em></td>
+          <td class="paramname"> <em>lowestFrequency</em> = <code>8.0</code></td>
           <td>&nbsp;)&nbsp;</td>
           <td></td>
         </tr>
@@ -98,6 +100,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor, taking the lowest desired playing frequency. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a10334fc5573b68f2b5c2819bdba786b8"></a><!-- doxytag: member="stk::Brass::tick" ref="a10334fc5573b68f2b5c2819bdba786b8" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Brass::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00119"></a>00119 {
+<a name="l00120"></a>00120   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00121"></a>00121 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00122"></a>00122 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00123"></a>00123     oStream_ &lt;&lt; <span class="stringliteral">&quot;Brass::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00124"></a>00124     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00125"></a>00125   }
+<a name="l00126"></a>00126 <span class="preprocessor">#endif</span>
+<a name="l00127"></a>00127 <span class="preprocessor"></span>
+<a name="l00128"></a>00128   StkFloat *samples = &amp;frames[channel];
+<a name="l00129"></a>00129   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00130"></a>00130   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00131"></a>00131     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00132"></a>00132       *samples++ = <a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">tick</a>();
+<a name="l00133"></a>00133   }
+<a name="l00134"></a>00134   <span class="keywordflow">else</span> {
+<a name="l00135"></a>00135     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00136"></a>00136       *samples++ = <a class="code" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321" title="Compute and return one output sample.">tick</a>();
+<a name="l00137"></a>00137       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00138"></a>00138         *samples++ = lastFrame_[j];
+<a name="l00139"></a>00139     }
+<a name="l00140"></a>00140   }
+<a name="l00141"></a>00141 
+<a name="l00142"></a>00142   <span class="keywordflow">return</span> frames;
+<a name="l00143"></a>00143 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -108,7 +170,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Chorus-members.html b/doc/html/classstk_1_1Chorus-members.html
index e950a82..bf4e79b 100644
--- a/doc/html/classstk_1_1Chorus-members.html
+++ b/doc/html/classstk_1_1Chorus-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Effect.html">stk::Effect</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Chorus.html#aabcc110787ec3b443c21845b2f06bb3c">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Chorus.html">stk::Chorus</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -28,7 +29,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d">sampleRate</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a740e872daa4b2ad1c918163e7c5ab56b">sampleRateChanged</a>(StkFloat newRate, StkFloat oldRate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Effect.html#ab4facbc9b317f18c139577e52fd69c3d">setEffectMix</a>(StkFloat mix)</td><td><a class="el" href="classstk_1_1Effect.html">stk::Effect</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Chorus.html#acb3a55518c919dafa6c19698c1ab3389">setModDepth</a>(StkFloat depth)</td><td><a class="el" href="classstk_1_1Chorus.html">stk::Chorus</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Chorus.html#acb3a55518c919dafa6c19698c1ab3389">setModDepth</a>(StkFloat depth)</td><td><a class="el" href="classstk_1_1Chorus.html">stk::Chorus</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Chorus.html#aa4372095b8526d62ff9cfbdb03f21c4d">setModFrequency</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Chorus.html">stk::Chorus</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
@@ -53,7 +54,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Chorus.gif b/doc/html/classstk_1_1Chorus.gif
deleted file mode 100644
index d8fb436..0000000
Binary files a/doc/html/classstk_1_1Chorus.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Chorus.html b/doc/html/classstk_1_1Chorus.html
index f2ec427..0a2cf44 100644
--- a/doc/html/classstk_1_1Chorus.html
+++ b/doc/html/classstk_1_1Chorus.html
@@ -39,7 +39,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Reset and clear all internal state. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acb3a55518c919dafa6c19698c1ab3389"></a><!-- doxytag: member="stk::Chorus::setModDepth" ref="acb3a55518c919dafa6c19698c1ab3389" args="(StkFloat depth)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Chorus.html#acb3a55518c919dafa6c19698c1ab3389">setModDepth</a> (StkFloat depth)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set modulation depth. <br/></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set modulation depth in range 0.0 - 1.0. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa4372095b8526d62ff9cfbdb03f21c4d"></a><!-- doxytag: member="stk::Chorus::setModFrequency" ref="aa4372095b8526d62ff9cfbdb03f21c4d" args="(StkFloat frequency)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Chorus.html#aa4372095b8526d62ff9cfbdb03f21c4d">setModFrequency</a> (StkFloat frequency)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set modulation frequency. <br/></td></tr>
@@ -55,7 +55,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK chorus effect class. </p>
 <p>This class implements a chorus effect. It takes a monophonic input signal and produces a stereo output signal.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a529f668e66188ae5a42e4cc30779059f"></a><!-- doxytag: member="stk::Chorus::Chorus" ref="a529f668e66188ae5a42e4cc30779059f" args="(StkFloat baseDelay=6000)" -->
 <div class="memitem">
@@ -98,6 +98,18 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Return the specified channel value of the last computed stereo frame. </p>
 <p>Use the <a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> function to get both values of the last computed stereo frame. The <code>channel</code> argument must be 0 or 1 (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00094"></a>00094 {
+<a name="l00095"></a>00095 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00096"></a>00096 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
+<a name="l00097"></a>00097     oStream_ &lt;&lt; <span class="stringliteral">&quot;Chorus::lastOut(): channel argument must be less than 2!&quot;</span>;
+<a name="l00098"></a>00098     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00099"></a>00099   }
+<a name="l00100"></a>00100 <span class="preprocessor">#endif</span>
+<a name="l00101"></a>00101 <span class="preprocessor"></span>
+<a name="l00102"></a>00102   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00103"></a>00103 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a31d5c48d5b4a030040f6bb6b5e2c99cf"></a><!-- doxytag: member="stk::Chorus::tick" ref="a31d5c48d5b4a030040f6bb6b5e2c99cf" args="(StkFloat input, unsigned int channel=0)" -->
@@ -128,6 +140,22 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Input one sample to the effect and return the specified <code>channel</code> value of the computed stereo frame. </p>
 <p>Use the <a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> function to get both values of the computed stereo output frame. The <code>channel</code> argument must be 0 or 1 (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00106"></a>00106 {
+<a name="l00107"></a>00107 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
+<a name="l00109"></a>00109     oStream_ &lt;&lt; <span class="stringliteral">&quot;Chorus::tick(): channel argument must be less than 2!&quot;</span>;
+<a name="l00110"></a>00110     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00111"></a>00111   }
+<a name="l00112"></a>00112 <span class="preprocessor">#endif</span>
+<a name="l00113"></a>00113 <span class="preprocessor"></span>
+<a name="l00114"></a>00114   delayLine_[0].setDelay( baseLength_ * 0.707 * ( 1.0 + modDepth_ * mods_[0].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
+<a name="l00115"></a>00115   delayLine_[1].setDelay( baseLength_  * 0.5 *  ( 1.0 - modDepth_ * mods_[1].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
+<a name="l00116"></a>00116   lastFrame_[0] = effectMix_ * ( delayLine_[0].tick( input ) - input ) + input;
+<a name="l00117"></a>00117   lastFrame_[1] = effectMix_ * ( delayLine_[1].tick( input ) - input ) + input;
+<a name="l00118"></a>00118   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00119"></a>00119 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="aef55c6fb93a1d00498ae436868f84501"></a><!-- doxytag: member="stk::Chorus::tick" ref="aef55c6fb93a1d00498ae436868f84501" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -158,6 +186,30 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Take a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object as inputs to the effect and replace with stereo outputs. </p>
 <p>The <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument reference is returned. The stereo outputs are written to the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument starting at the specified <code>channel</code>. Therefore, the <code>channel</code> argument must be less than ( channels() - 1 ) of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00122"></a>00122 {
+<a name="l00123"></a>00123 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00124"></a>00124 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() - 1 ) {
+<a name="l00125"></a>00125     oStream_ &lt;&lt; <span class="stringliteral">&quot;Chorus::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00126"></a>00126     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00127"></a>00127   }
+<a name="l00128"></a>00128 <span class="preprocessor">#endif</span>
+<a name="l00129"></a>00129 <span class="preprocessor"></span>
+<a name="l00130"></a>00130   StkFloat *samples = &amp;frames[channel];
+<a name="l00131"></a>00131   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels() - 1;
+<a name="l00132"></a>00132   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00133"></a>00133     delayLine_[0].setDelay( baseLength_ * 0.707 * ( 1.0 + modDepth_ * mods_[0].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
+<a name="l00134"></a>00134     delayLine_[1].setDelay( baseLength_  * 0.5 *  ( 1.0 - modDepth_ * mods_[1].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
+<a name="l00135"></a>00135     *samples = effectMix_ * ( delayLine_[0].tick( *samples ) - *samples ) + *samples;
+<a name="l00136"></a>00136     samples++;
+<a name="l00137"></a>00137     *samples = effectMix_ * ( delayLine_[1].tick( *samples ) - *samples ) + *samples;
+<a name="l00138"></a>00138   }
+<a name="l00139"></a>00139 
+<a name="l00140"></a>00140   lastFrame_[0] = *(samples-hop);
+<a name="l00141"></a>00141   lastFrame_[1] = *(samples-hop+1);
+<a name="l00142"></a>00142   <span class="keywordflow">return</span> frames;
+<a name="l00143"></a>00143 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="abdb8802a83f6b89716316399138e3032"></a><!-- doxytag: member="stk::Chorus::tick" ref="abdb8802a83f6b89716316399138e3032" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -200,6 +252,30 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Take a channel of the <code>iFrames</code> object as inputs to the effect and write stereo outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. The <code>iChannel</code> argument must be less than the number of channels in the <code>iFrames</code> argument (the first channel is specified by 0). The <code>oChannel</code> argument must be less than ( channels() - 1 ) of the <code>oFrames</code> argument. However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00146"></a>00146 {
+<a name="l00147"></a>00147 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00148"></a>00148 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() - 1 ) {
+<a name="l00149"></a>00149     oStream_ &lt;&lt; <span class="stringliteral">&quot;Chorus::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00150"></a>00150     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00151"></a>00151   }
+<a name="l00152"></a>00152 <span class="preprocessor">#endif</span>
+<a name="l00153"></a>00153 <span class="preprocessor"></span>
+<a name="l00154"></a>00154   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00155"></a>00155   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00156"></a>00156   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00157"></a>00157   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00158"></a>00158     delayLine_[0].setDelay( baseLength_ * 0.707 * ( 1.0 + modDepth_ * mods_[0].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
+<a name="l00159"></a>00159     delayLine_[1].setDelay( baseLength_  * 0.5 *  ( 1.0 - modDepth_ * mods_[1].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>() ) );
+<a name="l00160"></a>00160     *oSamples = effectMix_ * ( delayLine_[0].tick( *iSamples ) - *iSamples ) + *iSamples;
+<a name="l00161"></a>00161     *(oSamples+1) = effectMix_ * ( delayLine_[1].<a class="code" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf" title="Input one sample to the effect and return the specified channel value of the computed...">tick</a>( *iSamples ) - *iSamples ) + *iSamples;
+<a name="l00162"></a>00162   }
+<a name="l00163"></a>00163 
+<a name="l00164"></a>00164   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00165"></a>00165   lastFrame_[1] = *(oSamples-oHop+1);
+<a name="l00166"></a>00166   <span class="keywordflow">return</span> iFrames;
+<a name="l00167"></a>00167 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -210,7 +286,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Clarinet-members.html b/doc/html/classstk_1_1Clarinet-members.html
index 988e3a0..ab3398a 100644
--- a/doc/html/classstk_1_1Clarinet-members.html
+++ b/doc/html/classstk_1_1Clarinet-members.html
@@ -13,13 +13,14 @@
 <h1>stk::Clarinet Member List</h1>This is the complete list of members for <a class="el" href="classstk_1_1Clarinet.html">stk::Clarinet</a>, including all inherited members.<table>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340">addSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a32564b611598653fce5e708821b3fcb4">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Clarinet.html#a82e32a30e6d9664ac9fe748070bec23c">Clarinet</a>(StkFloat lowestFrequency)</td><td><a class="el" href="classstk_1_1Clarinet.html">stk::Clarinet</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Clarinet.html#aad5cf9fb562ee87f2dc0aed0b4cd6c5b">Clarinet</a>(StkFloat lowestFrequency=8.0)</td><td><a class="el" href="classstk_1_1Clarinet.html">stk::Clarinet</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Clarinet.html#a7eae4377eb4178067c2dba704032a2d1">clear</a>(void)</td><td><a class="el" href="classstk_1_1Clarinet.html">stk::Clarinet</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Clarinet.html#a63582205ab940101f5f9419fc717ff78">controlChange</a>(int number, StkFloat value)</td><td><a class="el" href="classstk_1_1Clarinet.html">stk::Clarinet</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a>(const char *message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -48,7 +49,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Clarinet.html">stk::Clarinet</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Clarinet.html#a059174eb1ab84e306bfad1d8b5833548">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Clarinet.html">stk::Clarinet</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Clarinet.html#a5166db9f4cf180fa189ba2e135affe34">~Clarinet</a>(void)</td><td><a class="el" href="classstk_1_1Clarinet.html">stk::Clarinet</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -56,7 +57,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Clarinet.gif b/doc/html/classstk_1_1Clarinet.gif
deleted file mode 100644
index c2c1cb8..0000000
Binary files a/doc/html/classstk_1_1Clarinet.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Clarinet.html b/doc/html/classstk_1_1Clarinet.html
index f5529f3..bf917d5 100644
--- a/doc/html/classstk_1_1Clarinet.html
+++ b/doc/html/classstk_1_1Clarinet.html
@@ -32,8 +32,8 @@ Inheritance diagram for stk::Clarinet:</div>
 <p><a href="classstk_1_1Clarinet-members.html">List of all members.</a></p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Clarinet.html#a82e32a30e6d9664ac9fe748070bec23c">Clarinet</a> (StkFloat lowestFrequency)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the lowest desired playing frequency.  <a href="#a82e32a30e6d9664ac9fe748070bec23c"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Clarinet.html#aad5cf9fb562ee87f2dc0aed0b4cd6c5b">Clarinet</a> (StkFloat lowestFrequency=8.0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the lowest desired playing frequency.  <a href="#aad5cf9fb562ee87f2dc0aed0b4cd6c5b"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5166db9f4cf180fa189ba2e135affe34"></a><!-- doxytag: member="stk::Clarinet::~Clarinet" ref="a5166db9f4cf180fa189ba2e135affe34" args="(void)" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Clarinet.html#a5166db9f4cf180fa189ba2e135affe34">~Clarinet</a> (void)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class destructor. <br/></td></tr>
@@ -61,6 +61,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4cd08bca954ad434bc636eda957ca8d5"></a><!-- doxytag: member="stk::Clarinet::tick" ref="a4cd08bca954ad434bc636eda957ca8d5" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Clarinet.html#a059174eb1ab84e306bfad1d8b5833548">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a059174eb1ab84e306bfad1d8b5833548"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK clarinet physical model class. </p>
@@ -74,9 +76,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Vibrato Gain = 1</li>
 <li>Breath Pressure = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
-<a class="anchor" id="a82e32a30e6d9664ac9fe748070bec23c"></a><!-- doxytag: member="stk::Clarinet::Clarinet" ref="a82e32a30e6d9664ac9fe748070bec23c" args="(StkFloat lowestFrequency)" -->
+<a class="anchor" id="aad5cf9fb562ee87f2dc0aed0b4cd6c5b"></a><!-- doxytag: member="stk::Clarinet::Clarinet" ref="aad5cf9fb562ee87f2dc0aed0b4cd6c5b" args="(StkFloat lowestFrequency=8.0)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
@@ -84,7 +86,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
           <td class="memname">stk::Clarinet::Clarinet </td>
           <td>(</td>
           <td class="paramtype">StkFloat&nbsp;</td>
-          <td class="paramname"> <em>lowestFrequency</em></td>
+          <td class="paramname"> <em>lowestFrequency</em> = <code>8.0</code></td>
           <td>&nbsp;)&nbsp;</td>
           <td></td>
         </tr>
@@ -95,6 +97,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor, taking the lowest desired playing frequency. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a059174eb1ab84e306bfad1d8b5833548"></a><!-- doxytag: member="stk::Clarinet::tick" ref="a059174eb1ab84e306bfad1d8b5833548" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Clarinet::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00124"></a>00124 {
+<a name="l00125"></a>00125   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00126"></a>00126 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00127"></a>00127 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00128"></a>00128     oStream_ &lt;&lt; <span class="stringliteral">&quot;Clarinet::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00129"></a>00129     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00130"></a>00130   }
+<a name="l00131"></a>00131 <span class="preprocessor">#endif</span>
+<a name="l00132"></a>00132 <span class="preprocessor"></span>
+<a name="l00133"></a>00133   StkFloat *samples = &amp;frames[channel];
+<a name="l00134"></a>00134   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00135"></a>00135   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00136"></a>00136     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00137"></a>00137       *samples++ = <a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">tick</a>();
+<a name="l00138"></a>00138   }
+<a name="l00139"></a>00139   <span class="keywordflow">else</span> {
+<a name="l00140"></a>00140     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00141"></a>00141       *samples++ = <a class="code" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5" title="Compute and return one output sample.">tick</a>();
+<a name="l00142"></a>00142       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00143"></a>00143         *samples++ = lastFrame_[j];
+<a name="l00144"></a>00144     }
+<a name="l00145"></a>00145   }
+<a name="l00146"></a>00146 
+<a name="l00147"></a>00147   <span class="keywordflow">return</span> frames;
+<a name="l00148"></a>00148 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -105,7 +167,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1PluckTwo-members.html b/doc/html/classstk_1_1Cubic-members.html
similarity index 62%
rename from doc/html/classstk_1_1PluckTwo-members.html
rename to doc/html/classstk_1_1Cubic-members.html
index 2a0622a..2a458b3 100644
--- a/doc/html/classstk_1_1PluckTwo-members.html
+++ b/doc/html/classstk_1_1Cubic-members.html
@@ -10,33 +10,28 @@
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
 <div class="contents">
-<h1>stk::PluckTwo Member List</h1>This is the complete list of members for <a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a>, including all inherited members.<table>
+<h1>stk::Cubic Member List</h1>This is the complete list of members for <a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a>, including all inherited members.<table>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340">addSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a32564b611598653fce5e708821b3fcb4">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a71821e47009a94de9e8a1f3305263840">clear</a>(void)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a5aecf9f4d4dcecdbef8271c7fe62b2cf">controlChange</a>(int number, StkFloat value)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline, virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Cubic.html#a2059a20146f6d7ec0854dc860ca90895">Cubic</a>(void)</td><td><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Function.html#a21648ab236a66f3f0155bdb911f9f3c3">Function</a>(void)</td><td><a class="el" href="classstk_1_1Function.html">stk::Function</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a>(const char *message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a0d5d81db10c145f3d5bafc5775d147bf">noteOff</a>(StkFloat amplitude)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td><code> [virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a0736ccd253b446660938d51909a32f44">noteOn</a>(StkFloat frequency, StkFloat amplitude)=0</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [pure virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#aa121655f6007003aebb5de425e98d099">PluckTwo</a>(StkFloat lowestFrequency)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Function.html#ae79bd6d0c9f53693b4ca28948d94fc25">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Function.html">stk::Function</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d">sampleRate</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a740e872daa4b2ad1c918163e7c5ab56b">sampleRateChanged</a>(StkFloat newRate, StkFloat oldRate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a168f563174e22b221744ef66b35a5277">setBaseLoopGain</a>(StkFloat aGain)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a6b355a495d9122273fb8c88009bf79d6">setDetune</a>(StkFloat detune)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a3cd8e9135b1d8a97b87f9486dd3cd671">setFreqAndDetune</a>(StkFloat frequency, StkFloat detune)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a9f0618a28243b235f6c0f424a236709c">setFrequency</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td><code> [virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#afffb424a2957fc691363ba1227809695">setPluckPosition</a>(StkFloat position)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Cubic.html#af4604c69f138415f9b9ee6944d2b54ef">setA1</a>(StkFloat a1)</td><td><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Cubic.html#afa16d53e6a720936543d0e0ea778f0eb">setA2</a>(StkFloat a2)</td><td><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Cubic.html#add4a05676471c4c09b76f5fe430b80fa">setA3</a>(StkFloat a3)</td><td><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Cubic.html#a3eca8ac3f81301592476aad7a2e1ec50">setGain</a>(StkFloat gain)</td><td><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Cubic.html#a10ba2b5c858fc2d656d49c676d5561b4">setThreshold</a>(StkFloat threshold)</td><td><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">showWarnings</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad75619ab92a0c19b5a52cb68884511e3">sleep</a>(unsigned long milliseconds)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a9bff83b5a318ff171f94a218ad52226b">Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -49,15 +44,16 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab2dc4c9e67317eb0753868a89c8095f6">swap16</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#ac8a0720b08d20741b0d8a312f1cf7e5c">~PluckTwo</a>(void)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td><code> [virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c">tick</a>(StkFloat input)</td><td><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></td><td><code> [inline, virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Cubic.html#af3e8a1d6ffe5e9788d841343bd5722cc">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Cubic.html#aef7887fe7e5131ce48c8488a21d295b9">tick</a>(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)</td><td><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Cubic.html b/doc/html/classstk_1_1Cubic.html
new file mode 100644
index 0000000..363001b
--- /dev/null
+++ b/doc/html/classstk_1_1Cubic.html
@@ -0,0 +1,190 @@
+<HTML>
+<HEAD>
+<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
+<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+<CENTER>
+<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
+<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
+<HR>
+<!-- Generated by Doxygen 1.6.2 -->
+  <div class="navpath"><a class="el" href="namespacestk.html">stk</a>::<a class="el" href="classstk_1_1Cubic.html">Cubic</a>
+  </div>
+<div class="contents">
+<h1>stk::Cubic Class Reference</h1><!-- doxytag: class="stk::Cubic" --><!-- doxytag: inherits="stk::Function" -->
+<p>STK cubic non-linearity class.  
+<a href="#_details">More...</a></p>
+
+<p><code>#include &lt;<a class="el" href="Cubic_8h_source.html">Cubic.h</a>&gt;</code></p>
+<div class="dynheader">
+Inheritance diagram for stk::Cubic:</div>
+<div class="dynsection">
+ <div class="center">
+  <img src="classstk_1_1Cubic.png" usemap="#stk::Cubic_map" alt=""/>
+  <map id="stk::Cubic_map" name="stk::Cubic_map">
+<area href="classstk_1_1Function.html" alt="stk::Function" shape="rect" coords="0,56,82,80"/>
+<area href="classstk_1_1Stk.html" alt="stk::Stk" shape="rect" coords="0,0,82,24"/>
+</map>
+ </div>
+</div>
+
+<p><a href="classstk_1_1Cubic-members.html">List of all members.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2059a20146f6d7ec0854dc860ca90895"></a><!-- doxytag: member="stk::Cubic::Cubic" ref="a2059a20146f6d7ec0854dc860ca90895" args="(void)" -->
+&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Cubic.html#a2059a20146f6d7ec0854dc860ca90895">Cubic</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Default constructor. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af4604c69f138415f9b9ee6944d2b54ef"></a><!-- doxytag: member="stk::Cubic::setA1" ref="af4604c69f138415f9b9ee6944d2b54ef" args="(StkFloat a1)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Cubic.html#af4604c69f138415f9b9ee6944d2b54ef">setA1</a> (StkFloat a1)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the a1 coefficient value. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afa16d53e6a720936543d0e0ea778f0eb"></a><!-- doxytag: member="stk::Cubic::setA2" ref="afa16d53e6a720936543d0e0ea778f0eb" args="(StkFloat a2)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Cubic.html#afa16d53e6a720936543d0e0ea778f0eb">setA2</a> (StkFloat a2)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the a2 coefficient value. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="add4a05676471c4c09b76f5fe430b80fa"></a><!-- doxytag: member="stk::Cubic::setA3" ref="add4a05676471c4c09b76f5fe430b80fa" args="(StkFloat a3)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Cubic.html#add4a05676471c4c09b76f5fe430b80fa">setA3</a> (StkFloat a3)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the a3 coefficient value. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3eca8ac3f81301592476aad7a2e1ec50"></a><!-- doxytag: member="stk::Cubic::setGain" ref="a3eca8ac3f81301592476aad7a2e1ec50" args="(StkFloat gain)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Cubic.html#a3eca8ac3f81301592476aad7a2e1ec50">setGain</a> (StkFloat gain)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the gain value. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a10ba2b5c858fc2d656d49c676d5561b4"></a><!-- doxytag: member="stk::Cubic::setThreshold" ref="a10ba2b5c858fc2d656d49c676d5561b4" args="(StkFloat threshold)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Cubic.html#a10ba2b5c858fc2d656d49c676d5561b4">setThreshold</a> (StkFloat threshold)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the threshold value. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a24e2270a347e0a6721bc0f7e0040117c"></a><!-- doxytag: member="stk::Cubic::tick" ref="a24e2270a347e0a6721bc0f7e0040117c" args="(StkFloat input)" -->
+StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c">tick</a> (StkFloat input)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Input one sample to the function and return one output. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Cubic.html#af3e8a1d6ffe5e9788d841343bd5722cc">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Take a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object as inputs to the function and replace with corresponding outputs.  <a href="#af3e8a1d6ffe5e9788d841343bd5722cc"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Cubic.html#aef7887fe7e5131ce48c8488a21d295b9">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;iFrames, <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Take a channel of the <code>iFrames</code> object as inputs to the function and write outputs to the <code>oFrames</code> object.  <a href="#aef7887fe7e5131ce48c8488a21d295b9"></a><br/></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>STK cubic non-linearity class. </p>
+<p>This class implements the cubic non-linearity that was used in SynthBuilder.</p>
+<p>The formula implemented is:</p>
+<div class="fragment"><pre class="fragment">    output = gain * (a1 * input + a2 * input^2 + a3 * input^3)
+</pre></div><p>followed by a limiter for values outside +-threshold.</p>
+<p>Ported to STK by Nick Porcaro, 2007. Updated for inclusion in STK distribution by Gary Scavone, 2011. </p>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="af3e8a1d6ffe5e9788d841343bd5722cc"></a><!-- doxytag: member="stk::Cubic::tick" ref="af3e8a1d6ffe5e9788d841343bd5722cc" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Cubic::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Take a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object as inputs to the function and replace with corresponding outputs. </p>
+<p>The <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument reference is returned. The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00100"></a>00100 {
+<a name="l00101"></a>00101 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00102"></a>00102 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00103"></a>00103     oStream_ &lt;&lt; <span class="stringliteral">&quot;Cubic::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00104"></a>00104     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106 <span class="preprocessor">#endif</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span>
+<a name="l00108"></a>00108   StkFloat *samples = &amp;frames[channel];
+<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00110"></a>00110   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00111"></a>00111     *samples = <a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c" title="Input one sample to the function and return one output.">tick</a>( *samples );
+<a name="l00112"></a>00112 
+<a name="l00113"></a>00113   lastFrame_[0] = *(samples-hop);
+<a name="l00114"></a>00114   <span class="keywordflow">return</span> frames;
+<a name="l00115"></a>00115 }
+</pre></div></p>
+
+</div>
+</div>
+<a class="anchor" id="aef7887fe7e5131ce48c8488a21d295b9"></a><!-- doxytag: member="stk::Cubic::tick" ref="aef7887fe7e5131ce48c8488a21d295b9" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Cubic::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>iFrames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>oFrames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>iChannel</em> = <code>0</code>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>oChannel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Take a channel of the <code>iFrames</code> object as inputs to the function and write outputs to the <code>oFrames</code> object. </p>
+<p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00118"></a>00118 {
+<a name="l00119"></a>00119 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00120"></a>00120 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00121"></a>00121     oStream_ &lt;&lt; <span class="stringliteral">&quot;Cubic::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00122"></a>00122     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00123"></a>00123   }
+<a name="l00124"></a>00124 <span class="preprocessor">#endif</span>
+<a name="l00125"></a>00125 <span class="preprocessor"></span>
+<a name="l00126"></a>00126   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00127"></a>00127   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00128"></a>00128   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00129"></a>00129   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop )
+<a name="l00130"></a>00130     *oSamples = <a class="code" href="classstk_1_1Cubic.html#a24e2270a347e0a6721bc0f7e0040117c" title="Input one sample to the function and return one output.">tick</a>( *iSamples );
+<a name="l00131"></a>00131 
+<a name="l00132"></a>00132   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00133"></a>00133   <span class="keywordflow">return</span> iFrames;
+<a name="l00134"></a>00134 }
+</pre></div></p>
+
+</div>
+</div>
+<hr/>The documentation for this class was generated from the following file:<ul>
+<li><a class="el" href="Cubic_8h_source.html">Cubic.h</a></li>
+</ul>
+</div>
+<HR>
+
+<table>
+  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+</table>
+
+</BODY>
+</HTML>
diff --git a/doc/html/classstk_1_1Cubic.png b/doc/html/classstk_1_1Cubic.png
new file mode 100644
index 0000000..9970726
Binary files /dev/null and b/doc/html/classstk_1_1Cubic.png differ
diff --git a/doc/html/classstk_1_1Delay-members.html b/doc/html/classstk_1_1Delay-members.html
index ab5fbd0..32e9219 100644
--- a/doc/html/classstk_1_1Delay-members.html
+++ b/doc/html/classstk_1_1Delay-members.html
@@ -12,23 +12,25 @@
 <div class="contents">
 <h1>stk::Delay Member List</h1>This is the complete list of members for <a class="el" href="classstk_1_1Delay.html">stk::Delay</a>, including all inherited members.<table>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340">addSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#aea5580dd84ea6982d1f7b92b53314118">addTo</a>(unsigned long tapDelay, StkFloat value)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#a80f143ab956c9d3b1721958ece6da65e">addTo</a>(StkFloat value, unsigned long tapDelay)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a48f23ab6613be35e3be8aceaf5adfdd7">channelsIn</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c">clear</a>(void)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#a7d4c9c21e752f860ba683e9849d14665">contentsAt</a>(unsigned long tapDelay)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#a9644532bfea44fae046e54f2509cf1ef">Delay</a>(unsigned long delay=0, unsigned long maxDelay=4095)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#a240830690cd8fa26e0604fd82c65dda1">energy</a>(void) const </td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#afc70117c0133d4a5d9a651ceb691d7c0">Filter</a>(void)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#a7ae307dc997ff07ff986ca5c4d287441">getDelay</a>(void) const </td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#af21e11b72ea59af4585c59600a0980c2">getGain</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#a31d348fd15e5b6e23f2984b75968a3ec">getMaximumDelay</a>(void)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a>(const char *message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#a2433e3246551f4fdf1366884cd2ae426">nextOut</a>(void)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -51,6 +53,8 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab2dc4c9e67317eb0753868a89c8095f6">swap16</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#abd0b93da7a12eca94c1e68ec3b3774f1">tapIn</a>(StkFloat value, unsigned long tapDelay)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#a4d5e5bab50e4fa062bd3f0e9e2fd19db">tapOut</a>(unsigned long tapDelay)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9">tick</a>(StkFloat input)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#a93fe8e45acb933889be812f35810f977">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Delay.html#ade0d544e45e535fd792fe70a2a22da6f">tick</a>(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)</td><td><a class="el" href="classstk_1_1Delay.html">stk::Delay</a></td><td><code> [inline]</code></td></tr>
@@ -61,7 +65,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Delay.gif b/doc/html/classstk_1_1Delay.gif
deleted file mode 100644
index 36784d6..0000000
Binary files a/doc/html/classstk_1_1Delay.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Delay.html b/doc/html/classstk_1_1Delay.html
index 0847617..01ec3d9 100644
--- a/doc/html/classstk_1_1Delay.html
+++ b/doc/html/classstk_1_1Delay.html
@@ -37,6 +37,9 @@ Inheritance diagram for stk::Delay:</div>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a24b6ed6c7c5fc6d15935ec2a118b6b4f"></a><!-- doxytag: member="stk::Delay::~Delay" ref="a24b6ed6c7c5fc6d15935ec2a118b6b4f" args="()" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#a24b6ed6c7c5fc6d15935ec2a118b6b4f">~Delay</a> ()</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class destructor. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a31d348fd15e5b6e23f2984b75968a3ec"></a><!-- doxytag: member="stk::Delay::getMaximumDelay" ref="a31d348fd15e5b6e23f2984b75968a3ec" args="(void)" -->
+unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#a31d348fd15e5b6e23f2984b75968a3ec">getMaximumDelay</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the maximum delay-line length. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#a0cf4c8da14bd4105eef06e35caaf1532">setMaximumDelay</a> (unsigned long delay)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the maximum delay-line length.  <a href="#a0cf4c8da14bd4105eef06e35caaf1532"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#a5eaeed55ea0c7b30ed66fedd6ef52fc2">setDelay</a> (unsigned long delay)</td></tr>
@@ -44,10 +47,13 @@ Inheritance diagram for stk::Delay:</div>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7ae307dc997ff07ff986ca5c4d287441"></a><!-- doxytag: member="stk::Delay::getDelay" ref="a7ae307dc997ff07ff986ca5c4d287441" args="(void) const " -->
 unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#a7ae307dc997ff07ff986ca5c4d287441">getDelay</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the current delay-line length. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#a7d4c9c21e752f860ba683e9849d14665">contentsAt</a> (unsigned long tapDelay)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the value at <em>tapDelay</em> samples from the delay-line input.  <a href="#a7d4c9c21e752f860ba683e9849d14665"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#aea5580dd84ea6982d1f7b92b53314118">addTo</a> (unsigned long tapDelay, StkFloat value)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Sum the provided value into the delay line at <em>tapDelay</em> samples from the input.  <a href="#aea5580dd84ea6982d1f7b92b53314118"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#a4d5e5bab50e4fa062bd3f0e9e2fd19db">tapOut</a> (unsigned long tapDelay)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the value at <em>tapDelay</em> samples from the delay-line input.  <a href="#a4d5e5bab50e4fa062bd3f0e9e2fd19db"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abd0b93da7a12eca94c1e68ec3b3774f1"></a><!-- doxytag: member="stk::Delay::tapIn" ref="abd0b93da7a12eca94c1e68ec3b3774f1" args="(StkFloat value, unsigned long tapDelay)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#abd0b93da7a12eca94c1e68ec3b3774f1">tapIn</a> (StkFloat value, unsigned long tapDelay)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the <em>value</em> at <em>tapDelay</em> samples from the delay-line input. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#a80f143ab956c9d3b1721958ece6da65e">addTo</a> (StkFloat value, unsigned long tapDelay)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Sum the provided <em>value</em> into the delay line at <em>tapDelay</em> samples from the input.  <a href="#a80f143ab956c9d3b1721958ece6da65e"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7b563a37eec1773e8e82f9e328aed9b2"></a><!-- doxytag: member="stk::Delay::lastOut" ref="a7b563a37eec1773e8e82f9e328aed9b2" args="(void) const " -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2">lastOut</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the last computed output value. <br/></td></tr>
@@ -68,7 +74,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>STK non-interpolating delay line class. </p>
 <p>This class implements a non-interpolating digital delay-line. If the delay and maximum length are not specified during instantiation, a fixed maximum length of 4095 and a delay of zero is set.</p>
 <p>A non-interpolating delay line is typically used in fixed delay-length applications, such as for reverberation.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a9644532bfea44fae046e54f2509cf1ef"></a><!-- doxytag: member="stk::Delay::Delay" ref="a9644532bfea44fae046e54f2509cf1ef" args="(unsigned long delay=0, unsigned long maxDelay=4095)" -->
 <div class="memitem">
@@ -118,7 +124,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Set the maximum delay-line length. </p>
-<p>This method should generally only be used during initial setup of the delay line. If it is used between calls to the <a class="el" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick()</a> function, without a call to <a class="el" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c" title="Clears all internal states of the filter.">clear()</a>, a signal discontinuity will likely occur. If the current maximum length is greater than the new length, no change will be made. </p>
+<p>This method should generally only be used during initial setup of the delay line. If it is used between calls to the <a class="el" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick()</a> function, without a call to <a class="el" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c" title="Clears all internal states of the filter.">clear()</a>, a signal discontinuity will likely occur. If the current maximum length is greater than the new length, no memory allocation change is made. </p>
 
 </div>
 </div>
@@ -143,12 +149,12 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 </div>
 </div>
-<a class="anchor" id="a7d4c9c21e752f860ba683e9849d14665"></a><!-- doxytag: member="stk::Delay::contentsAt" ref="a7d4c9c21e752f860ba683e9849d14665" args="(unsigned long tapDelay)" -->
+<a class="anchor" id="a4d5e5bab50e4fa062bd3f0e9e2fd19db"></a><!-- doxytag: member="stk::Delay::tapOut" ref="a4d5e5bab50e4fa062bd3f0e9e2fd19db" args="(unsigned long tapDelay)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">StkFloat stk::Delay::contentsAt </td>
+          <td class="memname">StkFloat stk::Delay::tapOut </td>
           <td>(</td>
           <td class="paramtype">unsigned long&nbsp;</td>
           <td class="paramname"> <em>tapDelay</em></td>
@@ -164,21 +170,21 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 </div>
 </div>
-<a class="anchor" id="aea5580dd84ea6982d1f7b92b53314118"></a><!-- doxytag: member="stk::Delay::addTo" ref="aea5580dd84ea6982d1f7b92b53314118" args="(unsigned long tapDelay, StkFloat value)" -->
+<a class="anchor" id="a80f143ab956c9d3b1721958ece6da65e"></a><!-- doxytag: member="stk::Delay::addTo" ref="a80f143ab956c9d3b1721958ece6da65e" args="(StkFloat value, unsigned long tapDelay)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
           <td class="memname">StkFloat stk::Delay::addTo </td>
           <td>(</td>
-          <td class="paramtype">unsigned long&nbsp;</td>
-          <td class="paramname"> <em>tapDelay</em>, </td>
+          <td class="paramtype">StkFloat&nbsp;</td>
+          <td class="paramname"> <em>value</em>, </td>
         </tr>
         <tr>
           <td class="paramkey"></td>
           <td></td>
-          <td class="paramtype">StkFloat&nbsp;</td>
-          <td class="paramname"> <em>value</em></td><td>&nbsp;</td>
+          <td class="paramtype">unsigned long&nbsp;</td>
+          <td class="paramname"> <em>tapDelay</em></td><td>&nbsp;</td>
         </tr>
         <tr>
           <td></td>
@@ -189,7 +195,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 </div>
 <div class="memdoc">
 
-<p>Sum the provided value into the delay line at <em>tapDelay</em> samples from the input. </p>
+<p>Sum the provided <em>value</em> into the delay line at <em>tapDelay</em> samples from the input. </p>
 <p>The new value is returned. The tap point is determined modulo the delay-line length and is relative to the last input value (i.e., a tapDelay of zero sums into the last input value). </p>
 
 </div>
@@ -213,6 +219,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Return the value that will be output by the next call to <a class="el" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9" title="Input one sample to the filter and return one output.">tick()</a>. </p>
 <p>This method is valid only for delay settings greater than zero! </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00087"></a>00087 { <span class="keywordflow">return</span> inputs_[outPoint_]; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a93fe8e45acb933889be812f35810f977"></a><!-- doxytag: member="stk::Delay::tick" ref="a93fe8e45acb933889be812f35810f977" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -245,6 +254,28 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00142"></a>00142 {
+<a name="l00143"></a>00143 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00144"></a>00144 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00145"></a>00145     oStream_ &lt;&lt; <span class="stringliteral">&quot;Delay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00146"></a>00146     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00147"></a>00147   }
+<a name="l00148"></a>00148 <span class="preprocessor">#endif</span>
+<a name="l00149"></a>00149 <span class="preprocessor"></span>
+<a name="l00150"></a>00150   StkFloat *samples = &amp;frames[channel];
+<a name="l00151"></a>00151   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00152"></a>00152   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00153"></a>00153     inputs_[inPoint_++] = *samples * gain_;
+<a name="l00154"></a>00154     <span class="keywordflow">if</span> ( inPoint_ == inputs_.size() ) inPoint_ = 0;
+<a name="l00155"></a>00155     *samples = inputs_[outPoint_++];
+<a name="l00156"></a>00156     <span class="keywordflow">if</span> ( outPoint_ == inputs_.size() ) outPoint_ = 0;
+<a name="l00157"></a>00157   }
+<a name="l00158"></a>00158 
+<a name="l00159"></a>00159   lastFrame_[0] = *(samples-hop);
+<a name="l00160"></a>00160   <span class="keywordflow">return</span> frames;
+<a name="l00161"></a>00161 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ade0d544e45e535fd792fe70a2a22da6f"></a><!-- doxytag: member="stk::Delay::tick" ref="ade0d544e45e535fd792fe70a2a22da6f" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -287,6 +318,29 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00164"></a>00164 {
+<a name="l00165"></a>00165 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00166"></a>00166 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00167"></a>00167     oStream_ &lt;&lt; <span class="stringliteral">&quot;Delay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00168"></a>00168     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00169"></a>00169   }
+<a name="l00170"></a>00170 <span class="preprocessor">#endif</span>
+<a name="l00171"></a>00171 <span class="preprocessor"></span>
+<a name="l00172"></a>00172   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00173"></a>00173   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00174"></a>00174   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00175"></a>00175   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00176"></a>00176     inputs_[inPoint_++] = *iSamples * gain_;
+<a name="l00177"></a>00177     <span class="keywordflow">if</span> ( inPoint_ == inputs_.size() ) inPoint_ = 0;
+<a name="l00178"></a>00178     *oSamples = inputs_[outPoint_++];
+<a name="l00179"></a>00179     <span class="keywordflow">if</span> ( outPoint_ == inputs_.size() ) outPoint_ = 0;
+<a name="l00180"></a>00180   }
+<a name="l00181"></a>00181 
+<a name="l00182"></a>00182   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00183"></a>00183   <span class="keywordflow">return</span> iFrames;
+<a name="l00184"></a>00184 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -297,7 +351,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1DelayA-members.html b/doc/html/classstk_1_1DelayA-members.html
index d2fb05c..7aaa243 100644
--- a/doc/html/classstk_1_1DelayA-members.html
+++ b/doc/html/classstk_1_1DelayA-members.html
@@ -15,18 +15,20 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a48f23ab6613be35e3be8aceaf5adfdd7">channelsIn</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#ae5e59f497eb84280fd94d60257ffae69">clear</a>(void)</td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td><code> [virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#a355422e50c1d2e89385f11aafffd064d">contentsAt</a>(unsigned long tapDelay)</td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#a9beb31f924bca961df99c1ea7789c42d">DelayA</a>(StkFloat delay=0.5, unsigned long maxDelay=4095)</td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#afc70117c0133d4a5d9a651ceb691d7c0">Filter</a>(void)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#a363d9ccc50acbd1f3bb533aa1ab3d9c7">getDelay</a>(void) const </td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#af21e11b72ea59af4585c59600a0980c2">getGain</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#a6ac5c818b6669bf904a4a5a81358bd28">getMaximumDelay</a>(void)</td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a>(const char *message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314">nextOut</a>(void)</td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -49,6 +51,8 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab2dc4c9e67317eb0753868a89c8095f6">swap16</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#adf33f950e60d31d355ea865ae3efd44e">tapIn</a>(StkFloat value, unsigned long tapDelay)</td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#aab723097f4634b23b0cd4ba8762271dc">tapOut</a>(unsigned long tapDelay)</td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74">tick</a>(StkFloat input)</td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#a57c568d56e5ed35926cfc23f83d48d98">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayA.html#a94a2998c9b2d1697ed9a747973be0a89">tick</a>(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)</td><td><a class="el" href="classstk_1_1DelayA.html">stk::DelayA</a></td><td><code> [inline]</code></td></tr>
@@ -59,7 +63,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1DelayA.gif b/doc/html/classstk_1_1DelayA.gif
deleted file mode 100644
index 8e8d409..0000000
Binary files a/doc/html/classstk_1_1DelayA.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1DelayA.html b/doc/html/classstk_1_1DelayA.html
index 32d6f1d..ab56071 100644
--- a/doc/html/classstk_1_1DelayA.html
+++ b/doc/html/classstk_1_1DelayA.html
@@ -40,6 +40,9 @@ Inheritance diagram for stk::DelayA:</div>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae5e59f497eb84280fd94d60257ffae69"></a><!-- doxytag: member="stk::DelayA::clear" ref="ae5e59f497eb84280fd94d60257ffae69" args="(void)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayA.html#ae5e59f497eb84280fd94d60257ffae69">clear</a> (void)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clears all internal states of the delay line. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6ac5c818b6669bf904a4a5a81358bd28"></a><!-- doxytag: member="stk::DelayA::getMaximumDelay" ref="a6ac5c818b6669bf904a4a5a81358bd28" args="(void)" -->
+unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayA.html#a6ac5c818b6669bf904a4a5a81358bd28">getMaximumDelay</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the maximum delay-line length. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayA.html#ab10bb5eb8316ce8b3c6667bdf4c98389">setMaximumDelay</a> (unsigned long delay)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the maximum delay-line length.  <a href="#ab10bb5eb8316ce8b3c6667bdf4c98389"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayA.html#a83ddc9bdf2f5059159160fdac0e25eda">setDelay</a> (StkFloat delay)</td></tr>
@@ -47,8 +50,11 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a363d9ccc50acbd1f3bb533aa1ab3d9c7"></a><!-- doxytag: member="stk::DelayA::getDelay" ref="a363d9ccc50acbd1f3bb533aa1ab3d9c7" args="(void) const " -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayA.html#a363d9ccc50acbd1f3bb533aa1ab3d9c7">getDelay</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the current delay-line length. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayA.html#a355422e50c1d2e89385f11aafffd064d">contentsAt</a> (unsigned long tapDelay)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the value at <em>tapDelay</em> samples from the delay-line input.  <a href="#a355422e50c1d2e89385f11aafffd064d"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayA.html#aab723097f4634b23b0cd4ba8762271dc">tapOut</a> (unsigned long tapDelay)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the value at <em>tapDelay</em> samples from the delay-line input.  <a href="#aab723097f4634b23b0cd4ba8762271dc"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adf33f950e60d31d355ea865ae3efd44e"></a><!-- doxytag: member="stk::DelayA::tapIn" ref="adf33f950e60d31d355ea865ae3efd44e" args="(StkFloat value, unsigned long tapDelay)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayA.html#adf33f950e60d31d355ea865ae3efd44e">tapIn</a> (StkFloat value, unsigned long tapDelay)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the <em>value</em> at <em>tapDelay</em> samples from the delay-line input. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4372d0e178af1cb6ca465affddfb1566"></a><!-- doxytag: member="stk::DelayA::lastOut" ref="a4372d0e178af1cb6ca465affddfb1566" args="(void) const " -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566">lastOut</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the last computed output value. <br/></td></tr>
@@ -66,7 +72,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>STK allpass interpolating delay line class. </p>
 <p>This class implements a fractional-length digital delay-line using a first-order allpass filter. If the delay and maximum length are not specified during instantiation, a fixed maximum length of 4095 and a delay of 0.5 is set.</p>
 <p>An allpass filter has unity magnitude gain but variable phase delay properties, making it useful in achieving fractional delays without affecting a signal's frequency magnitude response. In order to achieve a maximally flat phase delay response, the minimum delay possible in this implementation is limited to a value of 0.5.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a9beb31f924bca961df99c1ea7789c42d"></a><!-- doxytag: member="stk::DelayA::DelayA" ref="a9beb31f924bca961df99c1ea7789c42d" args="(StkFloat delay=0.5, unsigned long maxDelay=4095)" -->
 <div class="memitem">
@@ -116,7 +122,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Set the maximum delay-line length. </p>
-<p>This method should generally only be used during initial setup of the delay line. If it is used between calls to the <a class="el" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick()</a> function, without a call to <a class="el" href="classstk_1_1DelayA.html#ae5e59f497eb84280fd94d60257ffae69" title="Clears all internal states of the delay line.">clear()</a>, a signal discontinuity will likely occur. If the current maximum length is greater than the new length, no change will be made. </p>
+<p>This method should generally only be used during initial setup of the delay line. If it is used between calls to the <a class="el" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick()</a> function, without a call to <a class="el" href="classstk_1_1DelayA.html#ae5e59f497eb84280fd94d60257ffae69" title="Clears all internal states of the delay line.">clear()</a>, a signal discontinuity will likely occur. If the current maximum length is greater than the new length, no memory allocation change is made. </p>
 
 </div>
 </div>
@@ -141,12 +147,12 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 </div>
 </div>
-<a class="anchor" id="a355422e50c1d2e89385f11aafffd064d"></a><!-- doxytag: member="stk::DelayA::contentsAt" ref="a355422e50c1d2e89385f11aafffd064d" args="(unsigned long tapDelay)" -->
+<a class="anchor" id="aab723097f4634b23b0cd4ba8762271dc"></a><!-- doxytag: member="stk::DelayA::tapOut" ref="aab723097f4634b23b0cd4ba8762271dc" args="(unsigned long tapDelay)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">StkFloat stk::DelayA::contentsAt </td>
+          <td class="memname">StkFloat stk::DelayA::tapOut </td>
           <td>(</td>
           <td class="paramtype">unsigned long&nbsp;</td>
           <td class="paramname"> <em>tapDelay</em></td>
@@ -181,6 +187,18 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Return the value which will be output by the next call to <a class="el" href="classstk_1_1DelayA.html#ae602abe91560fb5f141db52333359b74" title="Input one sample to the filter and return one output.">tick()</a>. </p>
 <p>This method is valid only for delay settings greater than zero! </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00126"></a>00126 {
+<a name="l00127"></a>00127   <span class="keywordflow">if</span> ( doNextOut_ ) {
+<a name="l00128"></a>00128     <span class="comment">// Do allpass interpolation delay.</span>
+<a name="l00129"></a>00129     nextOutput_ = -coeff_ * lastFrame_[0];
+<a name="l00130"></a>00130     nextOutput_ += apInput_ + ( coeff_ * inputs_[outPoint_] );
+<a name="l00131"></a>00131     doNextOut_ = <span class="keyword">false</span>;
+<a name="l00132"></a>00132   }
+<a name="l00133"></a>00133 
+<a name="l00134"></a>00134   <span class="keywordflow">return</span> nextOutput_;
+<a name="l00135"></a>00135 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a57c568d56e5ed35926cfc23f83d48d98"></a><!-- doxytag: member="stk::DelayA::tick" ref="a57c568d56e5ed35926cfc23f83d48d98" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -213,6 +231,30 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00157"></a>00157 {
+<a name="l00158"></a>00158 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00159"></a>00159 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00160"></a>00160     oStream_ &lt;&lt; <span class="stringliteral">&quot;DelayA::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00161"></a>00161     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00162"></a>00162   }
+<a name="l00163"></a>00163 <span class="preprocessor">#endif</span>
+<a name="l00164"></a>00164 <span class="preprocessor"></span>
+<a name="l00165"></a>00165   StkFloat *samples = &amp;frames[channel];
+<a name="l00166"></a>00166   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00167"></a>00167   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00168"></a>00168     inputs_[inPoint_++] = *samples * gain_;
+<a name="l00169"></a>00169     <span class="keywordflow">if</span> ( inPoint_ == inputs_.size() ) inPoint_ = 0;
+<a name="l00170"></a>00170     *samples = <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
+<a name="l00171"></a>00171     lastFrame_[0] = *samples;
+<a name="l00172"></a>00172     doNextOut_ = <span class="keyword">true</span>;
+<a name="l00173"></a>00173     apInput_ = inputs_[outPoint_++];
+<a name="l00174"></a>00174     <span class="keywordflow">if</span> ( outPoint_ == inputs_.size() ) outPoint_ = 0;
+<a name="l00175"></a>00175   }
+<a name="l00176"></a>00176 
+<a name="l00177"></a>00177   <span class="keywordflow">return</span> frames;
+<a name="l00178"></a>00178 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a94a2998c9b2d1697ed9a747973be0a89"></a><!-- doxytag: member="stk::DelayA::tick" ref="a94a2998c9b2d1697ed9a747973be0a89" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -255,6 +297,31 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00181"></a>00181 {
+<a name="l00182"></a>00182 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00183"></a>00183 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00184"></a>00184     oStream_ &lt;&lt; <span class="stringliteral">&quot;DelayA::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00185"></a>00185     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00186"></a>00186   }
+<a name="l00187"></a>00187 <span class="preprocessor">#endif</span>
+<a name="l00188"></a>00188 <span class="preprocessor"></span>
+<a name="l00189"></a>00189   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00190"></a>00190   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00191"></a>00191   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00192"></a>00192   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00193"></a>00193     inputs_[inPoint_++] = *iSamples * gain_;
+<a name="l00194"></a>00194     <span class="keywordflow">if</span> ( inPoint_ == inputs_.size() ) inPoint_ = 0;
+<a name="l00195"></a>00195     *oSamples = <a class="code" href="classstk_1_1DelayA.html#a08c8ade17cea4a54844f90d976b14314" title="Return the value which will be output by the next call to tick().">nextOut</a>();
+<a name="l00196"></a>00196     lastFrame_[0] = *oSamples;
+<a name="l00197"></a>00197     doNextOut_ = <span class="keyword">true</span>;
+<a name="l00198"></a>00198     apInput_ = inputs_[outPoint_++];
+<a name="l00199"></a>00199     <span class="keywordflow">if</span> ( outPoint_ == inputs_.size() ) outPoint_ = 0;
+<a name="l00200"></a>00200   }
+<a name="l00201"></a>00201 
+<a name="l00202"></a>00202   <span class="keywordflow">return</span> iFrames;
+<a name="l00203"></a>00203 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -265,7 +332,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1DelayL-members.html b/doc/html/classstk_1_1DelayL-members.html
index 9ca7a9a..68d0028 100644
--- a/doc/html/classstk_1_1DelayL-members.html
+++ b/doc/html/classstk_1_1DelayL-members.html
@@ -15,18 +15,20 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a48f23ab6613be35e3be8aceaf5adfdd7">channelsIn</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c">clear</a>(void)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#a7a84a3a188f2de7cc05f81ad06e04874">contentsAt</a>(unsigned long tapDelay)</td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#ad60f2222397e19fe524fc3b76b59b846">DelayL</a>(StkFloat delay=0.0, unsigned long maxDelay=4095)</td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#afc70117c0133d4a5d9a651ceb691d7c0">Filter</a>(void)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#aaf2d5ef7dba47ff1fb279c327021beb0">getDelay</a>(void) const </td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#af21e11b72ea59af4585c59600a0980c2">getGain</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#acbcb8326db134a26fdad5f16f1a0ba7e">getMaximumDelay</a>(void)</td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a>(const char *message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8">nextOut</a>(void)</td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -49,6 +51,8 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab2dc4c9e67317eb0753868a89c8095f6">swap16</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#a984843567ba3de6543bd13c23457f495">tapIn</a>(StkFloat value, unsigned long tapDelay)</td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#ad16a1f176e93a9beb8e685aafa32579e">tapOut</a>(unsigned long tapDelay)</td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f">tick</a>(StkFloat input)</td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#acdc5d41de53c53d9d4b39ee8a46fb96c">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1DelayL.html#a56ee486fb01fbf45d5a3dbad754a838e">tick</a>(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)</td><td><a class="el" href="classstk_1_1DelayL.html">stk::DelayL</a></td><td><code> [inline]</code></td></tr>
@@ -59,7 +63,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1DelayL.gif b/doc/html/classstk_1_1DelayL.gif
deleted file mode 100644
index 42fa333..0000000
Binary files a/doc/html/classstk_1_1DelayL.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1DelayL.html b/doc/html/classstk_1_1DelayL.html
index b47b46a..c8bffae 100644
--- a/doc/html/classstk_1_1DelayL.html
+++ b/doc/html/classstk_1_1DelayL.html
@@ -37,6 +37,9 @@ Inheritance diagram for stk::DelayL:</div>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8f9b49c7b098d9e379baf44b0c345457"></a><!-- doxytag: member="stk::DelayL::~DelayL" ref="a8f9b49c7b098d9e379baf44b0c345457" args="()" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayL.html#a8f9b49c7b098d9e379baf44b0c345457">~DelayL</a> ()</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class destructor. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="acbcb8326db134a26fdad5f16f1a0ba7e"></a><!-- doxytag: member="stk::DelayL::getMaximumDelay" ref="acbcb8326db134a26fdad5f16f1a0ba7e" args="(void)" -->
+unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayL.html#acbcb8326db134a26fdad5f16f1a0ba7e">getMaximumDelay</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the maximum delay-line length. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayL.html#a18b40806591654a9c9c32603990fce40">setMaximumDelay</a> (unsigned long delay)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the maximum delay-line length.  <a href="#a18b40806591654a9c9c32603990fce40"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayL.html#a80dd30628502a7c3b37ff045176eb91f">setDelay</a> (StkFloat delay)</td></tr>
@@ -44,8 +47,11 @@ Inheritance diagram for stk::DelayL:</div>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aaf2d5ef7dba47ff1fb279c327021beb0"></a><!-- doxytag: member="stk::DelayL::getDelay" ref="aaf2d5ef7dba47ff1fb279c327021beb0" args="(void) const " -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayL.html#aaf2d5ef7dba47ff1fb279c327021beb0">getDelay</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the current delay-line length. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayL.html#a7a84a3a188f2de7cc05f81ad06e04874">contentsAt</a> (unsigned long tapDelay)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the value at <em>tapDelay</em> samples from the delay-line input.  <a href="#a7a84a3a188f2de7cc05f81ad06e04874"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayL.html#ad16a1f176e93a9beb8e685aafa32579e">tapOut</a> (unsigned long tapDelay)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the value at <em>tapDelay</em> samples from the delay-line input.  <a href="#ad16a1f176e93a9beb8e685aafa32579e"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a984843567ba3de6543bd13c23457f495"></a><!-- doxytag: member="stk::DelayL::tapIn" ref="a984843567ba3de6543bd13c23457f495" args="(StkFloat value, unsigned long tapDelay)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayL.html#a984843567ba3de6543bd13c23457f495">tapIn</a> (StkFloat value, unsigned long tapDelay)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the <em>value</em> at <em>tapDelay</em> samples from the delay-line input. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a16810ca38fab79276bb8ec51447623a9"></a><!-- doxytag: member="stk::DelayL::lastOut" ref="a16810ca38fab79276bb8ec51447623a9" args="(void) const " -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9">lastOut</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the last computed output value. <br/></td></tr>
@@ -63,7 +69,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>STK linear interpolating delay line class. </p>
 <p>This class implements a fractional-length digital delay-line using first-order linear interpolation. If the delay and maximum length are not specified during instantiation, a fixed maximum length of 4095 and a delay of zero is set.</p>
 <p>Linear interpolation is an efficient technique for achieving fractional delay lengths, though it does introduce high-frequency signal attenuation to varying degrees depending on the fractional delay setting. The use of higher order Lagrange interpolators can typically improve (minimize) this attenuation characteristic.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="ad60f2222397e19fe524fc3b76b59b846"></a><!-- doxytag: member="stk::DelayL::DelayL" ref="ad60f2222397e19fe524fc3b76b59b846" args="(StkFloat delay=0.0, unsigned long maxDelay=4095)" -->
 <div class="memitem">
@@ -113,7 +119,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Set the maximum delay-line length. </p>
-<p>This method should generally only be used during initial setup of the delay line. If it is used between calls to the <a class="el" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick()</a> function, without a call to <a class="el" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c" title="Clears all internal states of the filter.">clear()</a>, a signal discontinuity will likely occur. If the current maximum length is greater than the new length, no change will be made. </p>
+<p>This method should generally only be used during initial setup of the delay line. If it is used between calls to the <a class="el" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick()</a> function, without a call to <a class="el" href="classstk_1_1Filter.html#a670b9cc23ac798d3239cb819e801363c" title="Clears all internal states of the filter.">clear()</a>, a signal discontinuity will likely occur. If the current maximum length is greater than the new length, no memory allocation change is made. </p>
 
 </div>
 </div>
@@ -138,12 +144,12 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 </div>
 </div>
-<a class="anchor" id="a7a84a3a188f2de7cc05f81ad06e04874"></a><!-- doxytag: member="stk::DelayL::contentsAt" ref="a7a84a3a188f2de7cc05f81ad06e04874" args="(unsigned long tapDelay)" -->
+<a class="anchor" id="ad16a1f176e93a9beb8e685aafa32579e"></a><!-- doxytag: member="stk::DelayL::tapOut" ref="ad16a1f176e93a9beb8e685aafa32579e" args="(unsigned long tapDelay)" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">StkFloat stk::DelayL::contentsAt </td>
+          <td class="memname">StkFloat stk::DelayL::tapOut </td>
           <td>(</td>
           <td class="paramtype">unsigned long&nbsp;</td>
           <td class="paramname"> <em>tapDelay</em></td>
@@ -178,6 +184,22 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Return the value which will be output by the next call to <a class="el" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f" title="Input one sample to the filter and return one output.">tick()</a>. </p>
 <p>This method is valid only for delay settings greater than zero! </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00121"></a>00121 {
+<a name="l00122"></a>00122   <span class="keywordflow">if</span> ( doNextOut_ ) {
+<a name="l00123"></a>00123     <span class="comment">// First 1/2 of interpolation</span>
+<a name="l00124"></a>00124     nextOutput_ = inputs_[outPoint_] * omAlpha_;
+<a name="l00125"></a>00125     <span class="comment">// Second 1/2 of interpolation</span>
+<a name="l00126"></a>00126     <span class="keywordflow">if</span> (outPoint_+1 &lt; inputs_.size())
+<a name="l00127"></a>00127       nextOutput_ += inputs_[outPoint_+1] * alpha_;
+<a name="l00128"></a>00128     <span class="keywordflow">else</span>
+<a name="l00129"></a>00129       nextOutput_ += inputs_[0] * alpha_;
+<a name="l00130"></a>00130     doNextOut_ = <span class="keyword">false</span>;
+<a name="l00131"></a>00131   }
+<a name="l00132"></a>00132 
+<a name="l00133"></a>00133   <span class="keywordflow">return</span> nextOutput_;
+<a name="l00134"></a>00134 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="acdc5d41de53c53d9d4b39ee8a46fb96c"></a><!-- doxytag: member="stk::DelayL::tick" ref="acdc5d41de53c53d9d4b39ee8a46fb96c" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -210,6 +232,29 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00155"></a>00155 {
+<a name="l00156"></a>00156 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00157"></a>00157 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00158"></a>00158     oStream_ &lt;&lt; <span class="stringliteral">&quot;DelayL::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00159"></a>00159     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00160"></a>00160   }
+<a name="l00161"></a>00161 <span class="preprocessor">#endif</span>
+<a name="l00162"></a>00162 <span class="preprocessor"></span>
+<a name="l00163"></a>00163   StkFloat *samples = &amp;frames[channel];
+<a name="l00164"></a>00164   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00165"></a>00165   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00166"></a>00166     inputs_[inPoint_++] = *samples * gain_;
+<a name="l00167"></a>00167     <span class="keywordflow">if</span> ( inPoint_ == inputs_.size() ) inPoint_ = 0;
+<a name="l00168"></a>00168     *samples = <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
+<a name="l00169"></a>00169     doNextOut_ = <span class="keyword">true</span>;
+<a name="l00170"></a>00170     <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.size() ) outPoint_ = 0;
+<a name="l00171"></a>00171   }
+<a name="l00172"></a>00172 
+<a name="l00173"></a>00173   lastFrame_[0] = *(samples-hop);
+<a name="l00174"></a>00174   <span class="keywordflow">return</span> frames;
+<a name="l00175"></a>00175 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a56ee486fb01fbf45d5a3dbad754a838e"></a><!-- doxytag: member="stk::DelayL::tick" ref="a56ee486fb01fbf45d5a3dbad754a838e" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -252,6 +297,30 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00178"></a>00178 {
+<a name="l00179"></a>00179 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00180"></a>00180 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00181"></a>00181     oStream_ &lt;&lt; <span class="stringliteral">&quot;DelayL::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00182"></a>00182     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00183"></a>00183   }
+<a name="l00184"></a>00184 <span class="preprocessor">#endif</span>
+<a name="l00185"></a>00185 <span class="preprocessor"></span>
+<a name="l00186"></a>00186   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00187"></a>00187   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00188"></a>00188   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00189"></a>00189   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00190"></a>00190     inputs_[inPoint_++] = *iSamples * gain_;
+<a name="l00191"></a>00191     <span class="keywordflow">if</span> ( inPoint_ == inputs_.size() ) inPoint_ = 0;
+<a name="l00192"></a>00192     *oSamples = <a class="code" href="classstk_1_1DelayL.html#abfe69d19690fab75b6026dab96870fb8" title="Return the value which will be output by the next call to tick().">nextOut</a>();
+<a name="l00193"></a>00193     doNextOut_ = <span class="keyword">true</span>;
+<a name="l00194"></a>00194     <span class="keywordflow">if</span> ( ++outPoint_ == inputs_.size() ) outPoint_ = 0;
+<a name="l00195"></a>00195   }
+<a name="l00196"></a>00196 
+<a name="l00197"></a>00197   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00198"></a>00198   <span class="keywordflow">return</span> iFrames;
+<a name="l00199"></a>00199 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -262,7 +331,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Drummer-members.html b/doc/html/classstk_1_1Drummer-members.html
index adb086b..c3e5bb6 100644
--- a/doc/html/classstk_1_1Drummer-members.html
+++ b/doc/html/classstk_1_1Drummer-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -45,7 +46,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Drummer.html">stk::Drummer</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Drummer.html#ad186a954527a518c47467e6caaa2e2f5">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Drummer.html">stk::Drummer</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Drummer.html#a365fb4b2c501129f2efd6edfad1f5453">~Drummer</a>(void)</td><td><a class="el" href="classstk_1_1Drummer.html">stk::Drummer</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -53,7 +54,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Drummer.gif b/doc/html/classstk_1_1Drummer.gif
deleted file mode 100644
index 86e1acb..0000000
Binary files a/doc/html/classstk_1_1Drummer.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Drummer.html b/doc/html/classstk_1_1Drummer.html
index 5c8651d..cabb620 100644
--- a/doc/html/classstk_1_1Drummer.html
+++ b/doc/html/classstk_1_1Drummer.html
@@ -45,11 +45,13 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad65c63bfad0ffac03db7f56cf706e4ba"></a><!-- doxytag: member="stk::Drummer::tick" ref="ad65c63bfad0ffac03db7f56cf706e4ba" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Drummer.html#ad186a954527a518c47467e6caaa2e2f5">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#ad186a954527a518c47467e6caaa2e2f5"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK drum sample player class. </p>
 <p>This class implements a drum sampling synthesizer using <a class="el" href="classstk_1_1WvIn.html" title="STK audio input abstract base class.">WvIn</a> objects and one-pole filters. The drum rawwave files are sampled at 22050 Hz, but will be appropriately interpolated for other sample rates. You can specify the maximum polyphony (maximum number of simultaneous voices) via a define in the <a class="el" href="Drummer_8h_source.html">Drummer.h</a>.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="af5262dd2b29ae453323c0a514d79d26a"></a><!-- doxytag: member="stk::Drummer::Drummer" ref="af5262dd2b29ae453323c0a514d79d26a" args="(void)" -->
 <div class="memitem">
@@ -103,6 +105,65 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a0736ccd253b446660938d51909a32f44">stk::Instrmnt</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="ad186a954527a518c47467e6caaa2e2f5"></a><!-- doxytag: member="stk::Drummer::tick" ref="ad186a954527a518c47467e6caaa2e2f5" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Drummer::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00101"></a>00101 {
+<a name="l00102"></a>00102   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00103"></a>00103 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00104"></a>00104 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00105"></a>00105     oStream_ &lt;&lt; <span class="stringliteral">&quot;Drummer::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00106"></a>00106     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00107"></a>00107   }
+<a name="l00108"></a>00108 <span class="preprocessor">#endif</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span>
+<a name="l00110"></a>00110   StkFloat *samples = &amp;frames[channel];
+<a name="l00111"></a>00111   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00112"></a>00112   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00113"></a>00113     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00114"></a>00114       *samples++ = <a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">tick</a>();
+<a name="l00115"></a>00115   }
+<a name="l00116"></a>00116   <span class="keywordflow">else</span> {
+<a name="l00117"></a>00117     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00118"></a>00118       *samples++ = <a class="code" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba" title="Compute and return one output sample.">tick</a>();
+<a name="l00119"></a>00119       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00120"></a>00120         *samples++ = lastFrame_[j];
+<a name="l00121"></a>00121     }
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124   <span class="keywordflow">return</span> frames;
+<a name="l00125"></a>00125 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -113,7 +174,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Echo-members.html b/doc/html/classstk_1_1Echo-members.html
index ef8a000..6afa658 100644
--- a/doc/html/classstk_1_1Echo-members.html
+++ b/doc/html/classstk_1_1Echo-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Effect.html">stk::Effect</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Echo.html#a00a2a5949133a06680b026db7b21cc51">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Echo.html">stk::Echo</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -53,7 +54,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Echo.gif b/doc/html/classstk_1_1Echo.gif
deleted file mode 100644
index ba06e15..0000000
Binary files a/doc/html/classstk_1_1Echo.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Echo.html b/doc/html/classstk_1_1Echo.html
index 31cfe4c..af77e0b 100644
--- a/doc/html/classstk_1_1Echo.html
+++ b/doc/html/classstk_1_1Echo.html
@@ -57,7 +57,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK echo effect class. </p>
 <p>This class implements an echo effect.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a5f3320986d5c9b02ad10663ff11b6505"></a><!-- doxytag: member="stk::Echo::Echo" ref="a5f3320986d5c9b02ad10663ff11b6505" args="(unsigned long maximumDelay=(unsigned long) Stk::sampleRate())" -->
 <div class="memitem">
@@ -109,6 +109,25 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object as inputs to the effect and replace with corresponding outputs. </p>
 <p>The <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument reference is returned. The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00079"></a>00079 {
+<a name="l00080"></a>00080 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00081"></a>00081 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00082"></a>00082     oStream_ &lt;&lt; <span class="stringliteral">&quot;Echo::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00083"></a>00083     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00084"></a>00084   }
+<a name="l00085"></a>00085 <span class="preprocessor">#endif</span>
+<a name="l00086"></a>00086 <span class="preprocessor"></span>
+<a name="l00087"></a>00087   StkFloat *samples = &amp;frames[channel];
+<a name="l00088"></a>00088   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00089"></a>00089   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00090"></a>00090     *samples = effectMix_ * ( delayLine_.tick( *samples ) - *samples ) + *samples;
+<a name="l00091"></a>00091   }
+<a name="l00092"></a>00092 
+<a name="l00093"></a>00093   lastFrame_[0] = *(samples-hop);
+<a name="l00094"></a>00094   <span class="keywordflow">return</span> frames;
+<a name="l00095"></a>00095 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a1778a7da06b222afbe9281c886f678d8"></a><!-- doxytag: member="stk::Echo::tick" ref="a1778a7da06b222afbe9281c886f678d8" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -151,6 +170,26 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the effect and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00098"></a>00098 {
+<a name="l00099"></a>00099 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00100"></a>00100 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00101"></a>00101     oStream_ &lt;&lt; <span class="stringliteral">&quot;Echo::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00102"></a>00102     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00103"></a>00103   }
+<a name="l00104"></a>00104 <span class="preprocessor">#endif</span>
+<a name="l00105"></a>00105 <span class="preprocessor"></span>
+<a name="l00106"></a>00106   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00107"></a>00107   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00108"></a>00108   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00109"></a>00109   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00110"></a>00110     *oSamples = effectMix_ * ( delayLine_.tick( *iSamples ) - *iSamples ) + *iSamples;
+<a name="l00111"></a>00111   }
+<a name="l00112"></a>00112 
+<a name="l00113"></a>00113   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00114"></a>00114   <span class="keywordflow">return</span> iFrames;
+<a name="l00115"></a>00115 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -161,7 +200,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Effect-members.html b/doc/html/classstk_1_1Effect-members.html
index d3db563..d125e22 100644
--- a/doc/html/classstk_1_1Effect-members.html
+++ b/doc/html/classstk_1_1Effect-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Effect.html">stk::Effect</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -46,7 +47,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Effect.gif b/doc/html/classstk_1_1Effect.gif
deleted file mode 100644
index d266af6..0000000
Binary files a/doc/html/classstk_1_1Effect.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Effect.html b/doc/html/classstk_1_1Effect.html
index acce00b..de5902d 100644
--- a/doc/html/classstk_1_1Effect.html
+++ b/doc/html/classstk_1_1Effect.html
@@ -57,7 +57,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK abstract effects parent class. </p>
 <p>This class provides common functionality for STK effects subclasses. It is general enough to support both monophonic and polyphonic input/output classes.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Effect_8h_source.html">Effect.h</a></li>
 </ul>
@@ -66,7 +66,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Envelope-members.html b/doc/html/classstk_1_1Envelope-members.html
index 77d0770..1d269d3 100644
--- a/doc/html/classstk_1_1Envelope-members.html
+++ b/doc/html/classstk_1_1Envelope-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Envelope.html#a9dbefb15f8d64aac3969f77d38791774">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1Envelope.html">stk::Envelope</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Envelope.html#a18cf8f21ef70227bd5cd17f53752bd0f">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1Envelope.html">stk::Envelope</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
@@ -29,12 +30,12 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d">sampleRate</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Envelope.html#ade99b5c7cb974f71f1d2919868d774a0">setRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Envelope.html">stk::Envelope</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Envelope.html#ade99b5c7cb974f71f1d2919868d774a0">setRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Envelope.html">stk::Envelope</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e">setTarget</a>(StkFloat target)</td><td><a class="el" href="classstk_1_1Envelope.html">stk::Envelope</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7">setTime</a>(StkFloat time)</td><td><a class="el" href="classstk_1_1Envelope.html">stk::Envelope</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Envelope.html#ab8164a90c57616dc8bd55a6e5ba02fb6">setValue</a>(StkFloat value)</td><td><a class="el" href="classstk_1_1Envelope.html">stk::Envelope</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e">setTarget</a>(StkFloat target)</td><td><a class="el" href="classstk_1_1Envelope.html">stk::Envelope</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7">setTime</a>(StkFloat time)</td><td><a class="el" href="classstk_1_1Envelope.html">stk::Envelope</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Envelope.html#ab8164a90c57616dc8bd55a6e5ba02fb6">setValue</a>(StkFloat value)</td><td><a class="el" href="classstk_1_1Envelope.html">stk::Envelope</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">showWarnings</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad75619ab92a0c19b5a52cb68884511e3">sleep</a>(unsigned long milliseconds)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a9bff83b5a318ff171f94a218ad52226b">Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -56,7 +57,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Envelope.gif b/doc/html/classstk_1_1Envelope.gif
deleted file mode 100644
index d896cb3..0000000
Binary files a/doc/html/classstk_1_1Envelope.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Envelope.html b/doc/html/classstk_1_1Envelope.html
index f27022d..9a4f295 100644
--- a/doc/html/classstk_1_1Envelope.html
+++ b/doc/html/classstk_1_1Envelope.html
@@ -47,12 +47,10 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9dbefb15f8d64aac3969f77d38791774"></a><!-- doxytag: member="stk::Envelope::keyOff" ref="a9dbefb15f8d64aac3969f77d38791774" args="(void)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Envelope.html#a9dbefb15f8d64aac3969f77d38791774">keyOff</a> (void)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set target = 0. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ade99b5c7cb974f71f1d2919868d774a0"></a><!-- doxytag: member="stk::Envelope::setRate" ref="ade99b5c7cb974f71f1d2919868d774a0" args="(StkFloat rate)" -->
-void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Envelope.html#ade99b5c7cb974f71f1d2919868d774a0">setRate</a> (StkFloat rate)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the <em>rate</em>. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adeeb1676f9111980a0c1a48a6780c8f7"></a><!-- doxytag: member="stk::Envelope::setTime" ref="adeeb1676f9111980a0c1a48a6780c8f7" args="(StkFloat time)" -->
-void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7">setTime</a> (StkFloat time)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the <em>rate</em> based on a time duration. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Envelope.html#ade99b5c7cb974f71f1d2919868d774a0">setRate</a> (StkFloat rate)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the <em>rate</em>.  <a href="#ade99b5c7cb974f71f1d2919868d774a0"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7">setTime</a> (StkFloat time)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the <em>rate</em> based on a positive time duration (seconds).  <a href="#adeeb1676f9111980a0c1a48a6780c8f7"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5269bc5dc1d56161ab82b677b5462a3e"></a><!-- doxytag: member="stk::Envelope::setTarget" ref="a5269bc5dc1d56161ab82b677b5462a3e" args="(StkFloat target)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e">setTarget</a> (StkFloat target)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the target value. <br/></td></tr>
@@ -74,8 +72,50 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK linear line envelope class. </p>
 <p>This class implements a simple linear line envelope generator which is capable of ramping to an arbitrary target value by a specified <em>rate</em>. It also responds to simple <em>keyOn</em> and <em>keyOff</em> messages, ramping to 1.0 on keyOn and to 0.0 on keyOff.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="ade99b5c7cb974f71f1d2919868d774a0"></a><!-- doxytag: member="stk::Envelope::setRate" ref="ade99b5c7cb974f71f1d2919868d774a0" args="(StkFloat rate)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stk::Envelope::setRate </td>
+          <td>(</td>
+          <td class="paramtype">StkFloat&nbsp;</td>
+          <td class="paramname"> <em>rate</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Set the <em>rate</em>. </p>
+<p>The <em>rate</em> must be positive (though a value of 0.0 is allowed). </p>
+
+</div>
+</div>
+<a class="anchor" id="adeeb1676f9111980a0c1a48a6780c8f7"></a><!-- doxytag: member="stk::Envelope::setTime" ref="adeeb1676f9111980a0c1a48a6780c8f7" args="(StkFloat time)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stk::Envelope::setTime </td>
+          <td>(</td>
+          <td class="paramtype">StkFloat&nbsp;</td>
+          <td class="paramname"> <em>time</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Set the <em>rate</em> based on a positive time duration (seconds). </p>
+<p>The <em>rate</em> is calculated such that the envelope will ramp from a value of 0.0 to 1.0 in the specified time duration. </p>
+
+</div>
+</div>
 <a class="anchor" id="a9341c9dea4fd54c360a4a23254319cf7"></a><!-- doxytag: member="stk::Envelope::tick" ref="a9341c9dea4fd54c360a4a23254319cf7" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
 <div class="memitem">
 <div class="memproto">
@@ -106,6 +146,23 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00112"></a>00112 {
+<a name="l00113"></a>00113 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00114"></a>00114 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00115"></a>00115     oStream_ &lt;&lt; <span class="stringliteral">&quot;Envelope::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00116"></a>00116     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00117"></a>00117   }
+<a name="l00118"></a>00118 <span class="preprocessor">#endif</span>
+<a name="l00119"></a>00119 <span class="preprocessor"></span>
+<a name="l00120"></a>00120   StkFloat *samples = &amp;frames[channel];
+<a name="l00121"></a>00121   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00122"></a>00122   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00123"></a>00123     *samples = <a class="code" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601" title="Compute and return one output sample.">tick</a>();
+<a name="l00124"></a>00124 
+<a name="l00125"></a>00125   <span class="keywordflow">return</span> frames;
+<a name="l00126"></a>00126 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -116,7 +173,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FM-members.html b/doc/html/classstk_1_1FM-members.html
index 3c18854..e588df5 100644
--- a/doc/html/classstk_1_1FM-members.html
+++ b/doc/html/classstk_1_1FM-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#a7235e94a153df135330a591511269f7c">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#afc46280177d770404919f20ccf88e4ff">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
@@ -55,7 +56,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#a81f351fd8732fd6e686735b7b45a4241">tick</a>(unsigned int)=0</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td><code> [pure virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">tick</a>(StkFrames &amp;frames, unsigned int channel=0)=0</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td><code> [pure virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#aaba7e8bff02d105e146f8b62b20a27b9">~FM</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -63,7 +64,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FM.gif b/doc/html/classstk_1_1FM.gif
deleted file mode 100644
index ee4eaea..0000000
Binary files a/doc/html/classstk_1_1FM.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1FM.html b/doc/html/classstk_1_1FM.html
index e4d9e74..0fabb0b 100644
--- a/doc/html/classstk_1_1FM.html
+++ b/doc/html/classstk_1_1FM.html
@@ -86,6 +86,8 @@ virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a81f351fd8732fd6e686735b7b45a4241"></a><!-- doxytag: member="stk::FM::tick" ref="a81f351fd8732fd6e686735b7b45a4241" args="(unsigned int)=0" -->
 virtual StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FM.html#a81f351fd8732fd6e686735b7b45a4241">tick</a> (unsigned int)=0</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">virtual <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)=0</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a870c602be292d2dcc1b0fd97f515f2ff"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK abstract <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis base class. </p>
@@ -99,7 +101,7 @@ virtual StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el
 <li><a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> 2 &amp; 4 Target = 128</li>
 </ul>
 <p>The basic Chowning/Stanford <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> patent expired in 1995, but there exist follow-on patents, mostly assigned to Yamaha. If you are of the type who should worry about this (making money) worry away.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="af4732c22ce00743e1f751880fa07aa15"></a><!-- doxytag: member="stk::FM::FM" ref="af4732c22ce00743e1f751880fa07aa15" args="(unsigned int operators=4)" -->
 <div class="memitem">
@@ -120,6 +122,41 @@ virtual StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el
 <p>Class constructor, taking the number of wave/envelope operators to control. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a870c602be292d2dcc1b0fd97f515f2ff"></a><!-- doxytag: member="stk::FM::tick" ref="a870c602be292d2dcc1b0fd97f515f2ff" args="(StkFrames &amp;frames, unsigned int channel=0)=0" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">virtual <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a>&amp; stk::FM::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [pure virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p>Implemented in <a class="el" href="classstk_1_1BeeThree.html#a30520efff3fac0674d3c7ab95ac35999">stk::BeeThree</a>, <a class="el" href="classstk_1_1FMVoices.html#abad16be89b38d4618a07c5d71ab49e26">stk::FMVoices</a>, <a class="el" href="classstk_1_1HevyMetl.html#a555f3bf9322fd11150b00bb99476769a">stk::HevyMetl</a>, <a class="el" href="classstk_1_1PercFlut.html#a4105b2b1dfe375bcf870fb4903509e4e">stk::PercFlut</a>, <a class="el" href="classstk_1_1Rhodey.html#a9d843b764e5219c8289884d0903462f9">stk::Rhodey</a>, <a class="el" href="classstk_1_1TubeBell.html#a664cede881352aea1d300ca93ba416ac">stk::TubeBell</a>, and <a class="el" href="classstk_1_1Wurley.html#a505f7e6499761f64d0cc4b6419d945c3">stk::Wurley</a>.</p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -130,7 +167,7 @@ virtual StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FMVoices-members.html b/doc/html/classstk_1_1FMVoices-members.html
index 52e573c..9e91df5 100644
--- a/doc/html/classstk_1_1FMVoices-members.html
+++ b/doc/html/classstk_1_1FMVoices-members.html
@@ -21,6 +21,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#a7235e94a153df135330a591511269f7c">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#afc46280177d770404919f20ccf88e4ff">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
@@ -56,7 +57,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1FMVoices.html">stk::FMVoices</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1FMVoices.html#abad16be89b38d4618a07c5d71ab49e26">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1FMVoices.html">stk::FMVoices</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#aaba7e8bff02d105e146f8b62b20a27b9">~FM</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FMVoices.html#a8ff218d379ec020a38e1bc7203409e37">~FMVoices</a>(void)</td><td><a class="el" href="classstk_1_1FMVoices.html">stk::FMVoices</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
@@ -65,7 +66,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FMVoices.gif b/doc/html/classstk_1_1FMVoices.gif
deleted file mode 100644
index 9ef0523..0000000
Binary files a/doc/html/classstk_1_1FMVoices.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1FMVoices.html b/doc/html/classstk_1_1FMVoices.html
index 253c613..41343c7 100644
--- a/doc/html/classstk_1_1FMVoices.html
+++ b/doc/html/classstk_1_1FMVoices.html
@@ -50,6 +50,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a31111029e36d00230586250df7b4d887"></a><!-- doxytag: member="stk::FMVoices::tick" ref="a31111029e36d00230586250df7b4d887" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FMVoices.html#abad16be89b38d4618a07c5d71ab49e26">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#abad16be89b38d4618a07c5d71ab49e26"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK singing <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis instrument. </p>
@@ -67,7 +69,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li><a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> 2 &amp; 4 Target = 128</li>
 </ul>
 <p>The basic Chowning/Stanford <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> patent expired in 1995, but there exist follow-on patents, mostly assigned to Yamaha. If you are of the type who should worry about this (making money) worry away.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a27d5570c83cad660a53f04d86d01c888"></a><!-- doxytag: member="stk::FMVoices::FMVoices" ref="a27d5570c83cad660a53f04d86d01c888" args="(void)" -->
 <div class="memitem">
@@ -88,6 +90,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="abad16be89b38d4618a07c5d71ab49e26"></a><!-- doxytag: member="stk::FMVoices::tick" ref="abad16be89b38d4618a07c5d71ab49e26" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::FMVoices::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">stk::FM</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00107"></a>00107 {
+<a name="l00108"></a>00108   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00109"></a>00109 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00110"></a>00110 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00111"></a>00111     oStream_ &lt;&lt; <span class="stringliteral">&quot;FMVoices::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00112"></a>00112     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00113"></a>00113   }
+<a name="l00114"></a>00114 <span class="preprocessor">#endif</span>
+<a name="l00115"></a>00115 <span class="preprocessor"></span>
+<a name="l00116"></a>00116   StkFloat *samples = &amp;frames[channel];
+<a name="l00117"></a>00117   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00118"></a>00118   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00119"></a>00119     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00120"></a>00120       *samples++ = <a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">tick</a>();
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122   <span class="keywordflow">else</span> {
+<a name="l00123"></a>00123     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00124"></a>00124       *samples++ = <a class="code" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887" title="Compute and return one output sample.">tick</a>();
+<a name="l00125"></a>00125       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00126"></a>00126         *samples++ = lastFrame_[j];
+<a name="l00127"></a>00127     }
+<a name="l00128"></a>00128   }
+<a name="l00129"></a>00129 
+<a name="l00130"></a>00130   <span class="keywordflow">return</span> frames;
+<a name="l00131"></a>00131 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -98,7 +160,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FileLoop-members.html b/doc/html/classstk_1_1FileLoop-members.html
index 67ee331..cf11e06 100644
--- a/doc/html/classstk_1_1FileLoop-members.html
+++ b/doc/html/classstk_1_1FileLoop-members.html
@@ -15,7 +15,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileLoop.html#afe462794ba202dd879d29c39e76ae111">addPhaseOffset</a>(StkFloat angle)</td><td><a class="el" href="classstk_1_1FileLoop.html">stk::FileLoop</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340">addSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileLoop.html#a1986db79fd04b93f4d10b8cdf75bca34">addTime</a>(StkFloat time)</td><td><a class="el" href="classstk_1_1FileLoop.html">stk::FileLoop</a></td><td><code> [virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1WvIn.html#a2ce05e5c8087e483236961335e8abf04">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1WvIn.html">stk::WvIn</a></td><td><code> [inline, protected]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1FileLoop.html#a9f3c514ce166068197684a21d31c3a76">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1FileLoop.html">stk::FileLoop</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileLoop.html#a51688a9e84b2f9e5a9c4e62588b65c52">closeFile</a>(void)</td><td><a class="el" href="classstk_1_1FileLoop.html">stk::FileLoop</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileLoop.html#a0d977aae11d75d0327057add00fa7f84">FileLoop</a>(unsigned long chunkThreshold=1000000, unsigned long chunkSize=1024)</td><td><a class="el" href="classstk_1_1FileLoop.html">stk::FileLoop</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileLoop.html#a268bfb1efe8e35bab81949b70e43b82c">FileLoop</a>(std::string fileName, bool raw=false, bool doNormalize=true, unsigned long chunkThreshold=1000000, unsigned long chunkSize=1024)</td><td><a class="el" href="classstk_1_1FileLoop.html">stk::FileLoop</a></td><td></td></tr>
@@ -27,7 +27,9 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, protected]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, protected, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileWvIn.html#aca9ad0c12af3323e7bbf877513b0d10b">isFinished</a>(void) const </td><td><a class="el" href="classstk_1_1FileWvIn.html">stk::FileWvIn</a></td><td><code> [inline, protected]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1FileWvIn.html#aa45344366bca49f71c7153ac5b296e91">isOpen</a>(void)</td><td><a class="el" href="classstk_1_1FileWvIn.html">stk::FileWvIn</a></td><td><code> [inline, protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1WvIn.html#a3ab86e33eff9f962c9ef7b41e3ccb77e">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1WvIn.html">stk::WvIn</a></td><td><code> [inline, protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1FileLoop.html">stk::FileLoop</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b">normalize</a>(void)</td><td><a class="el" href="classstk_1_1FileLoop.html">stk::FileLoop</a></td><td><code> [inline, virtual]</code></td></tr>
@@ -65,7 +67,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FileLoop.gif b/doc/html/classstk_1_1FileLoop.gif
deleted file mode 100644
index a5cbb57..0000000
Binary files a/doc/html/classstk_1_1FileLoop.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1FileLoop.html b/doc/html/classstk_1_1FileLoop.html
index 3482b80..bdc27d5 100644
--- a/doc/html/classstk_1_1FileLoop.html
+++ b/doc/html/classstk_1_1FileLoop.html
@@ -50,6 +50,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2c539902d697d0b87334ca7dc4f3ce69"></a><!-- doxytag: member="stk::FileLoop::reset" ref="a2c539902d697d0b87334ca7dc4f3ce69" args="(void)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileLoop.html#a2c539902d697d0b87334ca7dc4f3ce69">reset</a> (void)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear outputs and reset time (file) pointer to zero. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9f3c514ce166068197684a21d31c3a76"></a><!-- doxytag: member="stk::FileLoop::channelsOut" ref="a9f3c514ce166068197684a21d31c3a76" args="(void) const " -->
+unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileLoop.html#a9f3c514ce166068197684a21d31c3a76">channelsOut</a> (void) const </td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the number of audio channels in the data or stream. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b">normalize</a> (void)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Normalize data to a maximum of +-1.0.  <a href="#a7c4a3d5c427154bf653f86a53e900b8b"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileLoop.html#aa1ac0c8d19f412f66f5fdb89854e2833">normalize</a> (StkFloat peak)</td></tr>
@@ -81,7 +84,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>STK file looping / oscillator class. </p>
 <p>This class provides audio file looping functionality. Any audio file that can be loaded by <a class="el" href="classstk_1_1FileRead.html" title="STK audio file input class.">FileRead</a> can be looped using this class.</p>
 <p><a class="el" href="classstk_1_1FileLoop.html" title="STK file looping / oscillator class.">FileLoop</a> supports multi-channel data. It is important to distinguish the <a class="el" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95" title="Compute a sample frame and return the specified channel value.">tick()</a> method that computes a single frame (and returns only the specified sample of a multi-channel frame) from the overloaded one that takes an <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object for multi-channel and/or multi-frame data.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a5905940c0dd046a95ca9c2a1d72983de"></a><!-- doxytag: member="stk::FileLoop::openFile" ref="a5905940c0dd046a95ca9c2a1d72983de" args="(std::string fileName, bool raw=false, bool doNormalize=true)" -->
 <div class="memitem">
@@ -142,6 +145,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <p>Reimplemented from <a class="el" href="classstk_1_1FileWvIn.html#aaecd1950fca3a5513e0efe4e86754b11">stk::FileWvIn</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00065"></a>00065 { <a class="code" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">FileWvIn::normalize</a>( 1.0 ); };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="aa1ac0c8d19f412f66f5fdb89854e2833"></a><!-- doxytag: member="stk::FileLoop::normalize" ref="aa1ac0c8d19f412f66f5fdb89854e2833" args="(StkFloat peak)" -->
@@ -165,6 +171,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <p>Reimplemented from <a class="el" href="classstk_1_1FileWvIn.html#a670b16fcbdd2a510706c23faeb00a1be">stk::FileWvIn</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00072"></a>00072 { <a class="code" href="classstk_1_1FileLoop.html#a7c4a3d5c427154bf653f86a53e900b8b" title="Normalize data to a maximum of +-1.0.">FileWvIn::normalize</a>( peak ); };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="aa18006c800c7dac1ddd277c987fe0003"></a><!-- doxytag: member="stk::FileLoop::getFileRate" ref="aa18006c800c7dac1ddd277c987fe0003" args="(void) const " -->
@@ -188,6 +197,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <p>Reimplemented from <a class="el" href="classstk_1_1FileWvIn.html#a867b7b7fdb60e5194e25d7a85a26ec0b">stk::FileWvIn</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00083"></a>00083 { <span class="keywordflow">return</span> data_.dataRate(); };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a13e1f693bc8a29d9051a400087347a3c"></a><!-- doxytag: member="stk::FileLoop::setRate" ref="a13e1f693bc8a29d9051a400087347a3c" args="(StkFloat rate)" -->
@@ -232,6 +244,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Set the data interpolation rate based on a looping frequency. </p>
 <p>This function determines the interpolation rate based on the file size and the current <a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>. The <em>frequency</em> value corresponds to file cycles per second. The frequency can be negative, in which case the loop is read in reverse order. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00098"></a>00098 { this-&gt;<a class="code" href="classstk_1_1FileLoop.html#a13e1f693bc8a29d9051a400087347a3c" title="Set the data read rate in samples. The rate can be negative.">setRate</a>( file_.fileSize() * frequency / <a class="code" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() ); };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a8e24d6f9292a9443fbc21e4e8797f482"></a><!-- doxytag: member="stk::FileLoop::addPhase" ref="a8e24d6f9292a9443fbc21e4e8797f482" args="(StkFloat angle)" -->
@@ -297,6 +312,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <p>Reimplemented from <a class="el" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608">stk::FileWvIn</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00129"></a>00129 { <span class="keywordflow">return</span> <a class="code" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd" title="Return the specified channel value of the last computed frame.">FileWvIn::lastOut</a>( channel ); };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a037b31918134ed1839a8b48de774ab95"></a><!-- doxytag: member="stk::FileLoop::tick" ref="a037b31918134ed1839a8b48de774ab95" args="(unsigned int channel=0)" -->
@@ -353,7 +371,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FileRead-members.html b/doc/html/classstk_1_1FileRead-members.html
index b00a099..bd00dc5 100644
--- a/doc/html/classstk_1_1FileRead-members.html
+++ b/doc/html/classstk_1_1FileRead-members.html
@@ -18,10 +18,12 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileRead.html#a9b8c55af1ca997dd3b808afcc54f3089">FileRead</a>(void)</td><td><a class="el" href="classstk_1_1FileRead.html">stk::FileRead</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileRead.html#aef47f180e2d7ef77a118b993541b372d">FileRead</a>(std::string fileName, bool typeRaw=false, unsigned int nChannels=1, StkFormat format=STK_SINT16, StkFloat rate=22050.0)</td><td><a class="el" href="classstk_1_1FileRead.html">stk::FileRead</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileRead.html#a6a83d925dd5bd18c4299ea42cc0ea488">fileSize</a>(void) const </td><td><a class="el" href="classstk_1_1FileRead.html">stk::FileRead</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1FileRead.html#a6852b303c34f01967be2a7a69221ef0b">format</a>(void) const </td><td><a class="el" href="classstk_1_1FileRead.html">stk::FileRead</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a>(const char *message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileRead.html#a3f30ed2a9f45493f0369aa2edbf38f70">isOpen</a>(void)</td><td><a class="el" href="classstk_1_1FileRead.html">stk::FileRead</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileRead.html#acc11b53871e05af1b0342e2cc1fc3157">open</a>(std::string fileName, bool typeRaw=false, unsigned int nChannels=1, StkFormat format=STK_SINT16, StkFloat rate=22050.0)</td><td><a class="el" href="classstk_1_1FileRead.html">stk::FileRead</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -51,7 +53,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FileRead.gif b/doc/html/classstk_1_1FileRead.gif
deleted file mode 100644
index 34c5872..0000000
Binary files a/doc/html/classstk_1_1FileRead.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1FileRead.html b/doc/html/classstk_1_1FileRead.html
index 928f842..14f550c 100644
--- a/doc/html/classstk_1_1FileRead.html
+++ b/doc/html/classstk_1_1FileRead.html
@@ -53,6 +53,9 @@ unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" h
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4c0c35f1817a4984b325967f1e7bcd81"></a><!-- doxytag: member="stk::FileRead::channels" ref="a4c0c35f1817a4984b325967f1e7bcd81" args="(void) const " -->
 unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileRead.html#a4c0c35f1817a4984b325967f1e7bcd81">channels</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the number of audio channels in the file. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6852b303c34f01967be2a7a69221ef0b"></a><!-- doxytag: member="stk::FileRead::format" ref="a6852b303c34f01967be2a7a69221ef0b" args="(void) const " -->
+StkFormat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileRead.html#a6852b303c34f01967be2a7a69221ef0b">format</a> (void) const </td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the data format of the file. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileRead.html#a7d6ba525b2f8ae693d953cb7f4b7c199">fileRate</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the file sample rate in Hz.  <a href="#a7d6ba525b2f8ae693d953cb7f4b7c199"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileRead.html#a8eefe5d1479789c02ac2dfa76ba143f8">read</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;buffer, unsigned long startFrame=0, bool doNormalize=true)</td></tr>
@@ -61,9 +64,9 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK audio file input class. </p>
 <p>This class provides input support for various audio file formats. Multi-channel (&gt;2) soundfiles are supported. The file data is returned via an external <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object passed to the <a class="el" href="classstk_1_1FileRead.html#a8eefe5d1479789c02ac2dfa76ba143f8" title="Read sample frames from the file into an StkFrames object.">read()</a> function. This class does not store its own copy of the file data, rather the data is read directly from disk.</p>
-<p><a class="el" href="classstk_1_1FileRead.html" title="STK audio file input class.">FileRead</a> currently supports uncompressed WAV, AIFF/AIFC, SND (AU), MAT-file (Matlab), and STK RAW file formats. Signed integer (8-, 16-, and 32-bit) and floating-point (32- and 64-bit) data types are supported. Compressed data types are not supported.</p>
-<p>STK RAW files have no header and are assumed to contain a monophonic stream of 16-bit signed integers in big-endian byte order at a sample rate of 22050 Hz. MAT-file data should be saved in an array with each data channel filling a matrix row. The sample rate for MAT-files is assumed to be 44100 Hz.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p><a class="el" href="classstk_1_1FileRead.html" title="STK audio file input class.">FileRead</a> currently supports uncompressed WAV, AIFF/AIFC, SND (AU), MAT-file (Matlab), and STK RAW file formats. Signed integer (8-, 16-, 24-, and 32-bit) and floating-point (32- and 64-bit) data types are supported. Compressed data types are not supported.</p>
+<p>STK RAW files have no header and are assumed to contain a monophonic stream of 16-bit signed integers in big-endian byte order at a sample rate of 22050 Hz. MAT-file data should be saved in an array with each data channel filling a matrix row. The sample rate for MAT-files should be specified in a variable named "fs". If no such variable is found, the sample rate is assumed to be 44100 Hz.</p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="aef47f180e2d7ef77a118b993541b372d"></a><!-- doxytag: member="stk::FileRead::FileRead" ref="aef47f180e2d7ef77a118b993541b372d" args="(std::string fileName, bool typeRaw=false, unsigned int nChannels=1, StkFormat format=STK_SINT16, StkFloat rate=22050.0)" -->
 <div class="memitem">
@@ -181,6 +184,9 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>Return the file sample rate in Hz. </p>
 <p>WAV, SND, and AIF formatted files specify a sample rate in their headers. By definition, STK RAW files have a sample rate of 22050 Hz. MAT-files are assumed to have a rate of 44100 Hz. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00091"></a>00091 { <span class="keywordflow">return</span> fileRate_; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a8eefe5d1479789c02ac2dfa76ba143f8"></a><!-- doxytag: member="stk::FileRead::read" ref="a8eefe5d1479789c02ac2dfa76ba143f8" args="(StkFrames &amp;buffer, unsigned long startFrame=0, bool doNormalize=true)" -->
@@ -227,7 +233,7 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FileWrite-members.html b/doc/html/classstk_1_1FileWrite-members.html
index cab8bb2..3e45180 100644
--- a/doc/html/classstk_1_1FileWrite-members.html
+++ b/doc/html/classstk_1_1FileWrite-members.html
@@ -24,6 +24,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileWrite.html#a636436624aa39eb5ba3401a9279a173e">isOpen</a>(void)</td><td><a class="el" href="classstk_1_1FileWrite.html">stk::FileWrite</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileWrite.html#a7575ddb275c902207b7b6518bb5a4ed9">open</a>(std::string fileName, unsigned int nChannels=1, FileWrite::FILE_TYPE type=FILE_WAV, Stk::StkFormat format=STK_SINT16)</td><td><a class="el" href="classstk_1_1FileWrite.html">stk::FileWrite</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -53,7 +54,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FileWrite.gif b/doc/html/classstk_1_1FileWrite.gif
deleted file mode 100644
index a0fafc8..0000000
Binary files a/doc/html/classstk_1_1FileWrite.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1FileWrite.html b/doc/html/classstk_1_1FileWrite.html
index 642b6cd..a0d65a5 100644
--- a/doc/html/classstk_1_1FileWrite.html
+++ b/doc/html/classstk_1_1FileWrite.html
@@ -60,8 +60,8 @@ bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>STK audio file output class. </p>
 <p>This class provides output support for various audio file formats.</p>
 <p><a class="el" href="classstk_1_1FileWrite.html" title="STK audio file output class.">FileWrite</a> writes samples to an audio file. It supports multi-channel data.</p>
-<p><a class="el" href="classstk_1_1FileWrite.html" title="STK audio file output class.">FileWrite</a> currently supports uncompressed WAV, AIFF, AIFC, SND (AU), MAT-file (Matlab), and STK RAW file formats. Signed integer (8-, 16-, and 32-bit) and floating- point (32- and 64-bit) data types are supported. STK RAW files use 16-bit integers by definition. MAT-files will always be written as 64-bit floats. If a data type specification does not match the specified file type, the data type will automatically be modified. Compressed data types are not supported.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p><a class="el" href="classstk_1_1FileWrite.html" title="STK audio file output class.">FileWrite</a> currently supports uncompressed WAV, AIFF, AIFC, SND (AU), MAT-file (Matlab), and STK RAW file formats. Signed integer (8-, 16-, 24-, and 32-bit) and floating- point (32- and 64-bit) data types are supported. STK RAW files use 16-bit integers by definition. MAT-files will always be written as 64-bit floats. If a data type specification does not match the specified file type, the data type will automatically be modified. Compressed data types are not supported.</p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a207f10bba60355fe3dc62dc837edee46"></a><!-- doxytag: member="stk::FileWrite::FileWrite" ref="a207f10bba60355fe3dc62dc837edee46" args="(std::string fileName, unsigned int nChannels=1, FILE_TYPE type=FILE_WAV, Stk::StkFormat format=STK_SINT16)" -->
 <div class="memitem">
@@ -248,7 +248,7 @@ bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FileWvIn-members.html b/doc/html/classstk_1_1FileWvIn-members.html
index 9b14583..70e3d86 100644
--- a/doc/html/classstk_1_1FileWvIn-members.html
+++ b/doc/html/classstk_1_1FileWvIn-members.html
@@ -23,7 +23,9 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileWvIn.html#aca9ad0c12af3323e7bbf877513b0d10b">isFinished</a>(void) const </td><td><a class="el" href="classstk_1_1FileWvIn.html">stk::FileWvIn</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1FileWvIn.html#aa45344366bca49f71c7153ac5b296e91">isOpen</a>(void)</td><td><a class="el" href="classstk_1_1FileWvIn.html">stk::FileWvIn</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1WvIn.html#a3ab86e33eff9f962c9ef7b41e3ccb77e">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1WvIn.html">stk::WvIn</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1FileWvIn.html">stk::FileWvIn</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileWvIn.html#aaecd1950fca3a5513e0efe4e86754b11">normalize</a>(void)</td><td><a class="el" href="classstk_1_1FileWvIn.html">stk::FileWvIn</a></td><td><code> [virtual]</code></td></tr>
@@ -59,7 +61,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FileWvIn.gif b/doc/html/classstk_1_1FileWvIn.gif
deleted file mode 100644
index 824cfc7..0000000
Binary files a/doc/html/classstk_1_1FileWvIn.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1FileWvIn.html b/doc/html/classstk_1_1FileWvIn.html
index 3968ce0..248a130 100644
--- a/doc/html/classstk_1_1FileWvIn.html
+++ b/doc/html/classstk_1_1FileWvIn.html
@@ -58,6 +58,9 @@ virtual unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a clas
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the file size in sample frames. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">virtual StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileWvIn.html#a867b7b7fdb60e5194e25d7a85a26ec0b">getFileRate</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the input file sample rate in Hz (not the data read rate).  <a href="#a867b7b7fdb60e5194e25d7a85a26ec0b"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa45344366bca49f71c7153ac5b296e91"></a><!-- doxytag: member="stk::FileWvIn::isOpen" ref="aa45344366bca49f71c7153ac5b296e91" args="(void)" -->
+bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileWvIn.html#aa45344366bca49f71c7153ac5b296e91">isOpen</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Query whether a file is open. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aca9ad0c12af3323e7bbf877513b0d10b"></a><!-- doxytag: member="stk::FileWvIn::isFinished" ref="aca9ad0c12af3323e7bbf877513b0d10b" args="(void) const " -->
 bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1FileWvIn.html#aca9ad0c12af3323e7bbf877513b0d10b">isFinished</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Query whether reading is complete. <br/></td></tr>
@@ -81,7 +84,7 @@ bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p><a class="el" href="classstk_1_1FileWvIn.html" title="STK audio file input class.">FileWvIn</a> will either load the entire content of an audio file into local memory or incrementally read file data from disk in chunks. This behavior is controlled by the optional constructor arguments <em>chunkThreshold</em> and <em>chunkSize</em>. File sizes greater than <em>chunkThreshold</em> (in sample frames) will be read incrementally in chunks of <em>chunkSize</em> each (also in sample frames).</p>
 <p>When the file end is reached, subsequent calls to the <a class="el" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2" title="Compute a sample frame and return the specified channel value.">tick()</a> functions return zeros and <a class="el" href="classstk_1_1FileWvIn.html#aca9ad0c12af3323e7bbf877513b0d10b" title="Query whether reading is complete.">isFinished()</a> returns <em>true</em>.</p>
 <p>See the <a class="el" href="classstk_1_1FileRead.html" title="STK audio file input class.">FileRead</a> class for a description of the supported audio file formats.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a01f985173b4d012fe5e9234134a71433"></a><!-- doxytag: member="stk::FileWvIn::FileWvIn" ref="a01f985173b4d012fe5e9234134a71433" args="(std::string fileName, bool raw=false, bool doNormalize=true, unsigned long chunkThreshold=1000000, unsigned long chunkSize=1024)" -->
 <div class="memitem">
@@ -237,6 +240,9 @@ bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <p>Reimplemented in <a class="el" href="classstk_1_1FileLoop.html#aa18006c800c7dac1ddd277c987fe0003">stk::FileLoop</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00100"></a>00100 { <span class="keywordflow">return</span> data_.dataRate(); };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="aacd97ad5f30f9cdc8201b4244aa69901"></a><!-- doxytag: member="stk::FileWvIn::setRate" ref="aacd97ad5f30f9cdc8201b4244aa69901" args="(StkFloat rate)" -->
@@ -304,6 +310,9 @@ bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Turn linear interpolation on/off. </p>
 <p>Interpolation is automatically off when the read rate is an integer value. If interpolation is turned off for a fractional rate, the time index is truncated to an integer value. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00127"></a>00127 { interpolate_ = doInterpolate; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ad17c12e8d51f90f59f0d0c9f6d626608"></a><!-- doxytag: member="stk::FileWvIn::lastOut" ref="ad17c12e8d51f90f59f0d0c9f6d626608" args="(unsigned int channel=0)" -->
@@ -328,6 +337,19 @@ bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <p>Reimplemented in <a class="el" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd">stk::FileLoop</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00182"></a>00182 {
+<a name="l00183"></a>00183 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00184"></a>00184 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= data_.channels() ) {
+<a name="l00185"></a>00185     oStream_ &lt;&lt; <span class="stringliteral">&quot;FileWvIn::lastOut(): channel argument and soundfile data are incompatible!&quot;</span>;
+<a name="l00186"></a>00186     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00187"></a>00187   }
+<a name="l00188"></a>00188 <span class="preprocessor">#endif</span>
+<a name="l00189"></a>00189 <span class="preprocessor"></span>
+<a name="l00190"></a>00190   <span class="keywordflow">if</span> ( finished_ ) <span class="keywordflow">return</span> 0.0;
+<a name="l00191"></a>00191   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00192"></a>00192 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ada668a0bc0bf89e155ef341de00babc2"></a><!-- doxytag: member="stk::FileWvIn::tick" ref="ada668a0bc0bf89e155ef341de00babc2" args="(unsigned int channel=0)" -->
@@ -388,7 +410,7 @@ bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FileWvOut-members.html b/doc/html/classstk_1_1FileWvOut-members.html
index e0c2c02..a45ea27 100644
--- a/doc/html/classstk_1_1FileWvOut-members.html
+++ b/doc/html/classstk_1_1FileWvOut-members.html
@@ -22,6 +22,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FileWvOut.html#a31dde577d41a65018c3e03001de8d645">openFile</a>(std::string fileName, unsigned int nChannels, FileWrite::FILE_TYPE type, Stk::StkFormat format)</td><td><a class="el" href="classstk_1_1FileWvOut.html">stk::FileWvOut</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -53,7 +54,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FileWvOut.gif b/doc/html/classstk_1_1FileWvOut.gif
deleted file mode 100644
index b31e231..0000000
Binary files a/doc/html/classstk_1_1FileWvOut.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1FileWvOut.html b/doc/html/classstk_1_1FileWvOut.html
index 1a24031..28513b8 100644
--- a/doc/html/classstk_1_1FileWvOut.html
+++ b/doc/html/classstk_1_1FileWvOut.html
@@ -54,7 +54,7 @@ virtual&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="c
 <p><a class="el" href="classstk_1_1FileWvOut.html" title="STK audio file output class.">FileWvOut</a> writes samples to an audio file and supports multi-channel data. It is important to distinguish the <a class="el" href="classstk_1_1FileWvOut.html#a9d3505aea3cd3c4d6822f05a2679dc41" title="Output a single sample to all channels in a sample frame.">tick()</a> method that outputs a single sample to all channels in a sample frame from the overloaded one that takes a reference to an <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object for multi-channel and/or multi-frame data.</p>
 <p>See the <a class="el" href="classstk_1_1FileWrite.html" title="STK audio file output class.">FileWrite</a> class for a description of the supported audio file formats.</p>
 <p>Currently, <a class="el" href="classstk_1_1FileWvOut.html" title="STK audio file output class.">FileWvOut</a> is non-interpolating and the output rate is always <a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate()</a>.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a6f0168fca20a3c9d6d5f2baedf03ec1b"></a><!-- doxytag: member="stk::FileWvOut::FileWvOut" ref="a6f0168fca20a3c9d6d5f2baedf03ec1b" args="(unsigned int bufferFrames=1024)" -->
 <div class="memitem">
@@ -243,7 +243,7 @@ virtual&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="c
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Filter-members.html b/doc/html/classstk_1_1Filter-members.html
index 9e77eef..ff01b13 100644
--- a/doc/html/classstk_1_1Filter-members.html
+++ b/doc/html/classstk_1_1Filter-members.html
@@ -21,7 +21,9 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -49,7 +51,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Filter.gif b/doc/html/classstk_1_1Filter.gif
deleted file mode 100644
index 47d61e0..0000000
Binary files a/doc/html/classstk_1_1Filter.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Filter.html b/doc/html/classstk_1_1Filter.html
index bccf251..a01cb3a 100644
--- a/doc/html/classstk_1_1Filter.html
+++ b/doc/html/classstk_1_1Filter.html
@@ -61,6 +61,8 @@ virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af21e11b72ea59af4585c59600a0980c2"></a><!-- doxytag: member="stk::Filter::getGain" ref="af21e11b72ea59af4585c59600a0980c2" args="(void) const " -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Filter.html#af21e11b72ea59af4585c59600a0980c2">getGain</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the current filter gain. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a> (StkFloat frequency)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the filter phase delay at the specified frequency.  <a href="#a6453c68dca60f87053c888b3635b7220"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab2d944f649693511dced1df249f0abe6"></a><!-- doxytag: member="stk::Filter::lastFrame" ref="ab2d944f649693511dced1df249f0abe6" args="(void) const " -->
 const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a> (void) const </td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return an <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> reference to the last output sample frame. <br/></td></tr>
@@ -70,7 +72,7 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK abstract filter class. </p>
 <p>This class provides limited common functionality for STK digital filter subclasses. It is general enough to support both monophonic and polyphonic input/output classes.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a827b1bd3a99fa9af408cbd4eb559d212"></a><!-- doxytag: member="stk::Filter::setGain" ref="a827b1bd3a99fa9af408cbd4eb559d212" args="(StkFloat gain)" -->
 <div class="memitem">
@@ -91,6 +93,59 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 <p>Set the filter gain. </p>
 <p>The gain is applied at the filter input and does not affect the coefficient values. The default gain value is 1.0. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00042"></a>00042 { gain_ = gain; };
+</pre></div></p>
+
+</div>
+</div>
+<a class="anchor" id="a6453c68dca60f87053c888b3635b7220"></a><!-- doxytag: member="stk::Filter::phaseDelay" ref="a6453c68dca60f87053c888b3635b7220" args="(StkFloat frequency)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">StkFloat stk::Filter::phaseDelay </td>
+          <td>(</td>
+          <td class="paramtype">StkFloat&nbsp;</td>
+          <td class="paramname"> <em>frequency</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td><code> [inline]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Return the filter phase delay at the specified frequency. </p>
+<p>Note that the phase delay calculation accounts for the filter gain. The frequency value should be greater than 0.0 and less than or equal to one-half the sample rate. </p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00094"></a>00094 {
+<a name="l00095"></a>00095   <span class="keywordflow">if</span> ( frequency &lt;= 0.0 || frequency &gt; 0.5 * <a class="code" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>() ) {
+<a name="l00096"></a>00096     oStream_ &lt;&lt; <span class="stringliteral">&quot;Filter::phaseDelay: argument (&quot;</span> &lt;&lt; frequency &lt;&lt; <span class="stringliteral">&quot;) is out of range!&quot;</span>;
+<a name="l00097"></a>00097     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::WARNING ); <span class="keywordflow">return</span> 0.0;
+<a name="l00098"></a>00098   }
+<a name="l00099"></a>00099 
+<a name="l00100"></a>00100   StkFloat omegaT = 2 * M_PI * frequency / <a class="code" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate</a>();
+<a name="l00101"></a>00101   StkFloat real = 0.0, imag = 0.0;
+<a name="l00102"></a>00102   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;b_.size(); i++ ) {
+<a name="l00103"></a>00103     real += b_[i] * std::cos( i * omegaT );
+<a name="l00104"></a>00104     imag -= b_[i] * std::sin( i * omegaT );
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106   real *= gain_;
+<a name="l00107"></a>00107   imag *= gain_;
+<a name="l00108"></a>00108 
+<a name="l00109"></a>00109   StkFloat phase = atan2( imag, real );
+<a name="l00110"></a>00110 
+<a name="l00111"></a>00111   real = 0.0, imag = 0.0;
+<a name="l00112"></a>00112   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;a_.size(); i++ ) {
+<a name="l00113"></a>00113     real += a_[i] * std::cos( i * omegaT );
+<a name="l00114"></a>00114     imag -= a_[i] * std::sin( i * omegaT );
+<a name="l00115"></a>00115   }
+<a name="l00116"></a>00116 
+<a name="l00117"></a>00117   phase -= std::atan2( imag, real );
+<a name="l00118"></a>00118   phase = std::fmod( -phase, 2 * M_PI );
+<a name="l00119"></a>00119   <span class="keywordflow">return</span> phase / omegaT;
+<a name="l00120"></a>00120 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a3260a238824c4a748ac057b84b7d3f21"></a><!-- doxytag: member="stk::Filter::tick" ref="a3260a238824c4a748ac057b84b7d3f21" args="(StkFrames &amp;frames, unsigned int channel=0)=0" -->
@@ -133,7 +188,7 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Fir-members.html b/doc/html/classstk_1_1Fir-members.html
index c6b2306..36c2899 100644
--- a/doc/html/classstk_1_1Fir-members.html
+++ b/doc/html/classstk_1_1Fir-members.html
@@ -23,8 +23,10 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Fir.html#a5182288d564977bf172439f6ecaf2377">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Fir.html">stk::Fir</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -56,7 +58,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Fir.gif b/doc/html/classstk_1_1Fir.gif
deleted file mode 100644
index 97a5490..0000000
Binary files a/doc/html/classstk_1_1Fir.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Fir.html b/doc/html/classstk_1_1Fir.html
index 66768db..6e41f12 100644
--- a/doc/html/classstk_1_1Fir.html
+++ b/doc/html/classstk_1_1Fir.html
@@ -59,7 +59,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>In particular, this class implements the standard difference equation:</p>
 <p>y[n] = b[0]*x[n] + ... + b[nb]*x[n-nb]</p>
 <p>The <em>gain</em> parameter is applied at the filter input and does not affect the coefficient values. The default gain value is 1.0. This structure results in one extra multiply per computed sample, but allows easy control of the overall filter gain.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a6f47a21d9fa7641aad2872df70432265"></a><!-- doxytag: member="stk::Fir::Fir" ref="a6f47a21d9fa7641aad2872df70432265" args="(std::vector&lt; StkFloat &gt; &amp;coefficients)" -->
 <div class="memitem">
@@ -143,6 +143,32 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00101"></a>00101 {
+<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00104"></a>00104     oStream_ &lt;&lt; <span class="stringliteral">&quot;Fir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00106"></a>00106   }
+<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span>
+<a name="l00109"></a>00109   StkFloat *samples = &amp;frames[channel];
+<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i, hop = frames.channels();
+<a name="l00111"></a>00111   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j=0; j&lt;frames.frames(); j++, samples += hop ) {
+<a name="l00112"></a>00112     inputs_[0] = gain_ * *samples;
+<a name="l00113"></a>00113     *samples = 0.0;
+<a name="l00114"></a>00114 
+<a name="l00115"></a>00115     <span class="keywordflow">for</span> ( i=b_.size()-1; i&gt;0; i-- ) {
+<a name="l00116"></a>00116       *samples += b_[i] * inputs_[i];
+<a name="l00117"></a>00117       inputs_[i] = inputs_[i-1];
+<a name="l00118"></a>00118     }
+<a name="l00119"></a>00119     *samples += b_[0] * inputs_[0];
+<a name="l00120"></a>00120   }
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122   lastFrame_[0] = *(samples-hop);
+<a name="l00123"></a>00123   <span class="keywordflow">return</span> frames;
+<a name="l00124"></a>00124 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a53bcdfc2e9ad757d2ec549529b7a9738"></a><!-- doxytag: member="stk::Fir::tick" ref="a53bcdfc2e9ad757d2ec549529b7a9738" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -185,6 +211,33 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00127"></a>00127 {
+<a name="l00128"></a>00128 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00129"></a>00129 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00130"></a>00130     oStream_ &lt;&lt; <span class="stringliteral">&quot;Fir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00131"></a>00131     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00132"></a>00132   }
+<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
+<a name="l00134"></a>00134 <span class="preprocessor"></span>
+<a name="l00135"></a>00135   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00136"></a>00136   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00137"></a>00137   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i, iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00138"></a>00138   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j=0; j&lt;iFrames.frames(); j++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00139"></a>00139     inputs_[0] = gain_ * *iSamples;
+<a name="l00140"></a>00140     *oSamples = 0.0;
+<a name="l00141"></a>00141 
+<a name="l00142"></a>00142     <span class="keywordflow">for</span> ( i=b_.size()-1; i&gt;0; i-- ) {
+<a name="l00143"></a>00143       *oSamples += b_[i] * inputs_[i];
+<a name="l00144"></a>00144       inputs_[i] = inputs_[i-1];
+<a name="l00145"></a>00145     }
+<a name="l00146"></a>00146     *oSamples += b_[0] * inputs_[0];
+<a name="l00147"></a>00147   }
+<a name="l00148"></a>00148 
+<a name="l00149"></a>00149   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00150"></a>00150   <span class="keywordflow">return</span> iFrames;
+<a name="l00151"></a>00151 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -195,7 +248,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Flute-members.html b/doc/html/classstk_1_1Flute-members.html
index 619b854..2b677e7 100644
--- a/doc/html/classstk_1_1Flute-members.html
+++ b/doc/html/classstk_1_1Flute-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -30,10 +31,10 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d">sampleRate</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a740e872daa4b2ad1c918163e7c5ab56b">sampleRateChanged</a>(StkFloat newRate, StkFloat oldRate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Flute.html#a7c0ef95a3170dafde08b65ee47102969">setEndReflection</a>(StkFloat coefficient)</td><td><a class="el" href="classstk_1_1Flute.html">stk::Flute</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Flute.html#a7c0ef95a3170dafde08b65ee47102969">setEndReflection</a>(StkFloat coefficient)</td><td><a class="el" href="classstk_1_1Flute.html">stk::Flute</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Flute.html#aea66780681552de9d12af6bb91f297da">setFrequency</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Flute.html">stk::Flute</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Flute.html#ad37a862df945987f91e3164813ce911b">setJetDelay</a>(StkFloat aRatio)</td><td><a class="el" href="classstk_1_1Flute.html">stk::Flute</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Flute.html#a0732403c66b3667f5f6a8c80e90046e0">setJetReflection</a>(StkFloat coefficient)</td><td><a class="el" href="classstk_1_1Flute.html">stk::Flute</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Flute.html#a0732403c66b3667f5f6a8c80e90046e0">setJetReflection</a>(StkFloat coefficient)</td><td><a class="el" href="classstk_1_1Flute.html">stk::Flute</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">showWarnings</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -51,7 +52,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Flute.html">stk::Flute</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Flute.html#a86640ddfacea6fd9385bc4e197fe1a28">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Flute.html">stk::Flute</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Flute.html#a76120aedfc0bab94416917d173f8a74e">~Flute</a>(void)</td><td><a class="el" href="classstk_1_1Flute.html">stk::Flute</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -59,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Flute.gif b/doc/html/classstk_1_1Flute.gif
deleted file mode 100644
index 8d675ad..0000000
Binary files a/doc/html/classstk_1_1Flute.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Flute.html b/doc/html/classstk_1_1Flute.html
index 584be89..564d6ec 100644
--- a/doc/html/classstk_1_1Flute.html
+++ b/doc/html/classstk_1_1Flute.html
@@ -70,6 +70,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab8f307f9a26ef2756ec4c0ea05f3acbe"></a><!-- doxytag: member="stk::Flute::tick" ref="ab8f307f9a26ef2756ec4c0ea05f3acbe" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Flute.html#a86640ddfacea6fd9385bc4e197fe1a28">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a86640ddfacea6fd9385bc4e197fe1a28"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK flute physical model class. </p>
@@ -83,7 +85,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Vibrato Gain = 1</li>
 <li>Breath Pressure = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a9769eef3340651acc31b4997e9985e57"></a><!-- doxytag: member="stk::Flute::Flute" ref="a9769eef3340651acc31b4997e9985e57" args="(StkFloat lowestFrequency)" -->
 <div class="memitem">
@@ -104,6 +106,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor, taking the lowest desired playing frequency. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a86640ddfacea6fd9385bc4e197fe1a28"></a><!-- doxytag: member="stk::Flute::tick" ref="a86640ddfacea6fd9385bc4e197fe1a28" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Flute::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00138"></a>00138 {
+<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00140"></a>00140 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00141"></a>00141 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00142"></a>00142     oStream_ &lt;&lt; <span class="stringliteral">&quot;Flute::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00143"></a>00143     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00144"></a>00144   }
+<a name="l00145"></a>00145 <span class="preprocessor">#endif</span>
+<a name="l00146"></a>00146 <span class="preprocessor"></span>
+<a name="l00147"></a>00147   StkFloat *samples = &amp;frames[channel];
+<a name="l00148"></a>00148   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00149"></a>00149   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00150"></a>00150     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00151"></a>00151       *samples++ = <a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">tick</a>();
+<a name="l00152"></a>00152   }
+<a name="l00153"></a>00153   <span class="keywordflow">else</span> {
+<a name="l00154"></a>00154     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00155"></a>00155       *samples++ = <a class="code" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe" title="Compute and return one output sample.">tick</a>();
+<a name="l00156"></a>00156       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00157"></a>00157         *samples++ = lastFrame_[j];
+<a name="l00158"></a>00158     }
+<a name="l00159"></a>00159   }
+<a name="l00160"></a>00160 
+<a name="l00161"></a>00161   <span class="keywordflow">return</span> frames;
+<a name="l00162"></a>00162 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -114,7 +176,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FormSwep-members.html b/doc/html/classstk_1_1FormSwep-members.html
index 858e647..803da64 100644
--- a/doc/html/classstk_1_1FormSwep-members.html
+++ b/doc/html/classstk_1_1FormSwep-members.html
@@ -22,8 +22,10 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FormSwep.html#a91096ebd684df25fc36a759f642b2200">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1FormSwep.html">stk::FormSwep</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FormSwep.html#a3d8405c24e8539b389daf86fccfe5d70">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1FormSwep.html">stk::FormSwep</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -58,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1FormSwep.gif b/doc/html/classstk_1_1FormSwep.gif
deleted file mode 100644
index a9effee..0000000
Binary files a/doc/html/classstk_1_1FormSwep.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1FormSwep.html b/doc/html/classstk_1_1FormSwep.html
index bc7e7e5..548e311 100644
--- a/doc/html/classstk_1_1FormSwep.html
+++ b/doc/html/classstk_1_1FormSwep.html
@@ -67,7 +67,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK sweepable formant filter class. </p>
 <p>This class implements a formant (resonance) which can be "swept" over time from one frequency setting to another. It provides methods for controlling the sweep rate and target frequency.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="aa6fe339cc937260c46e8c169a58d8529"></a><!-- doxytag: member="stk::FormSwep::setResonance" ref="aa6fe339cc937260c46e8c169a58d8529" args="(StkFloat frequency, StkFloat radius)" -->
 <div class="memitem">
@@ -95,7 +95,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Sets the filter coefficients for a resonance at <em>frequency</em> (in Hz). </p>
-<p>This method determines the filter coefficients corresponding to two complex-conjugate poles with the given <em>frequency</em> (in Hz) and <em>radius</em> from the z-plane origin. The filter zeros are placed at z = 1, z = -1, and the coefficients are then normalized to produce a constant unity gain (independent of the filter <em>gain</em> parameter). The resulting filter frequency response has a resonance at the given <em>frequency</em>. The closer the poles are to the unit-circle (<em>radius</em> close to one), the narrower the resulting resonance width. </p>
+<p>This method determines the filter coefficients corresponding to two complex-conjugate poles with the given <em>frequency</em> (in Hz) and <em>radius</em> from the z-plane origin. The filter zeros are placed at z = 1, z = -1, and the coefficients are then normalized to produce a constant unity gain (independent of the filter <em>gain</em> parameter). The resulting filter frequency response has a resonance at the given <em>frequency</em>. The closer the poles are to the unit-circle (<em>radius</em> close to one), the narrower the resulting resonance width. An unstable filter will result for <em>radius</em> &gt;= 1.0. The <em>frequency</em> value should be between zero and half the sample rate. </p>
 
 </div>
 </div>
@@ -171,6 +171,23 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00154"></a>00154 {
+<a name="l00155"></a>00155 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00156"></a>00156 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00157"></a>00157     oStream_ &lt;&lt; <span class="stringliteral">&quot;FormSwep::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00158"></a>00158     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00159"></a>00159   }
+<a name="l00160"></a>00160 <span class="preprocessor">#endif</span>
+<a name="l00161"></a>00161 <span class="preprocessor"></span>
+<a name="l00162"></a>00162   StkFloat *samples = &amp;frames[channel];
+<a name="l00163"></a>00163   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00164"></a>00164   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00165"></a>00165     *samples = <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( *samples );
+<a name="l00166"></a>00166 
+<a name="l00167"></a>00167   <span class="keywordflow">return</span> frames;
+<a name="l00168"></a>00168 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a8a16af2b4e169946cedb8fec2bb1417a"></a><!-- doxytag: member="stk::FormSwep::tick" ref="a8a16af2b4e169946cedb8fec2bb1417a" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -213,6 +230,24 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00171"></a>00171 {
+<a name="l00172"></a>00172 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00173"></a>00173 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00174"></a>00174     oStream_ &lt;&lt; <span class="stringliteral">&quot;FormSwep::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00175"></a>00175     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00176"></a>00176   }
+<a name="l00177"></a>00177 <span class="preprocessor">#endif</span>
+<a name="l00178"></a>00178 <span class="preprocessor"></span>
+<a name="l00179"></a>00179   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00180"></a>00180   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00181"></a>00181   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00182"></a>00182   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop )
+<a name="l00183"></a>00183     *oSamples = <a class="code" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774" title="Input one sample to the filter and return a reference to one output.">tick</a>( *iSamples );
+<a name="l00184"></a>00184 
+<a name="l00185"></a>00185   <span class="keywordflow">return</span> iFrames;
+<a name="l00186"></a>00186 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -223,7 +258,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Function-members.html b/doc/html/classstk_1_1Function-members.html
index a03a266..1e954af 100644
--- a/doc/html/classstk_1_1Function-members.html
+++ b/doc/html/classstk_1_1Function-members.html
@@ -17,6 +17,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Function.html#ae79bd6d0c9f53693b4ca28948d94fc25">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Function.html">stk::Function</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -44,7 +45,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Function.gif b/doc/html/classstk_1_1Function.gif
deleted file mode 100644
index 59d5bc0..0000000
Binary files a/doc/html/classstk_1_1Function.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Function.html b/doc/html/classstk_1_1Function.html
index 48729d3..810a851 100644
--- a/doc/html/classstk_1_1Function.html
+++ b/doc/html/classstk_1_1Function.html
@@ -23,10 +23,11 @@ Inheritance diagram for stk::Function:</div>
  <div class="center">
   <img src="classstk_1_1Function.png" usemap="#stk::Function_map" alt=""/>
   <map id="stk::Function_map" name="stk::Function_map">
-<area href="classstk_1_1Stk.html" alt="stk::Stk" shape="rect" coords="103,0,196,24"/>
+<area href="classstk_1_1Stk.html" alt="stk::Stk" shape="rect" coords="154,0,247,24"/>
 <area href="classstk_1_1BowTable.html" alt="stk::BowTable" shape="rect" coords="0,112,93,136"/>
-<area href="classstk_1_1JetTable.html" alt="stk::JetTable" shape="rect" coords="103,112,196,136"/>
-<area href="classstk_1_1ReedTable.html" alt="stk::ReedTable" shape="rect" coords="206,112,299,136"/>
+<area href="classstk_1_1Cubic.html" alt="stk::Cubic" shape="rect" coords="103,112,196,136"/>
+<area href="classstk_1_1JetTable.html" alt="stk::JetTable" shape="rect" coords="206,112,299,136"/>
+<area href="classstk_1_1ReedTable.html" alt="stk::ReedTable" shape="rect" coords="309,112,402,136"/>
 </map>
  </div>
 </div>
@@ -47,7 +48,7 @@ virtual StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK abstract function parent class. </p>
 <p>This class provides common functionality for STK classes that implement tables or other types of input to output function mappings.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Function_8h_source.html">Function.h</a></li>
 </ul>
@@ -56,7 +57,7 @@ virtual StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Function.png b/doc/html/classstk_1_1Function.png
index 92dc3ef..f58e578 100644
Binary files a/doc/html/classstk_1_1Function.png and b/doc/html/classstk_1_1Function.png differ
diff --git a/doc/html/classstk_1_1Generator-members.html b/doc/html/classstk_1_1Generator-members.html
index 06b2526..79a8e66 100644
--- a/doc/html/classstk_1_1Generator-members.html
+++ b/doc/html/classstk_1_1Generator-members.html
@@ -18,6 +18,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -45,7 +46,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Generator.gif b/doc/html/classstk_1_1Generator.gif
deleted file mode 100644
index d003207..0000000
Binary files a/doc/html/classstk_1_1Generator.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Generator.html b/doc/html/classstk_1_1Generator.html
index c0892cd..306ee20 100644
--- a/doc/html/classstk_1_1Generator.html
+++ b/doc/html/classstk_1_1Generator.html
@@ -57,7 +57,7 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK abstract unit generator parent class. </p>
 <p>This class provides limited common functionality for STK unit generator sample-source subclasses. It is general enough to support both monophonic and polyphonic output classes.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a86bb0421223cf27e25704d5f27b97425"></a><!-- doxytag: member="stk::Generator::tick" ref="a86bb0421223cf27e25704d5f27b97425" args="(StkFrames &amp;frames, unsigned int channel=0)=0" -->
 <div class="memitem">
@@ -99,7 +99,7 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Granulate-members.html b/doc/html/classstk_1_1Granulate-members.html
index d702122..4e8755c 100644
--- a/doc/html/classstk_1_1Granulate-members.html
+++ b/doc/html/classstk_1_1Granulate-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Granulate.html#a60db060a365fc32fe789cb9bcd042dd3">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Granulate.html">stk::Granulate</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Granulate.html#a6227f127a77b4fc581028033cd7658d8">openFile</a>(std::string fileName, bool typeRaw=false)</td><td><a class="el" href="classstk_1_1Granulate.html">stk::Granulate</a></td><td></td></tr>
@@ -56,7 +57,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Granulate.gif b/doc/html/classstk_1_1Granulate.gif
deleted file mode 100644
index 9ed2f7b..0000000
Binary files a/doc/html/classstk_1_1Granulate.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Granulate.html b/doc/html/classstk_1_1Granulate.html
index 5f599dc..49e89fb 100644
--- a/doc/html/classstk_1_1Granulate.html
+++ b/doc/html/classstk_1_1Granulate.html
@@ -243,6 +243,18 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>The <code>channel</code> argument must be less than the number of output channels, which can be determined with the <a class="el" href="classstk_1_1Generator.html#a9f9de4c495217ef8490a9d2d1fdabe11" title="Return the number of output channels for the class.">channelsOut()</a> function (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 <dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> </dd></dl>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00175"></a>00175 {
+<a name="l00176"></a>00176 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00177"></a>00177 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= lastFrame_.channels() ) {
+<a name="l00178"></a>00178     oStream_ &lt;&lt; <span class="stringliteral">&quot;Granulate::lastOut(): channel argument is invalid!&quot;</span>;
+<a name="l00179"></a>00179     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00180"></a>00180   }
+<a name="l00181"></a>00181 <span class="preprocessor">#endif</span>
+<a name="l00182"></a>00182 <span class="preprocessor"></span>
+<a name="l00183"></a>00183   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00184"></a>00184 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="aa9cc119b1515c5596a95d72f4b65b0c0"></a><!-- doxytag: member="stk::Granulate::tick" ref="aa9cc119b1515c5596a95d72f4b65b0c0" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -275,6 +287,27 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00187"></a>00187 {
+<a name="l00188"></a>00188   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00189"></a>00189 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00190"></a>00190 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00191"></a>00191     oStream_ &lt;&lt; <span class="stringliteral">&quot;Granulate::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00192"></a>00192     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00193"></a>00193   }
+<a name="l00194"></a>00194 <span class="preprocessor">#endif</span>
+<a name="l00195"></a>00195 <span class="preprocessor"></span>
+<a name="l00196"></a>00196   StkFloat *samples = &amp;frames[channel];
+<a name="l00197"></a>00197   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00198"></a>00198   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00199"></a>00199     *samples++ = <a class="code" href="classstk_1_1Granulate.html#a0f8b162c9c309b3cbec3802138a53c24" title="Compute one sample frame and return the specified channel value.">tick</a>();
+<a name="l00200"></a>00200     <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00201"></a>00201       *samples++ = lastFrame_[j];
+<a name="l00202"></a>00202   }
+<a name="l00203"></a>00203 
+<a name="l00204"></a>00204   <span class="keywordflow">return</span> frames;
+<a name="l00205"></a>00205 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -285,7 +318,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1HevyMetl-members.html b/doc/html/classstk_1_1HevyMetl-members.html
index 1b0dfb1..6d583ca 100644
--- a/doc/html/classstk_1_1HevyMetl-members.html
+++ b/doc/html/classstk_1_1HevyMetl-members.html
@@ -21,6 +21,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1HevyMetl.html#a61e000b4c2a8ba021e43e8074be44390">HevyMetl</a>(void)</td><td><a class="el" href="classstk_1_1HevyMetl.html">stk::HevyMetl</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#a7235e94a153df135330a591511269f7c">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#afc46280177d770404919f20ccf88e4ff">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
@@ -56,7 +57,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1HevyMetl.html">stk::HevyMetl</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1HevyMetl.html#a555f3bf9322fd11150b00bb99476769a">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1HevyMetl.html">stk::HevyMetl</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#aaba7e8bff02d105e146f8b62b20a27b9">~FM</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1HevyMetl.html#a03b76a27541928bf9e7d156f9709a8f0">~HevyMetl</a>(void)</td><td><a class="el" href="classstk_1_1HevyMetl.html">stk::HevyMetl</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
@@ -65,7 +66,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1HevyMetl.gif b/doc/html/classstk_1_1HevyMetl.gif
deleted file mode 100644
index c6158c0..0000000
Binary files a/doc/html/classstk_1_1HevyMetl.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1HevyMetl.html b/doc/html/classstk_1_1HevyMetl.html
index 45ef726..8d906b7 100644
--- a/doc/html/classstk_1_1HevyMetl.html
+++ b/doc/html/classstk_1_1HevyMetl.html
@@ -44,6 +44,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0261504b82845034be67ac573d564ff7"></a><!-- doxytag: member="stk::HevyMetl::tick" ref="a0261504b82845034be67ac573d564ff7" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1HevyMetl.html#a555f3bf9322fd11150b00bb99476769a">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a555f3bf9322fd11150b00bb99476769a"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK heavy metal <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis instrument. </p>
@@ -59,7 +61,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li><a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> 2 &amp; 4 Target = 128</li>
 </ul>
 <p>The basic Chowning/Stanford <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> patent expired in 1995, but there exist follow-on patents, mostly assigned to Yamaha. If you are of the type who should worry about this (making money) worry away.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a61e000b4c2a8ba021e43e8074be44390"></a><!-- doxytag: member="stk::HevyMetl::HevyMetl" ref="a61e000b4c2a8ba021e43e8074be44390" args="(void)" -->
 <div class="memitem">
@@ -80,6 +82,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a555f3bf9322fd11150b00bb99476769a"></a><!-- doxytag: member="stk::HevyMetl::tick" ref="a555f3bf9322fd11150b00bb99476769a" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::HevyMetl::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">stk::FM</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00098"></a>00098 {
+<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00100"></a>00100 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00101"></a>00101 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00102"></a>00102     oStream_ &lt;&lt; <span class="stringliteral">&quot;HevyMetl::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00103"></a>00103     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00104"></a>00104   }
+<a name="l00105"></a>00105 <span class="preprocessor">#endif</span>
+<a name="l00106"></a>00106 <span class="preprocessor"></span>
+<a name="l00107"></a>00107   StkFloat *samples = &amp;frames[channel];
+<a name="l00108"></a>00108   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00109"></a>00109   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00110"></a>00110     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00111"></a>00111       *samples++ = <a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">tick</a>();
+<a name="l00112"></a>00112   }
+<a name="l00113"></a>00113   <span class="keywordflow">else</span> {
+<a name="l00114"></a>00114     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00115"></a>00115       *samples++ = <a class="code" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7" title="Compute and return one output sample.">tick</a>();
+<a name="l00116"></a>00116       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00117"></a>00117         *samples++ = lastFrame_[j];
+<a name="l00118"></a>00118     }
+<a name="l00119"></a>00119   }
+<a name="l00120"></a>00120 
+<a name="l00121"></a>00121   <span class="keywordflow">return</span> frames;
+<a name="l00122"></a>00122 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -90,7 +152,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Iir-members.html b/doc/html/classstk_1_1Iir-members.html
index f5647dc..60ae7cf 100644
--- a/doc/html/classstk_1_1Iir-members.html
+++ b/doc/html/classstk_1_1Iir-members.html
@@ -23,8 +23,10 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Iir.html#a1d63797b4caf775de8d351ec0c15a4c0">Iir</a>(void)</td><td><a class="el" href="classstk_1_1Iir.html">stk::Iir</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Iir.html#ab011114d45e4f5b1222e07070c9bdc38">Iir</a>(std::vector&lt; StkFloat &gt; &amp;bCoefficients, std::vector&lt; StkFloat &gt; &amp;aCoefficients)</td><td><a class="el" href="classstk_1_1Iir.html">stk::Iir</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Iir.html#a5dcae9330f2c52d2bfa1647e6b250a14">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Iir.html">stk::Iir</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -58,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Iir.gif b/doc/html/classstk_1_1Iir.gif
deleted file mode 100644
index fae02da..0000000
Binary files a/doc/html/classstk_1_1Iir.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Iir.html b/doc/html/classstk_1_1Iir.html
index 0656326..761e015 100644
--- a/doc/html/classstk_1_1Iir.html
+++ b/doc/html/classstk_1_1Iir.html
@@ -64,7 +64,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>a[0]*y[n] = b[0]*x[n] + ... + b[nb]*x[n-nb] - a[1]*y[n-1] - ... - a[na]*y[n-na]</p>
 <p>If a[0] is not equal to 1, the filter coeffcients are normalized by a[0].</p>
 <p>The <em>gain</em> parameter is applied at the filter input and does not affect the coefficient values. The default gain value is 1.0. This structure results in one extra multiply per computed sample, but allows easy control of the overall filter gain.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="ab011114d45e4f5b1222e07070c9bdc38"></a><!-- doxytag: member="stk::Iir::Iir" ref="ab011114d45e4f5b1222e07070c9bdc38" args="(std::vector&lt; StkFloat &gt; &amp;bCoefficients, std::vector&lt; StkFloat &gt; &amp;aCoefficients)" -->
 <div class="memitem">
@@ -223,6 +223,38 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00136"></a>00136 {
+<a name="l00137"></a>00137 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00138"></a>00138 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00139"></a>00139     oStream_ &lt;&lt; <span class="stringliteral">&quot;Iir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00140"></a>00140     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00141"></a>00141   }
+<a name="l00142"></a>00142 <span class="preprocessor">#endif</span>
+<a name="l00143"></a>00143 <span class="preprocessor"></span>
+<a name="l00144"></a>00144   StkFloat *samples = &amp;frames[channel];
+<a name="l00145"></a>00145   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i, hop = frames.channels();
+<a name="l00146"></a>00146   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j=0; j&lt;frames.frames(); j++, samples += hop ) {
+<a name="l00147"></a>00147     outputs_[0] = 0.0;
+<a name="l00148"></a>00148     inputs_[0] = gain_ * *samples;
+<a name="l00149"></a>00149     <span class="keywordflow">for</span> ( i=b_.size()-1; i&gt;0; i-- ) {
+<a name="l00150"></a>00150       outputs_[0] += b_[i] * inputs_[i];
+<a name="l00151"></a>00151       inputs_[i] = inputs_[i-1];
+<a name="l00152"></a>00152     }
+<a name="l00153"></a>00153     outputs_[0] += b_[0] * inputs_[0];
+<a name="l00154"></a>00154 
+<a name="l00155"></a>00155     <span class="keywordflow">for</span> ( i=a_.size()-1; i&gt;0; i-- ) {
+<a name="l00156"></a>00156       outputs_[0] += -a_[i] * outputs_[i];
+<a name="l00157"></a>00157       outputs_[i] = outputs_[i-1];
+<a name="l00158"></a>00158     }
+<a name="l00159"></a>00159 
+<a name="l00160"></a>00160     *samples = outputs_[0];
+<a name="l00161"></a>00161   }
+<a name="l00162"></a>00162 
+<a name="l00163"></a>00163   lastFrame_[0] = *(samples-hop);
+<a name="l00164"></a>00164   <span class="keywordflow">return</span> frames;
+<a name="l00165"></a>00165 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a60919d8e000bf83613bdd5e002d750f1"></a><!-- doxytag: member="stk::Iir::tick" ref="a60919d8e000bf83613bdd5e002d750f1" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -265,6 +297,39 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00168"></a>00168 {
+<a name="l00169"></a>00169 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00170"></a>00170 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00171"></a>00171     oStream_ &lt;&lt; <span class="stringliteral">&quot;Iir::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00172"></a>00172     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00173"></a>00173   }
+<a name="l00174"></a>00174 <span class="preprocessor">#endif</span>
+<a name="l00175"></a>00175 <span class="preprocessor"></span>
+<a name="l00176"></a>00176   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00177"></a>00177   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00178"></a>00178   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i, iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00179"></a>00179   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j=0; j&lt;iFrames.frames(); j++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00180"></a>00180     outputs_[0] = 0.0;
+<a name="l00181"></a>00181     inputs_[0] = gain_ * *iSamples;
+<a name="l00182"></a>00182     <span class="keywordflow">for</span> ( i=b_.size()-1; i&gt;0; i-- ) {
+<a name="l00183"></a>00183       outputs_[0] += b_[i] * inputs_[i];
+<a name="l00184"></a>00184       inputs_[i] = inputs_[i-1];
+<a name="l00185"></a>00185     }
+<a name="l00186"></a>00186     outputs_[0] += b_[0] * inputs_[0];
+<a name="l00187"></a>00187 
+<a name="l00188"></a>00188     <span class="keywordflow">for</span> ( i=a_.size()-1; i&gt;0; i-- ) {
+<a name="l00189"></a>00189       outputs_[0] += -a_[i] * outputs_[i];
+<a name="l00190"></a>00190       outputs_[i] = outputs_[i-1];
+<a name="l00191"></a>00191     }
+<a name="l00192"></a>00192 
+<a name="l00193"></a>00193     *oSamples = outputs_[0];
+<a name="l00194"></a>00194   }
+<a name="l00195"></a>00195 
+<a name="l00196"></a>00196   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00197"></a>00197   <span class="keywordflow">return</span> iFrames;
+<a name="l00198"></a>00198 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -275,7 +340,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1InetWvIn-members.html b/doc/html/classstk_1_1InetWvIn-members.html
index 8c763a7..0baa001 100644
--- a/doc/html/classstk_1_1InetWvIn-members.html
+++ b/doc/html/classstk_1_1InetWvIn-members.html
@@ -18,6 +18,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1InetWvIn.html#ad97edafdfb9db2aee77b11d3086113a4">InetWvIn</a>(unsigned long bufferFrames=1024, unsigned int nBuffers=8)</td><td><a class="el" href="classstk_1_1InetWvIn.html">stk::InetWvIn</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1InetWvIn.html#a8b54226eabcd0c58d93fcc0792fa7e02">isConnected</a>(void)</td><td><a class="el" href="classstk_1_1InetWvIn.html">stk::InetWvIn</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1WvIn.html#a3ab86e33eff9f962c9ef7b41e3ccb77e">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1WvIn.html">stk::WvIn</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1InetWvIn.html#acfd578027b2bbcbe4ceefa11e49e8cd2">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1InetWvIn.html">stk::InetWvIn</a></td><td><code> [inline]</code></td></tr>
@@ -50,7 +51,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1InetWvIn.gif b/doc/html/classstk_1_1InetWvIn.gif
deleted file mode 100644
index 8362c17..0000000
Binary files a/doc/html/classstk_1_1InetWvIn.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1InetWvIn.html b/doc/html/classstk_1_1InetWvIn.html
index 9aa8297..b9677e8 100644
--- a/doc/html/classstk_1_1InetWvIn.html
+++ b/doc/html/classstk_1_1InetWvIn.html
@@ -53,7 +53,7 @@ Inheritance diagram for stk::InetWvIn:</div>
 <p>This Wvin subclass reads streamed audio data over a network via a TCP or UDP socket connection. The data is assumed in big-endian, or network, byte order. Only a single socket connection is supported.</p>
 <p><a class="el" href="classstk_1_1InetWvIn.html" title="STK internet streaming input class.">InetWvIn</a> supports multi-channel data. It is important to distinguish the <a class="el" href="classstk_1_1InetWvIn.html#a2109090620c80013ef3ae68cb975fb17" title="Compute a sample frame and return the specified channel value.">tick()</a> method that computes a single frame (and returns only the specified sample of a multi-channel frame) from the overloaded one that takes an <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object for multi-channel and/or multi-frame data.</p>
 <p>This class implements a socket server. When using the TCP protocol, the server "listens" for a single remote connection within the InetWvIn::start() function. For the UDP protocol, no attempt is made to verify packet delivery or order. The default data type for the incoming stream is signed 16-bit integers, though any of the defined StkFormats are permissible.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="ad97edafdfb9db2aee77b11d3086113a4"></a><!-- doxytag: member="stk::InetWvIn::InetWvIn" ref="ad97edafdfb9db2aee77b11d3086113a4" args="(unsigned long bufferFrames=1024, unsigned int nBuffers=8)" -->
 <div class="memitem">
@@ -168,6 +168,21 @@ Inheritance diagram for stk::InetWvIn:</div>
 <p>Return the specified channel value of the last computed frame. </p>
 <p>For multi-channel files, use the <a class="el" href="classstk_1_1WvIn.html#a3ab86e33eff9f962c9ef7b41e3ccb77e" title="Return an StkFrames reference to the last computed sample frame.">lastFrame()</a> function to get all values from the last computed frame. If no connection exists, the returned value is 0.0. The <code>channel</code> argument must be less than the number of channels in the data stream (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00141"></a>00141 {
+<a name="l00142"></a>00142 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00143"></a>00143 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= data_.channels() ) {
+<a name="l00144"></a>00144     oStream_ &lt;&lt; <span class="stringliteral">&quot;InetWvIn::lastOut(): channel argument and data stream are incompatible!&quot;</span>;
+<a name="l00145"></a>00145     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00146"></a>00146   }
+<a name="l00147"></a>00147 <span class="preprocessor">#endif</span>
+<a name="l00148"></a>00148 <span class="preprocessor"></span>
+<a name="l00149"></a>00149   <span class="comment">// If no connection and we&#39;ve output all samples in the queue, return.</span>
+<a name="l00150"></a>00150   <span class="keywordflow">if</span> ( !connected_ &amp;&amp; bytesFilled_ == 0 &amp;&amp; bufferCounter_ == 0 ) <span class="keywordflow">return</span> 0.0;
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00153"></a>00153 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a2109090620c80013ef3ae68cb975fb17"></a><!-- doxytag: member="stk::InetWvIn::tick" ref="a2109090620c80013ef3ae68cb975fb17" args="(unsigned int channel=0)" -->
@@ -224,7 +239,7 @@ Inheritance diagram for stk::InetWvIn:</div>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1InetWvOut-members.html b/doc/html/classstk_1_1InetWvOut-members.html
index eef9b24..45b828a 100644
--- a/doc/html/classstk_1_1InetWvOut-members.html
+++ b/doc/html/classstk_1_1InetWvOut-members.html
@@ -23,6 +23,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1InetWvOut.html#acc7c0b00c68cb76d1b15e7187d67a966">InetWvOut</a>(unsigned long packetFrames=1024)</td><td><a class="el" href="classstk_1_1InetWvOut.html">stk::InetWvOut</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1InetWvOut.html#af486ade34547956d4ad7c27cf304a085">InetWvOut</a>(int port, Socket::ProtocolType protocol=Socket::PROTO_TCP, std::string hostname=&quot;localhost&quot;, unsigned int nChannels=1, Stk::StkFormat format=STK_SINT16, unsigned long packetFrames=1024)</td><td><a class="el" href="classstk_1_1InetWvOut.html">stk::InetWvOut</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -53,7 +54,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1InetWvOut.gif b/doc/html/classstk_1_1InetWvOut.gif
deleted file mode 100644
index 345b9fa..0000000
Binary files a/doc/html/classstk_1_1InetWvOut.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1InetWvOut.html b/doc/html/classstk_1_1InetWvOut.html
index ad86cb8..eef22a9 100644
--- a/doc/html/classstk_1_1InetWvOut.html
+++ b/doc/html/classstk_1_1InetWvOut.html
@@ -55,7 +55,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>This <a class="el" href="classstk_1_1WvOut.html" title="STK audio output abstract base class.">WvOut</a> subclass can stream data over a network via a TCP or UDP socket connection. The data is converted to big-endian byte order, if necessary, before being transmitted.</p>
 <p><a class="el" href="classstk_1_1InetWvOut.html" title="STK internet streaming output class.">InetWvOut</a> supports multi-channel data. It is important to distinguish the <a class="el" href="classstk_1_1InetWvOut.html#a800f77228d851a2d276fae6a24bcdc9a" title="Output a single sample to all channels in a sample frame.">tick()</a> method that outputs a single sample to all channels in a sample frame from the overloaded one that takes a reference to an <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object for multi-channel and/or multi-frame data.</p>
 <p>This class connects to a socket server, the port and IP address of which must be specified as constructor arguments. The default data type is signed 16-bit integers but any of the defined StkFormats are permissible.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="af486ade34547956d4ad7c27cf304a085"></a><!-- doxytag: member="stk::InetWvOut::InetWvOut" ref="af486ade34547956d4ad7c27cf304a085" args="(int port, Socket::ProtocolType protocol=Socket::PROTO_TCP, std::string hostname=&quot;localhost&quot;, unsigned int nChannels=1, Stk::StkFormat format=STK_SINT16, unsigned long packetFrames=1024)" -->
 <div class="memitem">
@@ -214,7 +214,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Instrmnt-members.html b/doc/html/classstk_1_1Instrmnt-members.html
index ad417e0..016e5f9 100644
--- a/doc/html/classstk_1_1Instrmnt-members.html
+++ b/doc/html/classstk_1_1Instrmnt-members.html
@@ -18,6 +18,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -44,14 +45,14 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#ad5d070c1fc6f93124dfed2a27b8e3cf1">tick</a>(unsigned int channel=0)=0</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [pure virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">tick</a>(StkFrames &amp;frames, unsigned int channel=0)=0</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [pure virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Instrmnt.gif b/doc/html/classstk_1_1Instrmnt.gif
deleted file mode 100644
index 612cad8..0000000
Binary files a/doc/html/classstk_1_1Instrmnt.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Instrmnt.html b/doc/html/classstk_1_1Instrmnt.html
index 6c089f7..1b4238e 100644
--- a/doc/html/classstk_1_1Instrmnt.html
+++ b/doc/html/classstk_1_1Instrmnt.html
@@ -33,10 +33,10 @@ Inheritance diagram for stk::Instrmnt:</div>
 <area href="classstk_1_1Drummer.html" alt="stk::Drummer" shape="rect" coords="106,448,202,472"/>
 <area href="classstk_1_1Flute.html" alt="stk::Flute" shape="rect" coords="106,504,202,528"/>
 <area href="classstk_1_1FM.html" alt="stk::FM" shape="rect" coords="106,560,202,584"/>
-<area href="classstk_1_1Mesh2D.html" alt="stk::Mesh2D" shape="rect" coords="106,616,202,640"/>
-<area href="classstk_1_1Modal.html" alt="stk::Modal" shape="rect" coords="106,672,202,696"/>
-<area href="classstk_1_1Plucked.html" alt="stk::Plucked" shape="rect" coords="106,728,202,752"/>
-<area href="classstk_1_1PluckTwo.html" alt="stk::PluckTwo" shape="rect" coords="106,784,202,808"/>
+<area href="classstk_1_1Mandolin.html" alt="stk::Mandolin" shape="rect" coords="106,616,202,640"/>
+<area href="classstk_1_1Mesh2D.html" alt="stk::Mesh2D" shape="rect" coords="106,672,202,696"/>
+<area href="classstk_1_1Modal.html" alt="stk::Modal" shape="rect" coords="106,728,202,752"/>
+<area href="classstk_1_1Plucked.html" alt="stk::Plucked" shape="rect" coords="106,784,202,808"/>
 <area href="classstk_1_1Resonate.html" alt="stk::Resonate" shape="rect" coords="106,840,202,864"/>
 <area href="classstk_1_1Sampler.html" alt="stk::Sampler" shape="rect" coords="106,896,202,920"/>
 <area href="classstk_1_1Saxofony.html" alt="stk::Saxofony" shape="rect" coords="106,952,202,976"/>
@@ -78,13 +78,13 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return the specified channel value of the last computed frame.  <a href="#aaa6bd5e4a5be7f9b0be967daf012872e"></a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">virtual StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Instrmnt.html#ad5d070c1fc6f93124dfed2a27b8e3cf1">tick</a> (unsigned int channel=0)=0</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute one sample frame and return the specified <code>channel</code> value.  <a href="#ad5d070c1fc6f93124dfed2a27b8e3cf1"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed sample frames, starting at the specified channel.  <a href="#a4abfe94b5fc8d87b47729fe317222eb9"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">virtual <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)=0</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed sample frames, starting at the specified channel.  <a href="#a34c6733ca145763462d9e44ae3c772b6"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK instrument abstract base class. </p>
 <p>This class provides a common interface for all STK instruments.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="aaa6bd5e4a5be7f9b0be967daf012872e"></a><!-- doxytag: member="stk::Instrmnt::lastOut" ref="aaa6bd5e4a5be7f9b0be967daf012872e" args="(unsigned int channel=0)" -->
 <div class="memitem">
@@ -106,6 +106,18 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 <p>The <code>channel</code> argument must be less than the number of output channels, which can be determined with the <a class="el" href="classstk_1_1Instrmnt.html#a32564b611598653fce5e708821b3fcb4" title="Return the number of output channels for the class.">channelsOut()</a> function (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 <dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> </dd></dl>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00083"></a>00083 {
+<a name="l00084"></a>00084 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00085"></a>00085 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= lastFrame_.channels() ) {
+<a name="l00086"></a>00086     oStream_ &lt;&lt; <span class="stringliteral">&quot;Instrmnt::lastOut(): channel argument is invalid!&quot;</span>;
+<a name="l00087"></a>00087     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00088"></a>00088   }
+<a name="l00089"></a>00089 <span class="preprocessor">#endif</span>
+<a name="l00090"></a>00090 <span class="preprocessor"></span>
+<a name="l00091"></a>00091   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00092"></a>00092 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ad5d070c1fc6f93124dfed2a27b8e3cf1"></a><!-- doxytag: member="stk::Instrmnt::tick" ref="ad5d070c1fc6f93124dfed2a27b8e3cf1" args="(unsigned int channel=0)=0" -->
@@ -131,12 +143,12 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 
 </div>
 </div>
-<a class="anchor" id="a4abfe94b5fc8d87b47729fe317222eb9"></a><!-- doxytag: member="stk::Instrmnt::tick" ref="a4abfe94b5fc8d87b47729fe317222eb9" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<a class="anchor" id="a34c6733ca145763462d9e44ae3c772b6"></a><!-- doxytag: member="stk::Instrmnt::tick" ref="a34c6733ca145763462d9e44ae3c772b6" args="(StkFrames &amp;frames, unsigned int channel=0)=0" -->
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Instrmnt::tick </td>
+          <td class="memname">virtual <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a>&amp; stk::Instrmnt::tick </td>
           <td>(</td>
           <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
           <td class="paramname"> <em>frames</em>, </td>
@@ -150,7 +162,7 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
         <tr>
           <td></td>
           <td>)</td>
-          <td></td><td></td><td><code> [inline]</code></td>
+          <td></td><td></td><td><code> [pure virtual]</code></td>
         </tr>
       </table>
 </div>
@@ -159,6 +171,8 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 <p>Fill the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed sample frames, starting at the specified channel. </p>
 <p>The <code>channel</code> argument plus the number of output channels must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p>Implemented in <a class="el" href="classstk_1_1BandedWG.html#a6c2ebb66862b173c4835add6847801c9">stk::BandedWG</a>, <a class="el" href="classstk_1_1BeeThree.html#a30520efff3fac0674d3c7ab95ac35999">stk::BeeThree</a>, <a class="el" href="classstk_1_1BlowBotl.html#a49e1f536d821a8b2bf133533cb4bc93e">stk::BlowBotl</a>, <a class="el" href="classstk_1_1BlowHole.html#ad220cd597fa5f6edd043c0783bdc2ec7">stk::BlowHole</a>, <a class="el" href="classstk_1_1Bowed.html#ab7985e95058016201d16f3717039e1cd">stk::Bowed</a>, <a class="el" href="classstk_1_1Brass.html#a10334fc5573b68f2b5c2819bdba786b8">stk::Brass</a>, <a class="el" href="classstk_1_1Clarinet.html#a059174eb1ab84e306bfad1d8b5833548">stk::Clarinet</a>, <a class="el" href="classstk_1_1Drummer.html#ad186a954527a518c47467e6caaa2e2f5">stk::Drummer</a>, <a class="el" href="classstk_1_1Flute.html#a86640ddfacea6fd9385bc4e197fe1a28">stk::Flute</a>, <a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">stk::FM</a>, <a class="el" href="classstk_1_1FMVoices.html#abad16be89b38d4618a07c5d71ab49e26">stk::FMVoices</a>, <a class="el" href="classstk_1_1HevyMetl.html#a555f3bf9322fd11150b00bb99476769a">stk::HevyMetl</a>, <a class="el" href="classstk_1_1Mandolin.html#a37134f89e73e3e62ad5dfcfb0300a12d">stk::Mandolin</a>, <a class="el" href="classstk_1_1Mesh2D.html#a0bfe62f0ab05859963571f4a9a569bd8">stk::Mesh2D</a>, <a class="el" href="classstk_1_1Modal.html#ad2a28e7bd5fdae7d2a6d9fb79bbfb7b0">stk::Modal</a>, <a class="el" href="classstk_1_1Moog.html#aee6aa6373c424e941f963b2709310f4e">stk::Moog</a>, <a class="el" href="classstk_1_1PercFlut.html#a4105b2b1dfe375bcf870fb4903509e4e">stk::PercFlut</a>, <a class="el" href="classstk_1_1Plucked.html#ab9bb602c6f6867cf00995bc42101c006">stk::Plucked</a>, <a class="el" href="classstk_1_1Resonate.html#aeefb870c1eeb430160fdca374e8324b3">stk::Resonate</a>, <a class="el" href="classstk_1_1Rhodey.html#a9d843b764e5219c8289884d0903462f9">stk::Rhodey</a>, <a class="el" href="classstk_1_1Sampler.html#a30ef51142f99faf0586e2da78bc6daf6">stk::Sampler</a>, <a class="el" href="classstk_1_1Saxofony.html#a98c686337ea0c2be7683ddc569bb0a1d">stk::Saxofony</a>, <a class="el" href="classstk_1_1Shakers.html#a655713b658ddeb065d755997cac4b62e">stk::Shakers</a>, <a class="el" href="classstk_1_1Simple.html#adff17b07913c312e989f1987e4fb5cc8">stk::Simple</a>, <a class="el" href="classstk_1_1Sitar.html#a755cc36fe9cde1942184af0b1ae88f7a">stk::Sitar</a>, <a class="el" href="classstk_1_1StifKarp.html#a7d4afff257faa7ad9ef630f1db1ed93f">stk::StifKarp</a>, <a class="el" href="classstk_1_1TubeBell.html#a664cede881352aea1d300ca93ba416ac">stk::TubeBell</a>, <a class="el" href="classstk_1_1VoicForm.html#a619d2995894216181c2dc38fd863fe33">stk::VoicForm</a>, <a class="el" href="classstk_1_1Whistle.html#a46135035da33d0825e3ff0db04b857d4">stk::Whistle</a>, and <a class="el" href="classstk_1_1Wurley.html#a505f7e6499761f64d0cc4b6419d945c3">stk::Wurley</a>.</p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -169,7 +183,7 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Instrmnt.png b/doc/html/classstk_1_1Instrmnt.png
index d07afc1..f5f8754 100644
Binary files a/doc/html/classstk_1_1Instrmnt.png and b/doc/html/classstk_1_1Instrmnt.png differ
diff --git a/doc/html/classstk_1_1JCRev-members.html b/doc/html/classstk_1_1JCRev-members.html
index cefbf9a..8b5472a 100644
--- a/doc/html/classstk_1_1JCRev-members.html
+++ b/doc/html/classstk_1_1JCRev-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1JCRev.html#a5b9f0e2b7acc1fcb94a663353f1253dd">JCRev</a>(StkFloat T60=1.0)</td><td><a class="el" href="classstk_1_1JCRev.html">stk::JCRev</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Effect.html">stk::Effect</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1JCRev.html">stk::JCRev</a></td><td><code> [inline]</code></td></tr>
@@ -52,7 +53,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1JCRev.gif b/doc/html/classstk_1_1JCRev.gif
deleted file mode 100644
index 9ad7e14..0000000
Binary files a/doc/html/classstk_1_1JCRev.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1JCRev.html b/doc/html/classstk_1_1JCRev.html
index 5bf64ab..0fd98ac 100644
--- a/doc/html/classstk_1_1JCRev.html
+++ b/doc/html/classstk_1_1JCRev.html
@@ -53,7 +53,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>John Chowning's reverberator class. </p>
 <p>This class takes a monophonic input signal and produces a stereo output signal. It is derived from the CLM <a class="el" href="classstk_1_1JCRev.html" title="John Chowning&#39;s reverberator class.">JCRev</a> function, which is based on the use of networks of simple allpass and comb delay filters. This class implements three series allpass units, followed by four parallel comb filters, and two decorrelation delay lines in parallel at the output.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>Although not in the original JC reverberator, one-pole lowpass filters have been added inside the feedback comb filters.</p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a599e46bcfbc2b4b9a30a30d67580412b"></a><!-- doxytag: member="stk::JCRev::lastOut" ref="a599e46bcfbc2b4b9a30a30d67580412b" args="(unsigned int channel=0)" -->
 <div class="memitem">
@@ -74,6 +75,18 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Return the specified channel value of the last computed stereo frame. </p>
 <p>Use the <a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> function to get both values of the last computed stereo frame. The <code>channel</code> argument must be 0 or 1 (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00101"></a>00101 {
+<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
+<a name="l00104"></a>00104     oStream_ &lt;&lt; <span class="stringliteral">&quot;JCRev::lastOut(): channel argument must be less than 2!&quot;</span>;
+<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00106"></a>00106   }
+<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span>
+<a name="l00109"></a>00109   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00110"></a>00110 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ad667b48a6dbd663f2d7c49e201325f00"></a><!-- doxytag: member="stk::JCRev::tick" ref="ad667b48a6dbd663f2d7c49e201325f00" args="(StkFloat input, unsigned int channel=0)" -->
@@ -104,6 +117,57 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Input one sample to the effect and return the specified <code>channel</code> value of the computed stereo frame. </p>
 <p>Use the <a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> function to get both values of the computed stereo output frame. The <code>channel</code> argument must be 0 or 1 (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00113"></a>00113 {
+<a name="l00114"></a>00114 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00115"></a>00115 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
+<a name="l00116"></a>00116     oStream_ &lt;&lt; <span class="stringliteral">&quot;JCRev::tick(): channel argument must be less than 2!&quot;</span>;
+<a name="l00117"></a>00117     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00118"></a>00118   }
+<a name="l00119"></a>00119 <span class="preprocessor">#endif</span>
+<a name="l00120"></a>00120 <span class="preprocessor"></span>
+<a name="l00121"></a>00121   StkFloat temp, temp0, temp1, temp2, temp3, temp4, temp5, temp6;
+<a name="l00122"></a>00122   StkFloat filtout;
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124   temp = allpassDelays_[0].lastOut();
+<a name="l00125"></a>00125   temp0 = allpassCoefficient_ * temp;
+<a name="l00126"></a>00126   temp0 += input;
+<a name="l00127"></a>00127   allpassDelays_[0].tick(temp0);
+<a name="l00128"></a>00128   temp0 = -(allpassCoefficient_ * temp0) + temp;
+<a name="l00129"></a>00129     
+<a name="l00130"></a>00130   temp = allpassDelays_[1].lastOut();
+<a name="l00131"></a>00131   temp1 = allpassCoefficient_ * temp;
+<a name="l00132"></a>00132   temp1 += temp0;
+<a name="l00133"></a>00133   allpassDelays_[1].tick(temp1);
+<a name="l00134"></a>00134   temp1 = -(allpassCoefficient_ * temp1) + temp;
+<a name="l00135"></a>00135     
+<a name="l00136"></a>00136   temp = allpassDelays_[2].lastOut();
+<a name="l00137"></a>00137   temp2 = allpassCoefficient_ * temp;
+<a name="l00138"></a>00138   temp2 += temp1;
+<a name="l00139"></a>00139   allpassDelays_[2].tick(temp2);
+<a name="l00140"></a>00140   temp2 = -(allpassCoefficient_ * temp2) + temp;
+<a name="l00141"></a>00141     
+<a name="l00142"></a>00142   temp3 = temp2 + ( combFilters_[0].tick( combCoefficient_[0] * combDelays_[0].<a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>() ) );
+<a name="l00143"></a>00143   temp4 = temp2 + ( combFilters_[1].tick( combCoefficient_[1] * combDelays_[1].<a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>() ) );
+<a name="l00144"></a>00144   temp5 = temp2 + ( combFilters_[2].tick( combCoefficient_[2] * combDelays_[2].<a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>() ) );
+<a name="l00145"></a>00145   temp6 = temp2 + ( combFilters_[3].tick( combCoefficient_[3] * combDelays_[3].<a class="code" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b" title="Return the specified channel value of the last computed stereo frame.">lastOut</a>() ) );
+<a name="l00146"></a>00146 
+<a name="l00147"></a>00147   combDelays_[0].tick(temp3);
+<a name="l00148"></a>00148   combDelays_[1].tick(temp4);
+<a name="l00149"></a>00149   combDelays_[2].tick(temp5);
+<a name="l00150"></a>00150   combDelays_[3].tick(temp6);
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152   filtout = temp3 + temp4 + temp5 + temp6;
+<a name="l00153"></a>00153 
+<a name="l00154"></a>00154   lastFrame_[0] = effectMix_ * (outLeftDelay_.tick(filtout));
+<a name="l00155"></a>00155   lastFrame_[1] = effectMix_ * (outRightDelay_.tick(filtout));
+<a name="l00156"></a>00156   temp = (1.0 - effectMix_) * input;
+<a name="l00157"></a>00157   lastFrame_[0] += temp;
+<a name="l00158"></a>00158   lastFrame_[1] += temp;
+<a name="l00159"></a>00159     
+<a name="l00160"></a>00160   <span class="keywordflow">return</span> 0.7 * lastFrame_[channel];
+<a name="l00161"></a>00161 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="abfdf0b4db6d08cce1b0473776fce03d5"></a><!-- doxytag: member="stk::JCRev::tick" ref="abfdf0b4db6d08cce1b0473776fce03d5" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -186,7 +250,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1JetTable-members.html b/doc/html/classstk_1_1JetTable-members.html
index fdb23c0..971c014 100644
--- a/doc/html/classstk_1_1JetTable-members.html
+++ b/doc/html/classstk_1_1JetTable-members.html
@@ -17,6 +17,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Function.html#ae79bd6d0c9f53693b4ca28948d94fc25">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Function.html">stk::Function</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -46,7 +47,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1JetTable.gif b/doc/html/classstk_1_1JetTable.gif
deleted file mode 100644
index 2a70670..0000000
Binary files a/doc/html/classstk_1_1JetTable.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1JetTable.html b/doc/html/classstk_1_1JetTable.html
index 60f7d5b..99bb8cd 100644
--- a/doc/html/classstk_1_1JetTable.html
+++ b/doc/html/classstk_1_1JetTable.html
@@ -44,7 +44,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>STK jet table class. </p>
 <p>This class implements a flue jet non-linear function, computed by a polynomial calculation. Contrary to the name, this is not a "table".</p>
 <p>Consult Fletcher and Rossing, Karjalainen, Cook, and others for more information.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="ae17ee82b1ed7b185713b4ae0b7c2b0cd"></a><!-- doxytag: member="stk::JetTable::tick" ref="ae17ee82b1ed7b185713b4ae0b7c2b0cd" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
 <div class="memitem">
@@ -74,6 +74,27 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object as inputs to the table and replace with corresponding outputs. </p>
 <p>The <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument reference is returned. The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00068"></a>00068 {
+<a name="l00069"></a>00069 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00070"></a>00070 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00071"></a>00071     oStream_ &lt;&lt; <span class="stringliteral">&quot;JetTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00072"></a>00072     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00073"></a>00073   }
+<a name="l00074"></a>00074 <span class="preprocessor">#endif</span>
+<a name="l00075"></a>00075 <span class="preprocessor"></span>
+<a name="l00076"></a>00076   StkFloat *samples = &amp;frames[channel];
+<a name="l00077"></a>00077   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00078"></a>00078   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00079"></a>00079     *samples = *samples * (*samples * *samples - 1.0);
+<a name="l00080"></a>00080     <span class="keywordflow">if</span> ( *samples &gt; 1.0) *samples = 1.0;
+<a name="l00081"></a>00081     <span class="keywordflow">if</span> ( *samples &lt; -1.0) *samples = -1.0;
+<a name="l00082"></a>00082   }
+<a name="l00083"></a>00083 
+<a name="l00084"></a>00084   lastFrame_[0] = *(samples-hop);
+<a name="l00085"></a>00085   <span class="keywordflow">return</span> frames;
+<a name="l00086"></a>00086 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a7b261fd07b2325348ef14e3f0ebf8429"></a><!-- doxytag: member="stk::JetTable::tick" ref="a7b261fd07b2325348ef14e3f0ebf8429" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -116,6 +137,28 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the table and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00089"></a>00089 {
+<a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00092"></a>00092     oStream_ &lt;&lt; <span class="stringliteral">&quot;JetTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00094"></a>00094   }
+<a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
+<a name="l00096"></a>00096 <span class="preprocessor"></span>
+<a name="l00097"></a>00097   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00098"></a>00098   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00100"></a>00100   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00101"></a>00101     *oSamples = *oSamples * (*oSamples * *oSamples - 1.0);
+<a name="l00102"></a>00102     <span class="keywordflow">if</span> ( *oSamples &gt; 1.0) *oSamples = 1.0;
+<a name="l00103"></a>00103     <span class="keywordflow">if</span> ( *oSamples &lt; -1.0) *oSamples = -1.0;
+<a name="l00104"></a>00104   }
+<a name="l00105"></a>00105 
+<a name="l00106"></a>00106   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00107"></a>00107   <span class="keywordflow">return</span> iFrames;
+<a name="l00108"></a>00108 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -126,7 +169,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1LentPitShift-members.html b/doc/html/classstk_1_1LentPitShift-members.html
index e15d8ec..9c4ce72 100644
--- a/doc/html/classstk_1_1LentPitShift-members.html
+++ b/doc/html/classstk_1_1LentPitShift-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Effect.html">stk::Effect</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1LentPitShift.html#a0eb0c1ba3d8fdb6eaabb1c96c58ed536">LentPitShift</a>(StkFloat periodRatio=1.0, int tMax=RT_BUFFER_SIZE)</td><td><a class="el" href="classstk_1_1LentPitShift.html">stk::LentPitShift</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -52,7 +53,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1LentPitShift.html b/doc/html/classstk_1_1LentPitShift.html
index 5b424ae..309093e 100644
--- a/doc/html/classstk_1_1LentPitShift.html
+++ b/doc/html/classstk_1_1LentPitShift.html
@@ -85,6 +85,24 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object as inputs to the filter and replace with corresponding outputs. </p>
 <p>The <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument reference is returned. The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00228"></a>00228 {
+<a name="l00229"></a>00229 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00230"></a>00230 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00231"></a>00231     oStream_ &lt;&lt; <span class="stringliteral">&quot;LentPitShift::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00232"></a>00232     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00233"></a>00233   }
+<a name="l00234"></a>00234 <span class="preprocessor">#endif</span>
+<a name="l00235"></a>00235 <span class="preprocessor"></span>
+<a name="l00236"></a>00236   StkFloat *samples = &amp;frames[channel];
+<a name="l00237"></a>00237   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00238"></a>00238   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00239"></a>00239     *samples = <a class="code" href="classstk_1_1LentPitShift.html#a2bbc39e8e78dc672a0be451ec1fd6b7d" title="Input one sample to the filter and return one output.">tick</a>( *samples );
+<a name="l00240"></a>00240   }
+<a name="l00241"></a>00241 
+<a name="l00242"></a>00242   <span class="keywordflow">return</span> frames;
+<a name="l00243"></a>00243 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="af93de733eedca65de40597bd4a1f7b2a"></a><!-- doxytag: member="stk::LentPitShift::tick" ref="af93de733eedca65de40597bd4a1f7b2a" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -127,6 +145,25 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00246"></a>00246 {
+<a name="l00247"></a>00247 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00248"></a>00248 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00249"></a>00249     oStream_ &lt;&lt; <span class="stringliteral">&quot;LentPitShift::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00250"></a>00250     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00251"></a>00251   }
+<a name="l00252"></a>00252 <span class="preprocessor">#endif</span>
+<a name="l00253"></a>00253 <span class="preprocessor"></span>
+<a name="l00254"></a>00254   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00255"></a>00255   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00256"></a>00256   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00257"></a>00257   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00258"></a>00258     *oSamples = <a class="code" href="classstk_1_1LentPitShift.html#a2bbc39e8e78dc672a0be451ec1fd6b7d" title="Input one sample to the filter and return one output.">tick</a>( *iSamples );
+<a name="l00259"></a>00259   }
+<a name="l00260"></a>00260 
+<a name="l00261"></a>00261   <span class="keywordflow">return</span> iFrames;
+<a name="l00262"></a>00262 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a5af0a9e3902ca6fc7c5d77d861d74445"></a><!-- doxytag: member="stk::LentPitShift::process" ref="a5af0a9e3902ca6fc7c5d77d861d74445" args="()" -->
@@ -147,6 +184,102 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Apply the effect on the input samples and store it. </p>
 <p>The samples stored in the input frame vector are processed and the delayed result are stored in the output frame vector </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00114"></a>00114 {
+<a name="l00115"></a>00115   StkFloat x_t;    <span class="comment">// input coefficient</span>
+<a name="l00116"></a>00116   StkFloat x_t_T;  <span class="comment">// previous input coefficient at T samples</span>
+<a name="l00117"></a>00117   StkFloat coeff;  <span class="comment">// new coefficient for the difference function</span>
+<a name="l00118"></a>00118 
+<a name="l00119"></a>00119   <span class="keywordtype">int</span> alternativePitch = tMax_;  <span class="comment">// Global minimum storage</span>
+<a name="l00120"></a>00120   lastPeriod_ = tMax_+1;         <span class="comment">// Storage of the lowest local minimum under the threshold</span>
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122   <span class="comment">// Loop variables</span>
+<a name="l00123"></a>00123   <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> delay_;
+<a name="l00124"></a>00124   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> n;
+<a name="l00125"></a>00125 
+<a name="l00126"></a>00126   <span class="comment">// Initialization of the dt coefficients.  Since the</span>
+<a name="l00127"></a>00127   <span class="comment">// frames are of tMax_ length, there is no overlapping</span>
+<a name="l00128"></a>00128   <span class="comment">// between the successive windows where pitch tracking</span>
+<a name="l00129"></a>00129   <span class="comment">// is performed.</span>
+<a name="l00130"></a>00130   <span class="keywordflow">for</span> ( delay_=1; delay_&lt;=tMax_; delay_++ )
+<a name="l00131"></a>00131     dt[delay_] = 0.;
+<a name="l00132"></a>00132 
+<a name="l00133"></a>00133   <span class="comment">// Calculation of the dt coefficients and update of the input delay line.</span>
+<a name="l00134"></a>00134   <span class="keywordflow">for</span> ( n=0; n&lt;inputFrames.size(); n++ ) {
+<a name="l00135"></a>00135     x_t = inputLine_.tick( inputFrames[ n ] );
+<a name="l00136"></a>00136     <span class="keywordflow">for</span> ( delay_=1; delay_&lt;= tMax_; delay_++ ) {
+<a name="l00137"></a>00137       x_t_T = inputLine_.tapOut( delay_ );
+<a name="l00138"></a>00138       coeff = x_t - x_t_T;
+<a name="l00139"></a>00139       dt[delay_] += coeff * coeff;
+<a name="l00140"></a>00140     }
+<a name="l00141"></a>00141   }
+<a name="l00142"></a>00142 
+<a name="l00143"></a>00143   <span class="comment">// Calculation of the pitch tracking function and test for the minima.</span>
+<a name="l00144"></a>00144   <span class="keywordflow">for</span> ( delay_=1; delay_&lt;=tMax_; delay_++ ) {
+<a name="l00145"></a>00145     cumDt[delay_] = dt[delay_] + cumDt[delay_-1];
+<a name="l00146"></a>00146     dpt[delay_] = dt[delay_] * delay_ / cumDt[delay_];
+<a name="l00147"></a>00147 
+<a name="l00148"></a>00148     <span class="comment">// Look for a minimum</span>
+<a name="l00149"></a>00149     <span class="keywordflow">if</span> ( dpt[delay_-1]-dpt[delay_-2] &lt; 0 &amp;&amp; dpt[delay_]-dpt[delay_-1] &gt; 0 ) {
+<a name="l00150"></a>00150       <span class="comment">// Check if the minimum is under the threshold</span>
+<a name="l00151"></a>00151       <span class="keywordflow">if</span> ( dpt[delay_-1] &lt; threshold_ ){
+<a name="l00152"></a>00152         lastPeriod_ = delay_-1;
+<a name="l00153"></a>00153         <span class="comment">// If a minimum is found, we can stop the loop</span>
+<a name="l00154"></a>00154         <span class="keywordflow">break</span>;
+<a name="l00155"></a>00155       }
+<a name="l00156"></a>00156       <span class="keywordflow">else</span> <span class="keywordflow">if</span> ( dpt[alternativePitch] &gt; dpt[delay_-1] )
+<a name="l00157"></a>00157         <span class="comment">// Otherwise we store it if it is the current global minimum</span>
+<a name="l00158"></a>00158         alternativePitch = delay_-1;
+<a name="l00159"></a>00159     }
+<a name="l00160"></a>00160   }
+<a name="l00161"></a>00161 
+<a name="l00162"></a>00162   <span class="comment">// Test for the last period length.</span>
+<a name="l00163"></a>00163   <span class="keywordflow">if</span> ( dpt[delay_]-dpt[delay_-1] &lt; 0 ) {
+<a name="l00164"></a>00164     <span class="keywordflow">if</span> ( dpt[delay_] &lt; threshold_ )
+<a name="l00165"></a>00165       lastPeriod_ = delay_;
+<a name="l00166"></a>00166     <span class="keywordflow">else</span> <span class="keywordflow">if</span> ( dpt[alternativePitch] &gt; dpt[delay_] )
+<a name="l00167"></a>00167       alternativePitch = delay_;
+<a name="l00168"></a>00168   }
+<a name="l00169"></a>00169 
+<a name="l00170"></a>00170   <span class="keywordflow">if</span> ( lastPeriod_ == tMax_+1 )
+<a name="l00171"></a>00171     <span class="comment">// No period has been under the threshold so we used the global minimum</span>
+<a name="l00172"></a>00172     lastPeriod_ = alternativePitch;
+<a name="l00173"></a>00173 
+<a name="l00174"></a>00174   <span class="comment">// We put the new zero output coefficients in the output delay line and </span>
+<a name="l00175"></a>00175   <span class="comment">// we get the previous calculated coefficients</span>
+<a name="l00176"></a>00176   outputLine_.tick( zeroFrame, outputFrames );
+<a name="l00177"></a>00177 
+<a name="l00178"></a>00178   <span class="comment">// Initialization of the Hamming window used in the algorithm</span>
+<a name="l00179"></a>00179   <span class="keywordflow">for</span> ( <span class="keywordtype">int</span> n=-(<span class="keywordtype">int</span>)lastPeriod_; n&lt;(int)lastPeriod_; n++ )
+<a name="l00180"></a>00180     window[n+lastPeriod_] = (1 + cos(PI*n/lastPeriod_)) / 2    ;
+<a name="l00181"></a>00181 
+<a name="l00182"></a>00182   <span class="keywordtype">int</span> M;  <span class="comment">// Index of reading in the input delay line</span>
+<a name="l00183"></a>00183   <span class="keywordtype">int</span> N;  <span class="comment">// Index of writing in the output delay line</span>
+<a name="l00184"></a>00184   <span class="keywordtype">double</span> sample;  <span class="comment">// Temporary storage for the new coefficient</span>
+<a name="l00185"></a>00185 
+<a name="l00186"></a>00186   <span class="comment">// We loop for all the frames of length lastPeriod_ presents between inputPtr and tMax_</span>
+<a name="l00187"></a>00187   <span class="keywordflow">for</span> ( ; inputPtr&lt;(int)(tMax_-lastPeriod_); inputPtr+=lastPeriod_ ) {
+<a name="l00188"></a>00188     <span class="comment">// Test for the decision of compression/expansion</span>
+<a name="l00189"></a>00189     <span class="keywordflow">while</span> ( outputPtr &lt; inputPtr ) {
+<a name="l00190"></a>00190       <span class="comment">// Coefficients for the linear interpolation</span>
+<a name="l00191"></a>00191       env[1] = fmod( outputPtr + tMax_, 1.0 );
+<a name="l00192"></a>00192       env[0] = 1.0 - env[1];
+<a name="l00193"></a>00193       M = tMax_ - inputPtr + lastPeriod_ - 1; <span class="comment">// New reading pointer</span>
+<a name="l00194"></a>00194       N = 2*tMax_ - (<span class="keywordtype">unsigned</span> long)floor(outputPtr + tMax_) + lastPeriod_ - 1; <span class="comment">// New writing pointer</span>
+<a name="l00195"></a>00195       <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j=0; j&lt;2*lastPeriod_; j++,M--,N-- ) {
+<a name="l00196"></a>00196         sample = inputLine_.tapOut(M) * window[j] / 2.;
+<a name="l00197"></a>00197         <span class="comment">// Linear interpolation</span>
+<a name="l00198"></a>00198         outputLine_.addTo(N, env[0] * sample);
+<a name="l00199"></a>00199         outputLine_.addTo(N-1, env[1] * sample);
+<a name="l00200"></a>00200       }
+<a name="l00201"></a>00201       outputPtr = outputPtr + lastPeriod_ * periodRatio_; <span class="comment">// new output pointer</span>
+<a name="l00202"></a>00202     }
+<a name="l00203"></a>00203   }
+<a name="l00204"></a>00204   <span class="comment">// Shifting of the pointers waiting for the new frame of length tMax_.</span>
+<a name="l00205"></a>00205   outputPtr -= tMax_;
+<a name="l00206"></a>00206   inputPtr  -= tMax_;
+<a name="l00207"></a>00207 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -157,7 +290,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Mandolin-members.html b/doc/html/classstk_1_1Mandolin-members.html
index 34c9fd7..d670f69 100644
--- a/doc/html/classstk_1_1Mandolin-members.html
+++ b/doc/html/classstk_1_1Mandolin-members.html
@@ -13,32 +13,30 @@
 <h1>stk::Mandolin Member List</h1>This is the complete list of members for <a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a>, including all inherited members.<table>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340">addSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a32564b611598653fce5e708821b3fcb4">channelsOut</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a71821e47009a94de9e8a1f3305263840">clear</a>(void)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a2caec477ed0fe9479ed6d1fbdb45d827">clear</a>(void)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#abf341aa5e7d751012178ff7b853b73a1">controlChange</a>(int number, StkFloat value)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a>(const char *message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a5b2aaaf5697cbe57df62b568982f6300">Mandolin</a>(StkFloat lowestFrequency)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a0d5d81db10c145f3d5bafc5775d147bf">noteOff</a>(StkFloat amplitude)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td><code> [virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a569de60008c218f0939ab9aedd038776">noteOff</a>(StkFloat amplitude)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a8b60733652e54f1d6c93d63c915c9ca7">noteOn</a>(StkFloat frequency, StkFloat amplitude)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a3a2398d39b72e1c330f81f6545ac0f5c">pluck</a>(StkFloat amplitude)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a77bf06efc96f2a83e0fe2c91db83dbd3">pluck</a>(StkFloat amplitude, StkFloat position)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#aa121655f6007003aebb5de425e98d099">PluckTwo</a>(StkFloat lowestFrequency)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d">sampleRate</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a740e872daa4b2ad1c918163e7c5ab56b">sampleRateChanged</a>(StkFloat newRate, StkFloat oldRate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a168f563174e22b221744ef66b35a5277">setBaseLoopGain</a>(StkFloat aGain)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a21a5b0669b013cfd9c7142174530f629">setBodySize</a>(StkFloat size)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a6b355a495d9122273fb8c88009bf79d6">setDetune</a>(StkFloat detune)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a3cd8e9135b1d8a97b87f9486dd3cd671">setFreqAndDetune</a>(StkFloat frequency, StkFloat detune)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#a9f0618a28243b235f6c0f424a236709c">setFrequency</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td><code> [virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#afffb424a2957fc691363ba1227809695">setPluckPosition</a>(StkFloat position)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#af46367787cd0a21a04655be82d18df08">setDetune</a>(StkFloat detune)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#af5beeafcdfef7b71a5dda14e0c30c7fb">setFrequency</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td><code> [virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a8a0df47cccec5225e26d3b0e702a7c02">setPluckPosition</a>(StkFloat position)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">showWarnings</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -54,16 +52,15 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a37134f89e73e3e62ad5dfcfb0300a12d">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mandolin.html#a92d50a0f0c1c974683bf4685cfc6ff86">~Mandolin</a>(void)</td><td><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1PluckTwo.html#ac8a0720b08d20741b0d8a312f1cf7e5c">~PluckTwo</a>(void)</td><td><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Mandolin.gif b/doc/html/classstk_1_1Mandolin.gif
deleted file mode 100644
index e36ca30..0000000
Binary files a/doc/html/classstk_1_1Mandolin.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Mandolin.html b/doc/html/classstk_1_1Mandolin.html
index 830147f..7bc10b6 100644
--- a/doc/html/classstk_1_1Mandolin.html
+++ b/doc/html/classstk_1_1Mandolin.html
@@ -12,7 +12,7 @@
   <div class="navpath"><a class="el" href="namespacestk.html">stk</a>::<a class="el" href="classstk_1_1Mandolin.html">Mandolin</a>
   </div>
 <div class="contents">
-<h1>stk::Mandolin Class Reference</h1><!-- doxytag: class="stk::Mandolin" --><!-- doxytag: inherits="stk::PluckTwo" -->
+<h1>stk::Mandolin Class Reference</h1><!-- doxytag: class="stk::Mandolin" --><!-- doxytag: inherits="stk::Instrmnt" -->
 <p>STK mandolin instrument model class.  
 <a href="#_details">More...</a></p>
 
@@ -23,9 +23,8 @@ Inheritance diagram for stk::Mandolin:</div>
  <div class="center">
   <img src="classstk_1_1Mandolin.png" usemap="#stk::Mandolin_map" alt=""/>
   <map id="stk::Mandolin_map" name="stk::Mandolin_map">
-<area href="classstk_1_1PluckTwo.html" alt="stk::PluckTwo" shape="rect" coords="0,112,87,136"/>
-<area href="classstk_1_1Instrmnt.html" alt="stk::Instrmnt" shape="rect" coords="0,56,87,80"/>
-<area href="classstk_1_1Stk.html" alt="stk::Stk" shape="rect" coords="0,0,87,24"/>
+<area href="classstk_1_1Instrmnt.html" alt="stk::Instrmnt" shape="rect" coords="0,56,85,80"/>
+<area href="classstk_1_1Stk.html" alt="stk::Stk" shape="rect" coords="0,0,85,24"/>
 </map>
  </div>
 </div>
@@ -39,6 +38,21 @@ Inheritance diagram for stk::Mandolin:</div>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a92d50a0f0c1c974683bf4685cfc6ff86"></a><!-- doxytag: member="stk::Mandolin::~Mandolin" ref="a92d50a0f0c1c974683bf4685cfc6ff86" args="(void)" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#a92d50a0f0c1c974683bf4685cfc6ff86">~Mandolin</a> (void)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class destructor. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2caec477ed0fe9479ed6d1fbdb45d827"></a><!-- doxytag: member="stk::Mandolin::clear" ref="a2caec477ed0fe9479ed6d1fbdb45d827" args="(void)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#a2caec477ed0fe9479ed6d1fbdb45d827">clear</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Reset and clear all internal state. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af46367787cd0a21a04655be82d18df08"></a><!-- doxytag: member="stk::Mandolin::setDetune" ref="af46367787cd0a21a04655be82d18df08" args="(StkFloat detune)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#af46367787cd0a21a04655be82d18df08">setDetune</a> (StkFloat detune)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Detune the two strings by the given factor. A value of 1.0 produces unison strings. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a21a5b0669b013cfd9c7142174530f629"></a><!-- doxytag: member="stk::Mandolin::setBodySize" ref="a21a5b0669b013cfd9c7142174530f629" args="(StkFloat size)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#a21a5b0669b013cfd9c7142174530f629">setBodySize</a> (StkFloat size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the body size (a value of 1.0 produces the "default" size). <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8a0df47cccec5225e26d3b0e702a7c02"></a><!-- doxytag: member="stk::Mandolin::setPluckPosition" ref="a8a0df47cccec5225e26d3b0e702a7c02" args="(StkFloat position)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#a8a0df47cccec5225e26d3b0e702a7c02">setPluckPosition</a> (StkFloat position)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the pluck or "excitation" position along the string (0.0 - 1.0). <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="af5beeafcdfef7b71a5dda14e0c30c7fb"></a><!-- doxytag: member="stk::Mandolin::setFrequency" ref="af5beeafcdfef7b71a5dda14e0c30c7fb" args="(StkFloat frequency)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#af5beeafcdfef7b71a5dda14e0c30c7fb">setFrequency</a> (StkFloat frequency)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set instrument parameters for a particular frequency. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3a2398d39b72e1c330f81f6545ac0f5c"></a><!-- doxytag: member="stk::Mandolin::pluck" ref="a3a2398d39b72e1c330f81f6545ac0f5c" args="(StkFloat amplitude)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#a3a2398d39b72e1c330f81f6545ac0f5c">pluck</a> (StkFloat amplitude)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Pluck the strings with the given amplitude (0.0 - 1.0) using the current frequency. <br/></td></tr>
@@ -48,19 +62,22 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8b60733652e54f1d6c93d63c915c9ca7"></a><!-- doxytag: member="stk::Mandolin::noteOn" ref="a8b60733652e54f1d6c93d63c915c9ca7" args="(StkFloat frequency, StkFloat amplitude)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#a8b60733652e54f1d6c93d63c915c9ca7">noteOn</a> (StkFloat frequency, StkFloat amplitude)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a note with the given frequency and amplitude (0.0 - 1.0). <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a21a5b0669b013cfd9c7142174530f629"></a><!-- doxytag: member="stk::Mandolin::setBodySize" ref="a21a5b0669b013cfd9c7142174530f629" args="(StkFloat size)" -->
-void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#a21a5b0669b013cfd9c7142174530f629">setBodySize</a> (StkFloat size)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the body size (a value of 1.0 produces the "default" size). <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a569de60008c218f0939ab9aedd038776"></a><!-- doxytag: member="stk::Mandolin::noteOff" ref="a569de60008c218f0939ab9aedd038776" args="(StkFloat amplitude)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#a569de60008c218f0939ab9aedd038776">noteOff</a> (StkFloat amplitude)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Stop a note with the given amplitude (speed of decay). <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="abf341aa5e7d751012178ff7b853b73a1"></a><!-- doxytag: member="stk::Mandolin::controlChange" ref="abf341aa5e7d751012178ff7b853b73a1" args="(int number, StkFloat value)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#abf341aa5e7d751012178ff7b853b73a1">controlChange</a> (int number, StkFloat value)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Perform the control change specified by <em>number</em> and <em>value</em> (0.0 - 128.0). <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a99f5b51e76c97299dd8c58f27a6d0e62"></a><!-- doxytag: member="stk::Mandolin::tick" ref="a99f5b51e76c97299dd8c58f27a6d0e62" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mandolin.html#a37134f89e73e3e62ad5dfcfb0300a12d">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a37134f89e73e3e62ad5dfcfb0300a12d"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK mandolin instrument model class. </p>
-<p>This class inherits from <a class="el" href="classstk_1_1PluckTwo.html" title="STK enhanced plucked string model class.">PluckTwo</a> and uses "commuted synthesis" techniques to model a mandolin instrument.</p>
+<p>This class uses two "twang" models and "commuted
+    synthesis" techniques to model a mandolin instrument.</p>
 <p>This is a digital waveguide model, making its use possibly subject to patents held by Stanford University, Yamaha, and others. Commuted Synthesis, in particular, is covered by patents, granted, pending, and/or applied-for. All are assigned to the Board of Trustees, Stanford University. For information, contact the Office of Technology Licensing, Stanford University.</p>
 <p>Control Change Numbers:</p>
 <ul>
@@ -70,7 +87,67 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>String Detuning = 1</li>
 <li>Microphone Position = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a37134f89e73e3e62ad5dfcfb0300a12d"></a><!-- doxytag: member="stk::Mandolin::tick" ref="a37134f89e73e3e62ad5dfcfb0300a12d" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Mandolin::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00115"></a>00115 {
+<a name="l00116"></a>00116   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00117"></a>00117 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00118"></a>00118 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00119"></a>00119     oStream_ &lt;&lt; <span class="stringliteral">&quot;Mandolin::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00120"></a>00120     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122 <span class="preprocessor">#endif</span>
+<a name="l00123"></a>00123 <span class="preprocessor"></span>
+<a name="l00124"></a>00124   StkFloat *samples = &amp;frames[channel];
+<a name="l00125"></a>00125   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00126"></a>00126   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00127"></a>00127     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00128"></a>00128       *samples++ = <a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">tick</a>();
+<a name="l00129"></a>00129   }
+<a name="l00130"></a>00130   <span class="keywordflow">else</span> {
+<a name="l00131"></a>00131     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00132"></a>00132       *samples++ = <a class="code" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62" title="Compute and return one output sample.">tick</a>();
+<a name="l00133"></a>00133       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00134"></a>00134         *samples++ = lastFrame_[j];
+<a name="l00135"></a>00135     }
+<a name="l00136"></a>00136   }
+<a name="l00137"></a>00137 
+<a name="l00138"></a>00138   <span class="keywordflow">return</span> frames;
+<a name="l00139"></a>00139 }
+</pre></div></p>
+
+</div>
+</div>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Mandolin_8h_source.html">Mandolin.h</a></li>
 </ul>
@@ -79,7 +156,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Mandolin.png b/doc/html/classstk_1_1Mandolin.png
index 0202d89..1bf1315 100644
Binary files a/doc/html/classstk_1_1Mandolin.png and b/doc/html/classstk_1_1Mandolin.png differ
diff --git a/doc/html/classstk_1_1Mesh2D-members.html b/doc/html/classstk_1_1Mesh2D-members.html
index 662cb18..fc2d96b 100644
--- a/doc/html/classstk_1_1Mesh2D-members.html
+++ b/doc/html/classstk_1_1Mesh2D-members.html
@@ -21,10 +21,11 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#a688bed8725ef2d8bf4c6465251bd8b86">inputTick</a>(StkFloat input)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#a156fdff6515dbcd4b493ce0ef051a174">Mesh2D</a>(short nX, short nY)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#aef48c3c65901f62a8dbdbe606763203e">Mesh2D</a>(unsigned short nX, unsigned short nY)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#a0580962b3cc0dbac092581d0fc15127b">noteOff</a>(StkFloat amplitude)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#a7915dae1032ace5960c85790a7b93e0f">noteOn</a>(StkFloat frequency, StkFloat amplitude)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -35,8 +36,8 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#ab7b3d950e40308e7060e5ff9a62a8b8d">setDecay</a>(StkFloat decayFactor)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a597efc508ad367a308fa11b8cbdc96a7">setFrequency</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#a9cdfa80ecccf3f12dc184003458ba3a3">setInputPosition</a>(StkFloat xFactor, StkFloat yFactor)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#accbad29fd6364f7c2d439bcf837590ec">setNX</a>(short lenX)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#a4c4c54ad29fcee5654bd2ebaed29d916">setNY</a>(short lenY)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#a6834a52f03b072e18387b799f804527b">setNX</a>(unsigned short lenX)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#a2be2badaccfeb57e52e548f1b7515fbe">setNY</a>(unsigned short lenY)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">showWarnings</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -52,7 +53,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td><code> [virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#a0bfe62f0ab05859963571f4a9a569bd8">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mesh2D.html#ac4abd6b5190587d69c7c2b13870fb646">~Mesh2D</a>(void)</td><td><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -60,7 +61,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Mesh2D.gif b/doc/html/classstk_1_1Mesh2D.gif
deleted file mode 100644
index 0d9fb30..0000000
Binary files a/doc/html/classstk_1_1Mesh2D.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Mesh2D.html b/doc/html/classstk_1_1Mesh2D.html
index 958c837..d87854a 100644
--- a/doc/html/classstk_1_1Mesh2D.html
+++ b/doc/html/classstk_1_1Mesh2D.html
@@ -32,8 +32,8 @@ Inheritance diagram for stk::Mesh2D:</div>
 <p><a href="classstk_1_1Mesh2D-members.html">List of all members.</a></p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a156fdff6515dbcd4b493ce0ef051a174"></a><!-- doxytag: member="stk::Mesh2D::Mesh2D" ref="a156fdff6515dbcd4b493ce0ef051a174" args="(short nX, short nY)" -->
-&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#a156fdff6515dbcd4b493ce0ef051a174">Mesh2D</a> (short nX, short nY)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aef48c3c65901f62a8dbdbe606763203e"></a><!-- doxytag: member="stk::Mesh2D::Mesh2D" ref="aef48c3c65901f62a8dbdbe606763203e" args="(unsigned short nX, unsigned short nY)" -->
+&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#aef48c3c65901f62a8dbdbe606763203e">Mesh2D</a> (unsigned short nX, unsigned short nY)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the x and y dimensions in samples. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac4abd6b5190587d69c7c2b13870fb646"></a><!-- doxytag: member="stk::Mesh2D::~Mesh2D" ref="ac4abd6b5190587d69c7c2b13870fb646" args="(void)" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#ac4abd6b5190587d69c7c2b13870fb646">~Mesh2D</a> (void)</td></tr>
@@ -41,11 +41,11 @@ Inheritance diagram for stk::Mesh2D:</div>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a49f56b4865dc041ae874fbc1b80e967b"></a><!-- doxytag: member="stk::Mesh2D::clear" ref="a49f56b4865dc041ae874fbc1b80e967b" args="(void)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#a49f56b4865dc041ae874fbc1b80e967b">clear</a> (void)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Reset and clear all internal state. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="accbad29fd6364f7c2d439bcf837590ec"></a><!-- doxytag: member="stk::Mesh2D::setNX" ref="accbad29fd6364f7c2d439bcf837590ec" args="(short lenX)" -->
-void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#accbad29fd6364f7c2d439bcf837590ec">setNX</a> (short lenX)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6834a52f03b072e18387b799f804527b"></a><!-- doxytag: member="stk::Mesh2D::setNX" ref="a6834a52f03b072e18387b799f804527b" args="(unsigned short lenX)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#a6834a52f03b072e18387b799f804527b">setNX</a> (unsigned short lenX)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the x dimension size in samples. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4c4c54ad29fcee5654bd2ebaed29d916"></a><!-- doxytag: member="stk::Mesh2D::setNY" ref="a4c4c54ad29fcee5654bd2ebaed29d916" args="(short lenY)" -->
-void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#a4c4c54ad29fcee5654bd2ebaed29d916">setNY</a> (short lenY)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2be2badaccfeb57e52e548f1b7515fbe"></a><!-- doxytag: member="stk::Mesh2D::setNY" ref="a2be2badaccfeb57e52e548f1b7515fbe" args="(unsigned short lenY)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#a2be2badaccfeb57e52e548f1b7515fbe">setNY</a> (unsigned short lenY)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the y dimension size in samples. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9cdfa80ecccf3f12dc184003458ba3a3"></a><!-- doxytag: member="stk::Mesh2D::setInputPosition" ref="a9cdfa80ecccf3f12dc184003458ba3a3" args="(StkFloat xFactor, StkFloat yFactor)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#a9cdfa80ecccf3f12dc184003458ba3a3">setInputPosition</a> (StkFloat xFactor, StkFloat yFactor)</td></tr>
@@ -71,6 +71,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae8a7e86e4774d8738098c79ab0d5e00a"></a><!-- doxytag: member="stk::Mesh2D::tick" ref="ae8a7e86e4774d8738098c79ab0d5e00a" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Mesh2D.html#a0bfe62f0ab05859963571f4a9a569bd8">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a0bfe62f0ab05859963571f4a9a569bd8"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>Two-dimensional rectilinear waveguide mesh class. </p>
@@ -85,6 +87,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>X-Y Input Position = 1</li>
 </ul>
 <p>by Julius Smith, 2000 - 2002. Revised by Gary Scavone for STK, 2002. </p>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a0bfe62f0ab05859963571f4a9a569bd8"></a><!-- doxytag: member="stk::Mesh2D::tick" ref="a0bfe62f0ab05859963571f4a9a569bd8" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Mesh2D::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00116"></a>00116 {
+<a name="l00117"></a>00117   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00118"></a>00118 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00119"></a>00119 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00120"></a>00120     oStream_ &lt;&lt; <span class="stringliteral">&quot;Mesh2D::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00121"></a>00121     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 <span class="preprocessor">#endif</span>
+<a name="l00124"></a>00124 <span class="preprocessor"></span>
+<a name="l00125"></a>00125   StkFloat *samples = &amp;frames[channel];
+<a name="l00126"></a>00126   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00127"></a>00127   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00128"></a>00128     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00129"></a>00129       *samples++ = <a class="code" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a" title="Compute and return one output sample.">tick</a>();
+<a name="l00130"></a>00130   }
+<a name="l00131"></a>00131   <span class="keywordflow">else</span> {
+<a name="l00132"></a>00132     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00133"></a>00133       *samples++ = <a class="code" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a" title="Compute and return one output sample.">tick</a>();
+<a name="l00134"></a>00134       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00135"></a>00135         *samples++ = lastFrame_[j];
+<a name="l00136"></a>00136     }
+<a name="l00137"></a>00137   }
+<a name="l00138"></a>00138 
+<a name="l00139"></a>00139   <span class="keywordflow">return</span> frames;
+<a name="l00140"></a>00140 }
+</pre></div></p>
+
+</div>
+</div>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Mesh2D_8h_source.html">Mesh2D.h</a></li>
 </ul>
@@ -93,7 +155,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Messager-members.html b/doc/html/classstk_1_1Messager-members.html
index f424f1d..8ed1f9c 100644
--- a/doc/html/classstk_1_1Messager-members.html
+++ b/doc/html/classstk_1_1Messager-members.html
@@ -16,6 +16,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Messager.html#aa4c8f3396345157ccd19395258a253a9">Messager</a>()</td><td><a class="el" href="classstk_1_1Messager.html">stk::Messager</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Messager.html#a18525952880382c25322e57353a34372">popMessage</a>(Skini::Message &amp;message)</td><td><a class="el" href="classstk_1_1Messager.html">stk::Messager</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -49,7 +50,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Messager.gif b/doc/html/classstk_1_1Messager.gif
deleted file mode 100644
index 93a1c55..0000000
Binary files a/doc/html/classstk_1_1Messager.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Messager.html b/doc/html/classstk_1_1Messager.html
index 86fbbd5..4bc3c9f 100644
--- a/doc/html/classstk_1_1Messager.html
+++ b/doc/html/classstk_1_1Messager.html
@@ -57,7 +57,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>The various <em>realtime</em> message acquisition mechanisms (from MIDI, socket, or stdin) take place asynchronously, filling the message queue. A call to <a class="el" href="classstk_1_1Messager.html#a18525952880382c25322e57353a34372" title="Pop the next message from the queue and write it to the referenced message structure...">popMessage()</a> will pop the next available control message from the queue and return it via the referenced Message structure. When a <em>non-realtime</em> scorefile is set, it is not possible to start reading realtime input messages (from MIDI, socket, or stdin). Likewise, it is not possible to read from a scorefile when a realtime input mechanism is running.</p>
 <p>When MIDI input is started, input is also automatically read from stdin. This allows for program termination via the terminal window. An __SK_Exit_ message is pushed onto the stack whenever an "exit" or "Exit" message is received from stdin or when all socket connections close and no stdin thread is running.</p>
 <p>This class is primarily for use in STK example programs but it is generic enough to work in many other contexts.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a18525952880382c25322e57353a34372"></a><!-- doxytag: member="stk::Messager::popMessage" ref="a18525952880382c25322e57353a34372" args="(Skini::Message &amp;message)" -->
 <div class="memitem">
@@ -171,7 +171,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1MidiFileIn-members.html b/doc/html/classstk_1_1MidiFileIn-members.html
index 93c9da3..51b7147 100644
--- a/doc/html/classstk_1_1MidiFileIn-members.html
+++ b/doc/html/classstk_1_1MidiFileIn-members.html
@@ -12,16 +12,17 @@
 <div class="contents">
 <h1>stk::MidiFileIn Member List</h1>This is the complete list of members for <a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a>, including all inherited members.<table>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340">addSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1MidiFileIn.html#a43bc34a26e72f3311b855139a1408f78">getDivision</a>() const </td><td><a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1MidiFileIn.html#ac93b16c4de0ed3d98d31a2edb92bc105">getFileFormat</a>() const </td><td><a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1MidiFileIn.html#a43bc34a26e72f3311b855139a1408f78">getDivision</a>() const </td><td><a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1MidiFileIn.html#ac93b16c4de0ed3d98d31a2edb92bc105">getFileFormat</a>() const </td><td><a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1MidiFileIn.html#a117dd19afbc42d6c769d959588f9176b">getNextEvent</a>(std::vector&lt; unsigned char &gt; *event, unsigned int track=0)</td><td><a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1MidiFileIn.html#ab10ea0e225484fa2d31796f505d4e582">getNextMidiEvent</a>(std::vector&lt; unsigned char &gt; *midiEvent, unsigned int track=0)</td><td><a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1MidiFileIn.html#a7db7e6b2f6c1aedfbb78045106d36b17">getNumberOfTracks</a>() const </td><td><a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1MidiFileIn.html#a7db7e6b2f6c1aedfbb78045106d36b17">getNumberOfTracks</a>() const </td><td><a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1MidiFileIn.html#a92508a5847e45a05a3ff05de3e5d3efe">getTickSeconds</a>(unsigned int track=0)</td><td><a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a>(const char *message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1MidiFileIn.html#ad273dc7c13d4c4a4ced893af93d9176e">MidiFileIn</a>(std::string fileName)</td><td><a class="el" href="classstk_1_1MidiFileIn.html">stk::MidiFileIn</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -50,7 +51,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1MidiFileIn.gif b/doc/html/classstk_1_1MidiFileIn.gif
deleted file mode 100644
index 769cf3b..0000000
Binary files a/doc/html/classstk_1_1MidiFileIn.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1MidiFileIn.html b/doc/html/classstk_1_1MidiFileIn.html
index 8b59402..bf1709c 100644
--- a/doc/html/classstk_1_1MidiFileIn.html
+++ b/doc/html/classstk_1_1MidiFileIn.html
@@ -89,7 +89,7 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
           <td>(</td>
           <td class="paramname"></td>
           <td>&nbsp;)&nbsp;</td>
-          <td> const</td>
+          <td> const<code> [inline]</code></td>
         </tr>
       </table>
 </div>
@@ -98,6 +98,9 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>Return the MIDI file division value from the file header. </p>
 <p>Note that this value must be "parsed" in accordance with the MIDI File Specification. In particular, if the MSB is set, the file uses time-code representations for delta-time values. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00054"></a>00054 { <span class="keywordflow">return</span> division_; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a3bd547e3ee5bb8ad780274d7a09f12ff"></a><!-- doxytag: member="stk::MidiFileIn::rewindTrack" ref="a3bd547e3ee5bb8ad780274d7a09f12ff" args="(unsigned int track=0)" -->
@@ -210,7 +213,7 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Modal-members.html b/doc/html/classstk_1_1Modal-members.html
index c414622..d492535 100644
--- a/doc/html/classstk_1_1Modal-members.html
+++ b/doc/html/classstk_1_1Modal-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -52,7 +53,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Modal.html">stk::Modal</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Modal.html#ad2a28e7bd5fdae7d2a6d9fb79bbfb7b0">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Modal.html">stk::Modal</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Modal.html#a7f45379ae10495b7a864cade0063705a">~Modal</a>(void)</td><td><a class="el" href="classstk_1_1Modal.html">stk::Modal</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -60,7 +61,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Modal.gif b/doc/html/classstk_1_1Modal.gif
deleted file mode 100644
index 1ba7c0c..0000000
Binary files a/doc/html/classstk_1_1Modal.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Modal.html b/doc/html/classstk_1_1Modal.html
index 5054f0d..abb3a8d 100644
--- a/doc/html/classstk_1_1Modal.html
+++ b/doc/html/classstk_1_1Modal.html
@@ -74,11 +74,13 @@ virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac1fd3f5dcb9b5cbb8bed0bff330c3890"></a><!-- doxytag: member="stk::Modal::tick" ref="ac1fd3f5dcb9b5cbb8bed0bff330c3890" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Modal.html#ad2a28e7bd5fdae7d2a6d9fb79bbfb7b0">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#ad2a28e7bd5fdae7d2a6d9fb79bbfb7b0"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK resonance model abstract base class. </p>
 <p>This class contains an excitation wavetable, an envelope, an oscillator, and N resonances (non-sweeping <a class="el" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> filters), where N is set during instantiation.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="af6bfea135e80abb5537e62cf099c989a"></a><!-- doxytag: member="stk::Modal::Modal" ref="af6bfea135e80abb5537e62cf099c989a" args="(unsigned int modes=4)" -->
 <div class="memitem">
@@ -99,6 +101,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor, taking the desired number of modes to create. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="ad2a28e7bd5fdae7d2a6d9fb79bbfb7b0"></a><!-- doxytag: member="stk::Modal::tick" ref="ad2a28e7bd5fdae7d2a6d9fb79bbfb7b0" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Modal::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00126"></a>00126 {
+<a name="l00127"></a>00127   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00128"></a>00128 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00129"></a>00129 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00130"></a>00130     oStream_ &lt;&lt; <span class="stringliteral">&quot;Modal::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00131"></a>00131     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00132"></a>00132   }
+<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
+<a name="l00134"></a>00134 <span class="preprocessor"></span>
+<a name="l00135"></a>00135   StkFloat *samples = &amp;frames[channel];
+<a name="l00136"></a>00136   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00137"></a>00137   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00138"></a>00138     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00139"></a>00139       *samples++ = <a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">tick</a>();
+<a name="l00140"></a>00140   }
+<a name="l00141"></a>00141   <span class="keywordflow">else</span> {
+<a name="l00142"></a>00142     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00143"></a>00143       *samples++ = <a class="code" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890" title="Compute and return one output sample.">tick</a>();
+<a name="l00144"></a>00144       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00145"></a>00145         *samples++ = lastFrame_[j];
+<a name="l00146"></a>00146     }
+<a name="l00147"></a>00147   }
+<a name="l00148"></a>00148 
+<a name="l00149"></a>00149   <span class="keywordflow">return</span> frames;
+<a name="l00150"></a>00150 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -109,7 +171,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1ModalBar-members.html b/doc/html/classstk_1_1ModalBar-members.html
index bf6917b..ec0e23f 100644
--- a/doc/html/classstk_1_1ModalBar-members.html
+++ b/doc/html/classstk_1_1ModalBar-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -57,7 +58,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Modal.html">stk::Modal</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Modal.html#ad2a28e7bd5fdae7d2a6d9fb79bbfb7b0">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Modal.html">stk::Modal</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Modal.html#a7f45379ae10495b7a864cade0063705a">~Modal</a>(void)</td><td><a class="el" href="classstk_1_1Modal.html">stk::Modal</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1ModalBar.html#ab804e801a2d0b8e8c3552162152d6f3b">~ModalBar</a>(void)</td><td><a class="el" href="classstk_1_1ModalBar.html">stk::ModalBar</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
@@ -66,7 +67,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1ModalBar.gif b/doc/html/classstk_1_1ModalBar.gif
deleted file mode 100644
index a8f1af2..0000000
Binary files a/doc/html/classstk_1_1ModalBar.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1ModalBar.html b/doc/html/classstk_1_1ModalBar.html
index 50fc470..d7760d6 100644
--- a/doc/html/classstk_1_1ModalBar.html
+++ b/doc/html/classstk_1_1ModalBar.html
@@ -79,7 +79,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 </ul>
 </li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="ModalBar_8h_source.html">ModalBar.h</a></li>
 </ul>
@@ -88,7 +88,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Modulate-members.html b/doc/html/classstk_1_1Modulate-members.html
index 1f55fb6..8efdd2a 100644
--- a/doc/html/classstk_1_1Modulate-members.html
+++ b/doc/html/classstk_1_1Modulate-members.html
@@ -18,6 +18,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Modulate.html#addf73f58590ab082f106c9745c5bedc9">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Modulate.html">stk::Modulate</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Modulate.html#a96812173415bfb086f5d8d738f4d0c2e">Modulate</a>(void)</td><td><a class="el" href="classstk_1_1Modulate.html">stk::Modulate</a></td><td></td></tr>
@@ -52,7 +53,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Modulate.gif b/doc/html/classstk_1_1Modulate.gif
deleted file mode 100644
index fa25f3e..0000000
Binary files a/doc/html/classstk_1_1Modulate.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Modulate.html b/doc/html/classstk_1_1Modulate.html
index 50a7d52..1f7c974 100644
--- a/doc/html/classstk_1_1Modulate.html
+++ b/doc/html/classstk_1_1Modulate.html
@@ -61,7 +61,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK periodic/random modulator. </p>
 <p>This class combines random and periodic modulations to give a nice, natural human modulation function.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a96812173415bfb086f5d8d738f4d0c2e"></a><!-- doxytag: member="stk::Modulate::Modulate" ref="a96812173415bfb086f5d8d738f4d0c2e" args="(void)" -->
 <div class="memitem">
@@ -115,6 +115,23 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00090"></a>00090 {
+<a name="l00091"></a>00091 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00092"></a>00092 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00093"></a>00093     oStream_ &lt;&lt; <span class="stringliteral">&quot;Modulate::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00094"></a>00094     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00095"></a>00095   }
+<a name="l00096"></a>00096 <span class="preprocessor">#endif</span>
+<a name="l00097"></a>00097 <span class="preprocessor"></span>
+<a name="l00098"></a>00098   StkFloat *samples = &amp;frames[channel];
+<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00100"></a>00100   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00101"></a>00101     *samples = <a class="code" href="classstk_1_1Modulate.html#a237b96dd553d65253abbf00a186e293d" title="Compute and return one output sample.">Modulate::tick</a>();
+<a name="l00102"></a>00102 
+<a name="l00103"></a>00103   <span class="keywordflow">return</span> frames;
+<a name="l00104"></a>00104 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -125,7 +142,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Moog-members.html b/doc/html/classstk_1_1Moog-members.html
index 0537188..f54b0d2 100644
--- a/doc/html/classstk_1_1Moog-members.html
+++ b/doc/html/classstk_1_1Moog-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Sampler.html#a808aec2bf546b01e1ef53503c5a164e1">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1Sampler.html">stk::Sampler</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Sampler.html#ad277ac455b3434eeb21d628d6c70141a">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1Sampler.html">stk::Sampler</a></td><td></td></tr>
@@ -51,7 +52,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Moog.html">stk::Moog</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Moog.html#aee6aa6373c424e941f963b2709310f4e">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Moog.html">stk::Moog</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Moog.html#ac05815f49aab07e01ff0d4e5e8c4edba">~Moog</a>(void)</td><td><a class="el" href="classstk_1_1Moog.html">stk::Moog</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Sampler.html#a9262914e25d4b9fd28a760621902fd74">~Sampler</a>(void)</td><td><a class="el" href="classstk_1_1Sampler.html">stk::Sampler</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
@@ -60,7 +61,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Moog.gif b/doc/html/classstk_1_1Moog.gif
deleted file mode 100644
index fb24404..0000000
Binary files a/doc/html/classstk_1_1Moog.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Moog.html b/doc/html/classstk_1_1Moog.html
index 7849912..bce400c 100644
--- a/doc/html/classstk_1_1Moog.html
+++ b/doc/html/classstk_1_1Moog.html
@@ -56,6 +56,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab9635044198c12a5c1b5dbb94245ab5a"></a><!-- doxytag: member="stk::Moog::tick" ref="ab9635044198c12a5c1b5dbb94245ab5a" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Moog.html#aee6aa6373c424e941f963b2709310f4e">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#aee6aa6373c424e941f963b2709310f4e"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK moog-like swept filter sampling synthesis class. </p>
@@ -68,7 +70,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Vibrato Gain = 1</li>
 <li>Gain = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a07c8d02638711d5f08a3b320b7274156"></a><!-- doxytag: member="stk::Moog::Moog" ref="a07c8d02638711d5f08a3b320b7274156" args="(void)" -->
 <div class="memitem">
@@ -89,6 +91,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="aee6aa6373c424e941f963b2709310f4e"></a><!-- doxytag: member="stk::Moog::tick" ref="aee6aa6373c424e941f963b2709310f4e" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Moog::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Sampler.html#a30ef51142f99faf0586e2da78bc6daf6">stk::Sampler</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00097"></a>00097 {
+<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00099"></a>00099 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00100"></a>00100 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00101"></a>00101     oStream_ &lt;&lt; <span class="stringliteral">&quot;Moog::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00102"></a>00102     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00103"></a>00103   }
+<a name="l00104"></a>00104 <span class="preprocessor">#endif</span>
+<a name="l00105"></a>00105 <span class="preprocessor"></span>
+<a name="l00106"></a>00106   StkFloat *samples = &amp;frames[channel];
+<a name="l00107"></a>00107   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00108"></a>00108   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00109"></a>00109     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00110"></a>00110       *samples++ = <a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">tick</a>();
+<a name="l00111"></a>00111   }
+<a name="l00112"></a>00112   <span class="keywordflow">else</span> {
+<a name="l00113"></a>00113     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00114"></a>00114       *samples++ = <a class="code" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a" title="Compute and return one output sample.">tick</a>();
+<a name="l00115"></a>00115       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00116"></a>00116         *samples++ = lastFrame_[j];
+<a name="l00117"></a>00117     }
+<a name="l00118"></a>00118   }
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   <span class="keywordflow">return</span> frames;
+<a name="l00121"></a>00121 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -99,7 +161,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Mutex-members.html b/doc/html/classstk_1_1Mutex-members.html
index 7e0c867..0b139cf 100644
--- a/doc/html/classstk_1_1Mutex-members.html
+++ b/doc/html/classstk_1_1Mutex-members.html
@@ -16,6 +16,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mutex.html#af2bb62c13745502b58644189d1db5b35">lock</a>(void)</td><td><a class="el" href="classstk_1_1Mutex.html">stk::Mutex</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Mutex.html#a869b23f40be55c01cc381290de1d1375">Mutex</a>()</td><td><a class="el" href="classstk_1_1Mutex.html">stk::Mutex</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -47,7 +48,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Mutex.gif b/doc/html/classstk_1_1Mutex.gif
deleted file mode 100644
index 282cc11..0000000
Binary files a/doc/html/classstk_1_1Mutex.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Mutex.html b/doc/html/classstk_1_1Mutex.html
index 698a153..bbb1c87 100644
--- a/doc/html/classstk_1_1Mutex.html
+++ b/doc/html/classstk_1_1Mutex.html
@@ -51,7 +51,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK mutex class. </p>
 <p>This class provides a uniform interface for cross-platform mutex use. On Linux and IRIX systems, the pthread library is used. Under Windows, critical sections are used.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="afa637fae8940d6c3ad42384439962bbe"></a><!-- doxytag: member="stk::Mutex::wait" ref="afa637fae8940d6c3ad42384439962bbe" args="(void)" -->
 <div class="memitem">
@@ -103,7 +103,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1NRev-members.html b/doc/html/classstk_1_1NRev-members.html
index 2074c64..2e66a20 100644
--- a/doc/html/classstk_1_1NRev-members.html
+++ b/doc/html/classstk_1_1NRev-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Effect.html">stk::Effect</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1NRev.html#a9f9faa6542271163680c1925309ed788">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1NRev.html">stk::NRev</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1NRev.html#a68757d7a44e960acfd18cb94b465c727">NRev</a>(StkFloat T60=1.0)</td><td><a class="el" href="classstk_1_1NRev.html">stk::NRev</a></td><td></td></tr>
@@ -52,7 +53,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1NRev.gif b/doc/html/classstk_1_1NRev.gif
deleted file mode 100644
index 6df93e3..0000000
Binary files a/doc/html/classstk_1_1NRev.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1NRev.html b/doc/html/classstk_1_1NRev.html
index 33435b2..a13cd39 100644
--- a/doc/html/classstk_1_1NRev.html
+++ b/doc/html/classstk_1_1NRev.html
@@ -53,7 +53,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>CCRMA's <a class="el" href="classstk_1_1NRev.html" title="CCRMA&#39;s NRev reverberator class.">NRev</a> reverberator class. </p>
 <p>This class takes a monophonic input signal and produces a stereo output signal. It is derived from the CLM <a class="el" href="classstk_1_1NRev.html" title="CCRMA&#39;s NRev reverberator class.">NRev</a> function, which is based on the use of networks of simple allpass and comb delay filters. This particular arrangement consists of 6 comb filters in parallel, followed by 3 allpass filters, a lowpass filter, and another allpass in series, followed by two allpass filters in parallel with corresponding right and left outputs.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a9f9faa6542271163680c1925309ed788"></a><!-- doxytag: member="stk::NRev::lastOut" ref="a9f9faa6542271163680c1925309ed788" args="(unsigned int channel=0)" -->
 <div class="memitem">
@@ -74,6 +74,18 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Return the specified channel value of the last computed stereo frame. </p>
 <p>Use the <a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> function to get both values of the last computed stereo frame. The <code>channel</code> argument must be 0 or 1 (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00093"></a>00093 {
+<a name="l00094"></a>00094 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00095"></a>00095 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
+<a name="l00096"></a>00096     oStream_ &lt;&lt; <span class="stringliteral">&quot;NRev::lastOut(): channel argument must be less than 2!&quot;</span>;
+<a name="l00097"></a>00097     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00098"></a>00098   }
+<a name="l00099"></a>00099 <span class="preprocessor">#endif</span>
+<a name="l00100"></a>00100 <span class="preprocessor"></span>
+<a name="l00101"></a>00101   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00102"></a>00102 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="acfb629e4822fc5bffcf39b8f3ed9cfa1"></a><!-- doxytag: member="stk::NRev::tick" ref="acfb629e4822fc5bffcf39b8f3ed9cfa1" args="(StkFloat input, unsigned int channel=0)" -->
@@ -104,6 +116,59 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Input one sample to the effect and return the specified <code>channel</code> value of the computed stereo frame. </p>
 <p>Use the <a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> function to get both values of the computed stereo output frame. The <code>channel</code> argument must be 0 or 1 (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00105"></a>00105 {
+<a name="l00106"></a>00106 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
+<a name="l00108"></a>00108     oStream_ &lt;&lt; <span class="stringliteral">&quot;NRev::tick(): channel argument must be less than 2!&quot;</span>;
+<a name="l00109"></a>00109     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00110"></a>00110   }
+<a name="l00111"></a>00111 <span class="preprocessor">#endif</span>
+<a name="l00112"></a>00112 <span class="preprocessor"></span>
+<a name="l00113"></a>00113   StkFloat temp, temp0, temp1, temp2, temp3;
+<a name="l00114"></a>00114   <span class="keywordtype">int</span> i;
+<a name="l00115"></a>00115 
+<a name="l00116"></a>00116   temp0 = 0.0;
+<a name="l00117"></a>00117   <span class="keywordflow">for</span> ( i=0; i&lt;6; i++ ) {
+<a name="l00118"></a>00118     temp = input + (combCoefficient_[i] * combDelays_[i].lastOut());
+<a name="l00119"></a>00119     temp0 += combDelays_[i].tick(temp);
+<a name="l00120"></a>00120   }
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122   <span class="keywordflow">for</span> ( i=0; i&lt;3; i++ )    {
+<a name="l00123"></a>00123     temp = allpassDelays_[i].lastOut();
+<a name="l00124"></a>00124     temp1 = allpassCoefficient_ * temp;
+<a name="l00125"></a>00125     temp1 += temp0;
+<a name="l00126"></a>00126     allpassDelays_[i].tick(temp1);
+<a name="l00127"></a>00127     temp0 = -(allpassCoefficient_ * temp1) + temp;
+<a name="l00128"></a>00128   }
+<a name="l00129"></a>00129 
+<a name="l00130"></a>00130          <span class="comment">// One-pole lowpass filter.</span>
+<a name="l00131"></a>00131   lowpassState_ = 0.7 * lowpassState_ + 0.3 * temp0;
+<a name="l00132"></a>00132   temp = allpassDelays_[3].lastOut();
+<a name="l00133"></a>00133   temp1 = allpassCoefficient_ * temp;
+<a name="l00134"></a>00134   temp1 += lowpassState_;
+<a name="l00135"></a>00135   allpassDelays_[3].tick( temp1 );
+<a name="l00136"></a>00136   temp1 = -( allpassCoefficient_ * temp1 ) + temp;
+<a name="l00137"></a>00137     
+<a name="l00138"></a>00138   temp = allpassDelays_[4].lastOut();
+<a name="l00139"></a>00139   temp2 = allpassCoefficient_ * temp;
+<a name="l00140"></a>00140   temp2 += temp1;
+<a name="l00141"></a>00141   allpassDelays_[4].tick( temp2 );
+<a name="l00142"></a>00142   lastFrame_[0] = effectMix_*( -( allpassCoefficient_ * temp2 ) + temp );
+<a name="l00143"></a>00143     
+<a name="l00144"></a>00144   temp = allpassDelays_[5].lastOut();
+<a name="l00145"></a>00145   temp3 = allpassCoefficient_ * temp;
+<a name="l00146"></a>00146   temp3 += temp1;
+<a name="l00147"></a>00147   allpassDelays_[5].tick( temp3 );
+<a name="l00148"></a>00148   lastFrame_[1] = effectMix_*( - ( allpassCoefficient_ * temp3 ) + temp );
+<a name="l00149"></a>00149 
+<a name="l00150"></a>00150   temp = ( 1.0 - effectMix_ ) * input;
+<a name="l00151"></a>00151   lastFrame_[0] += temp;
+<a name="l00152"></a>00152   lastFrame_[1] += temp;
+<a name="l00153"></a>00153     
+<a name="l00154"></a>00154   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00155"></a>00155 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a27d7ee42b73e84c5032215f44f1887d5"></a><!-- doxytag: member="stk::NRev::tick" ref="a27d7ee42b73e84c5032215f44f1887d5" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -186,7 +251,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Noise-members.html b/doc/html/classstk_1_1Noise-members.html
index 1e939eb..ada81dd 100644
--- a/doc/html/classstk_1_1Noise-members.html
+++ b/doc/html/classstk_1_1Noise-members.html
@@ -18,6 +18,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Noise.html#a1d6c8ed80425cd0cea014bd2e328c823">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Noise.html">stk::Noise</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Noise.html#a2d442a08883be25f10952dff4e515f98">Noise</a>(unsigned int seed=0)</td><td><a class="el" href="classstk_1_1Noise.html">stk::Noise</a></td><td></td></tr>
@@ -49,7 +50,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Noise.gif b/doc/html/classstk_1_1Noise.gif
deleted file mode 100644
index a1283cd..0000000
Binary files a/doc/html/classstk_1_1Noise.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Noise.html b/doc/html/classstk_1_1Noise.html
index 2660a74..9fe2493 100644
--- a/doc/html/classstk_1_1Noise.html
+++ b/doc/html/classstk_1_1Noise.html
@@ -48,7 +48,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK noise generator. </p>
 <p>Generic random number generation using the C rand() function. The quality of the rand() function varies from one OS to another.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a2d442a08883be25f10952dff4e515f98"></a><!-- doxytag: member="stk::Noise::Noise" ref="a2d442a08883be25f10952dff4e515f98" args="(unsigned int seed=0)" -->
 <div class="memitem">
@@ -123,6 +123,24 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00064"></a>00064 {
+<a name="l00065"></a>00065 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00066"></a>00066 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00067"></a>00067     oStream_ &lt;&lt; <span class="stringliteral">&quot;Noise::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00068"></a>00068     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00069"></a>00069   }
+<a name="l00070"></a>00070 <span class="preprocessor">#endif</span>
+<a name="l00071"></a>00071 <span class="preprocessor"></span>
+<a name="l00072"></a>00072   StkFloat *samples = &amp;frames[channel];
+<a name="l00073"></a>00073   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00074"></a>00074   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00075"></a>00075     *samples = (StkFloat) ( 2.0 * rand() / (RAND_MAX + 1.0) - 1.0 );
+<a name="l00076"></a>00076 
+<a name="l00077"></a>00077   lastFrame_[0] = *(samples-hop);
+<a name="l00078"></a>00078   <span class="keywordflow">return</span> frames;
+<a name="l00079"></a>00079 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -133,7 +151,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1OnePole-members.html b/doc/html/classstk_1_1OnePole-members.html
index 512bced..b596d50 100644
--- a/doc/html/classstk_1_1OnePole-members.html
+++ b/doc/html/classstk_1_1OnePole-members.html
@@ -21,9 +21,11 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1OnePole.html#ad1ad906374102791a01bfd60844028ec">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1OnePole.html">stk::OnePole</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1OnePole.html#ad0d322987780778e9f53f34837bea4b8">OnePole</a>(StkFloat thePole=0.9)</td><td><a class="el" href="classstk_1_1OnePole.html">stk::OnePole</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -58,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1OnePole.gif b/doc/html/classstk_1_1OnePole.gif
deleted file mode 100644
index 789f08c..0000000
Binary files a/doc/html/classstk_1_1OnePole.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1OnePole.html b/doc/html/classstk_1_1OnePole.html
index 90bd4a3..b2ad6ab 100644
--- a/doc/html/classstk_1_1OnePole.html
+++ b/doc/html/classstk_1_1OnePole.html
@@ -63,7 +63,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK one-pole filter class. </p>
 <p>This class implements a one-pole digital filter. A method is provided for setting the pole position along the real axis of the z-plane while maintaining a constant peak filter gain.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="acc1aaa35c6d5ffbbebfe0c4bfa7d1132"></a><!-- doxytag: member="stk::OnePole::setPole" ref="acc1aaa35c6d5ffbbebfe0c4bfa7d1132" args="(StkFloat thePole)" -->
 <div class="memitem">
@@ -82,7 +82,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Set the pole position in the z-plane. </p>
-<p>This method sets the pole position along the real-axis of the z-plane and normalizes the coefficients for a maximum gain of one. A positive pole value produces a low-pass filter, while a negative pole value produces a high-pass filter. This method does not affect the filter <em>gain</em> value. </p>
+<p>This method sets the pole position along the real-axis of the z-plane and normalizes the coefficients for a maximum gain of one. A positive pole value produces a low-pass filter, while a negative pole value produces a high-pass filter. This method does not affect the filter <em>gain</em> value. The argument magnitude should be less than one to maintain filter stability. </p>
 
 </div>
 </div>
@@ -116,6 +116,27 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00090"></a>00090 {
+<a name="l00091"></a>00091 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00092"></a>00092 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00093"></a>00093     oStream_ &lt;&lt; <span class="stringliteral">&quot;OnePole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00094"></a>00094     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00095"></a>00095   }
+<a name="l00096"></a>00096 <span class="preprocessor">#endif</span>
+<a name="l00097"></a>00097 <span class="preprocessor"></span>
+<a name="l00098"></a>00098   StkFloat *samples = &amp;frames[channel];
+<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00100"></a>00100   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00101"></a>00101     inputs_[0] = gain_ * *samples;
+<a name="l00102"></a>00102     *samples = b_[0] * inputs_[0] - a_[1] * outputs_[1];
+<a name="l00103"></a>00103     outputs_[1] = *samples;
+<a name="l00104"></a>00104   }
+<a name="l00105"></a>00105 
+<a name="l00106"></a>00106   lastFrame_[0] = outputs_[1];
+<a name="l00107"></a>00107   <span class="keywordflow">return</span> frames;
+<a name="l00108"></a>00108 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a495943f1659f2da6208703a24275defb"></a><!-- doxytag: member="stk::OnePole::tick" ref="a495943f1659f2da6208703a24275defb" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -158,6 +179,28 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00111"></a>00111 {
+<a name="l00112"></a>00112 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00113"></a>00113 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00114"></a>00114     oStream_ &lt;&lt; <span class="stringliteral">&quot;OnePole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00115"></a>00115     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00116"></a>00116   }
+<a name="l00117"></a>00117 <span class="preprocessor">#endif</span>
+<a name="l00118"></a>00118 <span class="preprocessor"></span>
+<a name="l00119"></a>00119   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00120"></a>00120   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00121"></a>00121   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00122"></a>00122   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00123"></a>00123     inputs_[0] = gain_ * *iSamples;
+<a name="l00124"></a>00124     *oSamples = b_[0] * inputs_[0] - a_[1] * outputs_[1];
+<a name="l00125"></a>00125     outputs_[1] = *oSamples;
+<a name="l00126"></a>00126   }
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128   lastFrame_[0] = outputs_[1];
+<a name="l00129"></a>00129   <span class="keywordflow">return</span> iFrames;
+<a name="l00130"></a>00130 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -168,7 +211,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1OneZero-members.html b/doc/html/classstk_1_1OneZero-members.html
index ac9e018..a2583c0 100644
--- a/doc/html/classstk_1_1OneZero-members.html
+++ b/doc/html/classstk_1_1OneZero-members.html
@@ -21,9 +21,11 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1OneZero.html#a54e160f62354939876477d9c5a65890c">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1OneZero.html">stk::OneZero</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1OneZero.html#ada639198d28be5d170508a301ba854da">OneZero</a>(StkFloat theZero=-1.0)</td><td><a class="el" href="classstk_1_1OneZero.html">stk::OneZero</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -58,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1OneZero.gif b/doc/html/classstk_1_1OneZero.gif
deleted file mode 100644
index 945349c..0000000
Binary files a/doc/html/classstk_1_1OneZero.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1OneZero.html b/doc/html/classstk_1_1OneZero.html
index ccff1e7..13798d4 100644
--- a/doc/html/classstk_1_1OneZero.html
+++ b/doc/html/classstk_1_1OneZero.html
@@ -63,7 +63,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK one-zero filter class. </p>
 <p>This class implements a one-zero digital filter. A method is provided for setting the zero position along the real axis of the z-plane while maintaining a constant filter gain.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="af8301fdb6a893ec6eb74fbcbeeaa463c"></a><!-- doxytag: member="stk::OneZero::setZero" ref="af8301fdb6a893ec6eb74fbcbeeaa463c" args="(StkFloat theZero)" -->
 <div class="memitem">
@@ -116,6 +116,27 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00089"></a>00089 {
+<a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00092"></a>00092     oStream_ &lt;&lt; <span class="stringliteral">&quot;OneZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00094"></a>00094   }
+<a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
+<a name="l00096"></a>00096 <span class="preprocessor"></span>
+<a name="l00097"></a>00097   StkFloat *samples = &amp;frames[channel];
+<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00099"></a>00099   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00100"></a>00100     inputs_[0] = gain_ * *samples;
+<a name="l00101"></a>00101     *samples = b_[1] * inputs_[1] + b_[0] * inputs_[0];
+<a name="l00102"></a>00102     inputs_[1] = inputs_[0];
+<a name="l00103"></a>00103   }
+<a name="l00104"></a>00104 
+<a name="l00105"></a>00105   lastFrame_[0] = *(samples-hop);
+<a name="l00106"></a>00106   <span class="keywordflow">return</span> frames;
+<a name="l00107"></a>00107 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a8568a0d8c4aacc64b656b9fe46f217a4"></a><!-- doxytag: member="stk::OneZero::tick" ref="a8568a0d8c4aacc64b656b9fe46f217a4" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -158,6 +179,28 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00110"></a>00110 {
+<a name="l00111"></a>00111 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00112"></a>00112 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00113"></a>00113     oStream_ &lt;&lt; <span class="stringliteral">&quot;OneZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00114"></a>00114     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00115"></a>00115   }
+<a name="l00116"></a>00116 <span class="preprocessor">#endif</span>
+<a name="l00117"></a>00117 <span class="preprocessor"></span>
+<a name="l00118"></a>00118   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00119"></a>00119   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00120"></a>00120   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00121"></a>00121   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00122"></a>00122     inputs_[0] = gain_ * *iSamples;
+<a name="l00123"></a>00123     *oSamples = b_[1] * inputs_[1] + b_[0] * inputs_[0];
+<a name="l00124"></a>00124     inputs_[1] = inputs_[0];
+<a name="l00125"></a>00125   }
+<a name="l00126"></a>00126 
+<a name="l00127"></a>00127   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00128"></a>00128   <span class="keywordflow">return</span> iFrames;
+<a name="l00129"></a>00129 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -168,7 +211,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1PRCRev-members.html b/doc/html/classstk_1_1PRCRev-members.html
index 9cdf871..4ffe395 100644
--- a/doc/html/classstk_1_1PRCRev-members.html
+++ b/doc/html/classstk_1_1PRCRev-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Effect.html">stk::Effect</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1PRCRev.html#a47ed5fee4401f0050d6a47d1154e81c6">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1PRCRev.html">stk::PRCRev</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1PRCRev.html#afb6440fb909a3091f21f31f3565014de">PRCRev</a>(StkFloat T60=1.0)</td><td><a class="el" href="classstk_1_1PRCRev.html">stk::PRCRev</a></td><td></td></tr>
@@ -52,7 +53,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1PRCRev.gif b/doc/html/classstk_1_1PRCRev.gif
deleted file mode 100644
index 4803440..0000000
Binary files a/doc/html/classstk_1_1PRCRev.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1PRCRev.html b/doc/html/classstk_1_1PRCRev.html
index 58bbd22..d815406 100644
--- a/doc/html/classstk_1_1PRCRev.html
+++ b/doc/html/classstk_1_1PRCRev.html
@@ -53,7 +53,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>Perry's simple reverberator class. </p>
 <p>This class takes a monophonic input signal and produces a stereo output signal. It is based on some of the famous Stanford/CCRMA reverbs (<a class="el" href="classstk_1_1NRev.html" title="CCRMA&#39;s NRev reverberator class.">NRev</a>, KipRev), which were based on the Chowning/Moorer/Schroeder reverberators using networks of simple allpass and comb delay filters. This class implements two series allpass units and two parallel comb filters.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a47ed5fee4401f0050d6a47d1154e81c6"></a><!-- doxytag: member="stk::PRCRev::lastOut" ref="a47ed5fee4401f0050d6a47d1154e81c6" args="(unsigned int channel=0)" -->
 <div class="memitem">
@@ -74,6 +74,18 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Return the specified channel value of the last computed stereo frame. </p>
 <p>Use the <a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> function to get both values of the last computed stereo frame. The <code>channel</code> argument must be 0 or 1 (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00091"></a>00091 {
+<a name="l00092"></a>00092 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00093"></a>00093 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
+<a name="l00094"></a>00094     oStream_ &lt;&lt; <span class="stringliteral">&quot;PRCRev::lastOut(): channel argument must be less than 2!&quot;</span>;
+<a name="l00095"></a>00095     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00096"></a>00096   }
+<a name="l00097"></a>00097 <span class="preprocessor">#endif</span>
+<a name="l00098"></a>00098 <span class="preprocessor"></span>
+<a name="l00099"></a>00099   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00100"></a>00100 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ada84d5241777575b660db100a85b35a6"></a><!-- doxytag: member="stk::PRCRev::tick" ref="ada84d5241777575b660db100a85b35a6" args="(StkFloat input, unsigned int channel=0)" -->
@@ -104,6 +116,41 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <p>Input one sample to the effect and return the specified <code>channel</code> value of the computed stereo frame. </p>
 <p>Use the <a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> function to get both values of the computed stereo output frame. The <code>channel</code> argument must be 0 or 1 (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00103"></a>00103 {
+<a name="l00104"></a>00104 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00105"></a>00105 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; 1 ) {
+<a name="l00106"></a>00106     oStream_ &lt;&lt; <span class="stringliteral">&quot;PRCRev::tick(): channel argument must be less than 2!&quot;</span>;
+<a name="l00107"></a>00107     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00108"></a>00108   }
+<a name="l00109"></a>00109 <span class="preprocessor">#endif</span>
+<a name="l00110"></a>00110 <span class="preprocessor"></span>
+<a name="l00111"></a>00111   StkFloat temp, temp0, temp1, temp2, temp3;
+<a name="l00112"></a>00112 
+<a name="l00113"></a>00113   temp = allpassDelays_[0].lastOut();
+<a name="l00114"></a>00114   temp0 = allpassCoefficient_ * temp;
+<a name="l00115"></a>00115   temp0 += input;
+<a name="l00116"></a>00116   allpassDelays_[0].tick(temp0);
+<a name="l00117"></a>00117   temp0 = -(allpassCoefficient_ * temp0) + temp;
+<a name="l00118"></a>00118     
+<a name="l00119"></a>00119   temp = allpassDelays_[1].lastOut();
+<a name="l00120"></a>00120   temp1 = allpassCoefficient_ * temp;
+<a name="l00121"></a>00121   temp1 += temp0;
+<a name="l00122"></a>00122   allpassDelays_[1].tick(temp1);
+<a name="l00123"></a>00123   temp1 = -(allpassCoefficient_ * temp1) + temp;
+<a name="l00124"></a>00124     
+<a name="l00125"></a>00125   temp2 = temp1 + ( combCoefficient_[0] * combDelays_[0].lastOut() );
+<a name="l00126"></a>00126   temp3 = temp1 + ( combCoefficient_[1] * combDelays_[1].lastOut() );
+<a name="l00127"></a>00127 
+<a name="l00128"></a>00128   lastFrame_[0] = effectMix_ * (combDelays_[0].tick(temp2));
+<a name="l00129"></a>00129   lastFrame_[1] = effectMix_ * (combDelays_[1].tick(temp3));
+<a name="l00130"></a>00130   temp = (1.0 - effectMix_) * input;
+<a name="l00131"></a>00131   lastFrame_[0] += temp;
+<a name="l00132"></a>00132   lastFrame_[1] += temp;
+<a name="l00133"></a>00133 
+<a name="l00134"></a>00134   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00135"></a>00135 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a8a0ddbafabeabcf780d6a6b1d5e9a6b4"></a><!-- doxytag: member="stk::PRCRev::tick" ref="a8a0ddbafabeabcf780d6a6b1d5e9a6b4" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -186,7 +233,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1PercFlut-members.html b/doc/html/classstk_1_1PercFlut-members.html
index 114ccba..00b6384 100644
--- a/doc/html/classstk_1_1PercFlut-members.html
+++ b/doc/html/classstk_1_1PercFlut-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#a7235e94a153df135330a591511269f7c">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#afc46280177d770404919f20ccf88e4ff">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
@@ -56,7 +57,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1PercFlut.html">stk::PercFlut</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1PercFlut.html#a4105b2b1dfe375bcf870fb4903509e4e">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1PercFlut.html">stk::PercFlut</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#aaba7e8bff02d105e146f8b62b20a27b9">~FM</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1PercFlut.html#add2a18e8835d665d505521e0298bd2f0">~PercFlut</a>(void)</td><td><a class="el" href="classstk_1_1PercFlut.html">stk::PercFlut</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
@@ -65,7 +66,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1PercFlut.gif b/doc/html/classstk_1_1PercFlut.gif
deleted file mode 100644
index b143702..0000000
Binary files a/doc/html/classstk_1_1PercFlut.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1PercFlut.html b/doc/html/classstk_1_1PercFlut.html
index b11cc12..21e2cf6 100644
--- a/doc/html/classstk_1_1PercFlut.html
+++ b/doc/html/classstk_1_1PercFlut.html
@@ -47,6 +47,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac2b2958902c044413a1c7ff3bd0f8054"></a><!-- doxytag: member="stk::PercFlut::tick" ref="ac2b2958902c044413a1c7ff3bd0f8054" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PercFlut.html#a4105b2b1dfe375bcf870fb4903509e4e">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a4105b2b1dfe375bcf870fb4903509e4e"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK percussive flute <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis instrument. </p>
@@ -62,7 +64,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li><a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> 2 &amp; 4 Target = 128</li>
 </ul>
 <p>The basic Chowning/Stanford <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> patent expired in 1995, but there exist follow-on patents, mostly assigned to Yamaha. If you are of the type who should worry about this (making money) worry away.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="ab51f05b79d818ed8ba80fd827a4839c2"></a><!-- doxytag: member="stk::PercFlut::PercFlut" ref="ab51f05b79d818ed8ba80fd827a4839c2" args="(void)" -->
 <div class="memitem">
@@ -83,6 +85,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a4105b2b1dfe375bcf870fb4903509e4e"></a><!-- doxytag: member="stk::PercFlut::tick" ref="a4105b2b1dfe375bcf870fb4903509e4e" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::PercFlut::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">stk::FM</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00099"></a>00099 {
+<a name="l00100"></a>00100   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00101"></a>00101 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00102"></a>00102 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00103"></a>00103     oStream_ &lt;&lt; <span class="stringliteral">&quot;PercFlut::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00104"></a>00104     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106 <span class="preprocessor">#endif</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span>
+<a name="l00108"></a>00108   StkFloat *samples = &amp;frames[channel];
+<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00110"></a>00110   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00111"></a>00111     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00112"></a>00112       *samples++ = <a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">tick</a>();
+<a name="l00113"></a>00113   }
+<a name="l00114"></a>00114   <span class="keywordflow">else</span> {
+<a name="l00115"></a>00115     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00116"></a>00116       *samples++ = <a class="code" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054" title="Compute and return one output sample.">tick</a>();
+<a name="l00117"></a>00117       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00118"></a>00118         *samples++ = lastFrame_[j];
+<a name="l00119"></a>00119     }
+<a name="l00120"></a>00120   }
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122   <span class="keywordflow">return</span> frames;
+<a name="l00123"></a>00123 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -93,7 +155,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Phonemes-members.html b/doc/html/classstk_1_1Phonemes-members.html
index 082c32e..b195757 100644
--- a/doc/html/classstk_1_1Phonemes-members.html
+++ b/doc/html/classstk_1_1Phonemes-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Phonemes.html#a8b1a29ac4e6ddb629154d298d5abf585">name</a>(unsigned int index)</td><td><a class="el" href="classstk_1_1Phonemes.html">stk::Phonemes</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Phonemes.html#a57715042b02c835da194753bc8f8a99e">noiseGain</a>(unsigned int index)</td><td><a class="el" href="classstk_1_1Phonemes.html">stk::Phonemes</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -47,7 +48,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Phonemes.gif b/doc/html/classstk_1_1Phonemes.gif
deleted file mode 100644
index a3879f3..0000000
Binary files a/doc/html/classstk_1_1Phonemes.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Phonemes.html b/doc/html/classstk_1_1Phonemes.html
index bffe2bd..9bc2f5f 100644
--- a/doc/html/classstk_1_1Phonemes.html
+++ b/doc/html/classstk_1_1Phonemes.html
@@ -53,7 +53,7 @@ static StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el"
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK phonemes table. </p>
 <p>This class does nothing other than declare a set of 32 static phoneme formant parameters and provide access to those values.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Phonemes_8h_source.html">Phonemes.h</a></li>
 </ul>
@@ -62,7 +62,7 @@ static StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el"
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1PitShift-members.html b/doc/html/classstk_1_1PitShift-members.html
index 337b5aa..fd00739 100644
--- a/doc/html/classstk_1_1PitShift-members.html
+++ b/doc/html/classstk_1_1PitShift-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Effect.html">stk::Effect</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1PitShift.html#a782ad7b47c450c1584cebd20570f17e3">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1PitShift.html">stk::PitShift</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1PitShift.html#a8fdf3ef3b1a94e126a2953c6b8ed8cca">PitShift</a>(void)</td><td><a class="el" href="classstk_1_1PitShift.html">stk::PitShift</a></td><td></td></tr>
@@ -52,7 +53,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1PitShift.gif b/doc/html/classstk_1_1PitShift.gif
deleted file mode 100644
index dae4185..0000000
Binary files a/doc/html/classstk_1_1PitShift.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1PitShift.html b/doc/html/classstk_1_1PitShift.html
index 7da110d..8937a7b 100644
--- a/doc/html/classstk_1_1PitShift.html
+++ b/doc/html/classstk_1_1PitShift.html
@@ -55,7 +55,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK simple pitch shifter effect class. </p>
 <p>This class implements a simple pitch shifter using delay lines.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a8a871fd6c9e058dbb899b9a5854e7f3c"></a><!-- doxytag: member="stk::PitShift::tick" ref="a8a871fd6c9e058dbb899b9a5854e7f3c" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
 <div class="memitem">
@@ -137,7 +137,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1PluckTwo.gif b/doc/html/classstk_1_1PluckTwo.gif
deleted file mode 100644
index 52181cc..0000000
Binary files a/doc/html/classstk_1_1PluckTwo.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1PluckTwo.html b/doc/html/classstk_1_1PluckTwo.html
deleted file mode 100644
index ee5a815..0000000
--- a/doc/html/classstk_1_1PluckTwo.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="namespacestk.html">stk</a>::<a class="el" href="classstk_1_1PluckTwo.html">PluckTwo</a>
-  </div>
-<div class="contents">
-<h1>stk::PluckTwo Class Reference</h1><!-- doxytag: class="stk::PluckTwo" --><!-- doxytag: inherits="stk::Instrmnt" -->
-<p>STK enhanced plucked string model class.  
-<a href="#_details">More...</a></p>
-
-<p><code>#include &lt;<a class="el" href="PluckTwo_8h_source.html">PluckTwo.h</a>&gt;</code></p>
-<div class="dynheader">
-Inheritance diagram for stk::PluckTwo:</div>
-<div class="dynsection">
- <div class="center">
-  <img src="classstk_1_1PluckTwo.png" usemap="#stk::PluckTwo_map" alt=""/>
-  <map id="stk::PluckTwo_map" name="stk::PluckTwo_map">
-<area href="classstk_1_1Instrmnt.html" alt="stk::Instrmnt" shape="rect" coords="0,56,87,80"/>
-<area href="classstk_1_1Stk.html" alt="stk::Stk" shape="rect" coords="0,0,87,24"/>
-<area href="classstk_1_1Mandolin.html" alt="stk::Mandolin" shape="rect" coords="0,168,87,192"/>
-</map>
- </div>
-</div>
-
-<p><a href="classstk_1_1PluckTwo-members.html">List of all members.</a></p>
-<table border="0" cellpadding="0" cellspacing="0">
-<tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa121655f6007003aebb5de425e98d099"></a><!-- doxytag: member="stk::PluckTwo::PluckTwo" ref="aa121655f6007003aebb5de425e98d099" args="(StkFloat lowestFrequency)" -->
-&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PluckTwo.html#aa121655f6007003aebb5de425e98d099">PluckTwo</a> (StkFloat lowestFrequency)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the lowest desired playing frequency. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac8a0720b08d20741b0d8a312f1cf7e5c"></a><!-- doxytag: member="stk::PluckTwo::~PluckTwo" ref="ac8a0720b08d20741b0d8a312f1cf7e5c" args="(void)" -->
-virtual&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PluckTwo.html#ac8a0720b08d20741b0d8a312f1cf7e5c">~PluckTwo</a> (void)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class destructor. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a71821e47009a94de9e8a1f3305263840"></a><!-- doxytag: member="stk::PluckTwo::clear" ref="a71821e47009a94de9e8a1f3305263840" args="(void)" -->
-void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PluckTwo.html#a71821e47009a94de9e8a1f3305263840">clear</a> (void)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Reset and clear all internal state. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9f0618a28243b235f6c0f424a236709c"></a><!-- doxytag: member="stk::PluckTwo::setFrequency" ref="a9f0618a28243b235f6c0f424a236709c" args="(StkFloat frequency)" -->
-virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PluckTwo.html#a9f0618a28243b235f6c0f424a236709c">setFrequency</a> (StkFloat frequency)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set instrument parameters for a particular frequency. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6b355a495d9122273fb8c88009bf79d6"></a><!-- doxytag: member="stk::PluckTwo::setDetune" ref="a6b355a495d9122273fb8c88009bf79d6" args="(StkFloat detune)" -->
-void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PluckTwo.html#a6b355a495d9122273fb8c88009bf79d6">setDetune</a> (StkFloat detune)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Detune the two strings by the given factor. A value of 1.0 produces unison strings. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3cd8e9135b1d8a97b87f9486dd3cd671"></a><!-- doxytag: member="stk::PluckTwo::setFreqAndDetune" ref="a3cd8e9135b1d8a97b87f9486dd3cd671" args="(StkFloat frequency, StkFloat detune)" -->
-void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PluckTwo.html#a3cd8e9135b1d8a97b87f9486dd3cd671">setFreqAndDetune</a> (StkFloat frequency, StkFloat detune)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Efficient combined setting of frequency and detuning. <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afffb424a2957fc691363ba1227809695"></a><!-- doxytag: member="stk::PluckTwo::setPluckPosition" ref="afffb424a2957fc691363ba1227809695" args="(StkFloat position)" -->
-void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PluckTwo.html#afffb424a2957fc691363ba1227809695">setPluckPosition</a> (StkFloat position)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the pluck or "excitation" position along the string (0.0 - 1.0). <br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PluckTwo.html#a168f563174e22b221744ef66b35a5277">setBaseLoopGain</a> (StkFloat aGain)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the base loop gain.  <a href="#a168f563174e22b221744ef66b35a5277"></a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0d5d81db10c145f3d5bafc5775d147bf"></a><!-- doxytag: member="stk::PluckTwo::noteOff" ref="a0d5d81db10c145f3d5bafc5775d147bf" args="(StkFloat amplitude)" -->
-virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PluckTwo.html#a0d5d81db10c145f3d5bafc5775d147bf">noteOff</a> (StkFloat amplitude)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Stop a note with the given amplitude (speed of decay). <br/></td></tr>
-</table>
-<hr/><a name="_details"></a><h2>Detailed Description</h2>
-<p>STK enhanced plucked string model class. </p>
-<p>This class implements an enhanced two-string, plucked physical model, a la Jaffe-Smith, Smith, and others.</p>
-<p><a class="el" href="classstk_1_1PluckTwo.html" title="STK enhanced plucked string model class.">PluckTwo</a> is an abstract class, with no excitation specified. Therefore, it can't be directly instantiated.</p>
-<p>This is a digital waveguide model, making its use possibly subject to patents held by Stanford University, Yamaha, and others.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
-<hr/><h2>Member Function Documentation</h2>
-<a class="anchor" id="a168f563174e22b221744ef66b35a5277"></a><!-- doxytag: member="stk::PluckTwo::setBaseLoopGain" ref="a168f563174e22b221744ef66b35a5277" args="(StkFloat aGain)" -->
-<div class="memitem">
-<div class="memproto">
-      <table class="memname">
-        <tr>
-          <td class="memname">void stk::PluckTwo::setBaseLoopGain </td>
-          <td>(</td>
-          <td class="paramtype">StkFloat&nbsp;</td>
-          <td class="paramname"> <em>aGain</em></td>
-          <td>&nbsp;)&nbsp;</td>
-          <td></td>
-        </tr>
-      </table>
-</div>
-<div class="memdoc">
-
-<p>Set the base loop gain. </p>
-<p>The actual loop gain is set according to the frequency. Because of high-frequency loop filter roll-off, higher frequency settings have greater loop gains. </p>
-
-</div>
-</div>
-<hr/>The documentation for this class was generated from the following file:<ul>
-<li><a class="el" href="PluckTwo_8h_source.html">PluckTwo.h</a></li>
-</ul>
-</div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/classstk_1_1PluckTwo.png b/doc/html/classstk_1_1PluckTwo.png
deleted file mode 100644
index b2db2d8..0000000
Binary files a/doc/html/classstk_1_1PluckTwo.png and /dev/null differ
diff --git a/doc/html/classstk_1_1Plucked-members.html b/doc/html/classstk_1_1Plucked-members.html
index 1895d9d..bac183e 100644
--- a/doc/html/classstk_1_1Plucked-members.html
+++ b/doc/html/classstk_1_1Plucked-members.html
@@ -19,13 +19,14 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Plucked.html#aba5a6b6850874da55c32388e9857d6fc">noteOff</a>(StkFloat amplitude)</td><td><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Plucked.html#a1a8ce6b094c8e2b5c6dda805c032cd44">noteOn</a>(StkFloat frequency, StkFloat amplitude)</td><td><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Plucked.html#a9c8741ae249b590d24937743caf11f6c">pluck</a>(StkFloat amplitude)</td><td><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></td><td></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Plucked.html#a279ac82759d4184d9ad961e21dacdbca">Plucked</a>(StkFloat lowestFrequency)</td><td><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Plucked.html#a65eee23eda411e7fd82bf4a555d8dd85">Plucked</a>(StkFloat lowestFrequency=10.0)</td><td><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -47,7 +48,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Plucked.html#ab9bb602c6f6867cf00995bc42101c006">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Plucked.html#a6232b4a1ed48407fe9e66e1835011b5e">~Plucked</a>(void)</td><td><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -55,7 +56,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Plucked.gif b/doc/html/classstk_1_1Plucked.gif
deleted file mode 100644
index 0e03f7f..0000000
Binary files a/doc/html/classstk_1_1Plucked.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Plucked.html b/doc/html/classstk_1_1Plucked.html
index 767e663..0668e15 100644
--- a/doc/html/classstk_1_1Plucked.html
+++ b/doc/html/classstk_1_1Plucked.html
@@ -13,7 +13,7 @@
   </div>
 <div class="contents">
 <h1>stk::Plucked Class Reference</h1><!-- doxytag: class="stk::Plucked" --><!-- doxytag: inherits="stk::Instrmnt" -->
-<p>STK plucked string model class.  
+<p>STK basic plucked string class.  
 <a href="#_details">More...</a></p>
 
 <p><code>#include &lt;<a class="el" href="Plucked_8h_source.html">Plucked.h</a>&gt;</code></p>
@@ -32,8 +32,8 @@ Inheritance diagram for stk::Plucked:</div>
 <p><a href="classstk_1_1Plucked-members.html">List of all members.</a></p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a279ac82759d4184d9ad961e21dacdbca"></a><!-- doxytag: member="stk::Plucked::Plucked" ref="a279ac82759d4184d9ad961e21dacdbca" args="(StkFloat lowestFrequency)" -->
-&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Plucked.html#a279ac82759d4184d9ad961e21dacdbca">Plucked</a> (StkFloat lowestFrequency)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a65eee23eda411e7fd82bf4a555d8dd85"></a><!-- doxytag: member="stk::Plucked::Plucked" ref="a65eee23eda411e7fd82bf4a555d8dd85" args="(StkFloat lowestFrequency=10.0)" -->
+&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Plucked.html#a65eee23eda411e7fd82bf4a555d8dd85">Plucked</a> (StkFloat lowestFrequency=10.0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the lowest desired playing frequency. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a6232b4a1ed48407fe9e66e1835011b5e"></a><!-- doxytag: member="stk::Plucked::~Plucked" ref="a6232b4a1ed48407fe9e66e1835011b5e" args="(void)" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Plucked.html#a6232b4a1ed48407fe9e66e1835011b5e">~Plucked</a> (void)</td></tr>
@@ -56,12 +56,75 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adb4a5d731ad2b680120313f03a020c25"></a><!-- doxytag: member="stk::Plucked::tick" ref="adb4a5d731ad2b680120313f03a020c25" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Plucked.html#ab9bb602c6f6867cf00995bc42101c006">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#ab9bb602c6f6867cf00995bc42101c006"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
-<p>STK plucked string model class. </p>
+<p>STK basic plucked string class. </p>
 <p>This class implements a simple plucked string physical model based on the Karplus-Strong algorithm.</p>
+<p>For a more advanced plucked string implementation, see the <a class="el" href="classstk_1_1Twang.html" title="STK enhanced plucked string class.">stk::Twang</a> class.</p>
 <p>This is a digital waveguide model, making its use possibly subject to patents held by Stanford University, Yamaha, and others. There exist at least two patents, assigned to Stanford, bearing the names of Karplus and/or Strong.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="ab9bb602c6f6867cf00995bc42101c006"></a><!-- doxytag: member="stk::Plucked::tick" ref="ab9bb602c6f6867cf00995bc42101c006" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Plucked::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00088"></a>00088 {
+<a name="l00089"></a>00089   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00090"></a>00090 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00091"></a>00091 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00092"></a>00092     oStream_ &lt;&lt; <span class="stringliteral">&quot;Plucked::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00093"></a>00093     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00094"></a>00094   }
+<a name="l00095"></a>00095 <span class="preprocessor">#endif</span>
+<a name="l00096"></a>00096 <span class="preprocessor"></span>
+<a name="l00097"></a>00097   StkFloat *samples = &amp;frames[channel];
+<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00099"></a>00099   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00100"></a>00100     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00101"></a>00101       *samples++ = <a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">tick</a>();
+<a name="l00102"></a>00102   }
+<a name="l00103"></a>00103   <span class="keywordflow">else</span> {
+<a name="l00104"></a>00104     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00105"></a>00105       *samples++ = <a class="code" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25" title="Compute and return one output sample.">tick</a>();
+<a name="l00106"></a>00106       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00107"></a>00107         *samples++ = lastFrame_[j];
+<a name="l00108"></a>00108     }
+<a name="l00109"></a>00109   }
+<a name="l00110"></a>00110 
+<a name="l00111"></a>00111   <span class="keywordflow">return</span> frames;
+<a name="l00112"></a>00112 }
+</pre></div></p>
+
+</div>
+</div>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Plucked_8h_source.html">Plucked.h</a></li>
 </ul>
@@ -70,7 +133,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1PoleZero-members.html b/doc/html/classstk_1_1PoleZero-members.html
index 3699278..aec63d7 100644
--- a/doc/html/classstk_1_1PoleZero-members.html
+++ b/doc/html/classstk_1_1PoleZero-members.html
@@ -21,8 +21,10 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1PoleZero.html">stk::PoleZero</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1PoleZero.html#ad9a46d21ee470d7afcd641807b5e314e">PoleZero</a>()</td><td><a class="el" href="classstk_1_1PoleZero.html">stk::PoleZero</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -59,7 +61,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1PoleZero.gif b/doc/html/classstk_1_1PoleZero.gif
deleted file mode 100644
index 9f8ff10..0000000
Binary files a/doc/html/classstk_1_1PoleZero.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1PoleZero.html b/doc/html/classstk_1_1PoleZero.html
index ab0184a..894257f 100644
--- a/doc/html/classstk_1_1PoleZero.html
+++ b/doc/html/classstk_1_1PoleZero.html
@@ -66,7 +66,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK one-pole, one-zero filter class. </p>
 <p>This class implements a one-pole, one-zero digital filter. A method is provided for creating an allpass filter with a given coefficient. Another method is provided to create a DC blocking filter.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a51264d601b635aa0274c75ba1aa5a048"></a><!-- doxytag: member="stk::PoleZero::setAllpass" ref="a51264d601b635aa0274c75ba1aa5a048" args="(StkFloat coefficient)" -->
 <div class="memitem">
@@ -85,7 +85,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Set the filter for allpass behavior using <em>coefficient</em>. </p>
-<p>This method uses <em>coefficient</em> to create an allpass filter, which has unity gain at all frequencies. Note that the <em>coefficient</em> magnitude must be less than one to maintain stability. </p>
+<p>This method uses <em>coefficient</em> to create an allpass filter, which has unity gain at all frequencies. Note that the <em>coefficient</em> magnitude must be less than one to maintain filter stability. </p>
 
 </div>
 </div>
@@ -106,7 +106,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Create a DC blocking filter with the given pole position in the z-plane. </p>
-<p>This method sets the given pole position, together with a zero at z=1, to create a DC blocking filter. <em>thePole</em> should be close to one to minimize low-frequency attenuation. </p>
+<p>This method sets the given pole position, together with a zero at z=1, to create a DC blocking filter. The argument magnitude should be close to (but less than) one to minimize low-frequency attenuation. </p>
 
 </div>
 </div>
@@ -140,6 +140,28 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00090"></a>00090 {
+<a name="l00091"></a>00091 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00092"></a>00092 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00093"></a>00093     oStream_ &lt;&lt; <span class="stringliteral">&quot;PoleZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00094"></a>00094     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00095"></a>00095   }
+<a name="l00096"></a>00096 <span class="preprocessor">#endif</span>
+<a name="l00097"></a>00097 <span class="preprocessor"></span>
+<a name="l00098"></a>00098   StkFloat *samples = &amp;frames[channel];
+<a name="l00099"></a>00099   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00100"></a>00100   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00101"></a>00101     inputs_[0] = gain_ * *samples;
+<a name="l00102"></a>00102     *samples = b_[0] * inputs_[0] + b_[1] * inputs_[1] - a_[1] * outputs_[1];
+<a name="l00103"></a>00103     inputs_[1] = inputs_[0];
+<a name="l00104"></a>00104     outputs_[1] = *samples;
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106 
+<a name="l00107"></a>00107   lastFrame_[0] = outputs_[1];
+<a name="l00108"></a>00108   <span class="keywordflow">return</span> frames;
+<a name="l00109"></a>00109 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -150,7 +172,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1ReedTable-members.html b/doc/html/classstk_1_1ReedTable-members.html
index 534c16e..e1a67c1 100644
--- a/doc/html/classstk_1_1ReedTable-members.html
+++ b/doc/html/classstk_1_1ReedTable-members.html
@@ -17,6 +17,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Function.html#ae79bd6d0c9f53693b4ca28948d94fc25">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1Function.html">stk::Function</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -49,7 +50,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1ReedTable.gif b/doc/html/classstk_1_1ReedTable.gif
deleted file mode 100644
index b4252e2..0000000
Binary files a/doc/html/classstk_1_1ReedTable.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1ReedTable.html b/doc/html/classstk_1_1ReedTable.html
index 80061e6..adcf334 100644
--- a/doc/html/classstk_1_1ReedTable.html
+++ b/doc/html/classstk_1_1ReedTable.html
@@ -51,7 +51,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>STK reed table class. </p>
 <p>This class implements a simple one breakpoint, non-linear reed function, as described by Smith (1986). This function is based on a memoryless non-linear spring model of the reed (the reed mass is ignored) which saturates when the reed collides with the mouthpiece facing.</p>
 <p>See McIntyre, Schumacher, &amp; Woodhouse (1983), Smith (1986), Hirschman, Cook, Scavone, and others for more information.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="ab40ffd675bd7242a210e8630f8919556"></a><!-- doxytag: member="stk::ReedTable::setOffset" ref="ab40ffd675bd7242a210e8630f8919556" args="(StkFloat offset)" -->
 <div class="memitem">
@@ -72,6 +72,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Set the table offset value. </p>
 <p>The table offset roughly corresponds to the size of the initial reed tip opening (a greater offset represents a smaller opening). </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00039"></a>00039 { offset_ = offset; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a968a97400ec6bd424634ff377fc6417a"></a><!-- doxytag: member="stk::ReedTable::setSlope" ref="a968a97400ec6bd424634ff377fc6417a" args="(StkFloat slope)" -->
@@ -93,6 +96,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Set the table slope value. </p>
 <p>The table slope roughly corresponds to the reed stiffness (a greater slope represents a harder reed). </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00047"></a>00047 { slope_ = slope; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a3455fa2dedb2c86fc825ec48296822be"></a><!-- doxytag: member="stk::ReedTable::tick" ref="a3455fa2dedb2c86fc825ec48296822be" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -123,6 +129,27 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object as inputs to the table and replace with corresponding outputs. </p>
 <p>The <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument reference is returned. The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00099"></a>00099 {
+<a name="l00100"></a>00100 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00101"></a>00101 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00102"></a>00102     oStream_ &lt;&lt; <span class="stringliteral">&quot;ReedTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00103"></a>00103     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00104"></a>00104   }
+<a name="l00105"></a>00105 <span class="preprocessor">#endif</span>
+<a name="l00106"></a>00106 <span class="preprocessor"></span>
+<a name="l00107"></a>00107   StkFloat *samples = &amp;frames[channel];
+<a name="l00108"></a>00108   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00109"></a>00109   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00110"></a>00110     *samples = offset_ + (slope_ * *samples);
+<a name="l00111"></a>00111     <span class="keywordflow">if</span> ( *samples &gt; 1.0) *samples = 1.0;
+<a name="l00112"></a>00112     <span class="keywordflow">if</span> ( *samples &lt; -1.0) *samples = -1.0;
+<a name="l00113"></a>00113   }
+<a name="l00114"></a>00114 
+<a name="l00115"></a>00115   lastFrame_[0] = *(samples-hop);
+<a name="l00116"></a>00116   <span class="keywordflow">return</span> frames;
+<a name="l00117"></a>00117 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ae682fdc0a6ec68a9f858f5cd6889113d"></a><!-- doxytag: member="stk::ReedTable::tick" ref="ae682fdc0a6ec68a9f858f5cd6889113d" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -165,6 +192,28 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the table and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00120"></a>00120 {
+<a name="l00121"></a>00121 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00122"></a>00122 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00123"></a>00123     oStream_ &lt;&lt; <span class="stringliteral">&quot;ReedTable::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00124"></a>00124     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00125"></a>00125   }
+<a name="l00126"></a>00126 <span class="preprocessor">#endif</span>
+<a name="l00127"></a>00127 <span class="preprocessor"></span>
+<a name="l00128"></a>00128   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00129"></a>00129   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00130"></a>00130   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00131"></a>00131   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00132"></a>00132     *oSamples = offset_ + (slope_ * *iSamples);
+<a name="l00133"></a>00133     <span class="keywordflow">if</span> ( *oSamples &gt; 1.0) *oSamples = 1.0;
+<a name="l00134"></a>00134     <span class="keywordflow">if</span> ( *oSamples &lt; -1.0) *oSamples = -1.0;
+<a name="l00135"></a>00135   }
+<a name="l00136"></a>00136 
+<a name="l00137"></a>00137   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00138"></a>00138   <span class="keywordflow">return</span> iFrames;
+<a name="l00139"></a>00139 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -175,7 +224,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Resonate-members.html b/doc/html/classstk_1_1Resonate-members.html
index 462dfb5..3e82f50 100644
--- a/doc/html/classstk_1_1Resonate-members.html
+++ b/doc/html/classstk_1_1Resonate-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Resonate.html#a0008e1fdd7611b769b72b52c8bfb1e6a">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1Resonate.html">stk::Resonate</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Resonate.html#afebf784a302eb0043b4a453b0d1d852c">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1Resonate.html">stk::Resonate</a></td><td><code> [inline]</code></td></tr>
@@ -51,7 +52,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Resonate.html">stk::Resonate</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Resonate.html#aeefb870c1eeb430160fdca374e8324b3">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Resonate.html">stk::Resonate</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Resonate.html#a634ab2db8eabad147fa90fb1bf72a580">~Resonate</a>(void)</td><td><a class="el" href="classstk_1_1Resonate.html">stk::Resonate</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -59,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Resonate.gif b/doc/html/classstk_1_1Resonate.gif
deleted file mode 100644
index ff2e56a..0000000
Binary files a/doc/html/classstk_1_1Resonate.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Resonate.html b/doc/html/classstk_1_1Resonate.html
index d67a9d7..71c1d2b 100644
--- a/doc/html/classstk_1_1Resonate.html
+++ b/doc/html/classstk_1_1Resonate.html
@@ -68,6 +68,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab917279f4f57d5d305481426e9bffd98"></a><!-- doxytag: member="stk::Resonate::tick" ref="ab917279f4f57d5d305481426e9bffd98" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Resonate.html#aeefb870c1eeb430160fdca374e8324b3">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#aeefb870c1eeb430160fdca374e8324b3"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK noise driven formant filter. </p>
@@ -80,7 +82,67 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Zero Radii = 1</li>
 <li><a class="el" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> Gain = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="aeefb870c1eeb430160fdca374e8324b3"></a><!-- doxytag: member="stk::Resonate::tick" ref="aeefb870c1eeb430160fdca374e8324b3" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Resonate::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00099"></a>00099 {
+<a name="l00100"></a>00100   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00101"></a>00101 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00102"></a>00102 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00103"></a>00103     oStream_ &lt;&lt; <span class="stringliteral">&quot;Resonate::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00104"></a>00104     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00105"></a>00105   }
+<a name="l00106"></a>00106 <span class="preprocessor">#endif</span>
+<a name="l00107"></a>00107 <span class="preprocessor"></span>
+<a name="l00108"></a>00108   StkFloat *samples = &amp;frames[channel];
+<a name="l00109"></a>00109   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00110"></a>00110   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00111"></a>00111     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00112"></a>00112       *samples++ = <a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">tick</a>();
+<a name="l00113"></a>00113   }
+<a name="l00114"></a>00114   <span class="keywordflow">else</span> {
+<a name="l00115"></a>00115     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00116"></a>00116       *samples++ = <a class="code" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98" title="Compute and return one output sample.">tick</a>();
+<a name="l00117"></a>00117       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00118"></a>00118         *samples++ = lastFrame_[j];
+<a name="l00119"></a>00119     }
+<a name="l00120"></a>00120   }
+<a name="l00121"></a>00121 
+<a name="l00122"></a>00122   <span class="keywordflow">return</span> frames;
+<a name="l00123"></a>00123 }
+</pre></div></p>
+
+</div>
+</div>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Resonate_8h_source.html">Resonate.h</a></li>
 </ul>
@@ -89,7 +151,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Rhodey-members.html b/doc/html/classstk_1_1Rhodey-members.html
index 3d0a8ea..fadef13 100644
--- a/doc/html/classstk_1_1Rhodey-members.html
+++ b/doc/html/classstk_1_1Rhodey-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#a7235e94a153df135330a591511269f7c">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#afc46280177d770404919f20ccf88e4ff">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
@@ -56,7 +57,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Rhodey.html">stk::Rhodey</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Rhodey.html#a9d843b764e5219c8289884d0903462f9">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Rhodey.html">stk::Rhodey</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#aaba7e8bff02d105e146f8b62b20a27b9">~FM</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Rhodey.html#a6fc6c7473cef051e11a62802848b228c">~Rhodey</a>(void)</td><td><a class="el" href="classstk_1_1Rhodey.html">stk::Rhodey</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
@@ -65,7 +66,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Rhodey.gif b/doc/html/classstk_1_1Rhodey.gif
deleted file mode 100644
index 1c0da01..0000000
Binary files a/doc/html/classstk_1_1Rhodey.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Rhodey.html b/doc/html/classstk_1_1Rhodey.html
index 8fb454b..282516f 100644
--- a/doc/html/classstk_1_1Rhodey.html
+++ b/doc/html/classstk_1_1Rhodey.html
@@ -47,6 +47,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a199591ffb4230c653ec7d7ea52e37790"></a><!-- doxytag: member="stk::Rhodey::tick" ref="a199591ffb4230c653ec7d7ea52e37790" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Rhodey.html#a9d843b764e5219c8289884d0903462f9">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a9d843b764e5219c8289884d0903462f9"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK Fender Rhodes electric piano <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis instrument. </p>
@@ -63,7 +65,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li><a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> 2 &amp; 4 Target = 128</li>
 </ul>
 <p>The basic Chowning/Stanford <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> patent expired in 1995, but there exist follow-on patents, mostly assigned to Yamaha. If you are of the type who should worry about this (making money) worry away.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="ab647310b8bfc12b518b5c3a89db6d94e"></a><!-- doxytag: member="stk::Rhodey::Rhodey" ref="ab647310b8bfc12b518b5c3a89db6d94e" args="(void)" -->
 <div class="memitem">
@@ -84,6 +86,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a9d843b764e5219c8289884d0903462f9"></a><!-- doxytag: member="stk::Rhodey::tick" ref="a9d843b764e5219c8289884d0903462f9" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Rhodey::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">stk::FM</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00100"></a>00100 {
+<a name="l00101"></a>00101   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00104"></a>00104     oStream_ &lt;&lt; <span class="stringliteral">&quot;Rhodey::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00106"></a>00106   }
+<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span>
+<a name="l00109"></a>00109   StkFloat *samples = &amp;frames[channel];
+<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00111"></a>00111   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00112"></a>00112     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00113"></a>00113       *samples++ = <a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">tick</a>();
+<a name="l00114"></a>00114   }
+<a name="l00115"></a>00115   <span class="keywordflow">else</span> {
+<a name="l00116"></a>00116     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00117"></a>00117       *samples++ = <a class="code" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790" title="Compute and return one output sample.">tick</a>();
+<a name="l00118"></a>00118       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00119"></a>00119         *samples++ = lastFrame_[j];
+<a name="l00120"></a>00120     }
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122 
+<a name="l00123"></a>00123   <span class="keywordflow">return</span> frames;
+<a name="l00124"></a>00124 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -94,7 +156,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1RtWvIn-members.html b/doc/html/classstk_1_1RtWvIn-members.html
index 3a19fa4..e3f5fff 100644
--- a/doc/html/classstk_1_1RtWvIn-members.html
+++ b/doc/html/classstk_1_1RtWvIn-members.html
@@ -17,6 +17,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1WvIn.html#a3ab86e33eff9f962c9ef7b41e3ccb77e">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1WvIn.html">stk::WvIn</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1RtWvIn.html#a3a4f4035fc01fee4c2423791f9e9317e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1RtWvIn.html">stk::RtWvIn</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -50,7 +51,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1RtWvIn.gif b/doc/html/classstk_1_1RtWvIn.gif
deleted file mode 100644
index 48ae8c4..0000000
Binary files a/doc/html/classstk_1_1RtWvIn.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1RtWvIn.html b/doc/html/classstk_1_1RtWvIn.html
index 4356056..c732e47 100644
--- a/doc/html/classstk_1_1RtWvIn.html
+++ b/doc/html/classstk_1_1RtWvIn.html
@@ -52,7 +52,7 @@ Inheritance diagram for stk::RtWvIn:</div>
 <p>STK realtime audio (blocking) input class. </p>
 <p>This class provides a simplified interface to <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> for realtime audio input. It is a subclass of <a class="el" href="classstk_1_1WvIn.html" title="STK audio input abstract base class.">WvIn</a>. This class makes use of RtAudio's callback functionality by creating a large ring-buffer from which data is read. This class should not be used when low-latency is desired.</p>
 <p><a class="el" href="classstk_1_1RtWvIn.html" title="STK realtime audio (blocking) input class.">RtWvIn</a> supports multi-channel data in both interleaved and non-interleaved formats. It is important to distinguish the <a class="el" href="classstk_1_1RtWvIn.html#ad2ace75cfe44dd82dd706d2c8dac7901" title="Compute a sample frame and return the specified channel value.">tick()</a> method that computes a single frame (and returns only the specified sample of a multi-channel frame) from the overloaded one that takes an <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object for multi-channel and/or multi-frame data.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="ab84c98c568346d1ad86251961f7d1fba"></a><!-- doxytag: member="stk::RtWvIn::RtWvIn" ref="ab84c98c568346d1ad86251961f7d1fba" args="(unsigned int nChannels=1, StkFloat sampleRate=Stk::sampleRate(), int device=0, int bufferFrames=RT_BUFFER_SIZE, int nBuffers=20)" -->
 <div class="memitem">
@@ -164,6 +164,18 @@ Inheritance diagram for stk::RtWvIn:</div>
 <p>Return the specified channel value of the last computed frame. </p>
 <p>For multi-channel files, use the <a class="el" href="classstk_1_1WvIn.html#a3ab86e33eff9f962c9ef7b41e3ccb77e" title="Return an StkFrames reference to the last computed sample frame.">lastFrame()</a> function to get all values from the last computed frame. If the device is stopped, the returned value is 0.0. The <code>channel</code> argument must be less than the number of channels in the audio stream (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00112"></a>00112 {
+<a name="l00113"></a>00113 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00114"></a>00114 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= data_.channels() ) {
+<a name="l00115"></a>00115     oStream_ &lt;&lt; <span class="stringliteral">&quot;RtWvIn::lastOut(): channel argument and audio stream are incompatible!&quot;</span>;
+<a name="l00116"></a>00116     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00117"></a>00117   }
+<a name="l00118"></a>00118 <span class="preprocessor">#endif</span>
+<a name="l00119"></a>00119 <span class="preprocessor"></span>
+<a name="l00120"></a>00120   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00121"></a>00121 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ad2ace75cfe44dd82dd706d2c8dac7901"></a><!-- doxytag: member="stk::RtWvIn::tick" ref="ad2ace75cfe44dd82dd706d2c8dac7901" args="(unsigned int channel=0)" -->
@@ -220,7 +232,7 @@ Inheritance diagram for stk::RtWvIn:</div>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1RtWvOut-members.html b/doc/html/classstk_1_1RtWvOut-members.html
index 7a07461..6340b18 100644
--- a/doc/html/classstk_1_1RtWvOut-members.html
+++ b/doc/html/classstk_1_1RtWvOut-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -52,7 +53,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1RtWvOut.gif b/doc/html/classstk_1_1RtWvOut.gif
deleted file mode 100644
index 0bcbbbf..0000000
Binary files a/doc/html/classstk_1_1RtWvOut.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1RtWvOut.html b/doc/html/classstk_1_1RtWvOut.html
index 5ef4814..f756619 100644
--- a/doc/html/classstk_1_1RtWvOut.html
+++ b/doc/html/classstk_1_1RtWvOut.html
@@ -50,7 +50,7 @@ Inheritance diagram for stk::RtWvOut:</div>
 <p>STK realtime audio (blocking) output class. </p>
 <p>This class provides a simplified interface to <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> for realtime audio output. It is a subclass of <a class="el" href="classstk_1_1WvOut.html" title="STK audio output abstract base class.">WvOut</a>. This class makes use of RtAudio's callback functionality by creating a large ring-buffer into which data is written. This class should not be used when low-latency is desired.</p>
 <p><a class="el" href="classstk_1_1RtWvOut.html" title="STK realtime audio (blocking) output class.">RtWvOut</a> supports multi-channel data in interleaved format. It is important to distinguish the <a class="el" href="classstk_1_1RtWvOut.html#a02adabdc987f3b9ac4dc4e02ea20962d" title="Output a single sample to all channels in a sample frame.">tick()</a> method that outputs a single sample to all channels in a sample frame from the overloaded one that takes a reference to an <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object for multi-channel and/or multi-frame data.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="af2ee408eb10a0dbf9e14407b34f2181e"></a><!-- doxytag: member="stk::RtWvOut::RtWvOut" ref="af2ee408eb10a0dbf9e14407b34f2181e" args="(unsigned int nChannels=1, StkFloat sampleRate=Stk::sampleRate(), int device=0, int bufferFrames=RT_BUFFER_SIZE, int nBuffers=20)" -->
 <div class="memitem">
@@ -197,7 +197,7 @@ Inheritance diagram for stk::RtWvOut:</div>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Sampler-members.html b/doc/html/classstk_1_1Sampler-members.html
index ff27217..32f7166 100644
--- a/doc/html/classstk_1_1Sampler-members.html
+++ b/doc/html/classstk_1_1Sampler-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Sampler.html#a808aec2bf546b01e1ef53503c5a164e1">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1Sampler.html">stk::Sampler</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Sampler.html#ad277ac455b3434eeb21d628d6c70141a">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1Sampler.html">stk::Sampler</a></td><td></td></tr>
@@ -48,7 +49,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Sampler.html#a08502c96fa3e5f4c853c781354ed1965">tick</a>(unsigned int channel=0)=0</td><td><a class="el" href="classstk_1_1Sampler.html">stk::Sampler</a></td><td><code> [pure virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Sampler.html#a30ef51142f99faf0586e2da78bc6daf6">tick</a>(StkFrames &amp;frames, unsigned int channel=0)=0</td><td><a class="el" href="classstk_1_1Sampler.html">stk::Sampler</a></td><td><code> [pure virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Sampler.html#a9262914e25d4b9fd28a760621902fd74">~Sampler</a>(void)</td><td><a class="el" href="classstk_1_1Sampler.html">stk::Sampler</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -56,7 +57,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Sampler.gif b/doc/html/classstk_1_1Sampler.gif
deleted file mode 100644
index 2010b27..0000000
Binary files a/doc/html/classstk_1_1Sampler.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Sampler.html b/doc/html/classstk_1_1Sampler.html
index 2efa527..26b12d4 100644
--- a/doc/html/classstk_1_1Sampler.html
+++ b/doc/html/classstk_1_1Sampler.html
@@ -60,11 +60,48 @@ virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a08502c96fa3e5f4c853c781354ed1965"></a><!-- doxytag: member="stk::Sampler::tick" ref="a08502c96fa3e5f4c853c781354ed1965" args="(unsigned int channel=0)=0" -->
 virtual StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Sampler.html#a08502c96fa3e5f4c853c781354ed1965">tick</a> (unsigned int channel=0)=0</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">virtual <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Sampler.html#a30ef51142f99faf0586e2da78bc6daf6">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)=0</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a30ef51142f99faf0586e2da78bc6daf6"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK sampling synthesis abstract base class. </p>
 <p>This instrument provides an <a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> envelope, a one-pole filter, and structures for an arbitrary number of attack and looped files.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a30ef51142f99faf0586e2da78bc6daf6"></a><!-- doxytag: member="stk::Sampler::tick" ref="a30ef51142f99faf0586e2da78bc6daf6" args="(StkFrames &amp;frames, unsigned int channel=0)=0" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">virtual <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a>&amp; stk::Sampler::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [pure virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p>Implemented in <a class="el" href="classstk_1_1Moog.html#aee6aa6373c424e941f963b2709310f4e">stk::Moog</a>.</p>
+
+</div>
+</div>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Sampler_8h_source.html">Sampler.h</a></li>
 </ul>
@@ -73,7 +110,7 @@ virtual StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Saxofony-members.html b/doc/html/classstk_1_1Saxofony-members.html
index 8531239..5871149 100644
--- a/doc/html/classstk_1_1Saxofony-members.html
+++ b/doc/html/classstk_1_1Saxofony-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -49,7 +50,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Saxofony.html">stk::Saxofony</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Saxofony.html#a98c686337ea0c2be7683ddc569bb0a1d">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Saxofony.html">stk::Saxofony</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Saxofony.html#a1ff6a35de027e292c8a693aac314720d">~Saxofony</a>(void)</td><td><a class="el" href="classstk_1_1Saxofony.html">stk::Saxofony</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -57,7 +58,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Saxofony.gif b/doc/html/classstk_1_1Saxofony.gif
deleted file mode 100644
index 22ad0e7..0000000
Binary files a/doc/html/classstk_1_1Saxofony.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Saxofony.html b/doc/html/classstk_1_1Saxofony.html
index 5a03dd6..5431e52 100644
--- a/doc/html/classstk_1_1Saxofony.html
+++ b/doc/html/classstk_1_1Saxofony.html
@@ -64,6 +64,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a955d2ea0b3236039851d19b681ca2b0f"></a><!-- doxytag: member="stk::Saxofony::tick" ref="a955d2ea0b3236039851d19b681ca2b0f" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Saxofony.html#a98c686337ea0c2be7683ddc569bb0a1d">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a98c686337ea0c2be7683ddc569bb0a1d"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK faux conical bore reed instrument class. </p>
@@ -79,7 +81,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Vibrato Gain = 1</li>
 <li>Breath Pressure = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a15984d74213308e0d81d1ee32d99ee76"></a><!-- doxytag: member="stk::Saxofony::Saxofony" ref="a15984d74213308e0d81d1ee32d99ee76" args="(StkFloat lowestFrequency)" -->
 <div class="memitem">
@@ -100,6 +102,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor, taking the lowest desired playing frequency. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a98c686337ea0c2be7683ddc569bb0a1d"></a><!-- doxytag: member="stk::Saxofony::tick" ref="a98c686337ea0c2be7683ddc569bb0a1d" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Saxofony::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00138"></a>00138 {
+<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00140"></a>00140 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00141"></a>00141 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00142"></a>00142     oStream_ &lt;&lt; <span class="stringliteral">&quot;Saxofony::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00143"></a>00143     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00144"></a>00144   }
+<a name="l00145"></a>00145 <span class="preprocessor">#endif</span>
+<a name="l00146"></a>00146 <span class="preprocessor"></span>
+<a name="l00147"></a>00147   StkFloat *samples = &amp;frames[channel];
+<a name="l00148"></a>00148   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00149"></a>00149   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00150"></a>00150     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00151"></a>00151       *samples++ = <a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">tick</a>();
+<a name="l00152"></a>00152   }
+<a name="l00153"></a>00153   <span class="keywordflow">else</span> {
+<a name="l00154"></a>00154     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00155"></a>00155       *samples++ = <a class="code" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f" title="Compute and return one output sample.">tick</a>();
+<a name="l00156"></a>00156       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00157"></a>00157         *samples++ = lastFrame_[j];
+<a name="l00158"></a>00158     }
+<a name="l00159"></a>00159   }
+<a name="l00160"></a>00160 
+<a name="l00161"></a>00161   <span class="keywordflow">return</span> frames;
+<a name="l00162"></a>00162 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -110,7 +172,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Shakers-members.html b/doc/html/classstk_1_1Shakers-members.html
index 5ac77a5..6cbc4d1 100644
--- a/doc/html/classstk_1_1Shakers-members.html
+++ b/doc/html/classstk_1_1Shakers-members.html
@@ -18,6 +18,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -45,7 +46,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Shakers.html">stk::Shakers</a></td><td><code> [virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Shakers.html#a655713b658ddeb065d755997cac4b62e">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Shakers.html">stk::Shakers</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Shakers.html#aa1b2ab640268da68b867de1495f19a77">~Shakers</a>(void)</td><td><a class="el" href="classstk_1_1Shakers.html">stk::Shakers</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -53,7 +54,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Shakers.gif b/doc/html/classstk_1_1Shakers.gif
deleted file mode 100644
index cb4d60e..0000000
Binary files a/doc/html/classstk_1_1Shakers.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Shakers.html b/doc/html/classstk_1_1Shakers.html
index ec5f551..c17a5da 100644
--- a/doc/html/classstk_1_1Shakers.html
+++ b/doc/html/classstk_1_1Shakers.html
@@ -49,6 +49,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae06ebba276cef74cb8c83db4e33f21c2"></a><!-- doxytag: member="stk::Shakers::tick" ref="ae06ebba276cef74cb8c83db4e33f21c2" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Shakers.html#a655713b658ddeb065d755997cac4b62e">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a655713b658ddeb065d755997cac4b62e"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>PhISEM and PhOLIES class. </p>
@@ -88,7 +90,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 </ul>
 </li>
 </ul>
-<p>by Perry R. Cook, 1996 - 2010. </p>
+<p>by Perry R. Cook, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a81ffb0ad1e350993af10b2795ec01861"></a><!-- doxytag: member="stk::Shakers::noteOn" ref="a81ffb0ad1e350993af10b2795ec01861" args="(StkFloat instrument, StkFloat amplitude)" -->
 <div class="memitem">
@@ -120,6 +122,65 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a0736ccd253b446660938d51909a32f44">stk::Instrmnt</a>.</p>
 
+</div>
+</div>
+<a class="anchor" id="a655713b658ddeb065d755997cac4b62e"></a><!-- doxytag: member="stk::Shakers::tick" ref="a655713b658ddeb065d755997cac4b62e" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Shakers::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00140"></a>00140 {
+<a name="l00141"></a>00141   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00142"></a>00142 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00143"></a>00143 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00144"></a>00144     oStream_ &lt;&lt; <span class="stringliteral">&quot;Shakers::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00145"></a>00145     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00146"></a>00146   }
+<a name="l00147"></a>00147 <span class="preprocessor">#endif</span>
+<a name="l00148"></a>00148 <span class="preprocessor"></span>
+<a name="l00149"></a>00149   StkFloat *samples = &amp;frames[channel];
+<a name="l00150"></a>00150   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00151"></a>00151   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00152"></a>00152     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00153"></a>00153       *samples++ = <a class="code" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2" title="Compute and return one output sample.">tick</a>();
+<a name="l00154"></a>00154   }
+<a name="l00155"></a>00155   <span class="keywordflow">else</span> {
+<a name="l00156"></a>00156     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00157"></a>00157       *samples++ = <a class="code" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2" title="Compute and return one output sample.">tick</a>();
+<a name="l00158"></a>00158       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00159"></a>00159         *samples++ = lastFrame_[j];
+<a name="l00160"></a>00160     }
+<a name="l00161"></a>00161   }
+<a name="l00162"></a>00162 
+<a name="l00163"></a>00163   <span class="keywordflow">return</span> frames;
+<a name="l00164"></a>00164 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -130,7 +191,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Simple-members.html b/doc/html/classstk_1_1Simple-members.html
index 013df95..067e07c 100644
--- a/doc/html/classstk_1_1Simple-members.html
+++ b/doc/html/classstk_1_1Simple-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Simple.html#a4183bd057f8bf3783c8b1812f3459d32">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1Simple.html">stk::Simple</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Simple.html#a44650c4b65de79d4bf0b04b908c207b2">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1Simple.html">stk::Simple</a></td><td></td></tr>
@@ -48,7 +49,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Simple.html">stk::Simple</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Simple.html#adff17b07913c312e989f1987e4fb5cc8">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Simple.html">stk::Simple</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Simple.html#a7fc1b20b362b5902d8a47ea889144601">~Simple</a>(void)</td><td><a class="el" href="classstk_1_1Simple.html">stk::Simple</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -56,7 +57,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Simple.gif b/doc/html/classstk_1_1Simple.gif
deleted file mode 100644
index f770823..0000000
Binary files a/doc/html/classstk_1_1Simple.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Simple.html b/doc/html/classstk_1_1Simple.html
index edda98e..bd53d86 100644
--- a/doc/html/classstk_1_1Simple.html
+++ b/doc/html/classstk_1_1Simple.html
@@ -61,6 +61,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa65326847f8b693f7b5549d18df6e882"></a><!-- doxytag: member="stk::Simple::tick" ref="aa65326847f8b693f7b5549d18df6e882" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Simple.html#adff17b07913c312e989f1987e4fb5cc8">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#adff17b07913c312e989f1987e4fb5cc8"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK wavetable/noise instrument. </p>
@@ -72,7 +74,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li><a class="el" href="classstk_1_1Envelope.html" title="STK linear line envelope class.">Envelope</a> Rate = 11</li>
 <li>Gain = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a7fae7f883b6180e7d07c9e06b62e1283"></a><!-- doxytag: member="stk::Simple::Simple" ref="a7fae7f883b6180e7d07c9e06b62e1283" args="(void)" -->
 <div class="memitem">
@@ -93,6 +95,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="adff17b07913c312e989f1987e4fb5cc8"></a><!-- doxytag: member="stk::Simple::tick" ref="adff17b07913c312e989f1987e4fb5cc8" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Simple::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00101"></a>00101 {
+<a name="l00102"></a>00102   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00103"></a>00103 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00104"></a>00104 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00105"></a>00105     oStream_ &lt;&lt; <span class="stringliteral">&quot;Simple::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00106"></a>00106     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00107"></a>00107   }
+<a name="l00108"></a>00108 <span class="preprocessor">#endif</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span>
+<a name="l00110"></a>00110   StkFloat *samples = &amp;frames[channel];
+<a name="l00111"></a>00111   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00112"></a>00112   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00113"></a>00113     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00114"></a>00114       *samples++ = <a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">tick</a>();
+<a name="l00115"></a>00115   }
+<a name="l00116"></a>00116   <span class="keywordflow">else</span> {
+<a name="l00117"></a>00117     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00118"></a>00118       *samples++ = <a class="code" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882" title="Compute and return one output sample.">tick</a>();
+<a name="l00119"></a>00119       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00120"></a>00120         *samples++ = lastFrame_[j];
+<a name="l00121"></a>00121     }
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124   <span class="keywordflow">return</span> frames;
+<a name="l00125"></a>00125 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -103,7 +165,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1SineWave-members.html b/doc/html/classstk_1_1SineWave-members.html
index e5dbada..48587b0 100644
--- a/doc/html/classstk_1_1SineWave-members.html
+++ b/doc/html/classstk_1_1SineWave-members.html
@@ -21,6 +21,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1SineWave.html#ab788e787e5bb54445dd0769283567224">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1SineWave.html">stk::SineWave</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -54,7 +55,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1SineWave.gif b/doc/html/classstk_1_1SineWave.gif
deleted file mode 100644
index 52e5de4..0000000
Binary files a/doc/html/classstk_1_1SineWave.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1SineWave.html b/doc/html/classstk_1_1SineWave.html
index 4403b80..bef7475 100644
--- a/doc/html/classstk_1_1SineWave.html
+++ b/doc/html/classstk_1_1SineWave.html
@@ -65,7 +65,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>STK sinusoid oscillator class. </p>
 <p>This class computes and saves a static sine "table" that can be shared by multiple instances. It has an interface similar to the WaveLoop class but inherits from the <a class="el" href="classstk_1_1Generator.html" title="STK abstract unit generator parent class.">Generator</a> class. Output values are computed using linear interpolation.</p>
 <p>The "table" length, set in <a class="el" href="SineWave_8h_source.html">SineWave.h</a>, is 2048 samples by default.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2007. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="ae69b232dd3a33963d25cf6215692d9d5"></a><!-- doxytag: member="stk::SineWave::setRate" ref="ae69b232dd3a33963d25cf6215692d9d5" args="(StkFloat rate)" -->
 <div class="memitem">
@@ -86,6 +86,9 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Set the data read rate in samples. The rate can be negative. </p>
 <p>If the rate value is negative, the data is read in reverse order. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00041"></a>00041 { rate_ = rate; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a1047a43714bc2e40c7e31e8f7e34adbc"></a><!-- doxytag: member="stk::SineWave::setFrequency" ref="a1047a43714bc2e40c7e31e8f7e34adbc" args="(StkFloat frequency)" -->
@@ -181,6 +184,42 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00121"></a>00121 {
+<a name="l00122"></a>00122 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00123"></a>00123 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00124"></a>00124     oStream_ &lt;&lt; <span class="stringliteral">&quot;SineWave::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00125"></a>00125     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00126"></a>00126   }
+<a name="l00127"></a>00127 <span class="preprocessor">#endif</span>
+<a name="l00128"></a>00128 <span class="preprocessor"></span>
+<a name="l00129"></a>00129   StkFloat *samples = &amp;frames[channel];
+<a name="l00130"></a>00130   StkFloat tmp = 0.0;
+<a name="l00131"></a>00131 
+<a name="l00132"></a>00132   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00133"></a>00133   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00134"></a>00134 
+<a name="l00135"></a>00135     <span class="comment">// Check limits of time address ... if necessary, recalculate modulo</span>
+<a name="l00136"></a>00136     <span class="comment">// TABLE_SIZE.</span>
+<a name="l00137"></a>00137     <span class="keywordflow">while</span> ( time_ &lt; 0.0 )
+<a name="l00138"></a>00138       time_ += TABLE_SIZE;
+<a name="l00139"></a>00139     <span class="keywordflow">while</span> ( time_ &gt;= TABLE_SIZE )
+<a name="l00140"></a>00140       time_ -= TABLE_SIZE;
+<a name="l00141"></a>00141 
+<a name="l00142"></a>00142     iIndex_ = (<span class="keywordtype">unsigned</span> int) time_;
+<a name="l00143"></a>00143     alpha_ = time_ - iIndex_;
+<a name="l00144"></a>00144     tmp = table_[ iIndex_ ];
+<a name="l00145"></a>00145     tmp += ( alpha_ * ( table_[ iIndex_ + 1 ] - tmp ) );
+<a name="l00146"></a>00146     *samples = tmp;
+<a name="l00147"></a>00147 
+<a name="l00148"></a>00148     <span class="comment">// Increment time, which can be negative.</span>
+<a name="l00149"></a>00149     time_ += rate_;
+<a name="l00150"></a>00150   }
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152   lastFrame_[0] = tmp;
+<a name="l00153"></a>00153   <span class="keywordflow">return</span> frames;
+<a name="l00154"></a>00154 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -191,7 +230,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1SingWave-members.html b/doc/html/classstk_1_1SingWave-members.html
index 131eaaa..52b1be1 100644
--- a/doc/html/classstk_1_1SingWave-members.html
+++ b/doc/html/classstk_1_1SingWave-members.html
@@ -18,6 +18,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Generator.html">stk::Generator</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1SingWave.html#af1c5286c4a58904241d7b73ff29d4be0">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1SingWave.html">stk::SingWave</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1SingWave.html#aed07d9ebe8289abe232eb1337d0708db">normalize</a>(void)</td><td><a class="el" href="classstk_1_1SingWave.html">stk::SingWave</a></td><td><code> [inline]</code></td></tr>
@@ -61,7 +62,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1SingWave.gif b/doc/html/classstk_1_1SingWave.gif
deleted file mode 100644
index 192ad13..0000000
Binary files a/doc/html/classstk_1_1SingWave.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1SingWave.html b/doc/html/classstk_1_1SingWave.html
index 5136eed..c3e1018 100644
--- a/doc/html/classstk_1_1SingWave.html
+++ b/doc/html/classstk_1_1SingWave.html
@@ -85,7 +85,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK "singing" looped soundfile class. </p>
 <p>This class loops a specified soundfile and modulates it both periodically and randomly to produce a pitched musical sound, like a simple voice or violin. In general, it is not be used alone because of "munchkinification" effects from pitch shifting. Within STK, it is used as an excitation source for other instruments.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a7a38283d4e42d5f9b96d3ce8c401183a"></a><!-- doxytag: member="stk::SingWave::SingWave" ref="a7a38283d4e42d5f9b96d3ce8c401183a" args="(std::string fileName, bool raw=false)" -->
 <div class="memitem">
@@ -148,6 +148,23 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00118"></a>00118 {
+<a name="l00119"></a>00119 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00120"></a>00120 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00121"></a>00121     oStream_ &lt;&lt; <span class="stringliteral">&quot;SingWave::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00122"></a>00122     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00123"></a>00123   }
+<a name="l00124"></a>00124 <span class="preprocessor">#endif</span>
+<a name="l00125"></a>00125 <span class="preprocessor"></span>
+<a name="l00126"></a>00126   StkFloat *samples = &amp;frames[channel];
+<a name="l00127"></a>00127   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00128"></a>00128   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00129"></a>00129     *samples = <a class="code" href="classstk_1_1SingWave.html#a45136f9bf5b6f58433d4d65864d9db78" title="Compute and return one output sample.">SingWave::tick</a>();
+<a name="l00130"></a>00130 
+<a name="l00131"></a>00131   <span class="keywordflow">return</span> frames;
+<a name="l00132"></a>00132 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -158,7 +175,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Sitar-members.html b/doc/html/classstk_1_1Sitar-members.html
index f6c69d0..6a8f91a 100644
--- a/doc/html/classstk_1_1Sitar-members.html
+++ b/doc/html/classstk_1_1Sitar-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -34,7 +35,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">showWarnings</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Sitar.html#aa645039b4c1609f979775f5ec7e8bd4b">Sitar</a>(StkFloat lowestFrequency=20)</td><td><a class="el" href="classstk_1_1Sitar.html">stk::Sitar</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Sitar.html#a8a2c996ad8b32f98f2bca14aa742bc29">Sitar</a>(StkFloat lowestFrequency=8.0)</td><td><a class="el" href="classstk_1_1Sitar.html">stk::Sitar</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad75619ab92a0c19b5a52cb68884511e3">sleep</a>(unsigned long milliseconds)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a9bff83b5a318ff171f94a218ad52226b">Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a079e62be7093d593498e9d2ba4ac20fa">STK_FLOAT32</a></td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
@@ -47,7 +48,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Sitar.html">stk::Sitar</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Sitar.html#a755cc36fe9cde1942184af0b1ae88f7a">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Sitar.html">stk::Sitar</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Sitar.html#a4bb1d8cd5c1ffc331e6c97e28f6f3000">~Sitar</a>(void)</td><td><a class="el" href="classstk_1_1Sitar.html">stk::Sitar</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -55,7 +56,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Sitar.gif b/doc/html/classstk_1_1Sitar.gif
deleted file mode 100644
index 5c83399..0000000
Binary files a/doc/html/classstk_1_1Sitar.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Sitar.html b/doc/html/classstk_1_1Sitar.html
index 0568a3c..c9fc2a2 100644
--- a/doc/html/classstk_1_1Sitar.html
+++ b/doc/html/classstk_1_1Sitar.html
@@ -32,8 +32,8 @@ Inheritance diagram for stk::Sitar:</div>
 <p><a href="classstk_1_1Sitar-members.html">List of all members.</a></p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="aa645039b4c1609f979775f5ec7e8bd4b"></a><!-- doxytag: member="stk::Sitar::Sitar" ref="aa645039b4c1609f979775f5ec7e8bd4b" args="(StkFloat lowestFrequency=20)" -->
-&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Sitar.html#aa645039b4c1609f979775f5ec7e8bd4b">Sitar</a> (StkFloat lowestFrequency=20)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a8a2c996ad8b32f98f2bca14aa742bc29"></a><!-- doxytag: member="stk::Sitar::Sitar" ref="a8a2c996ad8b32f98f2bca14aa742bc29" args="(StkFloat lowestFrequency=8.0)" -->
+&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Sitar.html#a8a2c996ad8b32f98f2bca14aa742bc29">Sitar</a> (StkFloat lowestFrequency=8.0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the lowest desired playing frequency. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a4bb1d8cd5c1ffc331e6c97e28f6f3000"></a><!-- doxytag: member="stk::Sitar::~Sitar" ref="a4bb1d8cd5c1ffc331e6c97e28f6f3000" args="(void)" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Sitar.html#a4bb1d8cd5c1ffc331e6c97e28f6f3000">~Sitar</a> (void)</td></tr>
@@ -56,12 +56,74 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a811c8d08d78cfbd5061396af7027043e"></a><!-- doxytag: member="stk::Sitar::tick" ref="a811c8d08d78cfbd5061396af7027043e" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Sitar.html#a755cc36fe9cde1942184af0b1ae88f7a">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a755cc36fe9cde1942184af0b1ae88f7a"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK sitar string model class. </p>
 <p>This class implements a sitar plucked string physical model based on the Karplus-Strong algorithm.</p>
 <p>This is a digital waveguide model, making its use possibly subject to patents held by Stanford University, Yamaha, and others. There exist at least two patents, assigned to Stanford, bearing the names of Karplus and/or Strong.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a755cc36fe9cde1942184af0b1ae88f7a"></a><!-- doxytag: member="stk::Sitar::tick" ref="a755cc36fe9cde1942184af0b1ae88f7a" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Sitar::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00100"></a>00100 {
+<a name="l00101"></a>00101   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00104"></a>00104     oStream_ &lt;&lt; <span class="stringliteral">&quot;Sitar::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00106"></a>00106   }
+<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span>
+<a name="l00109"></a>00109   StkFloat *samples = &amp;frames[channel];
+<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00111"></a>00111   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00112"></a>00112     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00113"></a>00113       *samples++ = <a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">tick</a>();
+<a name="l00114"></a>00114   }
+<a name="l00115"></a>00115   <span class="keywordflow">else</span> {
+<a name="l00116"></a>00116     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00117"></a>00117       *samples++ = <a class="code" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e" title="Compute and return one output sample.">tick</a>();
+<a name="l00118"></a>00118       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00119"></a>00119         *samples++ = lastFrame_[j];
+<a name="l00120"></a>00120     }
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122 
+<a name="l00123"></a>00123   <span class="keywordflow">return</span> frames;
+<a name="l00124"></a>00124 }
+</pre></div></p>
+
+</div>
+</div>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Sitar_8h_source.html">Sitar.h</a></li>
 </ul>
@@ -70,7 +132,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Skini-members.html b/doc/html/classstk_1_1Skini-members.html
index f44a99f..5f53e8a 100644
--- a/doc/html/classstk_1_1Skini-members.html
+++ b/doc/html/classstk_1_1Skini-members.html
@@ -16,6 +16,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Skini.html#a675f2a9841c4b84e161de651eed4412d">nextMessage</a>(Skini::Message &amp;message)</td><td><a class="el" href="classstk_1_1Skini.html">stk::Skini</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Skini.html#ad3e29f6ca88052e95698137ec2e545ad">parseString</a>(std::string &amp;line, Skini::Message &amp;message)</td><td><a class="el" href="classstk_1_1Skini.html">stk::Skini</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -48,7 +49,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Skini.gif b/doc/html/classstk_1_1Skini.gif
deleted file mode 100644
index 2baaae2..0000000
Binary files a/doc/html/classstk_1_1Skini.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Skini.html b/doc/html/classstk_1_1Skini.html
index a9bd669..52b912f 100644
--- a/doc/html/classstk_1_1Skini.html
+++ b/doc/html/classstk_1_1Skini.html
@@ -60,7 +60,7 @@ static std::string&nbsp;</td><td class="memItemRight" valign="bottom"><a class="
 <p>SKINI (Synthesis toolKit Instrument Network Interface) is like MIDI, but allows for floating-point control changes, note numbers, etc. The following example causes a sharp middle C to be played with a velocity of 111.132:</p>
 <div class="fragment"><pre class="fragment">    noteOn  60.01  111.132
 </pre></div><dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="skini.html">Synthesis toolKit Instrument Network Interface (SKINI)</a></dd></dl>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a30eb5f5238c552d042b8eb510aa8d241"></a><!-- doxytag: member="stk::Skini::setFile" ref="a30eb5f5238c552d042b8eb510aa8d241" args="(std::string fileName)" -->
 <div class="memitem">
@@ -142,7 +142,7 @@ static std::string&nbsp;</td><td class="memItemRight" valign="bottom"><a class="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Socket-members.html b/doc/html/classstk_1_1Socket-members.html
index c9973a7..a24894c 100644
--- a/doc/html/classstk_1_1Socket-members.html
+++ b/doc/html/classstk_1_1Socket-members.html
@@ -18,6 +18,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#aeae0c6721248eecd5dae0b77ea66cb2c">id</a>(void) const </td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#a61375099d0d0811bf79c894587cc3724">isValid</a>(int socket)</td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#abe3040ecfff6ce921284c6ab4b0500a7">port</a>(void) const </td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -52,7 +53,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Socket.gif b/doc/html/classstk_1_1Socket.gif
deleted file mode 100644
index 1eecd42..0000000
Binary files a/doc/html/classstk_1_1Socket.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Socket.html b/doc/html/classstk_1_1Socket.html
index 90541fd..8a56805 100644
--- a/doc/html/classstk_1_1Socket.html
+++ b/doc/html/classstk_1_1Socket.html
@@ -72,7 +72,7 @@ static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK internet socket abstract base class. </p>
 <p>This class provides common functionality for TCP and UDP internet socket server and client subclasses. This class also provides a number of static functions for use with external socket descriptors.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Socket_8h_source.html">Socket.h</a></li>
 </ul>
@@ -81,7 +81,7 @@ static int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Sphere-members.html b/doc/html/classstk_1_1Sphere-members.html
index 21c9dee..ed24bcf 100644
--- a/doc/html/classstk_1_1Sphere-members.html
+++ b/doc/html/classstk_1_1Sphere-members.html
@@ -22,6 +22,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Sphere.html#a00bf47b0d5cd06a858d08f37d220ef9f">isInside</a>(Vector3D *position)</td><td><a class="el" href="classstk_1_1Sphere.html">stk::Sphere</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -54,7 +55,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Sphere.gif b/doc/html/classstk_1_1Sphere.gif
deleted file mode 100644
index 8c2d544..0000000
Binary files a/doc/html/classstk_1_1Sphere.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Sphere.html b/doc/html/classstk_1_1Sphere.html
index 14c89aa..d64ea5e 100644
--- a/doc/html/classstk_1_1Sphere.html
+++ b/doc/html/classstk_1_1Sphere.html
@@ -74,7 +74,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK sphere class. </p>
 <p>This class implements a spherical ball with radius, mass, position, and velocity parameters.</p>
-<p>by Perry R. Cook, 1995 - 2010. </p>
+<p>by Perry R. Cook, 1995-2011. </p>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Sphere_8h_source.html">Sphere.h</a></li>
 </ul>
@@ -83,7 +83,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1StifKarp-members.html b/doc/html/classstk_1_1StifKarp-members.html
index 55ebb7a..41322b2 100644
--- a/doc/html/classstk_1_1StifKarp-members.html
+++ b/doc/html/classstk_1_1StifKarp-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -38,7 +39,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1StifKarp.html#a21a9b7407c9d6a0b2ba34c0e41bb0b57">setStretch</a>(StkFloat stretch)</td><td><a class="el" href="classstk_1_1StifKarp.html">stk::StifKarp</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">showWarnings</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad75619ab92a0c19b5a52cb68884511e3">sleep</a>(unsigned long milliseconds)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1StifKarp.html#a946fb588b5b18b12ea2dca221150da66">StifKarp</a>(StkFloat lowestFrequency)</td><td><a class="el" href="classstk_1_1StifKarp.html">stk::StifKarp</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1StifKarp.html#a2ac1b3641559e787cf78a017797e9a70">StifKarp</a>(StkFloat lowestFrequency=8.0)</td><td><a class="el" href="classstk_1_1StifKarp.html">stk::StifKarp</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a9bff83b5a318ff171f94a218ad52226b">Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a079e62be7093d593498e9d2ba4ac20fa">STK_FLOAT32</a></td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a57b00150ae559b6f099be117b2e53af4">STK_FLOAT64</a></td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
@@ -50,7 +51,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1StifKarp.html">stk::StifKarp</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1StifKarp.html#a7d4afff257faa7ad9ef630f1db1ed93f">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1StifKarp.html">stk::StifKarp</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1StifKarp.html#a37bc5b0bb4fe385eda862622f675bee1">~StifKarp</a>(void)</td><td><a class="el" href="classstk_1_1StifKarp.html">stk::StifKarp</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
 </table></div>
@@ -58,7 +59,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1StifKarp.gif b/doc/html/classstk_1_1StifKarp.gif
deleted file mode 100644
index f5ff8a4..0000000
Binary files a/doc/html/classstk_1_1StifKarp.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1StifKarp.html b/doc/html/classstk_1_1StifKarp.html
index d5d21ef..d13a6b3 100644
--- a/doc/html/classstk_1_1StifKarp.html
+++ b/doc/html/classstk_1_1StifKarp.html
@@ -32,8 +32,8 @@ Inheritance diagram for stk::StifKarp:</div>
 <p><a href="classstk_1_1StifKarp-members.html">List of all members.</a></p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a946fb588b5b18b12ea2dca221150da66"></a><!-- doxytag: member="stk::StifKarp::StifKarp" ref="a946fb588b5b18b12ea2dca221150da66" args="(StkFloat lowestFrequency)" -->
-&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1StifKarp.html#a946fb588b5b18b12ea2dca221150da66">StifKarp</a> (StkFloat lowestFrequency)</td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2ac1b3641559e787cf78a017797e9a70"></a><!-- doxytag: member="stk::StifKarp::StifKarp" ref="a2ac1b3641559e787cf78a017797e9a70" args="(StkFloat lowestFrequency=8.0)" -->
+&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1StifKarp.html#a2ac1b3641559e787cf78a017797e9a70">StifKarp</a> (StkFloat lowestFrequency=8.0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the lowest desired playing frequency. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a37bc5b0bb4fe385eda862622f675bee1"></a><!-- doxytag: member="stk::StifKarp::~StifKarp" ref="a37bc5b0bb4fe385eda862622f675bee1" args="(void)" -->
 &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1StifKarp.html#a37bc5b0bb4fe385eda862622f675bee1">~StifKarp</a> (void)</td></tr>
@@ -67,6 +67,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a5cd896c59ee01fa8e21346ebe54365fc"></a><!-- doxytag: member="stk::StifKarp::tick" ref="a5cd896c59ee01fa8e21346ebe54365fc" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1StifKarp.html#a7d4afff257faa7ad9ef630f1db1ed93f">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a7d4afff257faa7ad9ef630f1db1ed93f"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK plucked stiff string instrument. </p>
@@ -78,7 +80,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>String Sustain = 11</li>
 <li>String Stretch = 1</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="ad1b5de5acf487271d99903cd43e891ce"></a><!-- doxytag: member="stk::StifKarp::setBaseLoopGain" ref="ad1b5de5acf487271d99903cd43e891ce" args="(StkFloat aGain)" -->
 <div class="memitem">
@@ -99,6 +101,65 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Set the base loop gain. </p>
 <p>The actual loop gain is set according to the frequency. Because of high-frequency loop filter roll-off, higher frequency settings have greater loop gains. </p>
 
+</div>
+</div>
+<a class="anchor" id="a7d4afff257faa7ad9ef630f1db1ed93f"></a><!-- doxytag: member="stk::StifKarp::tick" ref="a7d4afff257faa7ad9ef630f1db1ed93f" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::StifKarp::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00126"></a>00126 {
+<a name="l00127"></a>00127   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00128"></a>00128 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00129"></a>00129 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00130"></a>00130     oStream_ &lt;&lt; <span class="stringliteral">&quot;StifKarp::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00131"></a>00131     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00132"></a>00132   }
+<a name="l00133"></a>00133 <span class="preprocessor">#endif</span>
+<a name="l00134"></a>00134 <span class="preprocessor"></span>
+<a name="l00135"></a>00135   StkFloat *samples = &amp;frames[channel];
+<a name="l00136"></a>00136   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00137"></a>00137   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00138"></a>00138     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00139"></a>00139       *samples++ = <a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">tick</a>();
+<a name="l00140"></a>00140   }
+<a name="l00141"></a>00141   <span class="keywordflow">else</span> {
+<a name="l00142"></a>00142     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00143"></a>00143       *samples++ = <a class="code" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc" title="Compute and return one output sample.">tick</a>();
+<a name="l00144"></a>00144       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00145"></a>00145         *samples++ = lastFrame_[j];
+<a name="l00146"></a>00146     }
+<a name="l00147"></a>00147   }
+<a name="l00148"></a>00148 
+<a name="l00149"></a>00149   <span class="keywordflow">return</span> frames;
+<a name="l00150"></a>00150 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -109,7 +170,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Stk-members.html b/doc/html/classstk_1_1Stk-members.html
index 736ebc2..189c679 100644
--- a/doc/html/classstk_1_1Stk-members.html
+++ b/doc/html/classstk_1_1Stk-members.html
@@ -16,6 +16,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -41,7 +42,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Stk.gif b/doc/html/classstk_1_1Stk.gif
deleted file mode 100644
index 98bf88f..0000000
Binary files a/doc/html/classstk_1_1Stk.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Stk.html b/doc/html/classstk_1_1Stk.html
index 8309c90..9f77e86 100644
--- a/doc/html/classstk_1_1Stk.html
+++ b/doc/html/classstk_1_1Stk.html
@@ -38,10 +38,11 @@ Inheritance diagram for stk::Stk:</div>
 <area href="classstk_1_1Socket.html" alt="stk::Socket" shape="rect" coords="101,728,192,752"/>
 <area href="classstk_1_1Sphere.html" alt="stk::Sphere" shape="rect" coords="101,784,192,808"/>
 <area href="classstk_1_1Thread.html" alt="stk::Thread" shape="rect" coords="101,840,192,864"/>
-<area href="classstk_1_1Vector3D.html" alt="stk::Vector3D" shape="rect" coords="101,896,192,920"/>
-<area href="classstk_1_1Voicer.html" alt="stk::Voicer" shape="rect" coords="101,952,192,976"/>
-<area href="classstk_1_1WvIn.html" alt="stk::WvIn" shape="rect" coords="101,1008,192,1032"/>
-<area href="classstk_1_1WvOut.html" alt="stk::WvOut" shape="rect" coords="101,1064,192,1088"/>
+<area href="classstk_1_1Twang.html" alt="stk::Twang" shape="rect" coords="101,896,192,920"/>
+<area href="classstk_1_1Vector3D.html" alt="stk::Vector3D" shape="rect" coords="101,952,192,976"/>
+<area href="classstk_1_1Voicer.html" alt="stk::Voicer" shape="rect" coords="101,1008,192,1032"/>
+<area href="classstk_1_1WvIn.html" alt="stk::WvIn" shape="rect" coords="101,1064,192,1088"/>
+<area href="classstk_1_1WvOut.html" alt="stk::WvOut" shape="rect" coords="101,1120,192,1144"/>
 </map>
  </div>
 </div>
@@ -75,6 +76,9 @@ static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hre
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ad75619ab92a0c19b5a52cb68884511e3"></a><!-- doxytag: member="stk::Stk::sleep" ref="ad75619ab92a0c19b5a52cb68884511e3" args="(unsigned long milliseconds)" -->
 static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Stk.html#ad75619ab92a0c19b5a52cb68884511e3">sleep</a> (unsigned long milliseconds)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Static cross-platform method to sleep for a number of milliseconds. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7dd617f6bf20e55d3ab97b86d8200b2e"></a><!-- doxytag: member="stk::Stk::inRange" ref="a7dd617f6bf20e55d3ab97b86d8200b2e" args="(StkFloat value, StkFloat min, StkFloat max)" -->
+static bool&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a> (StkFloat value, StkFloat min, StkFloat max)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Static method to check whether a value is within a specified range. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a48ac73a0d8ca28445ba1a054e1f061ff"></a><!-- doxytag: member="stk::Stk::handleError" ref="a48ac73a0d8ca28445ba1a054e1f061ff" args="(const char *message, StkError::Type type)" -->
 static void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a> (const char *message, StkError::Type type)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Static function for error reporting and handling using c-strings. <br/></td></tr>
@@ -112,14 +116,14 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Remove class pointer from list for sample rate change notification. <br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a577656590baea0d65057b221f050f83d"></a><!-- doxytag: member="stk::Stk::handleError" ref="a577656590baea0d65057b221f050f83d" args="(StkError::Type type)" -->
 void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a> (StkError::Type type)</td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Internal function for error reporting that assumes message in <code>errorString_</code> variable. <br/></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Internal function for error reporting that assumes message in <code>oStream_</code> variable. <br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK base class. </p>
 <p>Nearly all STK classes inherit from this class. The global sample rate and rawwave path variables can be queried and modified via <a class="el" href="classstk_1_1Stk.html" title="STK base class.">Stk</a>. In addition, this class provides error handling and byte-swapping functions.</p>
 <p>The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language. STK was designed to facilitate rapid development of music synthesis and audio processing software, with an emphasis on cross-platform functionality, realtime control, ease of use, and educational example code. STK currently runs with realtime support (audio and MIDI) on Linux, Macintosh OS X, and Windows computer platforms. Generic, non-realtime support has been tested under NeXTStep, Sun, and other platforms and should work with any standard C++ compiler.</p>
 <p>STK WWW site: <a href="http://ccrma.stanford.edu/software/stk/">http://ccrma.stanford.edu/software/stk/</a></p>
-<p>The Synthesis ToolKit in C++ (STK) Copyright (c) 1995-2010 Perry R. Cook and Gary P. Scavone</p>
+<p>The Synthesis ToolKit in C++ (STK) Copyright (c) 1995-2011 Perry R. Cook and Gary P. Scavone</p>
 <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
 <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
 <p>Any person wishing to distribute modifications to the Software is asked to send the modifications to the original developer so that they can be incorporated into the canonical version. This is, however, not a binding provision of this license.</p>
@@ -167,6 +171,9 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <p>Reimplemented in <a class="el" href="classstk_1_1BiQuad.html#aab468cd1aa79b95442b15bb04d8bb211">stk::BiQuad</a>, <a class="el" href="classstk_1_1FormSwep.html#a91096ebd684df25fc36a759f642b2200">stk::FormSwep</a>, <a class="el" href="classstk_1_1TwoPole.html#ad0a3ac1b5d4e651a7ff1efb1d5362c0b">stk::TwoPole</a>, and <a class="el" href="classstk_1_1TwoZero.html#aa1a1568aae3cd3d53011b3fc344cb086">stk::TwoZero</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00172"></a>00172 { ignoreSampleRateChange_ = ignore; };
+</pre></div></p>
+
 </div>
 </div>
 <hr/><h2>Member Data Documentation</h2>
@@ -208,7 +215,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
       </table>
 </div>
 <div class="memdoc">
-<p>Upper 3 bytes of 32-bit signed integer. </p>
+<p>Lower 3 bytes of 32-bit signed integer. </p>
 
 </div>
 </div>
@@ -262,7 +269,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Stk.png b/doc/html/classstk_1_1Stk.png
index 6897e0a..ff8a7e7 100644
Binary files a/doc/html/classstk_1_1Stk.png and b/doc/html/classstk_1_1Stk.png differ
diff --git a/doc/html/classstk_1_1StkError-members.html b/doc/html/classstk_1_1StkError-members.html
index 85d2032..1b08c61 100644
--- a/doc/html/classstk_1_1StkError-members.html
+++ b/doc/html/classstk_1_1StkError-members.html
@@ -22,7 +22,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1StkError.html b/doc/html/classstk_1_1StkError.html
index f2d476d..d079da7 100644
--- a/doc/html/classstk_1_1StkError.html
+++ b/doc/html/classstk_1_1StkError.html
@@ -51,7 +51,7 @@ virtual const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1StkFrames-members.html b/doc/html/classstk_1_1StkFrames-members.html
index 3e0d6fd..cc5a23d 100644
--- a/doc/html/classstk_1_1StkFrames-members.html
+++ b/doc/html/classstk_1_1StkFrames-members.html
@@ -34,7 +34,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1StkFrames.html b/doc/html/classstk_1_1StkFrames.html
index c0e155e..313ab3b 100644
--- a/doc/html/classstk_1_1StkFrames.html
+++ b/doc/html/classstk_1_1StkFrames.html
@@ -70,8 +70,9 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>This class can hold single- or multi-channel audio data. The data type is always StkFloat and the channel format is always interleaved. In an effort to maintain efficiency, no out-of-bounds checks are performed in this class unless _STK_DEBUG_ is defined.</p>
 <p>Internally, the data is stored in a one-dimensional C array. An indexing operator is available to set and retrieve data values. Alternately, one can use pointers to access the data, using the index operator to get an address for a particular location in the data:</p>
 <p>StkFloat* ptr = &amp;myStkFrames[0];</p>
+<p>Note that this class can also be used as a table with interpolating lookup.</p>
 <p>Possible future improvements in this class could include functions to convert to and return other data types.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a8ed9cc0a4309f786cfe36da9e901fde9"></a><!-- doxytag: member="stk::StkFrames::operator[]" ref="a8ed9cc0a4309f786cfe36da9e901fde9" args="(size_t n)" -->
 <div class="memitem">
@@ -92,6 +93,19 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>Subscript operator that returns a reference to element <code>n</code> of self. </p>
 <p>The result can be used as an lvalue. This reference is valid until the resize function is called or the array is destroyed. The index <code>n</code> must be between 0 and size less one. No range checking is performed unless _STK_DEBUG_ is defined. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00413"></a>00413 {
+<a name="l00414"></a>00414 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00415"></a>00415 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( n &gt;= size_ ) {
+<a name="l00416"></a>00416     std::ostringstream error;
+<a name="l00417"></a>00417     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator[]: invalid index (&quot;</span> &lt;&lt; n &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
+<a name="l00418"></a>00418     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00419"></a>00419   }
+<a name="l00420"></a>00420 <span class="preprocessor">#endif</span>
+<a name="l00421"></a>00421 <span class="preprocessor"></span>
+<a name="l00422"></a>00422   <span class="keywordflow">return</span> data_[n];
+<a name="l00423"></a>00423 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a2d1c8a2b32725ca72e0f3256f9cd8cb6"></a><!-- doxytag: member="stk::StkFrames::operator[]" ref="a2d1c8a2b32725ca72e0f3256f9cd8cb6" args="(size_t n) const " -->
@@ -113,6 +127,19 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>Subscript operator that returns the value at element <code>n</code> of self. </p>
 <p>The index <code>n</code> must be between 0 and size less one. No range checking is performed unless _STK_DEBUG_ is defined. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00426"></a>00426 {
+<a name="l00427"></a>00427 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00428"></a>00428 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( n &gt;= size_ ) {
+<a name="l00429"></a>00429     std::ostringstream error;
+<a name="l00430"></a>00430     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator[]: invalid index (&quot;</span> &lt;&lt; n &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
+<a name="l00431"></a>00431     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00432"></a>00432   }
+<a name="l00433"></a>00433 <span class="preprocessor">#endif</span>
+<a name="l00434"></a>00434 <span class="preprocessor"></span>
+<a name="l00435"></a>00435   <span class="keywordflow">return</span> data_[n];
+<a name="l00436"></a>00436 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a0f6a81d36a8905d782b283b9a05893e6"></a><!-- doxytag: member="stk::StkFrames::operator+=" ref="a0f6a81d36a8905d782b283b9a05893e6" args="(StkFrames &amp;f)" -->
@@ -134,6 +161,22 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>Assignment by sum operator into self. </p>
 <p>The dimensions of the argument are expected to be the same as self. No range checking is performed unless _STK_DEBUG_ is defined. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00465"></a>00465 {
+<a name="l00466"></a>00466 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00467"></a>00467 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( f.frames() != nFrames_ || f.channels() != nChannels_ ) {
+<a name="l00468"></a>00468     std::ostringstream error;
+<a name="l00469"></a>00469     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator+=: frames argument must be of equal dimensions!&quot;</span>;
+<a name="l00470"></a>00470     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00471"></a>00471   }
+<a name="l00472"></a>00472 <span class="preprocessor">#endif</span>
+<a name="l00473"></a>00473 <span class="preprocessor"></span>
+<a name="l00474"></a>00474   StkFloat *fptr = &amp;f[0];
+<a name="l00475"></a>00475   StkFloat *dptr = data_;
+<a name="l00476"></a>00476   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;size_; i++ )
+<a name="l00477"></a>00477     *dptr++ += *fptr++;
+<a name="l00478"></a>00478 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a049cbfd10908f754a7c48c1dd0da21e0"></a><!-- doxytag: member="stk::StkFrames::operator*=" ref="a049cbfd10908f754a7c48c1dd0da21e0" args="(StkFrames &amp;f)" -->
@@ -155,6 +198,22 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>Assignment by product operator into self. </p>
 <p>The dimensions of the argument are expected to be the same as self. No range checking is performed unless _STK_DEBUG_ is defined. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00481"></a>00481 {
+<a name="l00482"></a>00482 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00483"></a>00483 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( f.frames() != nFrames_ || f.channels() != nChannels_ ) {
+<a name="l00484"></a>00484     std::ostringstream error;
+<a name="l00485"></a>00485     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator*=: frames argument must be of equal dimensions!&quot;</span>;
+<a name="l00486"></a>00486     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00487"></a>00487   }
+<a name="l00488"></a>00488 <span class="preprocessor">#endif</span>
+<a name="l00489"></a>00489 <span class="preprocessor"></span>
+<a name="l00490"></a>00490   StkFloat *fptr = &amp;f[0];
+<a name="l00491"></a>00491   StkFloat *dptr = data_;
+<a name="l00492"></a>00492   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;size_; i++ )
+<a name="l00493"></a>00493     *dptr++ *= *fptr++;
+<a name="l00494"></a>00494 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a813632277bf0c432bcf81136ccdbbec1"></a><!-- doxytag: member="stk::StkFrames::operator()" ref="a813632277bf0c432bcf81136ccdbbec1" args="(size_t frame, unsigned int channel)" -->
@@ -185,6 +244,19 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>Channel / frame subscript operator that returns a reference. </p>
 <p>The result can be used as an lvalue. This reference is valid until the resize function is called or the array is destroyed. The <code>frame</code> index must be between 0 and <a class="el" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames()</a> - 1. The <code>channel</code> index must be between 0 and <a class="el" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels()</a> - 1. No range checking is performed unless _STK_DEBUG_ is defined. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00439"></a>00439 {
+<a name="l00440"></a>00440 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00441"></a>00441 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( frame &gt;= nFrames_ || channel &gt;= nChannels_ ) {
+<a name="l00442"></a>00442     std::ostringstream error;
+<a name="l00443"></a>00443     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator(): invalid frame (&quot;</span> &lt;&lt; frame &lt;&lt; <span class="stringliteral">&quot;) or channel (&quot;</span> &lt;&lt; channel &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
+<a name="l00444"></a>00444     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00445"></a>00445   }
+<a name="l00446"></a>00446 <span class="preprocessor">#endif</span>
+<a name="l00447"></a>00447 <span class="preprocessor"></span>
+<a name="l00448"></a>00448   <span class="keywordflow">return</span> data_[ frame * nChannels_ + channel ];
+<a name="l00449"></a>00449 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a93e7e4c30affc29d0cdc98e7514188de"></a><!-- doxytag: member="stk::StkFrames::operator()" ref="a93e7e4c30affc29d0cdc98e7514188de" args="(size_t frame, unsigned int channel) const " -->
@@ -215,6 +287,19 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>Channel / frame subscript operator that returns a value. </p>
 <p>The <code>frame</code> index must be between 0 and <a class="el" href="classstk_1_1StkFrames.html#a05b1ab6fa750a8221a7d65c30e0cdab9" title="Return the number of sample frames represented by the data.">frames()</a> - 1. The <code>channel</code> index must be between 0 and <a class="el" href="classstk_1_1StkFrames.html#aec7ef9c46675a24111aa6e2fda3ba870" title="Return the number of channels represented by the data.">channels()</a> - 1. No range checking is performed unless _STK_DEBUG_ is defined. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00452"></a>00452 {
+<a name="l00453"></a>00453 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00454"></a>00454 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( frame &gt;= nFrames_ || channel &gt;= nChannels_ ) {
+<a name="l00455"></a>00455     std::ostringstream error;
+<a name="l00456"></a>00456     error &lt;&lt; <span class="stringliteral">&quot;StkFrames::operator(): invalid frame (&quot;</span> &lt;&lt; frame &lt;&lt; <span class="stringliteral">&quot;) or channel (&quot;</span> &lt;&lt; channel &lt;&lt; <span class="stringliteral">&quot;) value!&quot;</span>;
+<a name="l00457"></a>00457     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">Stk::handleError</a>( error.str(), StkError::MEMORY_ACCESS );
+<a name="l00458"></a>00458   }
+<a name="l00459"></a>00459 <span class="preprocessor">#endif</span>
+<a name="l00460"></a>00460 <span class="preprocessor"></span>
+<a name="l00461"></a>00461   <span class="keywordflow">return</span> data_[ frame * nChannels_ + channel ];
+<a name="l00462"></a>00462 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a4f9402d9be28da418f630b4261b9b386"></a><!-- doxytag: member="stk::StkFrames::interpolate" ref="a4f9402d9be28da418f630b4261b9b386" args="(StkFloat frame, unsigned int channel=0) const " -->
@@ -332,6 +417,9 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>Set the sample rate associated with the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> data. </p>
 <p>By default, this value is set equal to the current STK sample rate at the time of instantiation. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00386"></a>00386 { dataRate_ = rate; };
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a4dbbcbdc8db39a803e0861976f7f3522"></a><!-- doxytag: member="stk::StkFrames::dataRate" ref="a4dbbcbdc8db39a803e0861976f7f3522" args="(void) const " -->
@@ -353,6 +441,9 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>Return the sample rate associated with the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> data. </p>
 <p>By default, this value is set equal to the current STK sample rate at the time of instantiation. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00393"></a>00393 { <span class="keywordflow">return</span> dataRate_; };
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -363,7 +454,7 @@ unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TapDelay-members.html b/doc/html/classstk_1_1TapDelay-members.html
index b3beece..1732ffc 100644
--- a/doc/html/classstk_1_1TapDelay-members.html
+++ b/doc/html/classstk_1_1TapDelay-members.html
@@ -22,8 +22,10 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1TapDelay.html#a517399ddf52455ef083481cbb77c0b5c">lastOut</a>(unsigned int tap=0) const </td><td><a class="el" href="classstk_1_1TapDelay.html">stk::TapDelay</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -57,7 +59,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TapDelay.gif b/doc/html/classstk_1_1TapDelay.gif
deleted file mode 100644
index 30fa754..0000000
Binary files a/doc/html/classstk_1_1TapDelay.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1TapDelay.html b/doc/html/classstk_1_1TapDelay.html
index 9733a57..8e1d781 100644
--- a/doc/html/classstk_1_1TapDelay.html
+++ b/doc/html/classstk_1_1TapDelay.html
@@ -57,7 +57,7 @@ std::vector&lt; unsigned long &gt;&nbsp;</td><td class="memItemRight" valign="bo
 <p>STK non-interpolating tapped delay line class. </p>
 <p>This class implements a non-interpolating digital delay-line with an arbitrary number of output "taps". If the maximum length and tap delays are not specified during instantiation, a fixed maximum length of 4095 and a single tap delay of zero is set.</p>
 <p>A non-interpolating delay line is typically used in fixed delay-length applications, such as for reverberation.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a24913411dff23e05995979e42cc51ecc"></a><!-- doxytag: member="stk::TapDelay::TapDelay" ref="a24913411dff23e05995979e42cc51ecc" args="(std::vector&lt; unsigned long &gt; taps=std::vector&lt; unsigned long &gt;(1, 0), unsigned long maxDelay=4095)" -->
 <div class="memitem">
@@ -151,6 +151,18 @@ std::vector&lt; unsigned long &gt;&nbsp;</td><td class="memItemRight" valign="bo
 <p>Return the specified tap value of the last computed frame. </p>
 <p>Use the <a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> function to get all tap values from the last computed frame. The <code>tap</code> argument must be less than the number of delayline taps (the first tap is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00116"></a>00116 {
+<a name="l00117"></a>00117 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00118"></a>00118 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( tap &gt;= lastFrame_.size() ) ) {
+<a name="l00119"></a>00119     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::lastOut(): tap argument and number of taps are incompatible!&quot;</span>;
+<a name="l00120"></a>00120     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122 <span class="preprocessor">#endif</span>
+<a name="l00123"></a>00123 <span class="preprocessor"></span>
+<a name="l00124"></a>00124   <span class="keywordflow">return</span> lastFrame_[tap];
+<a name="l00125"></a>00125 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="aadd431e206dd1e4133e2ff0d49aa639b"></a><!-- doxytag: member="stk::TapDelay::tick" ref="aadd431e206dd1e4133e2ff0d49aa639b" args="(StkFloat input, StkFrames &amp;outputs)" -->
@@ -181,6 +193,33 @@ std::vector&lt; unsigned long &gt;&nbsp;</td><td class="memItemRight" valign="bo
 <p>Input one sample to the delayline and return outputs at all tap positions. </p>
 <p>The <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument reference is returned. The output values are ordered according to the tap positions set using the <a class="el" href="classstk_1_1TapDelay.html#aa2bbab19ae277dc3689471d4250f00ad" title="Set the delay-line tap lengths.">setTapDelays()</a> function (no sorting is performed). The <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument must contain at least as many channels as the number of taps. However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00128"></a>00128 {
+<a name="l00129"></a>00129 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00130"></a>00130 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( outputs.channels() &lt; outPoint_.size() ) {
+<a name="l00131"></a>00131     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): number of taps &gt; channels in StkFrames argument!&quot;</span>;
+<a name="l00132"></a>00132     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00133"></a>00133   }
+<a name="l00134"></a>00134 <span class="preprocessor">#endif</span>
+<a name="l00135"></a>00135 <span class="preprocessor"></span>
+<a name="l00136"></a>00136   inputs_[inPoint_++] = input * gain_;
+<a name="l00137"></a>00137 
+<a name="l00138"></a>00138   <span class="comment">// Check for end condition</span>
+<a name="l00139"></a>00139   <span class="keywordflow">if</span> ( inPoint_ == inputs_.size() )
+<a name="l00140"></a>00140     inPoint_ = 0;
+<a name="l00141"></a>00141 
+<a name="l00142"></a>00142   <span class="comment">// Read out next values</span>
+<a name="l00143"></a>00143   StkFloat *outs = &amp;outputs[0];
+<a name="l00144"></a>00144   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;outPoint_.size(); i++ ) {
+<a name="l00145"></a>00145     *outs++ = inputs_[outPoint_[i]];
+<a name="l00146"></a>00146     lastFrame_[i] = *outs;
+<a name="l00147"></a>00147     <span class="keywordflow">if</span> ( ++outPoint_[i] == inputs_.size() )
+<a name="l00148"></a>00148       outPoint_[i] = 0;
+<a name="l00149"></a>00149   }
+<a name="l00150"></a>00150 
+<a name="l00151"></a>00151   <span class="keywordflow">return</span> outputs;
+<a name="l00152"></a>00152 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a9255a00f0d7588ba5b51a12ba5db08c0"></a><!-- doxytag: member="stk::TapDelay::tick" ref="a9255a00f0d7588ba5b51a12ba5db08c0" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -213,6 +252,36 @@ std::vector&lt; unsigned long &gt;&nbsp;</td><td class="memItemRight" valign="bo
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00155"></a>00155 {
+<a name="l00156"></a>00156 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00157"></a>00157 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00158"></a>00158     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00159"></a>00159     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00160"></a>00160   }
+<a name="l00161"></a>00161   <span class="keywordflow">if</span> ( frames.channels() &lt; outPoint_.size() ) {
+<a name="l00162"></a>00162     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): number of taps &gt; channels in StkFrames argument!&quot;</span>;
+<a name="l00163"></a>00163     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00164"></a>00164   }
+<a name="l00165"></a>00165 <span class="preprocessor">#endif</span>
+<a name="l00166"></a>00166 <span class="preprocessor"></span>
+<a name="l00167"></a>00167   StkFloat *iSamples = &amp;frames[channel];
+<a name="l00168"></a>00168   StkFloat *oSamples = &amp;frames[0];
+<a name="l00169"></a>00169   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, iHop = frames.channels(), oHop = frames.channels() - outPoint_.size();
+<a name="l00170"></a>00170   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00171"></a>00171     inputs_[inPoint_++] = *iSamples * gain_;
+<a name="l00172"></a>00172     <span class="keywordflow">if</span> ( inPoint_ == inputs_.size() ) inPoint_ = 0;
+<a name="l00173"></a>00173     <span class="keywordflow">for</span> ( j=0; j&lt;outPoint_.size(); j++ ) {
+<a name="l00174"></a>00174       *oSamples++ = inputs_[outPoint_[j]];
+<a name="l00175"></a>00175       <span class="keywordflow">if</span> ( ++outPoint_[j] == inputs_.size() ) outPoint_[j] = 0;
+<a name="l00176"></a>00176     }
+<a name="l00177"></a>00177   }
+<a name="l00178"></a>00178 
+<a name="l00179"></a>00179   oSamples -= frames.channels();
+<a name="l00180"></a>00180   <span class="keywordflow">for</span> ( j=0; j&lt;outPoint_.size(); j++ ) lastFrame_[j] = *oSamples++;
+<a name="l00181"></a>00181   <span class="keywordflow">return</span> frames;
+<a name="l00182"></a>00182 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="ad8250d2802326bd3778c00642266d201"></a><!-- doxytag: member="stk::TapDelay::tick" ref="ad8250d2802326bd3778c00642266d201" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0)" -->
@@ -249,6 +318,36 @@ std::vector&lt; unsigned long &gt;&nbsp;</td><td class="memItemRight" valign="bo
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. The output values are ordered according to the tap positions set using the <a class="el" href="classstk_1_1TapDelay.html#aa2bbab19ae277dc3689471d4250f00ad" title="Set the delay-line tap lengths.">setTapDelays()</a> function (no sorting is performed). The <code>iChannel</code> argument must be less than the number of channels in the <code>iFrames</code> argument (the first channel is specified by 0). The <code>oFrames</code> argument must contain at least as many channels as the number of taps. However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00185"></a>00185 {
+<a name="l00186"></a>00186 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00187"></a>00187 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() ) {
+<a name="l00188"></a>00188     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00189"></a>00189     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00190"></a>00190   }
+<a name="l00191"></a>00191   <span class="keywordflow">if</span> ( oFrames.channels() &lt; outPoint_.size() ) {
+<a name="l00192"></a>00192     oStream_ &lt;&lt; <span class="stringliteral">&quot;TapDelay::tick(): number of taps &gt; channels in output StkFrames argument!&quot;</span>;
+<a name="l00193"></a>00193     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00194"></a>00194   }
+<a name="l00195"></a>00195 <span class="preprocessor">#endif</span>
+<a name="l00196"></a>00196 <span class="preprocessor"></span>
+<a name="l00197"></a>00197   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00198"></a>00198   StkFloat *oSamples = &amp;oFrames[0];
+<a name="l00199"></a>00199   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, iHop = iFrames.channels(), oHop = oFrames.channels() - outPoint_.size();
+<a name="l00200"></a>00200   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00201"></a>00201     inputs_[inPoint_++] = *iSamples * gain_;
+<a name="l00202"></a>00202     <span class="keywordflow">if</span> ( inPoint_ == inputs_.size() ) inPoint_ = 0;
+<a name="l00203"></a>00203     <span class="keywordflow">for</span> ( j=0; j&lt;outPoint_.size(); j++ ) {
+<a name="l00204"></a>00204       *oSamples++ = inputs_[outPoint_[j]];
+<a name="l00205"></a>00205       <span class="keywordflow">if</span> ( ++outPoint_[j] == inputs_.size() ) outPoint_[j] = 0;
+<a name="l00206"></a>00206     }
+<a name="l00207"></a>00207   }
+<a name="l00208"></a>00208 
+<a name="l00209"></a>00209   oSamples -= oFrames.channels();
+<a name="l00210"></a>00210   <span class="keywordflow">for</span> ( j=0; j&lt;outPoint_.size(); j++ ) lastFrame_[j] = *oSamples++;
+<a name="l00211"></a>00211   <span class="keywordflow">return</span> iFrames;
+<a name="l00212"></a>00212 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -259,7 +358,7 @@ std::vector&lt; unsigned long &gt;&nbsp;</td><td class="memItemRight" valign="bo
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TcpClient-members.html b/doc/html/classstk_1_1TcpClient-members.html
index 8e4510e..b26827c 100644
--- a/doc/html/classstk_1_1TcpClient-members.html
+++ b/doc/html/classstk_1_1TcpClient-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#aeae0c6721248eecd5dae0b77ea66cb2c">id</a>(void) const </td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#a61375099d0d0811bf79c894587cc3724">isValid</a>(int socket)</td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#abe3040ecfff6ce921284c6ab4b0500a7">port</a>(void) const </td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -55,7 +56,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TcpClient.gif b/doc/html/classstk_1_1TcpClient.gif
deleted file mode 100644
index 6deebe9..0000000
Binary files a/doc/html/classstk_1_1TcpClient.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1TcpClient.html b/doc/html/classstk_1_1TcpClient.html
index 728a2c1..eaba717 100644
--- a/doc/html/classstk_1_1TcpClient.html
+++ b/doc/html/classstk_1_1TcpClient.html
@@ -51,7 +51,7 @@ int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 <p>This class provides a uniform cross-platform TCP socket client interface. Methods are provided for reading or writing data buffers to/from connections.</p>
 <p>TCP sockets are reliable and connection-oriented. A TCP socket client must be connected to a TCP server before data can be sent or received. Data delivery is guaranteed in order, without loss, error, or duplication. That said, TCP transmissions tend to be slower than those using the UDP protocol and data sent with multiple <em>write()</em> calls can be arbitrarily combined by the underlying system.</p>
 <p>The user is responsible for checking the values returned by the read/write methods. Values less than or equal to zero indicate a closed or lost connection or the occurence of an error.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a1e1e2cf0981774147d516efcaf12e786"></a><!-- doxytag: member="stk::TcpClient::TcpClient" ref="a1e1e2cf0981774147d516efcaf12e786" args="(int port, std::string hostname=&quot;localhost&quot;)" -->
 <div class="memitem">
@@ -122,7 +122,7 @@ int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TcpServer-members.html b/doc/html/classstk_1_1TcpServer-members.html
index 22d933d..33c8395 100644
--- a/doc/html/classstk_1_1TcpServer-members.html
+++ b/doc/html/classstk_1_1TcpServer-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#aeae0c6721248eecd5dae0b77ea66cb2c">id</a>(void) const </td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#a61375099d0d0811bf79c894587cc3724">isValid</a>(int socket)</td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#abe3040ecfff6ce921284c6ab4b0500a7">port</a>(void) const </td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -55,7 +56,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TcpServer.gif b/doc/html/classstk_1_1TcpServer.gif
deleted file mode 100644
index 43a06e7..0000000
Binary files a/doc/html/classstk_1_1TcpServer.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1TcpServer.html b/doc/html/classstk_1_1TcpServer.html
index 9cb42d0..aa9acd8 100644
--- a/doc/html/classstk_1_1TcpServer.html
+++ b/doc/html/classstk_1_1TcpServer.html
@@ -51,7 +51,7 @@ int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 <p>This class provides a uniform cross-platform TCP socket server interface. Methods are provided for reading or writing data buffers to/from connections.</p>
 <p>TCP sockets are reliable and connection-oriented. A TCP socket server must accept a connection from a TCP client before data can be sent or received. Data delivery is guaranteed in order, without loss, error, or duplication. That said, TCP transmissions tend to be slower than those using the UDP protocol and data sent with multiple <em>write()</em> calls can be arbitrarily combined by the underlying system.</p>
 <p>The user is responsible for checking the values returned by the read/write methods. Values less than or equal to zero indicate a closed or lost connection or the occurence of an error.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a0fc92fd76f406ab8eeabbeb27ba9a2fc"></a><!-- doxytag: member="stk::TcpServer::TcpServer" ref="a0fc92fd76f406ab8eeabbeb27ba9a2fc" args="(int port=2006)" -->
 <div class="memitem">
@@ -104,7 +104,7 @@ int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Thread-members.html b/doc/html/classstk_1_1Thread-members.html
index 580ca6b..f059b7c 100644
--- a/doc/html/classstk_1_1Thread-members.html
+++ b/doc/html/classstk_1_1Thread-members.html
@@ -17,6 +17,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -47,7 +48,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Thread.gif b/doc/html/classstk_1_1Thread.gif
deleted file mode 100644
index bee7383..0000000
Binary files a/doc/html/classstk_1_1Thread.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Thread.html b/doc/html/classstk_1_1Thread.html
index be113e3..0c498a7 100644
--- a/doc/html/classstk_1_1Thread.html
+++ b/doc/html/classstk_1_1Thread.html
@@ -52,7 +52,7 @@ Inheritance diagram for stk::Thread:</div>
 <p>Each instance of the <a class="el" href="classstk_1_1Thread.html" title="STK thread class.">Thread</a> class can be used to control a single thread process. Routines are provided to signal cancelation and/or joining with a thread, though it is not possible for this class to know the running status of a thread once it is started.</p>
 <p>For cross-platform compatability, thread functions should be declared as follows:</p>
 <p>THREAD_RETURN THREAD_TYPE thread_function(void *ptr)</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="abcafe21595d9c6ac52b1ae872b34a531"></a><!-- doxytag: member="stk::Thread::start" ref="abcafe21595d9c6ac52b1ae872b34a531" args="(THREAD_FUNCTION routine, void *ptr=NULL)" -->
 <div class="memitem">
@@ -155,7 +155,7 @@ Inheritance diagram for stk::Thread:</div>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TubeBell-members.html b/doc/html/classstk_1_1TubeBell-members.html
index 26c2850..98e12bc 100644
--- a/doc/html/classstk_1_1TubeBell-members.html
+++ b/doc/html/classstk_1_1TubeBell-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#a7235e94a153df135330a591511269f7c">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#afc46280177d770404919f20ccf88e4ff">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
@@ -55,7 +56,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1TubeBell.html">stk::TubeBell</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1TubeBell.html#a664cede881352aea1d300ca93ba416ac">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1TubeBell.html">stk::TubeBell</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1TubeBell.html#a7b5de1d681fcb5c2899094dc1ffe0453">TubeBell</a>(void)</td><td><a class="el" href="classstk_1_1TubeBell.html">stk::TubeBell</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#aaba7e8bff02d105e146f8b62b20a27b9">~FM</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
@@ -65,7 +66,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TubeBell.gif b/doc/html/classstk_1_1TubeBell.gif
deleted file mode 100644
index 86f3c61..0000000
Binary files a/doc/html/classstk_1_1TubeBell.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1TubeBell.html b/doc/html/classstk_1_1TubeBell.html
index 04e699d..3a7a985 100644
--- a/doc/html/classstk_1_1TubeBell.html
+++ b/doc/html/classstk_1_1TubeBell.html
@@ -44,6 +44,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="afa7422b2a7361f2ebe60ebff887ef36f"></a><!-- doxytag: member="stk::TubeBell::tick" ref="afa7422b2a7361f2ebe60ebff887ef36f" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1TubeBell.html#a664cede881352aea1d300ca93ba416ac">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a664cede881352aea1d300ca93ba416ac"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK tubular bell (orchestral chime) <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis instrument. </p>
@@ -60,7 +62,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li><a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> 2 &amp; 4 Target = 128</li>
 </ul>
 <p>The basic Chowning/Stanford <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> patent expired in 1995, but there exist follow-on patents, mostly assigned to Yamaha. If you are of the type who should worry about this (making money) worry away.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a7b5de1d681fcb5c2899094dc1ffe0453"></a><!-- doxytag: member="stk::TubeBell::TubeBell" ref="a7b5de1d681fcb5c2899094dc1ffe0453" args="(void)" -->
 <div class="memitem">
@@ -81,6 +83,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a664cede881352aea1d300ca93ba416ac"></a><!-- doxytag: member="stk::TubeBell::tick" ref="a664cede881352aea1d300ca93ba416ac" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::TubeBell::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">stk::FM</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00097"></a>00097 {
+<a name="l00098"></a>00098   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00099"></a>00099 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00100"></a>00100 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00101"></a>00101     oStream_ &lt;&lt; <span class="stringliteral">&quot;TubeBell::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00102"></a>00102     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00103"></a>00103   }
+<a name="l00104"></a>00104 <span class="preprocessor">#endif</span>
+<a name="l00105"></a>00105 <span class="preprocessor"></span>
+<a name="l00106"></a>00106   StkFloat *samples = &amp;frames[channel];
+<a name="l00107"></a>00107   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00108"></a>00108   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00109"></a>00109     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00110"></a>00110       *samples++ = <a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">tick</a>();
+<a name="l00111"></a>00111   }
+<a name="l00112"></a>00112   <span class="keywordflow">else</span> {
+<a name="l00113"></a>00113     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00114"></a>00114       *samples++ = <a class="code" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f" title="Compute and return one output sample.">tick</a>();
+<a name="l00115"></a>00115       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00116"></a>00116         *samples++ = lastFrame_[j];
+<a name="l00117"></a>00117     }
+<a name="l00118"></a>00118   }
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   <span class="keywordflow">return</span> frames;
+<a name="l00121"></a>00121 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -91,7 +153,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Twang-members.html b/doc/html/classstk_1_1Twang-members.html
new file mode 100644
index 0000000..a3f2aba
--- /dev/null
+++ b/doc/html/classstk_1_1Twang-members.html
@@ -0,0 +1,61 @@
+<HTML>
+<HEAD>
+<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
+<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+<CENTER>
+<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
+<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
+<HR>
+<!-- Generated by Doxygen 1.6.2 -->
+<div class="contents">
+<h1>stk::Twang Member List</h1>This is the complete list of members for <a class="el" href="classstk_1_1Twang.html">stk::Twang</a>, including all inherited members.<table>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5ab0e88856708f65887295ad4ad90340">addSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#a7cdd4bf2e486239429f6d4f0f277cea9">clear</a>(void)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff">handleError</a>(const char *message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#ab54245fcb75144a8ffcc879789abc952">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d">sampleRate</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a740e872daa4b2ad1c918163e7c5ab56b">sampleRateChanged</a>(StkFloat newRate, StkFloat oldRate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#a0043b9d374b73b6660ec2d79475d602c">setFrequency</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#a7076c25dd3a06262b3bf927bc64bf89e">setLoopFilter</a>(std::vector&lt; StkFloat &gt; coefficients)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#ad7921c51f38b4e6e32d7db48cc101068">setLoopGain</a>(StkFloat loopGain)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#ae27aa429cbf49f0dd60f0cc6ef41c832">setLowestFrequency</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#a48008e3cd55dad6ee846b47ab32f993f">setPluckPosition</a>(StkFloat position)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a4f641ad194f9d8ce1f9d1ae56af5686b">setRawwavePath</a>(std::string path)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">setSampleRate</a>(StkFloat rate)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a2d8b38b9f808fb7c5e65c228b4b7dbbb">showWarnings</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad75619ab92a0c19b5a52cb68884511e3">sleep</a>(unsigned long milliseconds)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a9bff83b5a318ff171f94a218ad52226b">Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a079e62be7093d593498e9d2ba4ac20fa">STK_FLOAT32</a></td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a57b00150ae559b6f099be117b2e53af4">STK_FLOAT64</a></td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5a807971b7fc3c8985d97823be079a7b">STK_SINT16</a></td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#afbe8049756ea88bdd8cebad65305dd52">STK_SINT24</a></td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a605c96894e1b0f1f08a80214a08012ad">STK_SINT32</a></td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#adec863631653693af8f1ed5c0cfc5c4c">STK_SINT8</a></td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab2dc4c9e67317eb0753868a89c8095f6">swap16</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9">tick</a>(StkFloat input)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#ae9e770c446e1459a5e89c0bc8285f5e3">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#a089ff55338a22647d94665d6adbeb7ae">tick</a>(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#a813e99ee79974707a3afbfcab963c086">Twang</a>(StkFloat lowestFrequency=50.0)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Twang.html#adae2759ef254101f91aa3a0a5c3fba39">~Twang</a>(void)</td><td><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></td><td></td></tr>
+</table></div>
+<HR>
+
+<table>
+  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+</table>
+
+</BODY>
+</HTML>
diff --git a/doc/html/classstk_1_1Twang.html b/doc/html/classstk_1_1Twang.html
new file mode 100644
index 0000000..0fd6f92
--- /dev/null
+++ b/doc/html/classstk_1_1Twang.html
@@ -0,0 +1,234 @@
+<HTML>
+<HEAD>
+<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
+<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+<CENTER>
+<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
+<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
+<HR>
+<!-- Generated by Doxygen 1.6.2 -->
+  <div class="navpath"><a class="el" href="namespacestk.html">stk</a>::<a class="el" href="classstk_1_1Twang.html">Twang</a>
+  </div>
+<div class="contents">
+<h1>stk::Twang Class Reference</h1><!-- doxytag: class="stk::Twang" --><!-- doxytag: inherits="stk::Stk" -->
+<p>STK enhanced plucked string class.  
+<a href="#_details">More...</a></p>
+
+<p><code>#include &lt;<a class="el" href="Twang_8h_source.html">Twang.h</a>&gt;</code></p>
+<div class="dynheader">
+Inheritance diagram for stk::Twang:</div>
+<div class="dynsection">
+ <div class="center">
+  <img src="classstk_1_1Twang.png" usemap="#stk::Twang_map" alt=""/>
+  <map id="stk::Twang_map" name="stk::Twang_map">
+<area href="classstk_1_1Stk.html" alt="stk::Stk" shape="rect" coords="0,0,70,24"/>
+</map>
+ </div>
+</div>
+
+<p><a href="classstk_1_1Twang-members.html">List of all members.</a></p>
+<table border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="2"><h2>Public Member Functions</h2></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a813e99ee79974707a3afbfcab963c086"></a><!-- doxytag: member="stk::Twang::Twang" ref="a813e99ee79974707a3afbfcab963c086" args="(StkFloat lowestFrequency=50.0)" -->
+&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#a813e99ee79974707a3afbfcab963c086">Twang</a> (StkFloat lowestFrequency=50.0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class constructor, taking the lowest desired playing frequency. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="adae2759ef254101f91aa3a0a5c3fba39"></a><!-- doxytag: member="stk::Twang::~Twang" ref="adae2759ef254101f91aa3a0a5c3fba39" args="(void)" -->
+&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#adae2759ef254101f91aa3a0a5c3fba39">~Twang</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Class destructor. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a7cdd4bf2e486239429f6d4f0f277cea9"></a><!-- doxytag: member="stk::Twang::clear" ref="a7cdd4bf2e486239429f6d4f0f277cea9" args="(void)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#a7cdd4bf2e486239429f6d4f0f277cea9">clear</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Reset and clear all internal state. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ae27aa429cbf49f0dd60f0cc6ef41c832"></a><!-- doxytag: member="stk::Twang::setLowestFrequency" ref="ae27aa429cbf49f0dd60f0cc6ef41c832" args="(StkFloat frequency)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#ae27aa429cbf49f0dd60f0cc6ef41c832">setLowestFrequency</a> (StkFloat frequency)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the delayline parameters to allow frequencies as low as specified. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a0043b9d374b73b6660ec2d79475d602c"></a><!-- doxytag: member="stk::Twang::setFrequency" ref="a0043b9d374b73b6660ec2d79475d602c" args="(StkFloat frequency)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#a0043b9d374b73b6660ec2d79475d602c">setFrequency</a> (StkFloat frequency)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the delayline parameters for a particular frequency. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a48008e3cd55dad6ee846b47ab32f993f"></a><!-- doxytag: member="stk::Twang::setPluckPosition" ref="a48008e3cd55dad6ee846b47ab32f993f" args="(StkFloat position)" -->
+void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#a48008e3cd55dad6ee846b47ab32f993f">setPluckPosition</a> (StkFloat position)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the pluck or "excitation" position along the string (0.0 - 1.0). <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#ad7921c51f38b4e6e32d7db48cc101068">setLoopGain</a> (StkFloat loopGain)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the nominal loop gain.  <a href="#ad7921c51f38b4e6e32d7db48cc101068"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#a7076c25dd3a06262b3bf927bc64bf89e">setLoopFilter</a> (std::vector&lt; StkFloat &gt; coefficients)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the loop filter coefficients.  <a href="#a7076c25dd3a06262b3bf927bc64bf89e"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ab54245fcb75144a8ffcc879789abc952"></a><!-- doxytag: member="stk::Twang::lastFrame" ref="ab54245fcb75144a8ffcc879789abc952" args="(void) const " -->
+const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#ab54245fcb75144a8ffcc879789abc952">lastFrame</a> (void) const </td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Return an <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> reference to the last output sample frame. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3441ff449e3f7a451873e67d4c680ce9"></a><!-- doxytag: member="stk::Twang::tick" ref="a3441ff449e3f7a451873e67d4c680ce9" args="(StkFloat input)" -->
+StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9">tick</a> (StkFloat input)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#ae9e770c446e1459a5e89c0bc8285f5e3">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Take a channel of the <code>iFrames</code> object as inputs to the class and write outputs to the <code>oFrames</code> object.  <a href="#ae9e770c446e1459a5e89c0bc8285f5e3"></a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html#a089ff55338a22647d94665d6adbeb7ae">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;iFrames, <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Take a channel of the <code>iFrames</code> object as inputs to the effect and write outputs to the <code>oFrames</code> object.  <a href="#a089ff55338a22647d94665d6adbeb7ae"></a><br/></td></tr>
+</table>
+<hr/><a name="_details"></a><h2>Detailed Description</h2>
+<p>STK enhanced plucked string class. </p>
+<p>This class implements an enhanced plucked-string physical model, a la Jaffe-Smith, Smith, Karjalainen and others. It includes a comb filter to simulate pluck position. The <a class="el" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">tick()</a> function takes an input sample, which is added to the delayline input. This can be used to implement commuted synthesis (if the input samples are derived from the impulse response of a body filter) and/or feedback (as in an electric guitar model).</p>
+<p>This is a digital waveguide model, making its use possibly subject to patents held by Stanford University, Yamaha, and others.</p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="ad7921c51f38b4e6e32d7db48cc101068"></a><!-- doxytag: member="stk::Twang::setLoopGain" ref="ad7921c51f38b4e6e32d7db48cc101068" args="(StkFloat loopGain)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stk::Twang::setLoopGain </td>
+          <td>(</td>
+          <td class="paramtype">StkFloat&nbsp;</td>
+          <td class="paramname"> <em>loopGain</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Set the nominal loop gain. </p>
+<p>The actual loop gain is based on the value set with this function, but scaled slightly according to the frequency. Higher frequency settings have greater loop gains because of high-frequency loop-filter roll-off. </p>
+
+</div>
+</div>
+<a class="anchor" id="a7076c25dd3a06262b3bf927bc64bf89e"></a><!-- doxytag: member="stk::Twang::setLoopFilter" ref="a7076c25dd3a06262b3bf927bc64bf89e" args="(std::vector&lt; StkFloat &gt; coefficients)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">void stk::Twang::setLoopFilter </td>
+          <td>(</td>
+          <td class="paramtype">std::vector&lt; StkFloat &gt;&nbsp;</td>
+          <td class="paramname"> <em>coefficients</em></td>
+          <td>&nbsp;)&nbsp;</td>
+          <td></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Set the loop filter coefficients. </p>
+<p>The loop filter can be any arbitrary FIR filter. By default, the coefficients are set for a first-order lowpass filter with coefficients b = [0.5 0.5]. </p>
+
+</div>
+</div>
+<a class="anchor" id="ae9e770c446e1459a5e89c0bc8285f5e3"></a><!-- doxytag: member="stk::Twang::tick" ref="ae9e770c446e1459a5e89c0bc8285f5e3" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Twang::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Take a channel of the <code>iFrames</code> object as inputs to the class and write outputs to the <code>oFrames</code> object. </p>
+<p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00121"></a>00121 {
+<a name="l00122"></a>00122 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00123"></a>00123 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00124"></a>00124     oStream_ &lt;&lt; <span class="stringliteral">&quot;Twang::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00125"></a>00125     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00126"></a>00126   }
+<a name="l00127"></a>00127 <span class="preprocessor">#endif</span>
+<a name="l00128"></a>00128 <span class="preprocessor"></span>
+<a name="l00129"></a>00129   StkFloat *samples = &amp;frames[channel];
+<a name="l00130"></a>00130   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00131"></a>00131   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00132"></a>00132     *samples = <a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">tick</a>( *samples );
+<a name="l00133"></a>00133 
+<a name="l00134"></a>00134   <span class="keywordflow">return</span> frames;
+<a name="l00135"></a>00135 }
+</pre></div></p>
+
+</div>
+</div>
+<a class="anchor" id="a089ff55338a22647d94665d6adbeb7ae"></a><!-- doxytag: member="stk::Twang::tick" ref="a089ff55338a22647d94665d6adbeb7ae" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Twang::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>iFrames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>oFrames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>iChannel</em> = <code>0</code>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>oChannel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Take a channel of the <code>iFrames</code> object as inputs to the effect and write outputs to the <code>oFrames</code> object. </p>
+<p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00138"></a>00138 {
+<a name="l00139"></a>00139 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00140"></a>00140 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00141"></a>00141     oStream_ &lt;&lt; <span class="stringliteral">&quot;Twang::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00142"></a>00142     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00143"></a>00143   }
+<a name="l00144"></a>00144 <span class="preprocessor">#endif</span>
+<a name="l00145"></a>00145 <span class="preprocessor"></span>
+<a name="l00146"></a>00146   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00147"></a>00147   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00148"></a>00148   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00149"></a>00149   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop )
+<a name="l00150"></a>00150     *oSamples = <a class="code" href="classstk_1_1Twang.html#a3441ff449e3f7a451873e67d4c680ce9" title="Compute and return one output sample.">tick</a>( *iSamples );
+<a name="l00151"></a>00151 
+<a name="l00152"></a>00152   <span class="keywordflow">return</span> iFrames;
+<a name="l00153"></a>00153 }
+</pre></div></p>
+
+</div>
+</div>
+<hr/>The documentation for this class was generated from the following file:<ul>
+<li><a class="el" href="Twang_8h_source.html">Twang.h</a></li>
+</ul>
+</div>
+<HR>
+
+<table>
+  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+</table>
+
+</BODY>
+</HTML>
diff --git a/doc/html/classstk_1_1Twang.png b/doc/html/classstk_1_1Twang.png
new file mode 100644
index 0000000..8242f03
Binary files /dev/null and b/doc/html/classstk_1_1Twang.png differ
diff --git a/doc/html/classstk_1_1TwoPole-members.html b/doc/html/classstk_1_1TwoPole-members.html
index 3984a8b..aacd20b 100644
--- a/doc/html/classstk_1_1TwoPole-members.html
+++ b/doc/html/classstk_1_1TwoPole-members.html
@@ -21,8 +21,10 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1TwoPole.html#ad0a3ac1b5d4e651a7ff1efb1d5362c0b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1TwoPole.html">stk::TwoPole</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1TwoPole.html#a8a4fb4afe3e06c689827ecaec478aad1">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1TwoPole.html">stk::TwoPole</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -58,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TwoPole.gif b/doc/html/classstk_1_1TwoPole.gif
deleted file mode 100644
index 91dcec8..0000000
Binary files a/doc/html/classstk_1_1TwoPole.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1TwoPole.html b/doc/html/classstk_1_1TwoPole.html
index 04627f4..88d2390 100644
--- a/doc/html/classstk_1_1TwoPole.html
+++ b/doc/html/classstk_1_1TwoPole.html
@@ -69,7 +69,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK two-pole filter class. </p>
 <p>This class implements a two-pole digital filter. A method is provided for creating a resonance in the frequency response while maintaining a nearly constant filter gain.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a00997b12a1cf0a04888124eaf85c565d"></a><!-- doxytag: member="stk::TwoPole::setResonance" ref="a00997b12a1cf0a04888124eaf85c565d" args="(StkFloat frequency, StkFloat radius, bool normalize=false)" -->
 <div class="memitem">
@@ -103,7 +103,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Sets the filter coefficients for a resonance at <em>frequency</em> (in Hz). </p>
-<p>This method determines the filter coefficients corresponding to two complex-conjugate poles with the given <em>frequency</em> (in Hz) and <em>radius</em> from the z-plane origin. If <em>normalize</em> is true, the coefficients are then normalized to produce unity gain at <em>frequency</em> (the actual maximum filter gain tends to be slightly greater than unity when <em>radius</em> is not close to one). The resulting filter frequency response has a resonance at the given <em>frequency</em>. The closer the poles are to the unit-circle (<em>radius</em> close to one), the narrower the resulting resonance width. An unstable filter will result for <em>radius</em> &gt;= 1.0. For a better resonance filter, use a <a class="el" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> filter. </p>
+<p>This method determines the filter coefficients corresponding to two complex-conjugate poles with the given <em>frequency</em> (in Hz) and <em>radius</em> from the z-plane origin. If <em>normalize</em> is true, the coefficients are then normalized to produce unity gain at <em>frequency</em> (the actual maximum filter gain tends to be slightly greater than unity when <em>radius</em> is not close to one). The resulting filter frequency response has a resonance at the given <em>frequency</em>. The closer the poles are to the unit-circle (<em>radius</em> close to one), the narrower the resulting resonance width. An unstable filter will result for <em>radius</em> &gt;= 1.0. The <em>frequency</em> value should be between zero and half the sample rate. For a better resonance filter, use a <a class="el" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> filter. </p>
 <dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="classstk_1_1BiQuad.html" title="STK biquad (two-pole, two-zero) filter class.">BiQuad</a> filter class </dd></dl>
 
 </div>
@@ -138,6 +138,28 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00107"></a>00107 {
+<a name="l00108"></a>00108 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00110"></a>00110     oStream_ &lt;&lt; <span class="stringliteral">&quot;TwoPole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00111"></a>00111     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00112"></a>00112   }
+<a name="l00113"></a>00113 <span class="preprocessor">#endif</span>
+<a name="l00114"></a>00114 <span class="preprocessor"></span>
+<a name="l00115"></a>00115   StkFloat *samples = &amp;frames[channel];
+<a name="l00116"></a>00116   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00117"></a>00117   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00118"></a>00118     inputs_[0] = gain_ * *samples;
+<a name="l00119"></a>00119     *samples = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
+<a name="l00120"></a>00120     outputs_[2] = outputs_[1];
+<a name="l00121"></a>00121     outputs_[1] = *samples;
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124   lastFrame_[0] = outputs_[1];
+<a name="l00125"></a>00125   <span class="keywordflow">return</span> frames;
+<a name="l00126"></a>00126 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a5c9b52082c0d2845a5ca01ca276fe8f8"></a><!-- doxytag: member="stk::TwoPole::tick" ref="a5c9b52082c0d2845a5ca01ca276fe8f8" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -180,6 +202,29 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00129"></a>00129 {
+<a name="l00130"></a>00130 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00131"></a>00131 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00132"></a>00132     oStream_ &lt;&lt; <span class="stringliteral">&quot;TwoPole::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00133"></a>00133     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00134"></a>00134   }
+<a name="l00135"></a>00135 <span class="preprocessor">#endif</span>
+<a name="l00136"></a>00136 <span class="preprocessor"></span>
+<a name="l00137"></a>00137   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00138"></a>00138   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00139"></a>00139   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00140"></a>00140   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00141"></a>00141     inputs_[0] = gain_ * *iSamples;
+<a name="l00142"></a>00142     *oSamples = b_[0] * inputs_[0] - a_[1] * outputs_[1] - a_[2] * outputs_[2];
+<a name="l00143"></a>00143     outputs_[2] = outputs_[1];
+<a name="l00144"></a>00144     outputs_[1] = *oSamples;
+<a name="l00145"></a>00145   }
+<a name="l00146"></a>00146 
+<a name="l00147"></a>00147   lastFrame_[0] = outputs_[1];
+<a name="l00148"></a>00148   <span class="keywordflow">return</span> iFrames;
+<a name="l00149"></a>00149 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -190,7 +235,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TwoZero-members.html b/doc/html/classstk_1_1TwoZero-members.html
index 50bf4e9..7af9656 100644
--- a/doc/html/classstk_1_1TwoZero-members.html
+++ b/doc/html/classstk_1_1TwoZero-members.html
@@ -21,8 +21,10 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1TwoZero.html#aa1a1568aae3cd3d53011b3fc344cb086">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1TwoZero.html">stk::TwoZero</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba">lastOut</a>(void) const </td><td><a class="el" href="classstk_1_1TwoZero.html">stk::TwoZero</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">phaseDelay</a>(StkFloat frequency)</td><td><a class="el" href="classstk_1_1Filter.html">stk::Filter</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -58,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1TwoZero.gif b/doc/html/classstk_1_1TwoZero.gif
deleted file mode 100644
index 7723a46..0000000
Binary files a/doc/html/classstk_1_1TwoZero.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1TwoZero.html b/doc/html/classstk_1_1TwoZero.html
index 566f217..eef5e3b 100644
--- a/doc/html/classstk_1_1TwoZero.html
+++ b/doc/html/classstk_1_1TwoZero.html
@@ -69,7 +69,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK two-zero filter class. </p>
 <p>This class implements a two-zero digital filter. A method is provided for creating a "notch" in the frequency response while maintaining a constant filter gain.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a3a89facd2b94bbcfc2f06d8766a46329"></a><!-- doxytag: member="stk::TwoZero::setNotch" ref="a3a89facd2b94bbcfc2f06d8766a46329" args="(StkFloat frequency, StkFloat radius)" -->
 <div class="memitem">
@@ -97,7 +97,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <div class="memdoc">
 
 <p>Sets the filter coefficients for a "notch" at <em>frequency</em> (in Hz). </p>
-<p>This method determines the filter coefficients corresponding to two complex-conjugate zeros with the given <em>frequency</em> (in Hz) and <em>radius</em> from the z-plane origin. The coefficients are then normalized to produce a maximum filter gain of one (independent of the filter <em>gain</em> parameter). The resulting filter frequency response has a "notch" or anti-resonance at the given <em>frequency</em>. The closer the zeros are to the unit-circle (<em>radius</em> close to or equal to one), the narrower the resulting notch width. </p>
+<p>This method determines the filter coefficients corresponding to two complex-conjugate zeros with the given <em>frequency</em> (in Hz) and <em>radius</em> from the z-plane origin. The coefficients are then normalized to produce a maximum filter gain of one (independent of the filter <em>gain</em> parameter). The resulting filter frequency response has a "notch" or anti-resonance at the given <em>frequency</em>. The closer the zeros are to the unit-circle (<em>radius</em> close to or equal to one), the narrower the resulting notch width. The <em>frequency</em> value should be between zero and half the sample rate. The <em>radius</em> value should be positive. </p>
 
 </div>
 </div>
@@ -131,6 +131,28 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <p>Implements <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>.</p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00103"></a>00103 {
+<a name="l00104"></a>00104 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00105"></a>00105 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= frames.channels() ) {
+<a name="l00106"></a>00106     oStream_ &lt;&lt; <span class="stringliteral">&quot;TwoZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00107"></a>00107     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00108"></a>00108   }
+<a name="l00109"></a>00109 <span class="preprocessor">#endif</span>
+<a name="l00110"></a>00110 <span class="preprocessor"></span>
+<a name="l00111"></a>00111   StkFloat *samples = &amp;frames[channel];
+<a name="l00112"></a>00112   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> hop = frames.channels();
+<a name="l00113"></a>00113   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00114"></a>00114     inputs_[0] = gain_ * *samples;
+<a name="l00115"></a>00115     *samples = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
+<a name="l00116"></a>00116     inputs_[2] = inputs_[1];
+<a name="l00117"></a>00117     inputs_[1] = inputs_[0];
+<a name="l00118"></a>00118   }
+<a name="l00119"></a>00119 
+<a name="l00120"></a>00120   lastFrame_[0] = *(samples-hop);
+<a name="l00121"></a>00121   <span class="keywordflow">return</span> frames;
+<a name="l00122"></a>00122 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a0ef9deab4fbc7e64511d4b6d38afd185"></a><!-- doxytag: member="stk::TwoZero::tick" ref="a0ef9deab4fbc7e64511d4b6d38afd185" args="(StkFrames &amp;iFrames, StkFrames &amp;oFrames, unsigned int iChannel=0, unsigned int oChannel=0)" -->
@@ -173,6 +195,29 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Take a channel of the <code>iFrames</code> object as inputs to the filter and write outputs to the <code>oFrames</code> object. </p>
 <p>The <code>iFrames</code> object reference is returned. Each channel argument must be less than the number of channels in the corresponding <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00125"></a>00125 {
+<a name="l00126"></a>00126 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00127"></a>00127 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( iChannel &gt;= iFrames.channels() || oChannel &gt;= oFrames.channels() ) {
+<a name="l00128"></a>00128     oStream_ &lt;&lt; <span class="stringliteral">&quot;TwoZero::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00129"></a>00129     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00130"></a>00130   }
+<a name="l00131"></a>00131 <span class="preprocessor">#endif</span>
+<a name="l00132"></a>00132 <span class="preprocessor"></span>
+<a name="l00133"></a>00133   StkFloat *iSamples = &amp;iFrames[iChannel];
+<a name="l00134"></a>00134   StkFloat *oSamples = &amp;oFrames[oChannel];
+<a name="l00135"></a>00135   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> iHop = iFrames.channels(), oHop = oFrames.channels();
+<a name="l00136"></a>00136   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+<a name="l00137"></a>00137     inputs_[0] = gain_ * *iSamples;
+<a name="l00138"></a>00138     *oSamples = b_[2] * inputs_[2] + b_[1] * inputs_[1] + b_[0] * inputs_[0];
+<a name="l00139"></a>00139     inputs_[2] = inputs_[1];
+<a name="l00140"></a>00140     inputs_[1] = inputs_[0];
+<a name="l00141"></a>00141   }
+<a name="l00142"></a>00142 
+<a name="l00143"></a>00143   lastFrame_[0] = *(oSamples-oHop);
+<a name="l00144"></a>00144   <span class="keywordflow">return</span> iFrames;
+<a name="l00145"></a>00145 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -183,7 +228,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1UdpSocket-members.html b/doc/html/classstk_1_1UdpSocket-members.html
index e422477..b25024d 100644
--- a/doc/html/classstk_1_1UdpSocket-members.html
+++ b/doc/html/classstk_1_1UdpSocket-members.html
@@ -18,6 +18,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#aeae0c6721248eecd5dae0b77ea66cb2c">id</a>(void) const </td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#a61375099d0d0811bf79c894587cc3724">isValid</a>(int socket)</td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Socket.html#abe3040ecfff6ce921284c6ab4b0500a7">port</a>(void) const </td><td><a class="el" href="classstk_1_1Socket.html">stk::Socket</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -57,7 +58,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1UdpSocket.gif b/doc/html/classstk_1_1UdpSocket.gif
deleted file mode 100644
index 3a73d45..0000000
Binary files a/doc/html/classstk_1_1UdpSocket.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1UdpSocket.html b/doc/html/classstk_1_1UdpSocket.html
index 9ed0462..db75fd5 100644
--- a/doc/html/classstk_1_1UdpSocket.html
+++ b/doc/html/classstk_1_1UdpSocket.html
@@ -56,7 +56,7 @@ int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 <p>This class provides a uniform cross-platform UDP socket server/client interface. Methods are provided for reading or writing data buffers. The constructor creates a UDP socket and binds it to the specified port. Note that only one socket can be bound to a given port on the same machine.</p>
 <p>UDP sockets provide unreliable, connection-less service. Messages can be lost, duplicated, or received out of order. That said, data transmission tends to be faster than with TCP connections and datagrams are not potentially combined by the underlying system.</p>
 <p>The user is responsible for checking the values returned by the read/write methods. Values less than or equal to zero indicate the occurence of an error.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="aaad5171c74b4ab7c2155cd63ef30a271"></a><!-- doxytag: member="stk::UdpSocket::UdpSocket" ref="aaad5171c74b4ab7c2155cd63ef30a271" args="(int port=2006)" -->
 <div class="memitem">
@@ -192,7 +192,7 @@ int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="class
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Vector3D-members.html b/doc/html/classstk_1_1Vector3D-members.html
index 7d54d10..0a402d9 100644
--- a/doc/html/classstk_1_1Vector3D-members.html
+++ b/doc/html/classstk_1_1Vector3D-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -50,7 +51,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Vector3D.gif b/doc/html/classstk_1_1Vector3D.gif
deleted file mode 100644
index 10591a0..0000000
Binary files a/doc/html/classstk_1_1Vector3D.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Vector3D.html b/doc/html/classstk_1_1Vector3D.html
index a3174d4..e52eaf3 100644
--- a/doc/html/classstk_1_1Vector3D.html
+++ b/doc/html/classstk_1_1Vector3D.html
@@ -62,7 +62,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK 3D vector class. </p>
 <p>This class implements a three-dimensional vector.</p>
-<p>by Perry R. Cook, 1995 - 2010. </p>
+<p>by Perry R. Cook, 1995-2011. </p>
 <hr/>The documentation for this class was generated from the following file:<ul>
 <li><a class="el" href="Vector3D_8h_source.html">Vector3D.h</a></li>
 </ul>
@@ -71,7 +71,7 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1VoicForm-members.html b/doc/html/classstk_1_1VoicForm-members.html
index c0a14a8..6a4932a 100644
--- a/doc/html/classstk_1_1VoicForm-members.html
+++ b/doc/html/classstk_1_1VoicForm-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -52,7 +53,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1VoicForm.html">stk::VoicForm</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1VoicForm.html#a619d2995894216181c2dc38fd863fe33">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1VoicForm.html">stk::VoicForm</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1VoicForm.html#a9462c5ba6b627f5508c336153510de4c">VoicForm</a>(void)</td><td><a class="el" href="classstk_1_1VoicForm.html">stk::VoicForm</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1VoicForm.html#a298da1434bf38e6bf83c2f9db78f01ac">~VoicForm</a>(void)</td><td><a class="el" href="classstk_1_1VoicForm.html">stk::VoicForm</a></td><td></td></tr>
@@ -61,7 +62,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1VoicForm.gif b/doc/html/classstk_1_1VoicForm.gif
deleted file mode 100644
index a2709c5..0000000
Binary files a/doc/html/classstk_1_1VoicForm.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1VoicForm.html b/doc/html/classstk_1_1VoicForm.html
index 71b7cc2..33794cf 100644
--- a/doc/html/classstk_1_1VoicForm.html
+++ b/doc/html/classstk_1_1VoicForm.html
@@ -76,6 +76,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="ac12629d2730f582e405b221e1d7b6f29"></a><!-- doxytag: member="stk::VoicForm::tick" ref="ac12629d2730f582e405b221e1d7b6f29" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1VoicForm.html#a619d2995894216181c2dc38fd863fe33">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a619d2995894216181c2dc38fd863fe33"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>Four formant synthesis instrument. </p>
@@ -89,7 +91,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Vibrato Gain = 1</li>
 <li>Loudness (Spectral Tilt) = 128</li>
 </ul>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="a9462c5ba6b627f5508c336153510de4c"></a><!-- doxytag: member="stk::VoicForm::VoicForm" ref="a9462c5ba6b627f5508c336153510de4c" args="(void)" -->
 <div class="memitem">
@@ -110,6 +112,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a619d2995894216181c2dc38fd863fe33"></a><!-- doxytag: member="stk::VoicForm::tick" ref="a619d2995894216181c2dc38fd863fe33" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::VoicForm::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00133"></a>00133 {
+<a name="l00134"></a>00134   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00135"></a>00135 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00136"></a>00136 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00137"></a>00137     oStream_ &lt;&lt; <span class="stringliteral">&quot;VoicForm::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00138"></a>00138     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00139"></a>00139   }
+<a name="l00140"></a>00140 <span class="preprocessor">#endif</span>
+<a name="l00141"></a>00141 <span class="preprocessor"></span>
+<a name="l00142"></a>00142   StkFloat *samples = &amp;frames[channel];
+<a name="l00143"></a>00143   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00144"></a>00144   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00145"></a>00145     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00146"></a>00146       *samples++ = <a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">tick</a>();
+<a name="l00147"></a>00147   }
+<a name="l00148"></a>00148   <span class="keywordflow">else</span> {
+<a name="l00149"></a>00149     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00150"></a>00150       *samples++ = <a class="code" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29" title="Compute and return one output sample.">tick</a>();
+<a name="l00151"></a>00151       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00152"></a>00152         *samples++ = lastFrame_[j];
+<a name="l00153"></a>00153     }
+<a name="l00154"></a>00154   }
+<a name="l00155"></a>00155 
+<a name="l00156"></a>00156   <span class="keywordflow">return</span> frames;
+<a name="l00157"></a>00157 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -120,7 +182,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Voicer-members.html b/doc/html/classstk_1_1Voicer-members.html
index a06d2f0..b5de958 100644
--- a/doc/html/classstk_1_1Voicer-members.html
+++ b/doc/html/classstk_1_1Voicer-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Voicer.html#a50caec57c6a566e4836181774adf5e7b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Voicer.html">stk::Voicer</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Voicer.html#a98d843fa1f9fd2ad9a9fb03538dba03a">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Voicer.html">stk::Voicer</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Voicer.html#a4843895d8e4c0fffdd165aa480e2dcde">noteOff</a>(StkFloat noteNumber, StkFloat amplitude, int group=0)</td><td><a class="el" href="classstk_1_1Voicer.html">stk::Voicer</a></td><td></td></tr>
@@ -59,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Voicer.gif b/doc/html/classstk_1_1Voicer.gif
deleted file mode 100644
index 7b7cf50..0000000
Binary files a/doc/html/classstk_1_1Voicer.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Voicer.html b/doc/html/classstk_1_1Voicer.html
index 7d128f4..56508c3 100644
--- a/doc/html/classstk_1_1Voicer.html
+++ b/doc/html/classstk_1_1Voicer.html
@@ -81,7 +81,7 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 <p>This class can be used to manage a group of STK instrument classes. Individual voices can be controlled via unique note tags. Instrument groups can be controlled by group number.</p>
 <p>A previously constructed STK instrument class is linked with a voice manager using the <a class="el" href="classstk_1_1Voicer.html#aff9fc9304ef6ae9f7aa1e15611728b8c" title="Add an instrument with an optional group number to the voice manager.">addInstrument()</a> function. An optional group number argument can be specified to the <a class="el" href="classstk_1_1Voicer.html#aff9fc9304ef6ae9f7aa1e15611728b8c" title="Add an instrument with an optional group number to the voice manager.">addInstrument()</a> function as well (default group = 0). The voice manager does not delete any instrument instances ... it is the responsibility of the user to allocate and deallocate all instruments.</p>
 <p>The <a class="el" href="classstk_1_1Voicer.html#a3e504b3a6b896772b0f94a12faf0ee70" title="Mix one sample frame of all sounding voices and return the specified channel value...">tick()</a> function returns the mix of all sounding voices. Each noteOn returns a unique tag (credits to the NeXT MusicKit), so you can send control changes to specific voices within an ensemble. Alternately, control changes can be sent to all voices in a given group.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="aff9fc9304ef6ae9f7aa1e15611728b8c"></a><!-- doxytag: member="stk::Voicer::addInstrument" ref="aff9fc9304ef6ae9f7aa1e15611728b8c" args="(Instrmnt *instrument, int group=0)" -->
 <div class="memitem">
@@ -316,6 +316,18 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 <p>The <code>channel</code> argument must be less than the number of output channels, which can be determined with the <a class="el" href="classstk_1_1Voicer.html#a35230ae97772ae581fb9658a5f4d57b6" title="Return the current number of output channels.">channelsOut()</a> function (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 <dl class="see"><dt><b>See also:</b></dt><dd><a class="el" href="classstk_1_1Voicer.html#a50caec57c6a566e4836181774adf5e7b" title="Return an StkFrames reference to the last output sample frame.">lastFrame()</a> </dd></dl>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00166"></a>00166 {
+<a name="l00167"></a>00167 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00168"></a>00168 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt;= lastFrame_.channels() ) {
+<a name="l00169"></a>00169     oStream_ &lt;&lt; <span class="stringliteral">&quot;Voicer::lastOut(): channel argument is invalid!&quot;</span>;
+<a name="l00170"></a>00170     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00171"></a>00171   }
+<a name="l00172"></a>00172 <span class="preprocessor">#endif</span>
+<a name="l00173"></a>00173 <span class="preprocessor"></span>
+<a name="l00174"></a>00174   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00175"></a>00175 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a3e504b3a6b896772b0f94a12faf0ee70"></a><!-- doxytag: member="stk::Voicer::tick" ref="a3e504b3a6b896772b0f94a12faf0ee70" args="(unsigned int channel=0)" -->
@@ -337,6 +349,24 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 <p>Mix one sample frame of all sounding voices and return the specified <code>channel</code> value. </p>
 <p>The <code>channel</code> argument must be less than the number of output channels, which can be determined with the <a class="el" href="classstk_1_1Voicer.html#a35230ae97772ae581fb9658a5f4d57b6" title="Return the current number of output channels.">channelsOut()</a> function (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00179"></a>00179 {
+<a name="l00180"></a>00180   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j;
+<a name="l00181"></a>00181   <span class="keywordflow">for</span> ( j=0; j&lt;lastFrame_.channels(); j++ ) lastFrame_[j] = 0.0;
+<a name="l00182"></a>00182   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;voices_.size(); i++ ) {
+<a name="l00183"></a>00183     <span class="keywordflow">if</span> ( voices_[i].sounding != 0 ) {
+<a name="l00184"></a>00184       voices_[i].instrument-&gt;tick();
+<a name="l00185"></a>00185       <span class="keywordflow">for</span> ( j=0; j&lt;voices_[i].instrument-&gt;channelsOut(); j++ ) lastFrame_[j] += voices_[i].instrument-&gt;lastOut( j );
+<a name="l00186"></a>00186     }
+<a name="l00187"></a>00187     <span class="keywordflow">if</span> ( voices_[i].sounding &lt; 0 )
+<a name="l00188"></a>00188       voices_[i].sounding++;
+<a name="l00189"></a>00189     <span class="keywordflow">if</span> ( voices_[i].sounding == 0 )
+<a name="l00190"></a>00190       voices_[i].noteNumber = -1;
+<a name="l00191"></a>00191   }
+<a name="l00192"></a>00192 
+<a name="l00193"></a>00193   <span class="keywordflow">return</span> lastFrame_[channel];
+<a name="l00194"></a>00194 }
+</pre></div></p>
+
 </div>
 </div>
 <a class="anchor" id="a3fd795b0fce684c470484936ef39aa16"></a><!-- doxytag: member="stk::Voicer::tick" ref="a3fd795b0fce684c470484936ef39aa16" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
@@ -367,6 +397,27 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 <p>Fill the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument with computed frames and return the same reference. </p>
 <p>The number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument must equal the number of channels in the file data. However, this is only checked if _STK_DEBUG_ is defined during compilation, in which case an incompatibility will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. If no file data is loaded, the function does nothing (a warning will be issued if _STK_DEBUG_ is defined during compilation). </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00197"></a>00197 {
+<a name="l00198"></a>00198   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00199"></a>00199 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00200"></a>00200 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00201"></a>00201     oStream_ &lt;&lt; <span class="stringliteral">&quot;Voicer::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00202"></a>00202     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00203"></a>00203   }
+<a name="l00204"></a>00204 <span class="preprocessor">#endif</span>
+<a name="l00205"></a>00205 <span class="preprocessor"></span>
+<a name="l00206"></a>00206   StkFloat *samples = &amp;frames[channel];
+<a name="l00207"></a>00207   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00208"></a>00208   <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00209"></a>00209     <a class="code" href="classstk_1_1Voicer.html#a3e504b3a6b896772b0f94a12faf0ee70" title="Mix one sample frame of all sounding voices and return the specified channel value...">tick</a>();
+<a name="l00210"></a>00210     <span class="keywordflow">for</span> ( j=0; j&lt;nChannels; j++ )
+<a name="l00211"></a>00211       *samples++ = lastFrame_[j];
+<a name="l00212"></a>00212   }
+<a name="l00213"></a>00213 
+<a name="l00214"></a>00214   <span class="keywordflow">return</span> frames;
+<a name="l00215"></a>00215 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -377,7 +428,7 @@ const <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;<
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Whistle-members.html b/doc/html/classstk_1_1Whistle-members.html
index 27d900b..1e2deeb 100644
--- a/doc/html/classstk_1_1Whistle-members.html
+++ b/doc/html/classstk_1_1Whistle-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">lastOut</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
@@ -47,7 +48,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Whistle.html">stk::Whistle</a></td><td><code> [virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Whistle.html#a46135035da33d0825e3ff0db04b857d4">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Whistle.html">stk::Whistle</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Whistle.html#ae577e98aaf1957164155e4247f39a604">Whistle</a>(void)</td><td><a class="el" href="classstk_1_1Whistle.html">stk::Whistle</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Whistle.html#ab44c607efebd6d6d53bf06b95636a90b">~Whistle</a>(void)</td><td><a class="el" href="classstk_1_1Whistle.html">stk::Whistle</a></td><td></td></tr>
@@ -56,7 +57,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Whistle.gif b/doc/html/classstk_1_1Whistle.gif
deleted file mode 100644
index 6bf2295..0000000
Binary files a/doc/html/classstk_1_1Whistle.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Whistle.html b/doc/html/classstk_1_1Whistle.html
index b6ae288..c4a2fce 100644
--- a/doc/html/classstk_1_1Whistle.html
+++ b/doc/html/classstk_1_1Whistle.html
@@ -61,6 +61,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a3835e290dae97acfe79e1f7458a39cda"></a><!-- doxytag: member="stk::Whistle::tick" ref="a3835e290dae97acfe79e1f7458a39cda" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Whistle.html#a46135035da33d0825e3ff0db04b857d4">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a46135035da33d0825e3ff0db04b857d4"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK police/referee whistle instrument class. </p>
@@ -73,7 +75,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li>Blowing Frequency Modulation = 2</li>
 <li>Volume = 128</li>
 </ul>
-<p>by Perry R. Cook 1996 - 2010. </p>
+<p>by Perry R. Cook 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="ae577e98aaf1957164155e4247f39a604"></a><!-- doxytag: member="stk::Whistle::Whistle" ref="ae577e98aaf1957164155e4247f39a604" args="(void)" -->
 <div class="memitem">
@@ -94,6 +96,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a46135035da33d0825e3ff0db04b857d4"></a><!-- doxytag: member="stk::Whistle::tick" ref="a46135035da33d0825e3ff0db04b857d4" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Whistle::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00101"></a>00101 {
+<a name="l00102"></a>00102   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00103"></a>00103 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00104"></a>00104 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00105"></a>00105     oStream_ &lt;&lt; <span class="stringliteral">&quot;Whistle::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00106"></a>00106     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00107"></a>00107   }
+<a name="l00108"></a>00108 <span class="preprocessor">#endif</span>
+<a name="l00109"></a>00109 <span class="preprocessor"></span>
+<a name="l00110"></a>00110   StkFloat *samples = &amp;frames[channel];
+<a name="l00111"></a>00111   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00112"></a>00112   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00113"></a>00113     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00114"></a>00114       *samples++ = <a class="code" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda" title="Compute and return one output sample.">tick</a>();
+<a name="l00115"></a>00115   }
+<a name="l00116"></a>00116   <span class="keywordflow">else</span> {
+<a name="l00117"></a>00117     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00118"></a>00118       *samples++ = <a class="code" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda" title="Compute and return one output sample.">tick</a>();
+<a name="l00119"></a>00119       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00120"></a>00120         *samples++ = lastFrame_[j];
+<a name="l00121"></a>00121     }
+<a name="l00122"></a>00122   }
+<a name="l00123"></a>00123 
+<a name="l00124"></a>00124   <span class="keywordflow">return</span> frames;
+<a name="l00125"></a>00125 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -104,7 +166,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Wurley-members.html b/doc/html/classstk_1_1Wurley-members.html
index 84c29d0..ce7d0e8 100644
--- a/doc/html/classstk_1_1Wurley-members.html
+++ b/doc/html/classstk_1_1Wurley-members.html
@@ -20,6 +20,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">Instrmnt</a>(void)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#a7235e94a153df135330a591511269f7c">keyOff</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#afc46280177d770404919f20ccf88e4ff">keyOn</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td></td></tr>
@@ -55,7 +56,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a820631139e6f7e23d328d387c0f530fd">swap32</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f744eadf29ecbfbeddfdf7ceb5853c9">swap64</a>(unsigned char *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd">tick</a>(unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Wurley.html">stk::Wurley</a></td><td><code> [inline, virtual]</code></td></tr>
-  <tr class="memlist"><td><a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt::tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Instrmnt.html">stk::Instrmnt</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Wurley.html#a505f7e6499761f64d0cc4b6419d945c3">tick</a>(StkFrames &amp;frames, unsigned int channel=0)</td><td><a class="el" href="classstk_1_1Wurley.html">stk::Wurley</a></td><td><code> [inline, virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Wurley.html#afb2a68449dcd9902f0f037504387c52f">Wurley</a>(void)</td><td><a class="el" href="classstk_1_1Wurley.html">stk::Wurley</a></td><td></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1FM.html#aaba7e8bff02d105e146f8b62b20a27b9">~FM</a>(void)</td><td><a class="el" href="classstk_1_1FM.html">stk::FM</a></td><td><code> [virtual]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ad0d5c6ab745ad2841a59032addae3905">~Stk</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected, virtual]</code></td></tr>
@@ -65,7 +66,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1Wurley.gif b/doc/html/classstk_1_1Wurley.gif
deleted file mode 100644
index d8a7bbd..0000000
Binary files a/doc/html/classstk_1_1Wurley.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1Wurley.html b/doc/html/classstk_1_1Wurley.html
index 08c9102..b339f99 100644
--- a/doc/html/classstk_1_1Wurley.html
+++ b/doc/html/classstk_1_1Wurley.html
@@ -47,6 +47,8 @@ void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="clas
 <tr><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a2019cfe262eb755ac939c98bda0383bd"></a><!-- doxytag: member="stk::Wurley::tick" ref="a2019cfe262eb755ac939c98bda0383bd" args="(unsigned int channel=0)" -->
 StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd">tick</a> (unsigned int channel=0)</td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compute and return one output sample. <br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Wurley.html#a505f7e6499761f64d0cc4b6419d945c3">tick</a> (<a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;frames, unsigned int channel=0)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs.  <a href="#a505f7e6499761f64d0cc4b6419d945c3"></a><br/></td></tr>
 </table>
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK Wurlitzer electric piano <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis instrument. </p>
@@ -63,7 +65,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <li><a class="el" href="classstk_1_1ADSR.html" title="STK ADSR envelope class.">ADSR</a> 2 &amp; 4 Target = 128</li>
 </ul>
 <p>The basic Chowning/Stanford <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> patent expired in 1995, but there exist follow-on patents, mostly assigned to Yamaha. If you are of the type who should worry about this (making money) worry away.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Constructor &amp; Destructor Documentation</h2>
 <a class="anchor" id="afb2a68449dcd9902f0f037504387c52f"></a><!-- doxytag: member="stk::Wurley::Wurley" ref="afb2a68449dcd9902f0f037504387c52f" args="(void)" -->
 <div class="memitem">
@@ -84,6 +86,66 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 <p>Class constructor. </p>
 <p>An <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> will be thrown if the rawwave path is incorrectly set. </p>
 
+</div>
+</div>
+<hr/><h2>Member Function Documentation</h2>
+<a class="anchor" id="a505f7e6499761f64d0cc4b6419d945c3"></a><!-- doxytag: member="stk::Wurley::tick" ref="a505f7e6499761f64d0cc4b6419d945c3" args="(StkFrames &amp;frames, unsigned int channel=0)" -->
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp; stk::Wurley::tick </td>
+          <td>(</td>
+          <td class="paramtype"><a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp;</td>
+          <td class="paramname"> <em>frames</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype">unsigned int&nbsp;</td>
+          <td class="paramname"> <em>channel</em> = <code>0</code></td><td>&nbsp;</td>
+        </tr>
+        <tr>
+          <td></td>
+          <td>)</td>
+          <td></td><td></td><td><code> [inline, virtual]</code></td>
+        </tr>
+      </table>
+</div>
+<div class="memdoc">
+
+<p>Fill a channel of the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> object with computed outputs. </p>
+<p>The <code>channel</code> argument must be less than the number of channels in the <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> argument (the first channel is specified by 0). However, range checking is only performed if _STK_DEBUG_ is defined during compilation, in which case an out-of-range value will trigger an <a class="el" href="classstk_1_1StkError.html" title="STK error handling class.">StkError</a> exception. </p>
+
+<p>Implements <a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">stk::FM</a>.</p>
+
+<p><div class="fragment"><pre class="fragment"><a name="l00100"></a>00100 {
+<a name="l00101"></a>00101   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> nChannels = lastFrame_.channels();
+<a name="l00102"></a>00102 <span class="preprocessor">#if defined(_STK_DEBUG_)</span>
+<a name="l00103"></a>00103 <span class="preprocessor"></span>  <span class="keywordflow">if</span> ( channel &gt; frames.channels() - nChannels ) {
+<a name="l00104"></a>00104     oStream_ &lt;&lt; <span class="stringliteral">&quot;Wurley::tick(): channel and StkFrames arguments are incompatible!&quot;</span>;
+<a name="l00105"></a>00105     <a class="code" href="classstk_1_1Stk.html#a48ac73a0d8ca28445ba1a054e1f061ff" title="Static function for error reporting and handling using c-strings.">handleError</a>( StkError::FUNCTION_ARGUMENT );
+<a name="l00106"></a>00106   }
+<a name="l00107"></a>00107 <span class="preprocessor">#endif</span>
+<a name="l00108"></a>00108 <span class="preprocessor"></span>
+<a name="l00109"></a>00109   StkFloat *samples = &amp;frames[channel];
+<a name="l00110"></a>00110   <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> j, hop = frames.channels() - nChannels;
+<a name="l00111"></a>00111   <span class="keywordflow">if</span> ( nChannels == 1 ) {
+<a name="l00112"></a>00112     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop )
+<a name="l00113"></a>00113       *samples++ = <a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">tick</a>();
+<a name="l00114"></a>00114   }
+<a name="l00115"></a>00115   <span class="keywordflow">else</span> {
+<a name="l00116"></a>00116     <span class="keywordflow">for</span> ( <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> i=0; i&lt;frames.frames(); i++, samples += hop ) {
+<a name="l00117"></a>00117       *samples++ = <a class="code" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd" title="Compute and return one output sample.">tick</a>();
+<a name="l00118"></a>00118       <span class="keywordflow">for</span> ( j=1; j&lt;nChannels; j++ )
+<a name="l00119"></a>00119         *samples++ = lastFrame_[j];
+<a name="l00120"></a>00120     }
+<a name="l00121"></a>00121   }
+<a name="l00122"></a>00122 
+<a name="l00123"></a>00123   <span class="keywordflow">return</span> frames;
+<a name="l00124"></a>00124 }
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -94,7 +156,7 @@ StkFloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1WvIn-members.html b/doc/html/classstk_1_1WvIn-members.html
index 3a75a09..3261a8a 100644
--- a/doc/html/classstk_1_1WvIn-members.html
+++ b/doc/html/classstk_1_1WvIn-members.html
@@ -17,6 +17,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1WvIn.html#a3ab86e33eff9f962c9ef7b41e3ccb77e">lastFrame</a>(void) const </td><td><a class="el" href="classstk_1_1WvIn.html">stk::WvIn</a></td><td><code> [inline]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
@@ -45,7 +46,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1WvIn.gif b/doc/html/classstk_1_1WvIn.gif
deleted file mode 100644
index c2d75b2..0000000
Binary files a/doc/html/classstk_1_1WvIn.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1WvIn.html b/doc/html/classstk_1_1WvIn.html
index af940dc..f14b2ee 100644
--- a/doc/html/classstk_1_1WvIn.html
+++ b/doc/html/classstk_1_1WvIn.html
@@ -50,7 +50,7 @@ virtual <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp
 <hr/><a name="_details"></a><h2>Detailed Description</h2>
 <p>STK audio input abstract base class. </p>
 <p>This class provides common functionality for a variety of audio data input subclasses.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a3ab86e33eff9f962c9ef7b41e3ccb77e"></a><!-- doxytag: member="stk::WvIn::lastFrame" ref="a3ab86e33eff9f962c9ef7b41e3ccb77e" args="(void) const " -->
 <div class="memitem">
@@ -71,6 +71,9 @@ virtual <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp
 <p>Return an <a class="el" href="classstk_1_1StkFrames.html" title="An STK class to handle vectorized audio data.">StkFrames</a> reference to the last computed sample frame. </p>
 <p>If no file data is loaded, an empty container is returned. </p>
 
+<p><div class="fragment"><pre class="fragment"><a name="l00029"></a>00029 { <span class="keywordflow">return</span> lastFrame_; };
+</pre></div></p>
+
 </div>
 </div>
 <hr/>The documentation for this class was generated from the following file:<ul>
@@ -81,7 +84,7 @@ virtual <a class="el" href="classstk_1_1StkFrames.html">StkFrames</a> &amp;&nbsp
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1WvOut-members.html b/doc/html/classstk_1_1WvOut-members.html
index 5c48f5c..57e72a1 100644
--- a/doc/html/classstk_1_1WvOut-members.html
+++ b/doc/html/classstk_1_1WvOut-members.html
@@ -19,6 +19,7 @@
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#abc18b8fc8ed5b992bd2efef162a40777">handleError</a>(std::string message, StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a577656590baea0d65057b221f050f83d">handleError</a>(StkError::Type type)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">ignoreSampleRateChange</a>(bool ignore=true)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline]</code></td></tr>
+  <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">inRange</a>(StkFloat value, StkFloat min, StkFloat max)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#affb98f8f1f65ddc9e4af8440056b1504">printErrors</a>(bool status)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a5f3fd05b709788213549fe2cbaf4a52a">rawwavePath</a>(void)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [inline, static]</code></td></tr>
   <tr class="memlist"><td><a class="el" href="classstk_1_1Stk.html#a349865986f712f58087cb72603a6ced8">removeSampleRateAlert</a>(Stk *ptr)</td><td><a class="el" href="classstk_1_1Stk.html">stk::Stk</a></td><td><code> [protected]</code></td></tr>
@@ -48,7 +49,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/classstk_1_1WvOut.gif b/doc/html/classstk_1_1WvOut.gif
deleted file mode 100644
index b4669e1..0000000
Binary files a/doc/html/classstk_1_1WvOut.gif and /dev/null differ
diff --git a/doc/html/classstk_1_1WvOut.html b/doc/html/classstk_1_1WvOut.html
index 8b76716..afec721 100644
--- a/doc/html/classstk_1_1WvOut.html
+++ b/doc/html/classstk_1_1WvOut.html
@@ -59,7 +59,7 @@ virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 <p>STK audio output abstract base class. </p>
 <p>This class provides common functionality for a variety of audio data output subclasses.</p>
 <p>Currently, <a class="el" href="classstk_1_1WvOut.html" title="STK audio output abstract base class.">WvOut</a> is non-interpolating and the output rate is always <a class="el" href="classstk_1_1Stk.html#a5fbe37000a611ce56075ee7d8936472d" title="Static method that returns the current STK sample rate.">Stk::sampleRate()</a>.</p>
-<p>by Perry R. Cook and Gary P. Scavone, 1995 - 2010. </p>
+<p>by Perry R. Cook and Gary P. Scavone, 1995-2011. </p>
 <hr/><h2>Member Function Documentation</h2>
 <a class="anchor" id="a7fe517928a0043353ebc2a852b49953c"></a><!-- doxytag: member="stk::WvOut::tick" ref="a7fe517928a0043353ebc2a852b49953c" args="(const StkFloat sample)=0" -->
 <div class="memitem">
@@ -92,7 +92,7 @@ virtual void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" hr
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/closed.gif b/doc/html/closed.gif
new file mode 100644
index 0000000..5310631
Binary files /dev/null and b/doc/html/closed.gif differ
diff --git a/doc/html/compile.html b/doc/html/compile.html
index 8ac03b6..5f0fde0 100644
--- a/doc/html/compile.html
+++ b/doc/html/compile.html
@@ -59,7 +59,7 @@ Windows:</a></h2>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/controlin.html b/doc/html/controlin.html
index 5a8fc27..fff5a42 100644
--- a/doc/html/controlin.html
+++ b/doc/html/controlin.html
@@ -163,7 +163,7 @@ NoteOff         1.000000  2  69.0  64.0
     dac.<a class="code" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream</a>( &amp;parameters, NULL, format, (<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span>)Stk::sampleRate(), &amp;bufferFrames, &amp;tick, (<span class="keywordtype">void</span> *)&amp;data );
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
     <span class="keywordflow">goto</span> cleanup;
   }
 
@@ -182,7 +182,7 @@ NoteOff         1.000000  2  69.0  64.0
     dac.<a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">startStream</a>();
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
     <span class="keywordflow">goto</span> cleanup;
   }
 
@@ -195,7 +195,7 @@ NoteOff         1.000000  2  69.0  64.0
     dac.<a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">closeStream</a>();
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
   }
 
  cleanup:
@@ -215,7 +215,7 @@ NoteOff         1.000000  2  69.0  64.0
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/crealtime.html b/doc/html/crealtime.html
index cfbc643..59716ff 100644
--- a/doc/html/crealtime.html
+++ b/doc/html/crealtime.html
@@ -53,7 +53,7 @@
     dac.<a class="code" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream</a>( &amp;parameters, NULL, format, (<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span>)Stk::sampleRate(), &amp;bufferFrames, &amp;tick, (<span class="keywordtype">void</span> *)&amp;sine );
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
     <span class="keywordflow">goto</span> cleanup;
   }
 
@@ -63,7 +63,7 @@
     dac.<a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">startStream</a>();
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
     <span class="keywordflow">goto</span> cleanup;
   }
 
@@ -77,7 +77,7 @@
     dac.<a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">closeStream</a>();
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
   }
 
  cleanup:
@@ -98,7 +98,7 @@ Blocking vs. Callbacks</a></h2>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/dir_c28bfe24b93fcab464ea84f988cb34ef.html b/doc/html/dir_c28bfe24b93fcab464ea84f988cb34ef.html
deleted file mode 100644
index a0d5f39..0000000
--- a/doc/html/dir_c28bfe24b93fcab464ea84f988cb34ef.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_c28bfe24b93fcab464ea84f988cb34ef.html">include</a>
-  </div>
-<div class="contents">
-<h1>include Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Files</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>ADSR.h</b> <a href="ADSR_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Asymp.h</b> <a href="Asymp_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BandedWG.h</b> <a href="BandedWG_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BeeThree.h</b> <a href="BeeThree_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BiQuad.h</b> <a href="BiQuad_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Blit.h</b> <a href="Blit_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BlitSaw.h</b> <a href="BlitSaw_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BlitSquare.h</b> <a href="BlitSquare_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BlowBotl.h</b> <a href="BlowBotl_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BlowHole.h</b> <a href="BlowHole_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Bowed.h</b> <a href="Bowed_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BowTable.h</b> <a href="BowTable_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Brass.h</b> <a href="Brass_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Chorus.h</b> <a href="Chorus_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Clarinet.h</b> <a href="Clarinet_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Delay.h</b> <a href="Delay_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>DelayA.h</b> <a href="DelayA_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>DelayL.h</b> <a href="DelayL_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Drummer.h</b> <a href="Drummer_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Echo.h</b> <a href="Echo_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Effect.h</b> <a href="Effect_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Envelope.h</b> <a href="Envelope_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FileLoop.h</b> <a href="FileLoop_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FileRead.h</b> <a href="FileRead_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FileWrite.h</b> <a href="FileWrite_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FileWvIn.h</b> <a href="FileWvIn_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FileWvOut.h</b> <a href="FileWvOut_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Filter.h</b> <a href="Filter_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Fir.h</b> <a href="Fir_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Flute.h</b> <a href="Flute_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FM.h</b> <a href="FM_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FMVoices.h</b> <a href="FMVoices_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FormSwep.h</b> <a href="FormSwep_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Function.h</b> <a href="Function_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Generator.h</b> <a href="Generator_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Granulate.h</b> <a href="Granulate_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>HevyMetl.h</b> <a href="HevyMetl_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Iir.h</b> <a href="Iir_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>InetWvIn.h</b> <a href="InetWvIn_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>InetWvOut.h</b> <a href="InetWvOut_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Instrmnt.h</b> <a href="Instrmnt_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>JCRev.h</b> <a href="JCRev_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>JetTable.h</b> <a href="JetTable_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Mandolin.h</b> <a href="Mandolin_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Mesh2D.h</b> <a href="Mesh2D_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Messager.h</b> <a href="Messager_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>MidiFileIn.h</b> <a href="MidiFileIn_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Modal.h</b> <a href="Modal_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>ModalBar.h</b> <a href="ModalBar_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Modulate.h</b> <a href="Modulate_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Moog.h</b> <a href="Moog_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Mutex.h</b> <a href="Mutex_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Noise.h</b> <a href="Noise_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>NRev.h</b> <a href="NRev_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>OnePole.h</b> <a href="OnePole_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>OneZero.h</b> <a href="OneZero_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PercFlut.h</b> <a href="PercFlut_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Phonemes.h</b> <a href="Phonemes_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PitShift.h</b> <a href="PitShift_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Plucked.h</b> <a href="Plucked_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PluckTwo.h</b> <a href="PluckTwo_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PoleZero.h</b> <a href="PoleZero_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PRCRev.h</b> <a href="PRCRev_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>ReedTable.h</b> <a href="ReedTable_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Resonate.h</b> <a href="Resonate_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Rhodey.h</b> <a href="Rhodey_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="RtAudio_8h.html">RtAudio.h</a> <a href="RtAudio_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>RtError.h</b> <a href="RtError_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>RtMidi.h</b> <a href="RtMidi_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>RtWvIn.h</b> <a href="RtWvIn_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>RtWvOut.h</b> <a href="RtWvOut_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Sampler.h</b> <a href="Sampler_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Saxofony.h</b> <a href="Saxofony_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Shakers.h</b> <a href="Shakers_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Simple.h</b> <a href="Simple_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>SineWave.h</b> <a href="SineWave_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>SingWave.h</b> <a href="SingWave_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Sitar.h</b> <a href="Sitar_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Skini.h</b> <a href="Skini_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>SKINI.msg</b></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Socket.h</b> <a href="Socket_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Sphere.h</b> <a href="Sphere_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>StifKarp.h</b> <a href="StifKarp_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Stk.h</b> <a href="Stk_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TapDelay.h</b> <a href="TapDelay_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TcpClient.h</b> <a href="TcpClient_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TcpServer.h</b> <a href="TcpServer_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Thread.h</b> <a href="Thread_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TubeBell.h</b> <a href="TubeBell_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TwoPole.h</b> <a href="TwoPole_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TwoZero.h</b> <a href="TwoZero_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>UdpSocket.h</b> <a href="UdpSocket_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Vector3D.h</b> <a href="Vector3D_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Voicer.h</b> <a href="Voicer_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>VoicForm.h</b> <a href="VoicForm_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Whistle.h</b> <a href="Whistle_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Wurley.h</b> <a href="Wurley_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>WvIn.h</b> <a href="WvIn_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>WvOut.h</b> <a href="WvOut_8h-source.html">[code]</a></td></tr>
-
-</table>
-</div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/dir_d499f4756a454d8a02faa5ebe57d576f.html b/doc/html/dir_d499f4756a454d8a02faa5ebe57d576f.html
deleted file mode 100644
index f870318..0000000
--- a/doc/html/dir_d499f4756a454d8a02faa5ebe57d576f.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.5.8 -->
-  <div class="navpath"><a class="el" href="dir_d499f4756a454d8a02faa5ebe57d576f.html">include</a>
-  </div>
-<div class="contents">
-<h1>include Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Files</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>ADSR.h</b> <a href="ADSR_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Asymp.h</b> <a href="Asymp_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BandedWG.h</b> <a href="BandedWG_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BeeThree.h</b> <a href="BeeThree_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BiQuad.h</b> <a href="BiQuad_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Blit.h</b> <a href="Blit_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BlitSaw.h</b> <a href="BlitSaw_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BlitSquare.h</b> <a href="BlitSquare_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BlowBotl.h</b> <a href="BlowBotl_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BlowHole.h</b> <a href="BlowHole_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Bowed.h</b> <a href="Bowed_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>BowTable.h</b> <a href="BowTable_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Brass.h</b> <a href="Brass_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Chorus.h</b> <a href="Chorus_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Clarinet.h</b> <a href="Clarinet_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Delay.h</b> <a href="Delay_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>DelayA.h</b> <a href="DelayA_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>DelayL.h</b> <a href="DelayL_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Drummer.h</b> <a href="Drummer_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Echo.h</b> <a href="Echo_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Effect.h</b> <a href="Effect_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Envelope.h</b> <a href="Envelope_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FileLoop.h</b> <a href="FileLoop_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FileRead.h</b> <a href="FileRead_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FileWrite.h</b> <a href="FileWrite_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FileWvIn.h</b> <a href="FileWvIn_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FileWvOut.h</b> <a href="FileWvOut_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Filter.h</b> <a href="Filter_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Fir.h</b> <a href="Fir_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Flute.h</b> <a href="Flute_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FM.h</b> <a href="FM_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FMVoices.h</b> <a href="FMVoices_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>FormSwep.h</b> <a href="FormSwep_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Function.h</b> <a href="Function_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Generator.h</b> <a href="Generator_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Granulate.h</b> <a href="Granulate_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>HevyMetl.h</b> <a href="HevyMetl_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Iir.h</b> <a href="Iir_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>InetWvIn.h</b> <a href="InetWvIn_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>InetWvOut.h</b> <a href="InetWvOut_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Instrmnt.h</b> <a href="Instrmnt_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>JCRev.h</b> <a href="JCRev_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>JetTable.h</b> <a href="JetTable_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Mandolin.h</b> <a href="Mandolin_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Mesh2D.h</b> <a href="Mesh2D_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Messager.h</b> <a href="Messager_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>MidiFileIn.h</b> <a href="MidiFileIn_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Modal.h</b> <a href="Modal_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>ModalBar.h</b> <a href="ModalBar_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Modulate.h</b> <a href="Modulate_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Moog.h</b> <a href="Moog_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Mutex.h</b> <a href="Mutex_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Noise.h</b> <a href="Noise_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>NRev.h</b> <a href="NRev_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>OnePole.h</b> <a href="OnePole_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>OneZero.h</b> <a href="OneZero_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PercFlut.h</b> <a href="PercFlut_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Phonemes.h</b> <a href="Phonemes_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PitShift.h</b> <a href="PitShift_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Plucked.h</b> <a href="Plucked_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PluckTwo.h</b> <a href="PluckTwo_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PoleZero.h</b> <a href="PoleZero_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PRCRev.h</b> <a href="PRCRev_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>ReedTable.h</b> <a href="ReedTable_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Resonate.h</b> <a href="Resonate_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Rhodey.h</b> <a href="Rhodey_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="RtAudio_8h.html">RtAudio.h</a> <a href="RtAudio_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>RtError.h</b> <a href="RtError_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>RtMidi.h</b> <a href="RtMidi_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>RtWvIn.h</b> <a href="RtWvIn_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>RtWvOut.h</b> <a href="RtWvOut_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Sampler.h</b> <a href="Sampler_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Saxofony.h</b> <a href="Saxofony_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Shakers.h</b> <a href="Shakers_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Simple.h</b> <a href="Simple_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>SineWave.h</b> <a href="SineWave_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>SingWave.h</b> <a href="SingWave_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Sitar.h</b> <a href="Sitar_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Skini.h</b> <a href="Skini_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>SKINI.msg</b></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Socket.h</b> <a href="Socket_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Sphere.h</b> <a href="Sphere_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>StifKarp.h</b> <a href="StifKarp_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Stk.h</b> <a href="Stk_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TapDelay.h</b> <a href="TapDelay_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TcpClient.h</b> <a href="TcpClient_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TcpServer.h</b> <a href="TcpServer_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Thread.h</b> <a href="Thread_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TubeBell.h</b> <a href="TubeBell_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TwoPole.h</b> <a href="TwoPole_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TwoZero.h</b> <a href="TwoZero_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>UdpSocket.h</b> <a href="UdpSocket_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Vector3D.h</b> <a href="Vector3D_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Voicer.h</b> <a href="Voicer_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>VoicForm.h</b> <a href="VoicForm_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Whistle.h</b> <a href="Whistle_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Wurley.h</b> <a href="Wurley_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>WvIn.h</b> <a href="WvIn_8h-source.html">[code]</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>WvOut.h</b> <a href="WvOut_8h-source.html">[code]</a></td></tr>
-
-</table>
-</div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/dir_ca1e4533604ab7cb0cdaaff730a9c38f.html b/doc/html/dir_f14fd23bc74c76f288031ad23b3f3505.html
similarity index 97%
rename from doc/html/dir_ca1e4533604ab7cb0cdaaff730a9c38f.html
rename to doc/html/dir_f14fd23bc74c76f288031ad23b3f3505.html
index 67b0b54..02b5db8 100644
--- a/doc/html/dir_ca1e4533604ab7cb0cdaaff730a9c38f.html
+++ b/doc/html/dir_f14fd23bc74c76f288031ad23b3f3505.html
@@ -9,7 +9,7 @@
 <a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
-  <div class="navpath"><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a>
+  <div class="navpath"><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a>
   </div>
 <div class="contents">
 <h1>include Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
@@ -29,6 +29,7 @@
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Brass.h</b> <a href="Brass_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Chorus.h</b> <a href="Chorus_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Clarinet.h</b> <a href="Clarinet_8h_source.html">[code]</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Cubic.h</b> <a href="Cubic_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Delay.h</b> <a href="Delay_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>DelayA.h</b> <a href="DelayA_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>DelayL.h</b> <a href="DelayL_8h_source.html">[code]</a></td></tr>
@@ -75,7 +76,6 @@
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Phonemes.h</b> <a href="Phonemes_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PitShift.h</b> <a href="PitShift_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Plucked.h</b> <a href="Plucked_8h_source.html">[code]</a></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PluckTwo.h</b> <a href="PluckTwo_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PoleZero.h</b> <a href="PoleZero_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>PRCRev.h</b> <a href="PRCRev_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>ReedTable.h</b> <a href="ReedTable_8h_source.html">[code]</a></td></tr>
@@ -104,6 +104,7 @@
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TcpServer.h</b> <a href="TcpServer_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Thread.h</b> <a href="Thread_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TubeBell.h</b> <a href="TubeBell_8h_source.html">[code]</a></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>Twang.h</b> <a href="Twang_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TwoPole.h</b> <a href="TwoPole_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>TwoZero.h</b> <a href="TwoZero_8h_source.html">[code]</a></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><b>UdpSocket.h</b> <a href="UdpSocket_8h_source.html">[code]</a></td></tr>
@@ -120,7 +121,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/dirs.html b/doc/html/dirs.html
index 811f03a..da97f7d 100644
--- a/doc/html/dirs.html
+++ b/doc/html/dirs.html
@@ -11,14 +11,14 @@
 <!-- Generated by Doxygen 1.6.2 -->
 <div class="contents">
 <h1>Directories</h1>This directory hierarchy is sorted roughly, but not completely, alphabetically:<ul>
-<li><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html">include</a></li>
+<li><a class="el" href="dir_f14fd23bc74c76f288031ad23b3f3505.html">include</a></li>
 </ul>
 </div>
 <HR>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/download.html b/doc/html/download.html
index 09eb2f7..b8d0277 100644
--- a/doc/html/download.html
+++ b/doc/html/download.html
@@ -13,13 +13,35 @@
 
 
 <h1><a class="anchor" id="download">Download, Release Notes, and Bug Fixes </a></h1><h2><a class="anchor" id="down">
-Download Version 4.4.2 (4 February 2010):</a></h2>
+Download Version 4.4.3 (30 August 2011):</a></h2>
 <ul>
 <li>
-<a href="http://ccrma.stanford.edu/software/stk/release/stk-4.4.2.tar.gz">Source distribution</a> </li>
+<a href="http://ccrma.stanford.edu/software/stk/release/stk-4.4.3.tar.gz">Source distribution</a> </li>
 </ul>
 <h2><a class="anchor" id="notes">
 Release Notes:</a></h2>
+<h3><a class="anchor" id="v4dot4dot3">
+Version 4.4.3</a></h3>
+<ul>
+<li>
+Changed SINT24 to be lower 3 bytes of 32-bit word. </li>
+<li>
+Bug fixes to vectorized tick functions in Effects classes. </li>
+<li>
+Updated versions of <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> and <a class="el" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>. </li>
+<li>
+Bug fixes in ADSR and Envelope classes. </li>
+<li>
+Updates to the internal argument checking and reporting scheme. </li>
+<li>
+Updates to Bowed class (thanks to Esteban Maestre!). </li>
+<li>
+Fixes for 24-bit support in FileRead and FileWrite. </li>
+<li>
+Added WAVE_FORMAT_EXTENSIBLE support in FileWrite. </li>
+<li>
+Added sample rate variable reading and writing for MAT-files in FileRead and FileWrite. </li>
+</ul>
 <h3><a class="anchor" id="v4dot4dot2">
 Version 4.4.2</a></h3>
 <ul>
@@ -467,7 +489,7 @@ A single distribution for all platforms. The Unix and Windows versions have been
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/faq.html b/doc/html/faq.html
index 54a3c5b..9c98587 100644
--- a/doc/html/faq.html
+++ b/doc/html/faq.html
@@ -36,7 +36,7 @@ work with any standard C++ compiler.
 STK WWW site: http://ccrma.stanford.edu/software/stk/
 
 The Synthesis ToolKit in C++ (STK)
-Copyright (c) 1995-2010 Perry R. Cook and Gary P. Scavone
+Copyright (c) 1995-2011 Perry R. Cook and Gary P. Scavone
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -81,7 +81,7 @@ Why do I get a Tk display error message?</a></h2>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/files.html b/doc/html/files.html
index 60d3a53..1919612 100644
--- a/doc/html/files.html
+++ b/doc/html/files.html
@@ -26,6 +26,7 @@
   <tr><td class="indexkey"><b>Brass.h</b> <a href="Brass_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>Chorus.h</b> <a href="Chorus_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>Clarinet.h</b> <a href="Clarinet_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><b>Cubic.h</b> <a href="Cubic_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>Delay.h</b> <a href="Delay_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>DelayA.h</b> <a href="DelayA_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>DelayL.h</b> <a href="DelayL_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
@@ -72,7 +73,6 @@
   <tr><td class="indexkey"><b>Phonemes.h</b> <a href="Phonemes_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>PitShift.h</b> <a href="PitShift_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>Plucked.h</b> <a href="Plucked_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
-  <tr><td class="indexkey"><b>PluckTwo.h</b> <a href="PluckTwo_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>PoleZero.h</b> <a href="PoleZero_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>PRCRev.h</b> <a href="PRCRev_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>ReedTable.h</b> <a href="ReedTable_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
@@ -100,6 +100,7 @@
   <tr><td class="indexkey"><b>TcpServer.h</b> <a href="TcpServer_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>Thread.h</b> <a href="Thread_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>TubeBell.h</b> <a href="TubeBell_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
+  <tr><td class="indexkey"><b>Twang.h</b> <a href="Twang_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>TwoPole.h</b> <a href="TwoPole_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>TwoZero.h</b> <a href="TwoZero_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><b>UdpSocket.h</b> <a href="UdpSocket_8h_source.html">[code]</a></td><td class="indexvalue"></td></tr>
@@ -116,7 +117,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/filtering.html b/doc/html/filtering.html
index 680b20d..3aba1dd 100644
--- a/doc/html/filtering.html
+++ b/doc/html/filtering.html
@@ -88,7 +88,7 @@ Resonances:</a></h2>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/ftv2blank.png b/doc/html/ftv2blank.png
deleted file mode 100644
index 493c3c0..0000000
Binary files a/doc/html/ftv2blank.png and /dev/null differ
diff --git a/doc/html/ftv2doc.png b/doc/html/ftv2doc.png
deleted file mode 100644
index f72999f..0000000
Binary files a/doc/html/ftv2doc.png and /dev/null differ
diff --git a/doc/html/ftv2folderclosed.png b/doc/html/ftv2folderclosed.png
deleted file mode 100644
index d6d0634..0000000
Binary files a/doc/html/ftv2folderclosed.png and /dev/null differ
diff --git a/doc/html/ftv2folderopen.png b/doc/html/ftv2folderopen.png
deleted file mode 100644
index bbe2c91..0000000
Binary files a/doc/html/ftv2folderopen.png and /dev/null differ
diff --git a/doc/html/ftv2lastnode.png b/doc/html/ftv2lastnode.png
deleted file mode 100644
index e7b9ba9..0000000
Binary files a/doc/html/ftv2lastnode.png and /dev/null differ
diff --git a/doc/html/ftv2link.png b/doc/html/ftv2link.png
deleted file mode 100644
index 14f3fed..0000000
Binary files a/doc/html/ftv2link.png and /dev/null differ
diff --git a/doc/html/ftv2mlastnode.png b/doc/html/ftv2mlastnode.png
deleted file mode 100644
index 09ceb6a..0000000
Binary files a/doc/html/ftv2mlastnode.png and /dev/null differ
diff --git a/doc/html/ftv2mnode.png b/doc/html/ftv2mnode.png
deleted file mode 100644
index 3254c05..0000000
Binary files a/doc/html/ftv2mnode.png and /dev/null differ
diff --git a/doc/html/ftv2node.png b/doc/html/ftv2node.png
deleted file mode 100644
index c9f06a5..0000000
Binary files a/doc/html/ftv2node.png and /dev/null differ
diff --git a/doc/html/ftv2plastnode.png b/doc/html/ftv2plastnode.png
deleted file mode 100644
index 0b07e00..0000000
Binary files a/doc/html/ftv2plastnode.png and /dev/null differ
diff --git a/doc/html/ftv2pnode.png b/doc/html/ftv2pnode.png
deleted file mode 100644
index 2001b79..0000000
Binary files a/doc/html/ftv2pnode.png and /dev/null differ
diff --git a/doc/html/ftv2vertline.png b/doc/html/ftv2vertline.png
deleted file mode 100644
index b330f3a..0000000
Binary files a/doc/html/ftv2vertline.png and /dev/null differ
diff --git a/doc/html/functions.html b/doc/html/functions.html
index 4372a07..3b4f680 100644
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -77,7 +77,7 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1FileWvIn.html#ab2ccf7cc65c36a1ecfbb3b7d5707ea48">stk::FileWvIn</a>
 </li>
 <li>addTo()
-: <a class="el" href="classstk_1_1Delay.html#aea5580dd84ea6982d1f7b92b53314118">stk::Delay</a>
+: <a class="el" href="classstk_1_1Delay.html#a80f143ab956c9d3b1721958ece6da65e">stk::Delay</a>
 </li>
 <li>addVelocity()
 : <a class="el" href="classstk_1_1Sphere.html#a16666f1e94c6d1e6b1fa35ee6c46331f">stk::Sphere</a>
@@ -100,7 +100,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x62.html b/doc/html/functions_0x62.html
index fccf866..350fb4c 100644
--- a/doc/html/functions_0x62.html
+++ b/doc/html/functions_0x62.html
@@ -76,13 +76,13 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1BlowHole.html#a7f0aed9f79544d930c7f91dfa3e0efd9">stk::BlowHole</a>
 </li>
 <li>Bowed()
-: <a class="el" href="classstk_1_1Bowed.html#ab776c34c271de25c0cd036946d764158">stk::Bowed</a>
+: <a class="el" href="classstk_1_1Bowed.html#a1b442f60bbec3d07d2dd322ff761c767">stk::Bowed</a>
 </li>
 <li>BowTable()
 : <a class="el" href="classstk_1_1BowTable.html#a25d0985fd6821a7e1608af1e8f51952a">stk::BowTable</a>
 </li>
 <li>Brass()
-: <a class="el" href="classstk_1_1Brass.html#a96b223221f536efdaad4e724db01f11b">stk::Brass</a>
+: <a class="el" href="classstk_1_1Brass.html#a5bf59263a54250be84c027198c7d2d1d">stk::Brass</a>
 </li>
 </ul>
 </div>
@@ -90,7 +90,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x63.html b/doc/html/functions_0x63.html
index ae06255..7df7cd7 100644
--- a/doc/html/functions_0x63.html
+++ b/doc/html/functions_0x63.html
@@ -68,7 +68,8 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1Filter.html#a48f23ab6613be35e3be8aceaf5adfdd7">stk::Filter</a>
 </li>
 <li>channelsOut()
-: <a class="el" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275">stk::Filter</a>
+: <a class="el" href="classstk_1_1FileLoop.html#a9f3c514ce166068197684a21d31c3a76">stk::FileLoop</a>
+, <a class="el" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275">stk::Filter</a>
 , <a class="el" href="classstk_1_1Generator.html#a9f9de4c495217ef8490a9d2d1fdabe11">stk::Generator</a>
 , <a class="el" href="classstk_1_1Instrmnt.html#a32564b611598653fce5e708821b3fcb4">stk::Instrmnt</a>
 , <a class="el" href="classstk_1_1Voicer.html#a35230ae97772ae581fb9658a5f4d57b6">stk::Voicer</a>
@@ -79,26 +80,29 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1Chorus.html#a529f668e66188ae5a42e4cc30779059f">stk::Chorus</a>
 </li>
 <li>Clarinet()
-: <a class="el" href="classstk_1_1Clarinet.html#a82e32a30e6d9664ac9fe748070bec23c">stk::Clarinet</a>
+: <a class="el" href="classstk_1_1Clarinet.html#aad5cf9fb562ee87f2dc0aed0b4cd6c5b">stk::Clarinet</a>
 </li>
 <li>clear()
-: <a class="el" href="classstk_1_1BlowBotl.html#a271161f45e0a706d8ccd299f9aaf2ada">stk::BlowBotl</a>
+: <a class="el" href="classstk_1_1BandedWG.html#a182dbf5d75aebf5714bd6df15b0df90c">stk::BandedWG</a>
+, <a class="el" href="classstk_1_1Mesh2D.html#a49f56b4865dc041ae874fbc1b80e967b">stk::Mesh2D</a>
+, <a class="el" href="classstk_1_1Modal.html#af064dc6ee4290fd51b4a6dc8a1f0909d">stk::Modal</a>
+, <a class="el" href="classstk_1_1BlowBotl.html#a271161f45e0a706d8ccd299f9aaf2ada">stk::BlowBotl</a>
 , <a class="el" href="classstk_1_1NRev.html#a4097b11b38dd00d084ae4a94bc18f02c">stk::NRev</a>
 , <a class="el" href="classstk_1_1PitShift.html#afa1b0ff95ef9a22991525f72d703220e">stk::PitShift</a>
 , <a class="el" href="classstk_1_1BlowHole.html#a43b829201197f2d0f0e8a72072e6798a">stk::BlowHole</a>
 , <a class="el" href="classstk_1_1Plucked.html#a32a7063198af354fc007e3d903e21208">stk::Plucked</a>
-, <a class="el" href="classstk_1_1PluckTwo.html#a71821e47009a94de9e8a1f3305263840">stk::PluckTwo</a>
-, <a class="el" href="classstk_1_1Bowed.html#a8d522c36a35b86f90a06cf135fc83b11">stk::Bowed</a>
 , <a class="el" href="classstk_1_1PRCRev.html#a3e2fa911784a02a6d7211cbe2348ffe1">stk::PRCRev</a>
+, <a class="el" href="classstk_1_1Bowed.html#a8d522c36a35b86f90a06cf135fc83b11">stk::Bowed</a>
 , <a class="el" href="classstk_1_1Resonate.html#a534740efbbde171d790309e85c96017d">stk::Resonate</a>
-, <a class="el" href="classstk_1_1Brass.html#a64e48334efdc8f2508c29c5ea4281f2d">stk::Brass</a>
 , <a class="el" href="classstk_1_1Sampler.html#a6c80aad733f5e90dfa63d29c6a5c88ac">stk::Sampler</a>
+, <a class="el" href="classstk_1_1Brass.html#a64e48334efdc8f2508c29c5ea4281f2d">stk::Brass</a>
 , <a class="el" href="classstk_1_1Saxofony.html#ac74981cfa3b36ec1288eccab6aa80210">stk::Saxofony</a>
-, <a class="el" href="classstk_1_1Chorus.html#a63acbdd04d13110712c36a5cac5d972d">stk::Chorus</a>
 , <a class="el" href="classstk_1_1Simple.html#a8281297483ef2363a01590722dd739d8">stk::Simple</a>
+, <a class="el" href="classstk_1_1Chorus.html#a63acbdd04d13110712c36a5cac5d972d">stk::Chorus</a>
 , <a class="el" href="classstk_1_1Sitar.html#a52cc4d38204e6825e524228008a0e94c">stk::Sitar</a>
-, <a class="el" href="classstk_1_1Clarinet.html#a7eae4377eb4178067c2dba704032a2d1">stk::Clarinet</a>
 , <a class="el" href="classstk_1_1StifKarp.html#ad1015fa6d2ac1835d8be7dec0df12f6f">stk::StifKarp</a>
+, <a class="el" href="classstk_1_1Clarinet.html#a7eae4377eb4178067c2dba704032a2d1">stk::Clarinet</a>
+, <a class="el" href="classstk_1_1Twang.html#a7cdd4bf2e486239429f6d4f0f277cea9">stk::Twang</a>
 , <a class="el" href="classstk_1_1VoicForm.html#ad62987970200d4e9720190b884fb689d">stk::VoicForm</a>
 , <a class="el" href="classstk_1_1DelayA.html#ae5e59f497eb84280fd94d60257ffae69">stk::DelayA</a>
 , <a class="el" href="classstk_1_1Whistle.html#a8551209b9079d3bc626702e0745b2eb8">stk::Whistle</a>
@@ -109,9 +113,7 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1FM.html#ac5697f9929afd43379e8720f2f271b2d">stk::FM</a>
 , <a class="el" href="classstk_1_1JCRev.html#abf92e9783e4a738b6d3a3350bfae986e">stk::JCRev</a>
 , <a class="el" href="classstk_1_1LentPitShift.html#a5661bf4cd0a4b5b2bf9e4e81603c74be">stk::LentPitShift</a>
-, <a class="el" href="classstk_1_1BandedWG.html#a182dbf5d75aebf5714bd6df15b0df90c">stk::BandedWG</a>
-, <a class="el" href="classstk_1_1Mesh2D.html#a49f56b4865dc041ae874fbc1b80e967b">stk::Mesh2D</a>
-, <a class="el" href="classstk_1_1Modal.html#af064dc6ee4290fd51b4a6dc8a1f0909d">stk::Modal</a>
+, <a class="el" href="classstk_1_1Mandolin.html#a2caec477ed0fe9479ed6d1fbdb45d827">stk::Mandolin</a>
 </li>
 <li>clipStatus()
 : <a class="el" href="classstk_1_1WvOut.html#aed503fe979c33eb8240901f005cb48d5">stk::WvOut</a>
@@ -123,13 +125,13 @@ Here is a list of all documented class members with links to the class documenta
 </li>
 <li>closeFile()
 : <a class="el" href="classstk_1_1FileLoop.html#a51688a9e84b2f9e5a9c4e62588b65c52">stk::FileLoop</a>
-, <a class="el" href="classstk_1_1FileWvIn.html#ae586a93b45a979881d9bd6fc1cb364cb">stk::FileWvIn</a>
 , <a class="el" href="classstk_1_1FileWvOut.html#a54cbced5ce278b0d16fa800e8445103c">stk::FileWvOut</a>
+, <a class="el" href="classstk_1_1FileWvIn.html#ae586a93b45a979881d9bd6fc1cb364cb">stk::FileWvIn</a>
 </li>
 <li>closePort()
-: <a class="el" href="classRtMidiOut.html#a3092e53a8aed2d3b163fcaa05fafd041">RtMidiOut</a>
+: <a class="el" href="classRtMidi.html#a36125c4fa16550345b57f4a4927f5b4a">RtMidi</a>
 , <a class="el" href="classRtMidiIn.html#a55bacf0d228fd8e3be6a79d12fd1dc39">RtMidiIn</a>
-, <a class="el" href="classRtMidi.html#a36125c4fa16550345b57f4a4927f5b4a">RtMidi</a>
+, <a class="el" href="classRtMidiOut.html#a3092e53a8aed2d3b163fcaa05fafd041">RtMidiOut</a>
 </li>
 <li>closeStream()
 : <a class="el" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a">RtAudio</a>
@@ -138,36 +140,35 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1TcpClient.html#a46ff34075ef3a0342c396af5fe1aedda">stk::TcpClient</a>
 , <a class="el" href="classstk_1_1InetWvOut.html#a4c8b6fb25c6d751b7929bec9a2d04a53">stk::InetWvOut</a>
 </li>
-<li>contentsAt()
-: <a class="el" href="classstk_1_1DelayL.html#a7a84a3a188f2de7cc05f81ad06e04874">stk::DelayL</a>
-, <a class="el" href="classstk_1_1DelayA.html#a355422e50c1d2e89385f11aafffd064d">stk::DelayA</a>
-, <a class="el" href="classstk_1_1Delay.html#a7d4c9c21e752f860ba683e9849d14665">stk::Delay</a>
-</li>
 <li>controlChange()
-: <a class="el" href="classstk_1_1Clarinet.html#a63582205ab940101f5f9419fc717ff78">stk::Clarinet</a>
-, <a class="el" href="classstk_1_1Brass.html#a4d75ac361d11fcc870a330d393dbad80">stk::Brass</a>
+: <a class="el" href="classstk_1_1Whistle.html#a7d5d2d24fb0103aae0fb8c6308e2a663">stk::Whistle</a>
+, <a class="el" href="classstk_1_1Voicer.html#ab5fe99a639a872c90aed2541417cc896">stk::Voicer</a>
+, <a class="el" href="classstk_1_1Shakers.html#a688d9d8318e0c69779868079a7c64157">stk::Shakers</a>
+, <a class="el" href="classstk_1_1Mesh2D.html#acc618a91b288305785644d852cfdaf83">stk::Mesh2D</a>
 , <a class="el" href="classstk_1_1Modal.html#a9fab49ec164852c381758f5d333f8891">stk::Modal</a>
-, <a class="el" href="classstk_1_1Saxofony.html#a38efe138bea7af7aeab3652bf0a305ff">stk::Saxofony</a>
-, <a class="el" href="classstk_1_1ModalBar.html#a84e5b9963b74f0e4657f79d5dea013cb">stk::ModalBar</a>
+, <a class="el" href="classstk_1_1VoicForm.html#a427ca45d3e44e093c11f16e30fc2b550">stk::VoicForm</a>
 , <a class="el" href="classstk_1_1Mandolin.html#abf341aa5e7d751012178ff7b853b73a1">stk::Mandolin</a>
 , <a class="el" href="classstk_1_1BandedWG.html#a16baac1cc6612332d6d0aa40a661c137">stk::BandedWG</a>
 , <a class="el" href="classstk_1_1Bowed.html#ad066af9bb1340b6fcf9002d6922021f4">stk::Bowed</a>
 , <a class="el" href="classstk_1_1Flute.html#a968b3799338e39df35dcf94fe7ee90a2">stk::Flute</a>
 , <a class="el" href="classstk_1_1Instrmnt.html#a5aecf9f4d4dcecdbef8271c7fe62b2cf">stk::Instrmnt</a>
+, <a class="el" href="classstk_1_1BlowBotl.html#a21a4b2aaaac7afcc67b4abe5ed833bfd">stk::BlowBotl</a>
+, <a class="el" href="classstk_1_1ModalBar.html#a84e5b9963b74f0e4657f79d5dea013cb">stk::ModalBar</a>
+, <a class="el" href="classstk_1_1Brass.html#a4d75ac361d11fcc870a330d393dbad80">stk::Brass</a>
+, <a class="el" href="classstk_1_1Clarinet.html#a63582205ab940101f5f9419fc717ff78">stk::Clarinet</a>
 , <a class="el" href="classstk_1_1Sampler.html#ad9c0789f033978165226beb7c8133cc3">stk::Sampler</a>
-, <a class="el" href="classstk_1_1Shakers.html#a688d9d8318e0c69779868079a7c64157">stk::Shakers</a>
-, <a class="el" href="classstk_1_1Whistle.html#a7d5d2d24fb0103aae0fb8c6308e2a663">stk::Whistle</a>
-, <a class="el" href="classstk_1_1FM.html#a1db9d177363fb7d8dedb20fa0c9104f1">stk::FM</a>
-, <a class="el" href="classstk_1_1Voicer.html#ab5fe99a639a872c90aed2541417cc896">stk::Voicer</a>
-, <a class="el" href="classstk_1_1Mesh2D.html#acc618a91b288305785644d852cfdaf83">stk::Mesh2D</a>
+, <a class="el" href="classstk_1_1Voicer.html#ac3abcb8b3d402719426a13ffdb633522">stk::Voicer</a>
+, <a class="el" href="classstk_1_1StifKarp.html#a27e76ba187140ae575c1bd2e1ba99b03">stk::StifKarp</a>
 , <a class="el" href="classstk_1_1BlowHole.html#a0d8ad0201c455894acb1416ffb21614b">stk::BlowHole</a>
 , <a class="el" href="classstk_1_1FMVoices.html#a24e17888ff4e01edff96d81461d670a8">stk::FMVoices</a>
-, <a class="el" href="classstk_1_1VoicForm.html#a427ca45d3e44e093c11f16e30fc2b550">stk::VoicForm</a>
-, <a class="el" href="classstk_1_1StifKarp.html#a27e76ba187140ae575c1bd2e1ba99b03">stk::StifKarp</a>
-, <a class="el" href="classstk_1_1Resonate.html#af55feabf25f1f6f996c32574656ffd68">stk::Resonate</a>
-, <a class="el" href="classstk_1_1BlowBotl.html#a21a4b2aaaac7afcc67b4abe5ed833bfd">stk::BlowBotl</a>
-, <a class="el" href="classstk_1_1Moog.html#acadb54eccab35e3b18b62ffd96c18ac4">stk::Moog</a>
 , <a class="el" href="classstk_1_1Simple.html#acd14d5368545f5650aeebbbdad65fc52">stk::Simple</a>
+, <a class="el" href="classstk_1_1FM.html#a1db9d177363fb7d8dedb20fa0c9104f1">stk::FM</a>
+, <a class="el" href="classstk_1_1Moog.html#acadb54eccab35e3b18b62ffd96c18ac4">stk::Moog</a>
+, <a class="el" href="classstk_1_1Saxofony.html#a38efe138bea7af7aeab3652bf0a305ff">stk::Saxofony</a>
+, <a class="el" href="classstk_1_1Resonate.html#af55feabf25f1f6f996c32574656ffd68">stk::Resonate</a>
+</li>
+<li>Cubic()
+: <a class="el" href="classstk_1_1Cubic.html#a2059a20146f6d7ec0854dc860ca90895">stk::Cubic</a>
 </li>
 </ul>
 </div>
@@ -175,7 +176,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x64.html b/doc/html/functions_0x64.html
index aba2609..cbb3f13 100644
--- a/doc/html/functions_0x64.html
+++ b/doc/html/functions_0x64.html
@@ -78,9 +78,6 @@ Here is a list of all documented class members with links to the class documenta
 <li>disconnect()
 : <a class="el" href="classstk_1_1InetWvOut.html#a2314d2e2d005c5b08aa24d21075af638">stk::InetWvOut</a>
 </li>
-<li>DONE
-: <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baac9fd188b8e5ad469e002f7ba3498028b">stk::ADSR</a>
-</li>
 <li>DRIVER_ERROR
 : <a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca995e97ecf6beeedaba525022a63aec6b">RtError</a>
 </li>
@@ -96,7 +93,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x65.html b/doc/html/functions_0x65.html
index 9258fdd..d5142c7 100644
--- a/doc/html/functions_0x65.html
+++ b/doc/html/functions_0x65.html
@@ -73,7 +73,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x66.html b/doc/html/functions_0x66.html
index d1a5c76..2162c85 100644
--- a/doc/html/functions_0x66.html
+++ b/doc/html/functions_0x66.html
@@ -91,7 +91,7 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1Filter.html#afc70117c0133d4a5d9a651ceb691d7c0">stk::Filter</a>
 </li>
 <li>Fir()
-: <a class="el" href="classstk_1_1Fir.html#a6f47a21d9fa7641aad2872df70432265">stk::Fir</a>
+: <a class="el" href="classstk_1_1Fir.html#a4ad986b7f644d3e22e75b0744b2f948a">stk::Fir</a>
 </li>
 <li>firstChannel
 : <a class="el" href="structRtAudio_1_1StreamParameters.html#ad4b4503782653ec93c83328c46abe50c">RtAudio::StreamParameters</a>
@@ -120,6 +120,9 @@ Here is a list of all documented class members with links to the class documenta
 <li>formantRadius()
 : <a class="el" href="classstk_1_1Phonemes.html#aaa22b87de100770a4995632932c324bb">stk::Phonemes</a>
 </li>
+<li>format()
+: <a class="el" href="classstk_1_1FileRead.html#a6852b303c34f01967be2a7a69221ef0b">stk::FileRead</a>
+</li>
 <li>FormSwep()
 : <a class="el" href="classstk_1_1FormSwep.html#aeb0093d5962acf4b5d582730e8c8bab9">stk::FormSwep</a>
 </li>
@@ -135,7 +138,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x67.html b/doc/html/functions_0x67.html
index b9842a3..3ef1bb3 100644
--- a/doc/html/functions_0x67.html
+++ b/doc/html/functions_0x67.html
@@ -99,8 +99,13 @@ Here is a list of all documented class members with links to the class documenta
 <li>getMass()
 : <a class="el" href="classstk_1_1Sphere.html#aa82d922e0b8513364d9d0d473e6239c6">stk::Sphere</a>
 </li>
+<li>getMaximumDelay()
+: <a class="el" href="classstk_1_1Delay.html#a31d348fd15e5b6e23f2984b75968a3ec">stk::Delay</a>
+, <a class="el" href="classstk_1_1DelayA.html#a6ac5c818b6669bf904a4a5a81358bd28">stk::DelayA</a>
+, <a class="el" href="classstk_1_1DelayL.html#acbcb8326db134a26fdad5f16f1a0ba7e">stk::DelayL</a>
+</li>
 <li>getMessage()
-: <a class="el" href="classRtError.html#ac7f467788e29d246333d7af050801164">RtError</a>
+: <a class="el" href="classRtError.html#afd067ba6b46edd37f989cad02cd70b50">RtError</a>
 , <a class="el" href="classRtMidiIn.html#a1ba10ecd276b30a8579c7d60a9c890eb">RtMidiIn</a>
 , <a class="el" href="classstk_1_1StkError.html#ac691cbffe442d9e0760978146df5d9fb">stk::StkError</a>
 </li>
@@ -121,14 +126,14 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1BlitSquare.html#abbda8cb84bcd36fc6d96130e9832a6af">stk::BlitSquare</a>
 </li>
 <li>getPortCount()
-: <a class="el" href="classRtMidi.html#a9a49ef73a1e6007444019a7ae095e195">RtMidi</a>
-, <a class="el" href="classRtMidiIn.html#a62b1b38aa8e5f11cd66f03d59228f4e4">RtMidiIn</a>
+: <a class="el" href="classRtMidiIn.html#a62b1b38aa8e5f11cd66f03d59228f4e4">RtMidiIn</a>
 , <a class="el" href="classRtMidiOut.html#ad6cddbcc7faa20a7be229f765ade0877">RtMidiOut</a>
+, <a class="el" href="classRtMidi.html#a9a49ef73a1e6007444019a7ae095e195">RtMidi</a>
 </li>
 <li>getPortName()
-: <a class="el" href="classRtMidiIn.html#af2961fff09fa01a3d5bc0f0c5a042aaf">RtMidiIn</a>
+: <a class="el" href="classRtMidi.html#a799e2b9f4df39b298518f2b394db3391">RtMidi</a>
+, <a class="el" href="classRtMidiIn.html#af2961fff09fa01a3d5bc0f0c5a042aaf">RtMidiIn</a>
 , <a class="el" href="classRtMidiOut.html#acc4ae0ab71a49ae7629075d5a9cd837c">RtMidiOut</a>
-, <a class="el" href="classRtMidi.html#a799e2b9f4df39b298518f2b394db3391">RtMidi</a>
 </li>
 <li>getPosition()
 : <a class="el" href="classstk_1_1Sphere.html#a91a3e710a7ff0cf160e9d46fca373bfd">stk::Sphere</a>
@@ -140,8 +145,8 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1Sphere.html#a4cf8f763e732bcf9ca79b8602e8ec24a">stk::Sphere</a>
 </li>
 <li>getSize()
-: <a class="el" href="classstk_1_1FileLoop.html#ad86d4f64c44a6f2488779fef24fc1ee7">stk::FileLoop</a>
-, <a class="el" href="classstk_1_1FileWvIn.html#aa8ef94c3ed01af0efc9e968f09207a26">stk::FileWvIn</a>
+: <a class="el" href="classstk_1_1FileWvIn.html#aa8ef94c3ed01af0efc9e968f09207a26">stk::FileWvIn</a>
+, <a class="el" href="classstk_1_1FileLoop.html#ad86d4f64c44a6f2488779fef24fc1ee7">stk::FileLoop</a>
 </li>
 <li>getState()
 : <a class="el" href="classstk_1_1ADSR.html#a87f9918cfa4104a841dc5b44f26f8904">stk::ADSR</a>
@@ -167,8 +172,8 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1WvOut.html#aca11b8991f281beb2b1c4d562c7ff43b">stk::WvOut</a>
 </li>
 <li>getType()
-: <a class="el" href="classstk_1_1StkError.html#aae641cf5ed2b756adbf02fc668fac53e">stk::StkError</a>
-, <a class="el" href="classRtError.html#a4ee7df9728d73f533afbaddcd9ca4d9c">RtError</a>
+: <a class="el" href="classRtError.html#a3e316dc9b9b41fe2f64cabf34beb4fe7">RtError</a>
+, <a class="el" href="classstk_1_1StkError.html#aae641cf5ed2b756adbf02fc668fac53e">stk::StkError</a>
 </li>
 <li>getVelocity()
 : <a class="el" href="classstk_1_1Sphere.html#a43ccf47d5d952f14f1ba0940aa87f4c5">stk::Sphere</a>
@@ -183,7 +188,7 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1Vector3D.html#af1c7389a2b4640cbe594fa33f9e4f805">stk::Vector3D</a>
 </li>
 <li>Granulate()
-: <a class="el" href="classstk_1_1Granulate.html#a78af615a331de9b643dfabb8e106883f">stk::Granulate</a>
+: <a class="el" href="classstk_1_1Granulate.html#aaff22b306824e885191892bbab35b9f6">stk::Granulate</a>
 </li>
 </ul>
 </div>
@@ -191,7 +196,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x68.html b/doc/html/functions_0x68.html
index 5b5a86f..8f3f9f4 100644
--- a/doc/html/functions_0x68.html
+++ b/doc/html/functions_0x68.html
@@ -63,7 +63,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x69.html b/doc/html/functions_0x69.html
index 0dcbd8b..8aa925e 100644
--- a/doc/html/functions_0x69.html
+++ b/doc/html/functions_0x69.html
@@ -54,11 +54,14 @@ Here is a list of all documented class members with links to the class documenta
 <li>id()
 : <a class="el" href="classstk_1_1Socket.html#aeae0c6721248eecd5dae0b77ea66cb2c">stk::Socket</a>
 </li>
+<li>IDLE
+: <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8">stk::ADSR</a>
+</li>
 <li>ignoreSampleRateChange()
-: <a class="el" href="classstk_1_1BiQuad.html#aab468cd1aa79b95442b15bb04d8bb211">stk::BiQuad</a>
+: <a class="el" href="classstk_1_1FormSwep.html#a91096ebd684df25fc36a759f642b2200">stk::FormSwep</a>
 , <a class="el" href="classstk_1_1Stk.html#ab8a52e4897bea5c0f5e66adf37a8e39b">stk::Stk</a>
+, <a class="el" href="classstk_1_1BiQuad.html#aab468cd1aa79b95442b15bb04d8bb211">stk::BiQuad</a>
 , <a class="el" href="classstk_1_1TwoPole.html#ad0a3ac1b5d4e651a7ff1efb1d5362c0b">stk::TwoPole</a>
-, <a class="el" href="classstk_1_1FormSwep.html#a91096ebd684df25fc36a759f642b2200">stk::FormSwep</a>
 , <a class="el" href="classstk_1_1TwoZero.html#aa1a1568aae3cd3d53011b3fc344cb086">stk::TwoZero</a>
 </li>
 <li>ignoreTypes()
@@ -79,6 +82,9 @@ Here is a list of all documented class members with links to the class documenta
 <li>inputTick()
 : <a class="el" href="classstk_1_1Mesh2D.html#a688bed8725ef2d8bf4c6465251bd8b86">stk::Mesh2D</a>
 </li>
+<li>inRange()
+: <a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">stk::Stk</a>
+</li>
 <li>Instrmnt()
 : <a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">stk::Instrmnt</a>
 </li>
@@ -113,8 +119,9 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1Sphere.html#a00bf47b0d5cd06a858d08f37d220ef9f">stk::Sphere</a>
 </li>
 <li>isOpen()
-: <a class="el" href="classstk_1_1FileRead.html#a3f30ed2a9f45493f0369aa2edbf38f70">stk::FileRead</a>
+: <a class="el" href="classstk_1_1FileWvIn.html#aa45344366bca49f71c7153ac5b296e91">stk::FileWvIn</a>
 , <a class="el" href="classstk_1_1FileWrite.html#a636436624aa39eb5ba3401a9279a173e">stk::FileWrite</a>
+, <a class="el" href="classstk_1_1FileRead.html#a3f30ed2a9f45493f0369aa2edbf38f70">stk::FileRead</a>
 </li>
 <li>isStreamOpen()
 : <a class="el" href="classRtAudio.html#a3863e45ff81dbe97176de0ee7545917f">RtAudio</a>
@@ -131,7 +138,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x6a.html b/doc/html/functions_0x6a.html
index 2d69811..ba6584f 100644
--- a/doc/html/functions_0x6a.html
+++ b/doc/html/functions_0x6a.html
@@ -60,7 +60,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x6b.html b/doc/html/functions_0x6b.html
index f27f2ab..b8c1a82 100644
--- a/doc/html/functions_0x6b.html
+++ b/doc/html/functions_0x6b.html
@@ -75,7 +75,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x6c.html b/doc/html/functions_0x6c.html
index cfc058a..e72a76d 100644
--- a/doc/html/functions_0x6c.html
+++ b/doc/html/functions_0x6c.html
@@ -55,48 +55,49 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0">stk::Effect</a>
 , <a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">stk::Filter</a>
 , <a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">stk::Instrmnt</a>
-, <a class="el" href="classstk_1_1Voicer.html#a50caec57c6a566e4836181774adf5e7b">stk::Voicer</a>
+, <a class="el" href="classstk_1_1Twang.html#ab54245fcb75144a8ffcc879789abc952">stk::Twang</a>
 , <a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">stk::Generator</a>
+, <a class="el" href="classstk_1_1Voicer.html#a50caec57c6a566e4836181774adf5e7b">stk::Voicer</a>
 , <a class="el" href="classstk_1_1WvIn.html#a3ab86e33eff9f962c9ef7b41e3ccb77e">stk::WvIn</a>
 </li>
 <li>lastOut()
-: <a class="el" href="classstk_1_1Asymp.html#aeb868c171e07206e2d5d30f8ce8f4436">stk::Asymp</a>
-, <a class="el" href="classstk_1_1Voicer.html#a98d843fa1f9fd2ad9a9fb03538dba03a">stk::Voicer</a>
+: <a class="el" href="classstk_1_1Voicer.html#a98d843fa1f9fd2ad9a9fb03538dba03a">stk::Voicer</a>
 , <a class="el" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba">stk::TwoZero</a>
 , <a class="el" href="classstk_1_1TwoPole.html#a8a4fb4afe3e06c689827ecaec478aad1">stk::TwoPole</a>
-, <a class="el" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9">stk::DelayL</a>
-, <a class="el" href="classstk_1_1SingWave.html#af1c5286c4a58904241d7b73ff29d4be0">stk::SingWave</a>
+, <a class="el" href="classstk_1_1TapDelay.html#a517399ddf52455ef083481cbb77c0b5c">stk::TapDelay</a>
+, <a class="el" href="classstk_1_1ADSR.html#aedbcb85346c354139f139b3232f36f39">stk::ADSR</a>
 , <a class="el" href="classstk_1_1SineWave.html#ab788e787e5bb54445dd0769283567224">stk::SineWave</a>
 , <a class="el" href="classstk_1_1RtWvIn.html#a3a4f4035fc01fee4c2423791f9e9317e">stk::RtWvIn</a>
 , <a class="el" href="classstk_1_1PRCRev.html#a47ed5fee4401f0050d6a47d1154e81c6">stk::PRCRev</a>
 , <a class="el" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232">stk::PoleZero</a>
-, <a class="el" href="classstk_1_1OnePole.html#ad1ad906374102791a01bfd60844028ec">stk::OnePole</a>
+, <a class="el" href="classstk_1_1PitShift.html#a782ad7b47c450c1584cebd20570f17e3">stk::PitShift</a>
 , <a class="el" href="classstk_1_1OneZero.html#a54e160f62354939876477d9c5a65890c">stk::OneZero</a>
-, <a class="el" href="classstk_1_1Echo.html#a00a2a5949133a06680b026db7b21cc51">stk::Echo</a>
+, <a class="el" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566">stk::DelayA</a>
 , <a class="el" href="classstk_1_1NRev.html#a9f9faa6542271163680c1925309ed788">stk::NRev</a>
 , <a class="el" href="classstk_1_1Noise.html#a1d6c8ed80425cd0cea014bd2e328c823">stk::Noise</a>
 , <a class="el" href="classstk_1_1Modulate.html#addf73f58590ab082f106c9745c5bedc9">stk::Modulate</a>
 , <a class="el" href="classstk_1_1JCRev.html#a599e46bcfbc2b4b9a30a30d67580412b">stk::JCRev</a>
-, <a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">stk::Instrmnt</a>
+, <a class="el" href="classstk_1_1OnePole.html#ad1ad906374102791a01bfd60844028ec">stk::OnePole</a>
 , <a class="el" href="classstk_1_1InetWvIn.html#acfd578027b2bbcbe4ceefa11e49e8cd2">stk::InetWvIn</a>
-, <a class="el" href="classstk_1_1PitShift.html#a782ad7b47c450c1584cebd20570f17e3">stk::PitShift</a>
-, <a class="el" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063">stk::BiQuad</a>
-, <a class="el" href="classstk_1_1Function.html#ae79bd6d0c9f53693b4ca28948d94fc25">stk::Function</a>
+, <a class="el" href="classstk_1_1Iir.html#a5dcae9330f2c52d2bfa1647e6b250a14">stk::Iir</a>
+, <a class="el" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9">stk::DelayL</a>
+, <a class="el" href="classstk_1_1Asymp.html#aeb868c171e07206e2d5d30f8ce8f4436">stk::Asymp</a>
 , <a class="el" href="classstk_1_1FormSwep.html#a3d8405c24e8539b389daf86fccfe5d70">stk::FormSwep</a>
 , <a class="el" href="classstk_1_1Fir.html#a5182288d564977bf172439f6ecaf2377">stk::Fir</a>
-, <a class="el" href="classstk_1_1TapDelay.html#a517399ddf52455ef083481cbb77c0b5c">stk::TapDelay</a>
-, <a class="el" href="classstk_1_1Envelope.html#a31044eab6eaf668ba7e74ea17bed109d">stk::Envelope</a>
-, <a class="el" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd">stk::FileLoop</a>
-, <a class="el" href="classstk_1_1Blit.html#a530af82a27731734af4f4b58bce283de">stk::Blit</a>
 , <a class="el" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608">stk::FileWvIn</a>
-, <a class="el" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566">stk::DelayA</a>
+, <a class="el" href="classstk_1_1SingWave.html#af1c5286c4a58904241d7b73ff29d4be0">stk::SingWave</a>
+, <a class="el" href="classstk_1_1Echo.html#a00a2a5949133a06680b026db7b21cc51">stk::Echo</a>
+, <a class="el" href="classstk_1_1Envelope.html#a31044eab6eaf668ba7e74ea17bed109d">stk::Envelope</a>
+, <a class="el" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063">stk::BiQuad</a>
+, <a class="el" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd">stk::FileLoop</a>
 , <a class="el" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2">stk::Delay</a>
-, <a class="el" href="classstk_1_1Chorus.html#aabcc110787ec3b443c21845b2f06bb3c">stk::Chorus</a>
-, <a class="el" href="classstk_1_1Iir.html#a5dcae9330f2c52d2bfa1647e6b250a14">stk::Iir</a>
-, <a class="el" href="classstk_1_1BlitSaw.html#a254758ecd4166cc4e7d6fced5650a198">stk::BlitSaw</a>
+, <a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">stk::Instrmnt</a>
 , <a class="el" href="classstk_1_1BlitSquare.html#a77972e4e1c53600bf80cf692601ccae1">stk::BlitSquare</a>
 , <a class="el" href="classstk_1_1Granulate.html#a60db060a365fc32fe789cb9bcd042dd3">stk::Granulate</a>
-, <a class="el" href="classstk_1_1ADSR.html#aedbcb85346c354139f139b3232f36f39">stk::ADSR</a>
+, <a class="el" href="classstk_1_1Blit.html#a530af82a27731734af4f4b58bce283de">stk::Blit</a>
+, <a class="el" href="classstk_1_1BlitSaw.html#a254758ecd4166cc4e7d6fced5650a198">stk::BlitSaw</a>
+, <a class="el" href="classstk_1_1Function.html#ae79bd6d0c9f53693b4ca28948d94fc25">stk::Function</a>
+, <a class="el" href="classstk_1_1Chorus.html#aabcc110787ec3b443c21845b2f06bb3c">stk::Chorus</a>
 </li>
 <li>LentPitShift()
 : <a class="el" href="classstk_1_1LentPitShift.html#a0eb0c1ba3d8fdb6eaabb1c96c58ed536">stk::LentPitShift</a>
@@ -122,7 +123,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x6d.html b/doc/html/functions_0x6d.html
index b0ffe15..6380a38 100644
--- a/doc/html/functions_0x6d.html
+++ b/doc/html/functions_0x6d.html
@@ -61,7 +61,7 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acab4f813e5a36905c89d4081a59497432e">RtError</a>
 </li>
 <li>Mesh2D()
-: <a class="el" href="classstk_1_1Mesh2D.html#a156fdff6515dbcd4b493ce0ef051a174">stk::Mesh2D</a>
+: <a class="el" href="classstk_1_1Mesh2D.html#aef48c3c65901f62a8dbdbe606763203e">stk::Mesh2D</a>
 </li>
 <li>Messager()
 : <a class="el" href="classstk_1_1Messager.html#aa4c8f3396345157ccd19395258a253a9">stk::Messager</a>
@@ -90,7 +90,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x6e.html b/doc/html/functions_0x6e.html
index d8d041d..eadbc65 100644
--- a/doc/html/functions_0x6e.html
+++ b/doc/html/functions_0x6e.html
@@ -105,10 +105,10 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1Flute.html#ae371e0d2366ef9fae8d12898204e7b31">stk::Flute</a>
 , <a class="el" href="classstk_1_1FM.html#a56cc61b1923dba2ff80859df4904d4f9">stk::FM</a>
 , <a class="el" href="classstk_1_1Instrmnt.html#a582c77e71cd2c5cb46ba6f78fa0ac6a2">stk::Instrmnt</a>
+, <a class="el" href="classstk_1_1Mandolin.html#a569de60008c218f0939ab9aedd038776">stk::Mandolin</a>
 , <a class="el" href="classstk_1_1Mesh2D.html#a0580962b3cc0dbac092581d0fc15127b">stk::Mesh2D</a>
 , <a class="el" href="classstk_1_1Modal.html#a3483dafe33fa37e98781279810ea808f">stk::Modal</a>
 , <a class="el" href="classstk_1_1Plucked.html#aba5a6b6850874da55c32388e9857d6fc">stk::Plucked</a>
-, <a class="el" href="classstk_1_1PluckTwo.html#a0d5d81db10c145f3d5bafc5775d147bf">stk::PluckTwo</a>
 </li>
 <li>noteOn()
 : <a class="el" href="classstk_1_1VoicForm.html#a9f8431ef3c7588c0d032e821d4dd1ad9">stk::VoicForm</a>
@@ -155,7 +155,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x6f.html b/doc/html/functions_0x6f.html
index 145d8ea..5705fac 100644
--- a/doc/html/functions_0x6f.html
+++ b/doc/html/functions_0x6f.html
@@ -104,7 +104,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x70.html b/doc/html/functions_0x70.html
index 8666933..35d676b 100644
--- a/doc/html/functions_0x70.html
+++ b/doc/html/functions_0x70.html
@@ -57,25 +57,24 @@ Here is a list of all documented class members with links to the class documenta
 <li>PercFlut()
 : <a class="el" href="classstk_1_1PercFlut.html#ab51f05b79d818ed8ba80fd827a4839c2">stk::PercFlut</a>
 </li>
+<li>phaseDelay()
+: <a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">stk::Filter</a>
+</li>
 <li>pitchBend()
-: <a class="el" href="classstk_1_1Voicer.html#ab093e46365c99be9d77a9e38fcc780b4">stk::Voicer</a>
+: <a class="el" href="classstk_1_1Voicer.html#ae2ab6a6804960c686509d7f919829ad4">stk::Voicer</a>
 </li>
 <li>PitShift()
 : <a class="el" href="classstk_1_1PitShift.html#a8fdf3ef3b1a94e126a2953c6b8ed8cca">stk::PitShift</a>
 </li>
 <li>pluck()
-: <a class="el" href="classstk_1_1Mandolin.html#a77bf06efc96f2a83e0fe2c91db83dbd3">stk::Mandolin</a>
+: <a class="el" href="classstk_1_1Mandolin.html#a3a2398d39b72e1c330f81f6545ac0f5c">stk::Mandolin</a>
 , <a class="el" href="classstk_1_1Plucked.html#a9c8741ae249b590d24937743caf11f6c">stk::Plucked</a>
 , <a class="el" href="classstk_1_1Sitar.html#afcbccba0e49bf538c190381785c90752">stk::Sitar</a>
 , <a class="el" href="classstk_1_1StifKarp.html#a016ff5971a1b51ea472f7e7fa2d677ee">stk::StifKarp</a>
 , <a class="el" href="classstk_1_1BandedWG.html#a271573afaa2dc655446482bad6745cc1">stk::BandedWG</a>
-, <a class="el" href="classstk_1_1Mandolin.html#a3a2398d39b72e1c330f81f6545ac0f5c">stk::Mandolin</a>
 </li>
 <li>Plucked()
-: <a class="el" href="classstk_1_1Plucked.html#a279ac82759d4184d9ad961e21dacdbca">stk::Plucked</a>
-</li>
-<li>PluckTwo()
-: <a class="el" href="classstk_1_1PluckTwo.html#aa121655f6007003aebb5de425e98d099">stk::PluckTwo</a>
+: <a class="el" href="classstk_1_1Plucked.html#a65eee23eda411e7fd82bf4a555d8dd85">stk::Plucked</a>
 </li>
 <li>PoleZero()
 : <a class="el" href="classstk_1_1PoleZero.html#ad9a46d21ee470d7afcd641807b5e314e">stk::PoleZero</a>
@@ -94,7 +93,7 @@ Here is a list of all documented class members with links to the class documenta
 </li>
 <li>printMessage()
 : <a class="el" href="classstk_1_1StkError.html#a337437a729f03d48fc56277037ac6fdc">stk::StkError</a>
-, <a class="el" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943">RtError</a>
+, <a class="el" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc">RtError</a>
 </li>
 <li>priority
 : <a class="el" href="structRtAudio_1_1StreamOptions.html#adfd267059434edb21573c584e6367def">RtAudio::StreamOptions</a>
@@ -114,7 +113,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x71.html b/doc/html/functions_0x71.html
index 27de8e3..a185069 100644
--- a/doc/html/functions_0x71.html
+++ b/doc/html/functions_0x71.html
@@ -60,7 +60,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x72.html b/doc/html/functions_0x72.html
index 1625dab..281ef60 100644
--- a/doc/html/functions_0x72.html
+++ b/doc/html/functions_0x72.html
@@ -118,7 +118,7 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classRtMidiIn.html#a297d2eb3c3420b437970a6fc59d89cbf">RtMidiIn</a>
 </li>
 <li>RtMidiIn()
-: <a class="el" href="classRtMidiIn.html#a31abb996e5fdc4a8f9dc5a50848e2ee5">RtMidiIn</a>
+: <a class="el" href="classRtMidiIn.html#a1d70da3ef18d24c5b3f0cc01888e093d">RtMidiIn</a>
 </li>
 <li>RtMidiOut()
 : <a class="el" href="classRtMidiOut.html#a8ed1b492900f3410bf91ad53203b9db3">RtMidiOut</a>
@@ -135,7 +135,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x73.html b/doc/html/functions_0x73.html
index 50e57b2..7cb3a92 100644
--- a/doc/html/functions_0x73.html
+++ b/doc/html/functions_0x73.html
@@ -70,15 +70,20 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classRtMidiOut.html#a0bd8972ef8ac4e8d37ccc4b5d51c2eb3">RtMidiOut</a>
 </li>
 <li>setA1()
-: <a class="el" href="classstk_1_1OnePole.html#a1f99beebd9c4fbdfce6478e40d7625d8">stk::OnePole</a>
+: <a class="el" href="classstk_1_1Cubic.html#af4604c69f138415f9b9ee6944d2b54ef">stk::Cubic</a>
+, <a class="el" href="classstk_1_1OnePole.html#a1f99beebd9c4fbdfce6478e40d7625d8">stk::OnePole</a>
 , <a class="el" href="classstk_1_1PoleZero.html#ae3f0fc1182eb06730f09b8137c01779f">stk::PoleZero</a>
 , <a class="el" href="classstk_1_1TwoPole.html#ad0c2f8ddc09ca1eb864515d816ebacdd">stk::TwoPole</a>
 , <a class="el" href="classstk_1_1BiQuad.html#a1c9799e47163fe8a59fd85196c089cb3">stk::BiQuad</a>
 </li>
 <li>setA2()
 : <a class="el" href="classstk_1_1BiQuad.html#ae28afd560df11435ea54f128d23b9383">stk::BiQuad</a>
+, <a class="el" href="classstk_1_1Cubic.html#afa16d53e6a720936543d0e0ea778f0eb">stk::Cubic</a>
 , <a class="el" href="classstk_1_1TwoPole.html#a309960a8b2cf6858f43f43dc739146ea">stk::TwoPole</a>
 </li>
+<li>setA3()
+: <a class="el" href="classstk_1_1Cubic.html#add4a05676471c4c09b76f5fe430b80fa">stk::Cubic</a>
+</li>
 <li>setAddress()
 : <a class="el" href="classstk_1_1UdpSocket.html#a785594fd882b76d4c280b72a016f026d">stk::UdpSocket</a>
 </li>
@@ -91,6 +96,9 @@ Here is a list of all documented class members with links to the class documenta
 <li>setAttackRate()
 : <a class="el" href="classstk_1_1ADSR.html#aff18347235fd52ce307c4b5de18a9c62">stk::ADSR</a>
 </li>
+<li>setAttackTarget()
+: <a class="el" href="classstk_1_1ADSR.html#ae0af300e39f83f79776c04a3e83a85b1">stk::ADSR</a>
+</li>
 <li>setAttackTime()
 : <a class="el" href="classstk_1_1ADSR.html#a48885319b8175cd4d6312fdf7980f116">stk::ADSR</a>
 </li>
@@ -113,8 +121,7 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1TwoZero.html#a98a7d6d1615753f338f75409d850a9b4">stk::TwoZero</a>
 </li>
 <li>setBaseLoopGain()
-: <a class="el" href="classstk_1_1PluckTwo.html#a168f563174e22b221744ef66b35a5277">stk::PluckTwo</a>
-, <a class="el" href="classstk_1_1StifKarp.html#ad1b5de5acf487271d99903cd43e891ce">stk::StifKarp</a>
+: <a class="el" href="classstk_1_1StifKarp.html#ad1b5de5acf487271d99903cd43e891ce">stk::StifKarp</a>
 </li>
 <li>setBlocking()
 : <a class="el" href="classstk_1_1Socket.html#a12f0abb799fbf7d5d2ee6364627cb6ac">stk::Socket</a>
@@ -172,7 +179,7 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1UdpSocket.html#a4267442661257aae2a0f6b48d367fea1">stk::UdpSocket</a>
 </li>
 <li>setDetune()
-: <a class="el" href="classstk_1_1PluckTwo.html#a6b355a495d9122273fb8c88009bf79d6">stk::PluckTwo</a>
+: <a class="el" href="classstk_1_1Mandolin.html#af46367787cd0a21a04655be82d18df08">stk::Mandolin</a>
 </li>
 <li>setDirectGain()
 : <a class="el" href="classstk_1_1Modal.html#a70006135da2ecdc46eff4156504d94e1">stk::Modal</a>
@@ -193,9 +200,6 @@ Here is a list of all documented class members with links to the class documenta
 <li>setFilterSweepRate()
 : <a class="el" href="classstk_1_1VoicForm.html#a14d8323edda6e8c82ab39d633b8064a8">stk::VoicForm</a>
 </li>
-<li>setFreqAndDetune()
-: <a class="el" href="classstk_1_1PluckTwo.html#a3cd8e9135b1d8a97b87f9486dd3cd671">stk::PluckTwo</a>
-</li>
 <li>setFrequency()
 : <a class="el" href="classstk_1_1BandedWG.html#acf104d4ed663b5f0cd034c8025f4d420">stk::BandedWG</a>
 , <a class="el" href="classstk_1_1Blit.html#a5571562e489947c4beccc206ecccfbdd">stk::Blit</a>
@@ -211,11 +215,11 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1FM.html#a8182c605d51ec623f90f4e07c2b90891">stk::FM</a>
 , <a class="el" href="classstk_1_1FMVoices.html#af47a92f6892f3a5bef5226d4772fc8cb">stk::FMVoices</a>
 , <a class="el" href="classstk_1_1Instrmnt.html#a597efc508ad367a308fa11b8cbdc96a7">stk::Instrmnt</a>
+, <a class="el" href="classstk_1_1Mandolin.html#af5beeafcdfef7b71a5dda14e0c30c7fb">stk::Mandolin</a>
 , <a class="el" href="classstk_1_1Modal.html#a503092926e66667227bb46312a82a264">stk::Modal</a>
 , <a class="el" href="classstk_1_1Moog.html#ab0d66174dd734d55ef7224d6d8f2cb06">stk::Moog</a>
 , <a class="el" href="classstk_1_1PercFlut.html#a24197fb4ae0bf806d8e3f6fe4eb5598c">stk::PercFlut</a>
 , <a class="el" href="classstk_1_1Plucked.html#a1864c705b85633542621ba3ba4491331">stk::Plucked</a>
-, <a class="el" href="classstk_1_1PluckTwo.html#a9f0618a28243b235f6c0f424a236709c">stk::PluckTwo</a>
 , <a class="el" href="classstk_1_1Rhodey.html#a216ff771d88e7e03c46bc477d7ed5e86">stk::Rhodey</a>
 , <a class="el" href="classstk_1_1Sampler.html#a746eaab88793e3e8cdac9f6e59e00ca3">stk::Sampler</a>
 , <a class="el" href="classstk_1_1Saxofony.html#a5844455497f50e4b64beb23f275ac8d1">stk::Saxofony</a>
@@ -224,13 +228,15 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1SingWave.html#ae1ac4a84551f89570ff0842d032a3cba">stk::SingWave</a>
 , <a class="el" href="classstk_1_1Sitar.html#a02acfe592d8d601a37fadb94aaedb074">stk::Sitar</a>
 , <a class="el" href="classstk_1_1StifKarp.html#a51371b8592fc01aba1993ac304962f6e">stk::StifKarp</a>
+, <a class="el" href="classstk_1_1Twang.html#a0043b9d374b73b6660ec2d79475d602c">stk::Twang</a>
 , <a class="el" href="classstk_1_1Voicer.html#a5ee3f8a17e031430486e030520709acf">stk::Voicer</a>
 , <a class="el" href="classstk_1_1VoicForm.html#aeb2b7ffe130e016c847cd7aebfd628ee">stk::VoicForm</a>
 , <a class="el" href="classstk_1_1Whistle.html#a6fd2ded34c6bfda618d80d7068e829d4">stk::Whistle</a>
 , <a class="el" href="classstk_1_1Wurley.html#af00b42ac4011cacc724bf4c9cf16fba4">stk::Wurley</a>
 </li>
 <li>setGain()
-: <a class="el" href="classstk_1_1Filter.html#a827b1bd3a99fa9af408cbd4eb559d212">stk::Filter</a>
+: <a class="el" href="classstk_1_1Cubic.html#a3eca8ac3f81301592476aad7a2e1ec50">stk::Cubic</a>
+, <a class="el" href="classstk_1_1Filter.html#a827b1bd3a99fa9af408cbd4eb559d212">stk::Filter</a>
 , <a class="el" href="classstk_1_1FM.html#a65a8c54556f0c288871876ffad4d9eef">stk::FM</a>
 </li>
 <li>setGainRate()
@@ -262,6 +268,15 @@ Here is a list of all documented class members with links to the class documenta
 <li>setLip()
 : <a class="el" href="classstk_1_1Brass.html#a2e1a150328504050499c5cb9fa0e536f">stk::Brass</a>
 </li>
+<li>setLoopFilter()
+: <a class="el" href="classstk_1_1Twang.html#a7076c25dd3a06262b3bf927bc64bf89e">stk::Twang</a>
+</li>
+<li>setLoopGain()
+: <a class="el" href="classstk_1_1Twang.html#ad7921c51f38b4e6e32d7db48cc101068">stk::Twang</a>
+</li>
+<li>setLowestFrequency()
+: <a class="el" href="classstk_1_1Twang.html#ae27aa429cbf49f0dd60f0cc6ef41c832">stk::Twang</a>
+</li>
 <li>setMass()
 : <a class="el" href="classstk_1_1Sphere.html#a0db842c9f06b377bcd803391b7126d2f">stk::Sphere</a>
 </li>
@@ -275,6 +290,12 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1Echo.html#a421a6f5f06f8e7df09edd179d397da7d">stk::Echo</a>
 , <a class="el" href="classstk_1_1TapDelay.html#a104b7bd81435a38191e1e43a24cb471d">stk::TapDelay</a>
 </li>
+<li>setMaxOutput()
+: <a class="el" href="classstk_1_1BowTable.html#a634d5063eba886445f4057c823b00ff7">stk::BowTable</a>
+</li>
+<li>setMinOutput()
+: <a class="el" href="classstk_1_1BowTable.html#a9540d5c56cfd4556ab25c25f0612b25d">stk::BowTable</a>
+</li>
 <li>setModDepth()
 : <a class="el" href="classstk_1_1Chorus.html#acb3a55518c919dafa6c19698c1ab3389">stk::Chorus</a>
 </li>
@@ -294,18 +315,18 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1Moog.html#afeb63bf762f07851db22ae5bf18f0a81">stk::Moog</a>
 </li>
 <li>setNotch()
-: <a class="el" href="classstk_1_1TwoZero.html#a3a89facd2b94bbcfc2f06d8766a46329">stk::TwoZero</a>
-, <a class="el" href="classstk_1_1BiQuad.html#ae10a26fc319ba357bc92df4e528c2d8f">stk::BiQuad</a>
+: <a class="el" href="classstk_1_1BiQuad.html#ae10a26fc319ba357bc92df4e528c2d8f">stk::BiQuad</a>
 , <a class="el" href="classstk_1_1Resonate.html#ad4476301fba545cbbfc773150ca6901d">stk::Resonate</a>
+, <a class="el" href="classstk_1_1TwoZero.html#a3a89facd2b94bbcfc2f06d8766a46329">stk::TwoZero</a>
 </li>
 <li>setNumerator()
 : <a class="el" href="classstk_1_1Iir.html#a7a1473446857a14cdbb33cb5afde076c">stk::Iir</a>
 </li>
 <li>setNX()
-: <a class="el" href="classstk_1_1Mesh2D.html#accbad29fd6364f7c2d439bcf837590ec">stk::Mesh2D</a>
+: <a class="el" href="classstk_1_1Mesh2D.html#a6834a52f03b072e18387b799f804527b">stk::Mesh2D</a>
 </li>
 <li>setNY()
-: <a class="el" href="classstk_1_1Mesh2D.html#a4c4c54ad29fcee5654bd2ebaed29d916">stk::Mesh2D</a>
+: <a class="el" href="classstk_1_1Mesh2D.html#a2be2badaccfeb57e52e548f1b7515fbe">stk::Mesh2D</a>
 </li>
 <li>setOffset()
 : <a class="el" href="classstk_1_1BowTable.html#a9adcc3c36085b73d3b877828071a3b2c">stk::BowTable</a>
@@ -325,7 +346,8 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1VoicForm.html#a2e4adfe6542f6103a8ac85c7ea2f2ce5">stk::VoicForm</a>
 </li>
 <li>setPluckPosition()
-: <a class="el" href="classstk_1_1PluckTwo.html#afffb424a2957fc691363ba1227809695">stk::PluckTwo</a>
+: <a class="el" href="classstk_1_1Mandolin.html#a8a0df47cccec5225e26d3b0e702a7c02">stk::Mandolin</a>
+, <a class="el" href="classstk_1_1Twang.html#a48008e3cd55dad6ee846b47ab32f993f">stk::Twang</a>
 </li>
 <li>setPole()
 : <a class="el" href="classstk_1_1OnePole.html#acc1aaa35c6d5ffbbebfe0c4bfa7d1132">stk::OnePole</a>
@@ -337,9 +359,6 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1BandedWG.html#ab1e3a367eef86e6cb372b4ee232e1804">stk::BandedWG</a>
 , <a class="el" href="classstk_1_1ModalBar.html#a3a09a114ccd420ab549b8565eb4928af">stk::ModalBar</a>
 </li>
-<li>setQueueSizeLimit()
-: <a class="el" href="classRtMidiIn.html#a2e15868916737039e0a34d47bffdf188">RtMidiIn</a>
-</li>
 <li>setRadius()
 : <a class="el" href="classstk_1_1Sphere.html#ac3f4f85642307bebe0733662620f0ee2">stk::Sphere</a>
 </li>
@@ -352,9 +371,9 @@ Here is a list of all documented class members with links to the class documenta
 </li>
 <li>setRate()
 : <a class="el" href="classstk_1_1Envelope.html#ade99b5c7cb974f71f1d2919868d774a0">stk::Envelope</a>
-, <a class="el" href="classstk_1_1FileLoop.html#a13e1f693bc8a29d9051a400087347a3c">stk::FileLoop</a>
-, <a class="el" href="classstk_1_1SineWave.html#ae69b232dd3a33963d25cf6215692d9d5">stk::SineWave</a>
 , <a class="el" href="classstk_1_1FileWvIn.html#aacd97ad5f30f9cdc8201b4244aa69901">stk::FileWvIn</a>
+, <a class="el" href="classstk_1_1SineWave.html#ae69b232dd3a33963d25cf6215692d9d5">stk::SineWave</a>
+, <a class="el" href="classstk_1_1FileLoop.html#a13e1f693bc8a29d9051a400087347a3c">stk::FileLoop</a>
 </li>
 <li>setRatio()
 : <a class="el" href="classstk_1_1FM.html#a58f0898b677750a259036f628ec1a91b">stk::FM</a>
@@ -372,10 +391,10 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1ADSR.html#a91c14442557cb65286a327f8b297237a">stk::ADSR</a>
 </li>
 <li>setResonance()
-: <a class="el" href="classstk_1_1BiQuad.html#a55aaa01fd4156f1fac1168f526e3d969">stk::BiQuad</a>
+: <a class="el" href="classstk_1_1FormSwep.html#aa6fe339cc937260c46e8c169a58d8529">stk::FormSwep</a>
 , <a class="el" href="classstk_1_1Resonate.html#a8767e6c05862c183483776ac4cf354f9">stk::Resonate</a>
 , <a class="el" href="classstk_1_1TwoPole.html#a00997b12a1cf0a04888124eaf85c565d">stk::TwoPole</a>
-, <a class="el" href="classstk_1_1FormSwep.html#aa6fe339cc937260c46e8c169a58d8529">stk::FormSwep</a>
+, <a class="el" href="classstk_1_1BiQuad.html#a55aaa01fd4156f1fac1168f526e3d969">stk::BiQuad</a>
 </li>
 <li>setSampleRate()
 : <a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">stk::Stk</a>
@@ -391,8 +410,8 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1PitShift.html#a1ade8534def67636af6f0d7e50825891">stk::PitShift</a>
 </li>
 <li>setSlope()
-: <a class="el" href="classstk_1_1ReedTable.html#a968a97400ec6bd424634ff377fc6417a">stk::ReedTable</a>
-, <a class="el" href="classstk_1_1BowTable.html#ad8391e46941ff9f49b78bf4f77c35143">stk::BowTable</a>
+: <a class="el" href="classstk_1_1BowTable.html#ad8391e46941ff9f49b78bf4f77c35143">stk::BowTable</a>
+, <a class="el" href="classstk_1_1ReedTable.html#a968a97400ec6bd424634ff377fc6417a">stk::ReedTable</a>
 </li>
 <li>setStates()
 : <a class="el" href="classstk_1_1FormSwep.html#a3aede7b088dbe2ca98b3398a5f953ae7">stk::FormSwep</a>
@@ -401,8 +420,8 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1ModalBar.html#ad4fbd1f97cd8c8c0782827969b0b4acf">stk::ModalBar</a>
 </li>
 <li>setStretch()
-: <a class="el" href="classstk_1_1StifKarp.html#a21a9b7407c9d6a0b2ba34c0e41bb0b57">stk::StifKarp</a>
-, <a class="el" href="classstk_1_1Granulate.html#aabd711f2b71bbcd28412d5cb73c085d6">stk::Granulate</a>
+: <a class="el" href="classstk_1_1Granulate.html#aabd711f2b71bbcd28412d5cb73c085d6">stk::Granulate</a>
+, <a class="el" href="classstk_1_1StifKarp.html#a21a9b7407c9d6a0b2ba34c0e41bb0b57">stk::StifKarp</a>
 </li>
 <li>setStrikePosition()
 : <a class="el" href="classstk_1_1BandedWG.html#a4394ee4cd1c84a8b3f92713e60715c4d">stk::BandedWG</a>
@@ -419,8 +438,9 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1FormSwep.html#a242edcbe2a6f88393357b5a5ccec43e8">stk::FormSwep</a>
 </li>
 <li>setT60()
-: <a class="el" href="classstk_1_1NRev.html#a9c0d41a2b9ce7fb9edb2d620ba005e3c">stk::NRev</a>
-, <a class="el" href="classstk_1_1PRCRev.html#a9478ed84e76d12cc66d11716ebfa8b3b">stk::PRCRev</a>
+: <a class="el" href="classstk_1_1PRCRev.html#a9478ed84e76d12cc66d11716ebfa8b3b">stk::PRCRev</a>
+, <a class="el" href="classstk_1_1Asymp.html#afa6fcf4bf3060c0c6092701e409d5fbf">stk::Asymp</a>
+, <a class="el" href="classstk_1_1NRev.html#a9c0d41a2b9ce7fb9edb2d620ba005e3c">stk::NRev</a>
 , <a class="el" href="classstk_1_1JCRev.html#a8f4caa6de1e662c76b853ebab814a2eb">stk::JCRev</a>
 </li>
 <li>setTapDelays()
@@ -428,8 +448,8 @@ Here is a list of all documented class members with links to the class documenta
 </li>
 <li>setTarget()
 : <a class="el" href="classstk_1_1ADSR.html#a428eebd510e464ccd7bb4e5728f80d63">stk::ADSR</a>
-, <a class="el" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e">stk::Envelope</a>
 , <a class="el" href="classstk_1_1Asymp.html#a7b0f7025ba5f268f1e5ce097b209f0ec">stk::Asymp</a>
+, <a class="el" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e">stk::Envelope</a>
 </li>
 <li>setTargets()
 : <a class="el" href="classstk_1_1FormSwep.html#a2f00d2edf80fbf8f74a284c68caf07d6">stk::FormSwep</a>
@@ -437,9 +457,12 @@ Here is a list of all documented class members with links to the class documenta
 <li>setTau()
 : <a class="el" href="classstk_1_1Asymp.html#aebd8ebaf6f6c9570d3ee78e1bcbbcbd2">stk::Asymp</a>
 </li>
+<li>setThreshold()
+: <a class="el" href="classstk_1_1Cubic.html#a10ba2b5c858fc2d656d49c676d5561b4">stk::Cubic</a>
+</li>
 <li>setTime()
-: <a class="el" href="classstk_1_1Asymp.html#aca998e9c4ae86b4958da59fc9433268c">stk::Asymp</a>
-, <a class="el" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7">stk::Envelope</a>
+: <a class="el" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7">stk::Envelope</a>
+, <a class="el" href="classstk_1_1Asymp.html#aca998e9c4ae86b4958da59fc9433268c">stk::Asymp</a>
 </li>
 <li>setTonehole()
 : <a class="el" href="classstk_1_1BlowHole.html#aaacb152624133d82e311b9e0b8218289">stk::BlowHole</a>
@@ -448,9 +471,9 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1VoicForm.html#aa4fa86def4ded3698f75c0e4bdbdf638">stk::VoicForm</a>
 </li>
 <li>setValue()
-: <a class="el" href="classstk_1_1ADSR.html#aa99bf5fca3885bf8d99a3edc4072a4b5">stk::ADSR</a>
+: <a class="el" href="classstk_1_1Envelope.html#ab8164a90c57616dc8bd55a6e5ba02fb6">stk::Envelope</a>
 , <a class="el" href="classstk_1_1Asymp.html#a81881bb8aca615f69bbbfd56267f971c">stk::Asymp</a>
-, <a class="el" href="classstk_1_1Envelope.html#ab8164a90c57616dc8bd55a6e5ba02fb6">stk::Envelope</a>
+, <a class="el" href="classstk_1_1ADSR.html#aa99bf5fca3885bf8d99a3edc4072a4b5">stk::ADSR</a>
 </li>
 <li>setVelocity()
 : <a class="el" href="classstk_1_1Sphere.html#ac76725a19fe806e9af9841d30faacb11">stk::Sphere</a>
@@ -513,7 +536,7 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1SingWave.html#a7a38283d4e42d5f9b96d3ce8c401183a">stk::SingWave</a>
 </li>
 <li>Sitar()
-: <a class="el" href="classstk_1_1Sitar.html#aa645039b4c1609f979775f5ec7e8bd4b">stk::Sitar</a>
+: <a class="el" href="classstk_1_1Sitar.html#a8a2c996ad8b32f98f2bca14aa742bc29">stk::Sitar</a>
 </li>
 <li>size()
 : <a class="el" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79">stk::StkFrames</a>
@@ -534,22 +557,22 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classstk_1_1Sphere.html#a73d4fac54fba9aa11a56a34e4198656c">stk::Sphere</a>
 </li>
 <li>start()
-: <a class="el" href="classstk_1_1RtWvOut.html#a2e34c9ff845155230e0336ea3729dc45">stk::RtWvOut</a>
+: <a class="el" href="classstk_1_1RtWvIn.html#a0ae4012cb269fb70536611b9116142fa">stk::RtWvIn</a>
 , <a class="el" href="classstk_1_1Thread.html#abcafe21595d9c6ac52b1ae872b34a531">stk::Thread</a>
-, <a class="el" href="classstk_1_1RtWvIn.html#a0ae4012cb269fb70536611b9116142fa">stk::RtWvIn</a>
+, <a class="el" href="classstk_1_1RtWvOut.html#a2e34c9ff845155230e0336ea3729dc45">stk::RtWvOut</a>
 </li>
 <li>startBlowing()
-: <a class="el" href="classstk_1_1Whistle.html#ade1532d8b10e8b3ce7dfecba86514eaa">stk::Whistle</a>
-, <a class="el" href="classstk_1_1Flute.html#a33b58e80c6ebbd5bd45f90a7a1c6a025">stk::Flute</a>
-, <a class="el" href="classstk_1_1Clarinet.html#a0e4d016135c3ee291f4d74e9b030caee">stk::Clarinet</a>
-, <a class="el" href="classstk_1_1Brass.html#a02533e02818e2848fb6480106a54ce94">stk::Brass</a>
-, <a class="el" href="classstk_1_1BlowBotl.html#a926d428669edf9c87a1f88faf01550c4">stk::BlowBotl</a>
+: <a class="el" href="classstk_1_1BlowBotl.html#a926d428669edf9c87a1f88faf01550c4">stk::BlowBotl</a>
+, <a class="el" href="classstk_1_1Whistle.html#ade1532d8b10e8b3ce7dfecba86514eaa">stk::Whistle</a>
 , <a class="el" href="classstk_1_1Saxofony.html#a6e46b18ad2f992dfc3d948f966ec1bf2">stk::Saxofony</a>
+, <a class="el" href="classstk_1_1Flute.html#a33b58e80c6ebbd5bd45f90a7a1c6a025">stk::Flute</a>
 , <a class="el" href="classstk_1_1BlowHole.html#a1be64a601f2fbc8e9efaec5a53c55866">stk::BlowHole</a>
+, <a class="el" href="classstk_1_1Brass.html#a02533e02818e2848fb6480106a54ce94">stk::Brass</a>
+, <a class="el" href="classstk_1_1Clarinet.html#a0e4d016135c3ee291f4d74e9b030caee">stk::Clarinet</a>
 </li>
 <li>startBowing()
-: <a class="el" href="classstk_1_1BandedWG.html#a37b20c2554e7100241a99758f5a4433e">stk::BandedWG</a>
-, <a class="el" href="classstk_1_1Bowed.html#a519d511ddcc1cf23e897aeacdfe45020">stk::Bowed</a>
+: <a class="el" href="classstk_1_1Bowed.html#a519d511ddcc1cf23e897aeacdfe45020">stk::Bowed</a>
+, <a class="el" href="classstk_1_1BandedWG.html#a37b20c2554e7100241a99758f5a4433e">stk::BandedWG</a>
 </li>
 <li>startMidiInput()
 : <a class="el" href="classstk_1_1Messager.html#a49877209a4ee08e684de82a73f2d9df9">stk::Messager</a>
@@ -564,7 +587,7 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80">RtAudio</a>
 </li>
 <li>StifKarp()
-: <a class="el" href="classstk_1_1StifKarp.html#a946fb588b5b18b12ea2dca221150da66">stk::StifKarp</a>
+: <a class="el" href="classstk_1_1StifKarp.html#a2ac1b3641559e787cf78a017797e9a70">stk::StifKarp</a>
 </li>
 <li>Stk()
 : <a class="el" href="classstk_1_1Stk.html#a9bff83b5a318ff171f94a218ad52226b">stk::Stk</a>
@@ -598,13 +621,13 @@ Here is a list of all documented class members with links to the class documenta
 , <a class="el" href="classstk_1_1RtWvOut.html#a7368c42b81670c0335b25f14faa08918">stk::RtWvOut</a>
 </li>
 <li>stopBlowing()
-: <a class="el" href="classstk_1_1Whistle.html#a6f529770c888caca50fc35f454c98898">stk::Whistle</a>
-, <a class="el" href="classstk_1_1Brass.html#a8bf1624aca6283fafb830a3f22546199">stk::Brass</a>
-, <a class="el" href="classstk_1_1Clarinet.html#ae33627365f66f30c3685dc72cd7fadce">stk::Clarinet</a>
+: <a class="el" href="classstk_1_1Brass.html#a8bf1624aca6283fafb830a3f22546199">stk::Brass</a>
 , <a class="el" href="classstk_1_1Saxofony.html#ae792c62c3bcf2fe756387c1f5cd61794">stk::Saxofony</a>
-, <a class="el" href="classstk_1_1Flute.html#a65b8e74b1a99bc8bada4e80ebd512058">stk::Flute</a>
+, <a class="el" href="classstk_1_1Whistle.html#a6f529770c888caca50fc35f454c98898">stk::Whistle</a>
+, <a class="el" href="classstk_1_1Clarinet.html#ae33627365f66f30c3685dc72cd7fadce">stk::Clarinet</a>
 , <a class="el" href="classstk_1_1BlowBotl.html#a91a174c3501aafbbfe6841f6915fe4f3">stk::BlowBotl</a>
 , <a class="el" href="classstk_1_1BlowHole.html#aeb4dfd7d75b1996e15833c0928ed39c4">stk::BlowHole</a>
+, <a class="el" href="classstk_1_1Flute.html#a65b8e74b1a99bc8bada4e80ebd512058">stk::Flute</a>
 </li>
 <li>stopBowing()
 : <a class="el" href="classstk_1_1BandedWG.html#aa14786c32af030311e2118db3b68a892">stk::BandedWG</a>
@@ -640,7 +663,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x74.html b/doc/html/functions_0x74.html
index 0756874..4867ff7 100644
--- a/doc/html/functions_0x74.html
+++ b/doc/html/functions_0x74.html
@@ -54,6 +54,16 @@ Here is a list of all documented class members with links to the class documenta
 <li>TapDelay()
 : <a class="el" href="classstk_1_1TapDelay.html#a24913411dff23e05995979e42cc51ecc">stk::TapDelay</a>
 </li>
+<li>tapIn()
+: <a class="el" href="classstk_1_1Delay.html#abd0b93da7a12eca94c1e68ec3b3774f1">stk::Delay</a>
+, <a class="el" href="classstk_1_1DelayL.html#a984843567ba3de6543bd13c23457f495">stk::DelayL</a>
+, <a class="el" href="classstk_1_1DelayA.html#adf33f950e60d31d355ea865ae3efd44e">stk::DelayA</a>
+</li>
+<li>tapOut()
+: <a class="el" href="classstk_1_1Delay.html#a4d5e5bab50e4fa062bd3f0e9e2fd19db">stk::Delay</a>
+, <a class="el" href="classstk_1_1DelayA.html#aab723097f4634b23b0cd4ba8762271dc">stk::DelayA</a>
+, <a class="el" href="classstk_1_1DelayL.html#ad16a1f176e93a9beb8e685aafa32579e">stk::DelayL</a>
+</li>
 <li>TcpClient()
 : <a class="el" href="classstk_1_1TcpClient.html#a1e1e2cf0981774147d516efcaf12e786">stk::TcpClient</a>
 </li>
@@ -70,98 +80,112 @@ Here is a list of all documented class members with links to the class documenta
 : <a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acaeb6282f991e2d93ab294a4272fc3f6c6">RtError</a>
 </li>
 <li>tick()
-: <a class="el" href="classstk_1_1ADSR.html#a97a617c65e62aadb4f88bd10cf437a6a">stk::ADSR</a>
-, <a class="el" href="classstk_1_1WvOut.html#a7e20334ec73dde8c6c5edef697812b7e">stk::WvOut</a>
-, <a class="el" href="classstk_1_1WvIn.html#a76718752b0cc1ab767ba4e70d72b9453">stk::WvIn</a>
-, <a class="el" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd">stk::Wurley</a>
-, <a class="el" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda">stk::Whistle</a>
-, <a class="el" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29">stk::VoicForm</a>
+: <a class="el" href="classstk_1_1Wurley.html#a505f7e6499761f64d0cc4b6419d945c3">stk::Wurley</a>
+, <a class="el" href="classstk_1_1Whistle.html#a46135035da33d0825e3ff0db04b857d4">stk::Whistle</a>
+, <a class="el" href="classstk_1_1VoicForm.html#a619d2995894216181c2dc38fd863fe33">stk::VoicForm</a>
 , <a class="el" href="classstk_1_1Voicer.html#a3fd795b0fce684c470484936ef39aa16">stk::Voicer</a>
 , <a class="el" href="classstk_1_1TwoZero.html#a0ef9deab4fbc7e64511d4b6d38afd185">stk::TwoZero</a>
 , <a class="el" href="classstk_1_1TwoPole.html#a5c9b52082c0d2845a5ca01ca276fe8f8">stk::TwoPole</a>
-, <a class="el" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f">stk::TubeBell</a>
+, <a class="el" href="classstk_1_1Twang.html#a089ff55338a22647d94665d6adbeb7ae">stk::Twang</a>
+, <a class="el" href="classstk_1_1TubeBell.html#a664cede881352aea1d300ca93ba416ac">stk::TubeBell</a>
 , <a class="el" href="classstk_1_1TapDelay.html#ad8250d2802326bd3778c00642266d201">stk::TapDelay</a>
-, <a class="el" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc">stk::StifKarp</a>
+, <a class="el" href="classstk_1_1StifKarp.html#a7d4afff257faa7ad9ef630f1db1ed93f">stk::StifKarp</a>
 , <a class="el" href="classstk_1_1Sphere.html#adc4709622b77fc91ad6f33be98c86344">stk::Sphere</a>
-, <a class="el" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e">stk::Sitar</a>
+, <a class="el" href="classstk_1_1Sitar.html#a755cc36fe9cde1942184af0b1ae88f7a">stk::Sitar</a>
 , <a class="el" href="classstk_1_1SingWave.html#ab74d7a305510eec92a9aa1a26bcb5e94">stk::SingWave</a>
-, <a class="el" href="classstk_1_1Blit.html#a528b8dc95499b11d6173cf065d62c717">stk::Blit</a>
-, <a class="el" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5">stk::Clarinet</a>
-, <a class="el" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda">stk::SineWave</a>
-, <a class="el" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882">stk::Simple</a>
-, <a class="el" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2">stk::Shakers</a>
-, <a class="el" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f">stk::Saxofony</a>
-, <a class="el" href="classstk_1_1Sampler.html#a08502c96fa3e5f4c853c781354ed1965">stk::Sampler</a>
+, <a class="el" href="classstk_1_1Asymp.html#a2647bc013816f026915b1e92ddd6a322">stk::Asymp</a>
+, <a class="el" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94">stk::BlowHole</a>
+, <a class="el" href="classstk_1_1Simple.html#adff17b07913c312e989f1987e4fb5cc8">stk::Simple</a>
+, <a class="el" href="classstk_1_1Shakers.html#a655713b658ddeb065d755997cac4b62e">stk::Shakers</a>
+, <a class="el" href="classstk_1_1Saxofony.html#a98c686337ea0c2be7683ddc569bb0a1d">stk::Saxofony</a>
+, <a class="el" href="classstk_1_1Sampler.html#a30ef51142f99faf0586e2da78bc6daf6">stk::Sampler</a>
 , <a class="el" href="classstk_1_1RtWvOut.html#a025484fb9849d37ccc254c51929c77ab">stk::RtWvOut</a>
 , <a class="el" href="classstk_1_1RtWvIn.html#a38e698120ae0abf58dde995cba9e47cf">stk::RtWvIn</a>
-, <a class="el" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790">stk::Rhodey</a>
-, <a class="el" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98">stk::Resonate</a>
+, <a class="el" href="classstk_1_1Rhodey.html#a9d843b764e5219c8289884d0903462f9">stk::Rhodey</a>
+, <a class="el" href="classstk_1_1Resonate.html#aeefb870c1eeb430160fdca374e8324b3">stk::Resonate</a>
+, <a class="el" href="classstk_1_1Envelope.html#a9341c9dea4fd54c360a4a23254319cf7">stk::Envelope</a>
 , <a class="el" href="classstk_1_1ReedTable.html#ae682fdc0a6ec68a9f858f5cd6889113d">stk::ReedTable</a>
 , <a class="el" href="classstk_1_1PRCRev.html#a86e9fe7b68a69326b89e924e9789a00f">stk::PRCRev</a>
 , <a class="el" href="classstk_1_1PoleZero.html#a1b5e97a13c582d97cfaa7fcbd4211b47">stk::PoleZero</a>
-, <a class="el" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25">stk::Plucked</a>
+, <a class="el" href="classstk_1_1Plucked.html#ab9bb602c6f6867cf00995bc42101c006">stk::Plucked</a>
 , <a class="el" href="classstk_1_1PitShift.html#a4c00529546a282b352aa87e2ece7e6a8">stk::PitShift</a>
-, <a class="el" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054">stk::PercFlut</a>
 , <a class="el" href="classstk_1_1OneZero.html#a8568a0d8c4aacc64b656b9fe46f217a4">stk::OneZero</a>
+, <a class="el" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054">stk::PercFlut</a>
+, <a class="el" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95">stk::FileLoop</a>
+, <a class="el" href="classstk_1_1PercFlut.html#a4105b2b1dfe375bcf870fb4903509e4e">stk::PercFlut</a>
+, <a class="el" href="classstk_1_1OneZero.html#a2ca42a158bed919d8578c4a2dd184b3d">stk::OneZero</a>
 , <a class="el" href="classstk_1_1OnePole.html#a495943f1659f2da6208703a24275defb">stk::OnePole</a>
-, <a class="el" href="classstk_1_1Function.html#a2545fede83a8afcbe11b3bcf3e4d9f42">stk::Function</a>
-, <a class="el" href="classstk_1_1SineWave.html#af205d7029046af8a392341cabd58f9de">stk::SineWave</a>
-, <a class="el" href="classstk_1_1NRev.html#acfb629e4822fc5bffcf39b8f3ed9cfa1">stk::NRev</a>
+, <a class="el" href="classstk_1_1NRev.html#a0c44ff635369af0e644728df69d91957">stk::NRev</a>
 , <a class="el" href="classstk_1_1Noise.html#a2f92e91787dc19309305cf246632cd50">stk::Noise</a>
-, <a class="el" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a">stk::Moog</a>
+, <a class="el" href="classstk_1_1Moog.html#aee6aa6373c424e941f963b2709310f4e">stk::Moog</a>
 , <a class="el" href="classstk_1_1Modulate.html#a942eee1bb78318e1b59afeb311748b2d">stk::Modulate</a>
-, <a class="el" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890">stk::Modal</a>
-, <a class="el" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a">stk::Mesh2D</a>
-, <a class="el" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62">stk::Mandolin</a>
+, <a class="el" href="classstk_1_1Modal.html#ad2a28e7bd5fdae7d2a6d9fb79bbfb7b0">stk::Modal</a>
+, <a class="el" href="classstk_1_1PitShift.html#a433fcd3da3e7b08cb8b3392865e93033">stk::PitShift</a>
+, <a class="el" href="classstk_1_1Mesh2D.html#a0bfe62f0ab05859963571f4a9a569bd8">stk::Mesh2D</a>
+, <a class="el" href="classstk_1_1Mandolin.html#a37134f89e73e3e62ad5dfcfb0300a12d">stk::Mandolin</a>
 , <a class="el" href="classstk_1_1LentPitShift.html#af93de733eedca65de40597bd4a1f7b2a">stk::LentPitShift</a>
 , <a class="el" href="classstk_1_1JetTable.html#a7b261fd07b2325348ef14e3f0ebf8429">stk::JetTable</a>
-, <a class="el" href="classstk_1_1SingWave.html#a45136f9bf5b6f58433d4d65864d9db78">stk::SingWave</a>
-, <a class="el" href="classstk_1_1JCRev.html#abfdf0b4db6d08cce1b0473776fce03d5">stk::JCRev</a>
-, <a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt</a>
-, <a class="el" href="classstk_1_1InetWvOut.html#a0305b3498e0277443a9309799e4ad8b7">stk::InetWvOut</a>
+, <a class="el" href="classstk_1_1JCRev.html#ad6ae1c038bd3e5f8b40f18bed1dc026a">stk::JCRev</a>
+, <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>
+, <a class="el" href="classstk_1_1WvOut.html#a7fe517928a0043353ebc2a852b49953c">stk::WvOut</a>
+, <a class="el" href="classstk_1_1InetWvOut.html#a800f77228d851a2d276fae6a24bcdc9a">stk::InetWvOut</a>
 , <a class="el" href="classstk_1_1InetWvIn.html#a3ccbdb9a4d54ac51ff999ea0ce350212">stk::InetWvIn</a>
 , <a class="el" href="classstk_1_1Iir.html#a60919d8e000bf83613bdd5e002d750f1">stk::Iir</a>
-, <a class="el" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7">stk::HevyMetl</a>
+, <a class="el" href="classstk_1_1HevyMetl.html#a555f3bf9322fd11150b00bb99476769a">stk::HevyMetl</a>
+, <a class="el" href="classstk_1_1Granulate.html#aa9cc119b1515c5596a95d72f4b65b0c0">stk::Granulate</a>
 , <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>
-, <a class="el" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9">stk::Delay</a>
-, <a class="el" href="classstk_1_1Granulate.html#a0f8b162c9c309b3cbec3802138a53c24">stk::Granulate</a>
+, <a class="el" href="classstk_1_1Function.html#a2545fede83a8afcbe11b3bcf3e4d9f42">stk::Function</a>
 , <a class="el" href="classstk_1_1FormSwep.html#a8a16af2b4e169946cedb8fec2bb1417a">stk::FormSwep</a>
+, <a class="el" href="classstk_1_1SineWave.html#af205d7029046af8a392341cabd58f9de">stk::SineWave</a>
 , <a class="el" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887">stk::FMVoices</a>
-, <a class="el" href="classstk_1_1FM.html#a81f351fd8732fd6e686735b7b45a4241">stk::FM</a>
-, <a class="el" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe">stk::Flute</a>
+, <a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">stk::FM</a>
+, <a class="el" href="classstk_1_1Flute.html#a86640ddfacea6fd9385bc4e197fe1a28">stk::Flute</a>
 , <a class="el" href="classstk_1_1Fir.html#a53bcdfc2e9ad757d2ec549529b7a9738">stk::Fir</a>
+, <a class="el" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98">stk::Resonate</a>
 , <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>
 , <a class="el" href="classstk_1_1FileWvOut.html#a417f5d967ae4dd425163d36c8563c0dc">stk::FileWvOut</a>
 , <a class="el" href="classstk_1_1FileWvIn.html#ad492f9becef5dfc9202a027bc5ad4580">stk::FileWvIn</a>
+, <a class="el" href="classstk_1_1BlowHole.html#ad220cd597fa5f6edd043c0783bdc2ec7">stk::BlowHole</a>
 , <a class="el" href="classstk_1_1FileLoop.html#a3d91eb1f9c76d1bf6461ce2e4a3f8983">stk::FileLoop</a>
-, <a class="el" href="classstk_1_1NRev.html#a0c44ff635369af0e644728df69d91957">stk::NRev</a>
-, <a class="el" href="classstk_1_1Envelope.html#a9341c9dea4fd54c360a4a23254319cf7">stk::Envelope</a>
+, <a class="el" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2">stk::FileWvIn</a>
+, <a class="el" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497">stk::BandedWG</a>
+, <a class="el" href="classstk_1_1Envelope.html#a8de91b9caf10a03f52bd2247648c4601">stk::Envelope</a>
 , <a class="el" href="classstk_1_1Echo.html#a1778a7da06b222afbe9281c886f678d8">stk::Echo</a>
-, <a class="el" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba">stk::Drummer</a>
+, <a class="el" href="classstk_1_1Drummer.html#ad186a954527a518c47467e6caaa2e2f5">stk::Drummer</a>
 , <a class="el" href="classstk_1_1DelayL.html#a56ee486fb01fbf45d5a3dbad754a838e">stk::DelayL</a>
-, <a class="el" href="classstk_1_1JCRev.html#ad6ae1c038bd3e5f8b40f18bed1dc026a">stk::JCRev</a>
+, <a class="el" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890">stk::Modal</a>
 , <a class="el" href="classstk_1_1DelayL.html#a1d01bbaf40cc20a0b70241bb8072da7f">stk::DelayL</a>
 , <a class="el" href="classstk_1_1DelayA.html#a94a2998c9b2d1697ed9a747973be0a89">stk::DelayA</a>
-, <a class="el" href="classstk_1_1Blit.html#a20a3634131ff890641931c1d04df19ad">stk::Blit</a>
-, <a class="el" href="classstk_1_1Delay.html#a93fe8e45acb933889be812f35810f977">stk::Delay</a>
-, <a class="el" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e">stk::Asymp</a>
+, <a class="el" href="classstk_1_1Delay.html#ade0d544e45e535fd792fe70a2a22da6f">stk::Delay</a>
+, <a class="el" href="classstk_1_1WvIn.html#a76718752b0cc1ab767ba4e70d72b9453">stk::WvIn</a>
+, <a class="el" href="classstk_1_1Cubic.html#af3e8a1d6ffe5e9788d841343bd5722cc">stk::Cubic</a>
+, <a class="el" href="classstk_1_1Clarinet.html#a059174eb1ab84e306bfad1d8b5833548">stk::Clarinet</a>
 , <a class="el" href="classstk_1_1Chorus.html#abdb8802a83f6b89716316399138e3032">stk::Chorus</a>
+, <a class="el" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda">stk::SineWave</a>
 , <a class="el" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321">stk::Brass</a>
 , <a class="el" href="classstk_1_1BowTable.html#aaf72f823f210b18f417337ac7181cde5">stk::BowTable</a>
-, <a class="el" href="classstk_1_1NRev.html#a27d7ee42b73e84c5032215f44f1887d5">stk::NRev</a>
-, <a class="el" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94">stk::BlowHole</a>
-, <a class="el" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119">stk::BlowBotl</a>
+, <a class="el" href="classstk_1_1Fir.html#afc5fd95f6bf72edaf4ee3060ca947793">stk::Fir</a>
+, <a class="el" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750">stk::Bowed</a>
+, <a class="el" href="classstk_1_1BandedWG.html#a6c2ebb66862b173c4835add6847801c9">stk::BandedWG</a>
+, <a class="el" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19">stk::BowTable</a>
+, <a class="el" href="classstk_1_1BlowBotl.html#a49e1f536d821a8b2bf133533cb4bc93e">stk::BlowBotl</a>
 , <a class="el" href="classstk_1_1BlitSquare.html#a7df894d40b3d6effbb2a09819356258d">stk::BlitSquare</a>
 , <a class="el" href="classstk_1_1DelayL.html#acdc5d41de53c53d9d4b39ee8a46fb96c">stk::DelayL</a>
-, <a class="el" href="classstk_1_1BlitSaw.html#a03536a1f1823ea41649b4a62ba98007c">stk::BlitSaw</a>
-, <a class="el" href="classstk_1_1Asymp.html#a2647bc013816f026915b1e92ddd6a322">stk::Asymp</a>
-, <a class="el" href="classstk_1_1BlitSquare.html#a04366d55cecb4c8a726ea0519683d817">stk::BlitSquare</a>
+, <a class="el" href="classstk_1_1BlitSaw.html#ab53f6ba99ef5c4f8982f6c0f07bf2e1d">stk::BlitSaw</a>
+, <a class="el" href="classstk_1_1Blit.html#a20a3634131ff890641931c1d04df19ad">stk::Blit</a>
+, <a class="el" href="classstk_1_1InetWvOut.html#a0305b3498e0277443a9309799e4ad8b7">stk::InetWvOut</a>
 , <a class="el" href="classstk_1_1BiQuad.html#ac9836f0e074ea9516727f27eb9b411aa">stk::BiQuad</a>
-, <a class="el" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95">stk::FileLoop</a>
-, <a class="el" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497">stk::BandedWG</a>
+, <a class="el" href="classstk_1_1FMVoices.html#abad16be89b38d4618a07c5d71ab49e26">stk::FMVoices</a>
 , <a class="el" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7">stk::BeeThree</a>
-, <a class="el" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750">stk::Bowed</a>
+, <a class="el" href="classstk_1_1Brass.html#a10334fc5573b68f2b5c2819bdba786b8">stk::Brass</a>
+, <a class="el" href="classstk_1_1WvOut.html#a7e20334ec73dde8c6c5edef697812b7e">stk::WvOut</a>
+, <a class="el" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e">stk::Asymp</a>
+, <a class="el" href="classstk_1_1BlitSquare.html#a04366d55cecb4c8a726ea0519683d817">stk::BlitSquare</a>
 , <a class="el" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975">stk::ADSR</a>
+, <a class="el" href="classstk_1_1Cubic.html#aef7887fe7e5131ce48c8488a21d295b9">stk::Cubic</a>
+, <a class="el" href="classstk_1_1WvIn.html#a0eda243730408a434856fffed776931e">stk::WvIn</a>
+, <a class="el" href="classstk_1_1Blit.html#a528b8dc95499b11d6173cf065d62c717">stk::Blit</a>
+, <a class="el" href="classstk_1_1ADSR.html#a97a617c65e62aadb4f88bd10cf437a6a">stk::ADSR</a>
 </li>
 <li>time
 : <a class="el" href="structstk_1_1Skini_1_1Message.html#a6d07933c0cf4c92e76677236c2341e2f">stk::Skini::Message</a>
@@ -169,6 +193,9 @@ Here is a list of all documented class members with links to the class documenta
 <li>TubeBell()
 : <a class="el" href="classstk_1_1TubeBell.html#a7b5de1d681fcb5c2899094dc1ffe0453">stk::TubeBell</a>
 </li>
+<li>Twang()
+: <a class="el" href="classstk_1_1Twang.html#a813e99ee79974707a3afbfcab963c086">stk::Twang</a>
+</li>
 <li>TwoPole()
 : <a class="el" href="classstk_1_1TwoPole.html#a01a2b3b3d286e00a097918ec5f8a287b">stk::TwoPole</a>
 </li>
@@ -187,7 +214,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x75.html b/doc/html/functions_0x75.html
index 35aaea6..7126d9c 100644
--- a/doc/html/functions_0x75.html
+++ b/doc/html/functions_0x75.html
@@ -70,7 +70,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x76.html b/doc/html/functions_0x76.html
index 2a23410..a2695d2 100644
--- a/doc/html/functions_0x76.html
+++ b/doc/html/functions_0x76.html
@@ -69,7 +69,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x77.html b/doc/html/functions_0x77.html
index 552beea..9f016c2 100644
--- a/doc/html/functions_0x77.html
+++ b/doc/html/functions_0x77.html
@@ -101,7 +101,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_0x7e.html b/doc/html/functions_0x7e.html
index b4d7491..51dd248 100644
--- a/doc/html/functions_0x7e.html
+++ b/doc/html/functions_0x7e.html
@@ -189,9 +189,6 @@ Here is a list of all documented class members with links to the class documenta
 <li>~Plucked()
 : <a class="el" href="classstk_1_1Plucked.html#a6232b4a1ed48407fe9e66e1835011b5e">stk::Plucked</a>
 </li>
-<li>~PluckTwo()
-: <a class="el" href="classstk_1_1PluckTwo.html#ac8a0720b08d20741b0d8a312f1cf7e5c">stk::PluckTwo</a>
-</li>
 <li>~PoleZero()
 : <a class="el" href="classstk_1_1PoleZero.html#abeb7feab68b5d8370bd9c2aef94c8541">stk::PoleZero</a>
 </li>
@@ -273,6 +270,9 @@ Here is a list of all documented class members with links to the class documenta
 <li>~TubeBell()
 : <a class="el" href="classstk_1_1TubeBell.html#ab841ecb52b7be3b896d92b968364b529">stk::TubeBell</a>
 </li>
+<li>~Twang()
+: <a class="el" href="classstk_1_1Twang.html#adae2759ef254101f91aa3a0a5c3fba39">stk::Twang</a>
+</li>
 <li>~TwoPole()
 : <a class="el" href="classstk_1_1TwoPole.html#aabc2e1046f8f908fc78a53b50b00ed9f">stk::TwoPole</a>
 </li>
@@ -297,7 +297,7 @@ Here is a list of all documented class members with links to the class documenta
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_enum.html b/doc/html/functions_enum.html
index 56590f6..47e7bef 100644
--- a/doc/html/functions_enum.html
+++ b/doc/html/functions_enum.html
@@ -33,7 +33,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_eval.html b/doc/html/functions_eval.html
index f9f5449..8610417 100644
--- a/doc/html/functions_eval.html
+++ b/doc/html/functions_eval.html
@@ -30,12 +30,12 @@
 <li>DECAY
 : <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa75e1deeb861fe2989250b1977018cacf">stk::ADSR</a>
 </li>
-<li>DONE
-: <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baac9fd188b8e5ad469e002f7ba3498028b">stk::ADSR</a>
-</li>
 <li>DRIVER_ERROR
 : <a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903aca995e97ecf6beeedaba525022a63aec6b">RtError</a>
 </li>
+<li>IDLE
+: <a class="el" href="classstk_1_1ADSR.html#ae1cdd1f2886d69a76fcd5b1e0e9154baa1ed3238253daecbdba14da71759392d8">stk::ADSR</a>
+</li>
 <li>INVALID_DEVICE
 : <a class="el" href="classRtError.html#ab04667aae01bffc354a9ac6bda6903acad6064062066fffdba258237a7c2159b1">RtError</a>
 </li>
@@ -97,7 +97,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func.html b/doc/html/functions_func.html
index 5aac0af..4f8471f 100644
--- a/doc/html/functions_func.html
+++ b/doc/html/functions_func.html
@@ -77,7 +77,7 @@
 , <a class="el" href="classstk_1_1SineWave.html#adc8f03d5d81cfc24c20794033aad876f">stk::SineWave</a>
 </li>
 <li>addTo()
-: <a class="el" href="classstk_1_1Delay.html#aea5580dd84ea6982d1f7b92b53314118">stk::Delay</a>
+: <a class="el" href="classstk_1_1Delay.html#a80f143ab956c9d3b1721958ece6da65e">stk::Delay</a>
 </li>
 <li>addVelocity()
 : <a class="el" href="classstk_1_1Sphere.html#a16666f1e94c6d1e6b1fa35ee6c46331f">stk::Sphere</a>
@@ -94,7 +94,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x62.html b/doc/html/functions_func_0x62.html
index a5ef1c0..8168087 100644
--- a/doc/html/functions_func_0x62.html
+++ b/doc/html/functions_func_0x62.html
@@ -76,13 +76,13 @@
 : <a class="el" href="classstk_1_1BlowHole.html#a7f0aed9f79544d930c7f91dfa3e0efd9">stk::BlowHole</a>
 </li>
 <li>Bowed()
-: <a class="el" href="classstk_1_1Bowed.html#ab776c34c271de25c0cd036946d764158">stk::Bowed</a>
+: <a class="el" href="classstk_1_1Bowed.html#a1b442f60bbec3d07d2dd322ff761c767">stk::Bowed</a>
 </li>
 <li>BowTable()
 : <a class="el" href="classstk_1_1BowTable.html#a25d0985fd6821a7e1608af1e8f51952a">stk::BowTable</a>
 </li>
 <li>Brass()
-: <a class="el" href="classstk_1_1Brass.html#a96b223221f536efdaad4e724db01f11b">stk::Brass</a>
+: <a class="el" href="classstk_1_1Brass.html#a5bf59263a54250be84c027198c7d2d1d">stk::Brass</a>
 </li>
 </ul>
 </div>
@@ -90,7 +90,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x63.html b/doc/html/functions_func_0x63.html
index 82df299..acc5f32 100644
--- a/doc/html/functions_func_0x63.html
+++ b/doc/html/functions_func_0x63.html
@@ -65,35 +65,39 @@
 : <a class="el" href="classstk_1_1Filter.html#a48f23ab6613be35e3be8aceaf5adfdd7">stk::Filter</a>
 </li>
 <li>channelsOut()
-: <a class="el" href="classstk_1_1Generator.html#a9f9de4c495217ef8490a9d2d1fdabe11">stk::Generator</a>
+: <a class="el" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275">stk::Filter</a>
+, <a class="el" href="classstk_1_1Generator.html#a9f9de4c495217ef8490a9d2d1fdabe11">stk::Generator</a>
 , <a class="el" href="classstk_1_1Instrmnt.html#a32564b611598653fce5e708821b3fcb4">stk::Instrmnt</a>
 , <a class="el" href="classstk_1_1Voicer.html#a35230ae97772ae581fb9658a5f4d57b6">stk::Voicer</a>
-, <a class="el" href="classstk_1_1WvIn.html#a2ce05e5c8087e483236961335e8abf04">stk::WvIn</a>
 , <a class="el" href="classstk_1_1Effect.html#abfdef9ce644c251607acfd183e3d7f7b">stk::Effect</a>
-, <a class="el" href="classstk_1_1Filter.html#a4f1ed97c9ad8aef32e54b48da03f5275">stk::Filter</a>
+, <a class="el" href="classstk_1_1WvIn.html#a2ce05e5c8087e483236961335e8abf04">stk::WvIn</a>
+, <a class="el" href="classstk_1_1FileLoop.html#a9f3c514ce166068197684a21d31c3a76">stk::FileLoop</a>
 </li>
 <li>Chorus()
 : <a class="el" href="classstk_1_1Chorus.html#a529f668e66188ae5a42e4cc30779059f">stk::Chorus</a>
 </li>
 <li>Clarinet()
-: <a class="el" href="classstk_1_1Clarinet.html#a82e32a30e6d9664ac9fe748070bec23c">stk::Clarinet</a>
+: <a class="el" href="classstk_1_1Clarinet.html#aad5cf9fb562ee87f2dc0aed0b4cd6c5b">stk::Clarinet</a>
 </li>
 <li>clear()
-: <a class="el" href="classstk_1_1BlowHole.html#a43b829201197f2d0f0e8a72072e6798a">stk::BlowHole</a>
+: <a class="el" href="classstk_1_1BlowBotl.html#a271161f45e0a706d8ccd299f9aaf2ada">stk::BlowBotl</a>
+, <a class="el" href="classstk_1_1Modal.html#af064dc6ee4290fd51b4a6dc8a1f0909d">stk::Modal</a>
+, <a class="el" href="classstk_1_1NRev.html#a4097b11b38dd00d084ae4a94bc18f02c">stk::NRev</a>
+, <a class="el" href="classstk_1_1BlowHole.html#a43b829201197f2d0f0e8a72072e6798a">stk::BlowHole</a>
 , <a class="el" href="classstk_1_1PitShift.html#afa1b0ff95ef9a22991525f72d703220e">stk::PitShift</a>
 , <a class="el" href="classstk_1_1Plucked.html#a32a7063198af354fc007e3d903e21208">stk::Plucked</a>
 , <a class="el" href="classstk_1_1Bowed.html#a8d522c36a35b86f90a06cf135fc83b11">stk::Bowed</a>
-, <a class="el" href="classstk_1_1PluckTwo.html#a71821e47009a94de9e8a1f3305263840">stk::PluckTwo</a>
 , <a class="el" href="classstk_1_1PRCRev.html#a3e2fa911784a02a6d7211cbe2348ffe1">stk::PRCRev</a>
-, <a class="el" href="classstk_1_1Brass.html#a64e48334efdc8f2508c29c5ea4281f2d">stk::Brass</a>
 , <a class="el" href="classstk_1_1Resonate.html#a534740efbbde171d790309e85c96017d">stk::Resonate</a>
+, <a class="el" href="classstk_1_1Brass.html#a64e48334efdc8f2508c29c5ea4281f2d">stk::Brass</a>
 , <a class="el" href="classstk_1_1Sampler.html#a6c80aad733f5e90dfa63d29c6a5c88ac">stk::Sampler</a>
-, <a class="el" href="classstk_1_1Chorus.html#a63acbdd04d13110712c36a5cac5d972d">stk::Chorus</a>
 , <a class="el" href="classstk_1_1Saxofony.html#ac74981cfa3b36ec1288eccab6aa80210">stk::Saxofony</a>
+, <a class="el" href="classstk_1_1Chorus.html#a63acbdd04d13110712c36a5cac5d972d">stk::Chorus</a>
 , <a class="el" href="classstk_1_1Simple.html#a8281297483ef2363a01590722dd739d8">stk::Simple</a>
-, <a class="el" href="classstk_1_1Clarinet.html#a7eae4377eb4178067c2dba704032a2d1">stk::Clarinet</a>
 , <a class="el" href="classstk_1_1Sitar.html#a52cc4d38204e6825e524228008a0e94c">stk::Sitar</a>
+, <a class="el" href="classstk_1_1Clarinet.html#a7eae4377eb4178067c2dba704032a2d1">stk::Clarinet</a>
 , <a class="el" href="classstk_1_1StifKarp.html#ad1015fa6d2ac1835d8be7dec0df12f6f">stk::StifKarp</a>
+, <a class="el" href="classstk_1_1Twang.html#a7cdd4bf2e486239429f6d4f0f277cea9">stk::Twang</a>
 , <a class="el" href="classstk_1_1DelayA.html#ae5e59f497eb84280fd94d60257ffae69">stk::DelayA</a>
 , <a class="el" href="classstk_1_1VoicForm.html#ad62987970200d4e9720190b884fb689d">stk::VoicForm</a>
 , <a class="el" href="classstk_1_1Whistle.html#a8551209b9079d3bc626702e0745b2eb8">stk::Whistle</a>
@@ -103,12 +107,10 @@
 , <a class="el" href="classstk_1_1Flute.html#a4554fc4feffd469b83d02dd4e5471ffa">stk::Flute</a>
 , <a class="el" href="classstk_1_1FM.html#ac5697f9929afd43379e8720f2f271b2d">stk::FM</a>
 , <a class="el" href="classstk_1_1JCRev.html#abf92e9783e4a738b6d3a3350bfae986e">stk::JCRev</a>
-, <a class="el" href="classstk_1_1BandedWG.html#a182dbf5d75aebf5714bd6df15b0df90c">stk::BandedWG</a>
 , <a class="el" href="classstk_1_1LentPitShift.html#a5661bf4cd0a4b5b2bf9e4e81603c74be">stk::LentPitShift</a>
+, <a class="el" href="classstk_1_1BandedWG.html#a182dbf5d75aebf5714bd6df15b0df90c">stk::BandedWG</a>
+, <a class="el" href="classstk_1_1Mandolin.html#a2caec477ed0fe9479ed6d1fbdb45d827">stk::Mandolin</a>
 , <a class="el" href="classstk_1_1Mesh2D.html#a49f56b4865dc041ae874fbc1b80e967b">stk::Mesh2D</a>
-, <a class="el" href="classstk_1_1BlowBotl.html#a271161f45e0a706d8ccd299f9aaf2ada">stk::BlowBotl</a>
-, <a class="el" href="classstk_1_1Modal.html#af064dc6ee4290fd51b4a6dc8a1f0909d">stk::Modal</a>
-, <a class="el" href="classstk_1_1NRev.html#a4097b11b38dd00d084ae4a94bc18f02c">stk::NRev</a>
 </li>
 <li>clipStatus()
 : <a class="el" href="classstk_1_1WvOut.html#aed503fe979c33eb8240901f005cb48d5">stk::WvOut</a>
@@ -119,53 +121,50 @@
 , <a class="el" href="classstk_1_1Socket.html#a816c3dfae2549db692944042821d6019">stk::Socket</a>
 </li>
 <li>closeFile()
-: <a class="el" href="classstk_1_1FileLoop.html#a51688a9e84b2f9e5a9c4e62588b65c52">stk::FileLoop</a>
-, <a class="el" href="classstk_1_1FileWvIn.html#ae586a93b45a979881d9bd6fc1cb364cb">stk::FileWvIn</a>
+: <a class="el" href="classstk_1_1FileWvIn.html#ae586a93b45a979881d9bd6fc1cb364cb">stk::FileWvIn</a>
+, <a class="el" href="classstk_1_1FileLoop.html#a51688a9e84b2f9e5a9c4e62588b65c52">stk::FileLoop</a>
 , <a class="el" href="classstk_1_1FileWvOut.html#a54cbced5ce278b0d16fa800e8445103c">stk::FileWvOut</a>
 </li>
 <li>closePort()
-: <a class="el" href="classRtMidi.html#a36125c4fa16550345b57f4a4927f5b4a">RtMidi</a>
-, <a class="el" href="classRtMidiIn.html#a55bacf0d228fd8e3be6a79d12fd1dc39">RtMidiIn</a>
+: <a class="el" href="classRtMidiIn.html#a55bacf0d228fd8e3be6a79d12fd1dc39">RtMidiIn</a>
+, <a class="el" href="classRtMidi.html#a36125c4fa16550345b57f4a4927f5b4a">RtMidi</a>
 , <a class="el" href="classRtMidiOut.html#a3092e53a8aed2d3b163fcaa05fafd041">RtMidiOut</a>
 </li>
 <li>closeStream()
 : <a class="el" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a">RtAudio</a>
 </li>
 <li>connect()
-: <a class="el" href="classstk_1_1TcpClient.html#a46ff34075ef3a0342c396af5fe1aedda">stk::TcpClient</a>
-, <a class="el" href="classstk_1_1InetWvOut.html#a4c8b6fb25c6d751b7929bec9a2d04a53">stk::InetWvOut</a>
-</li>
-<li>contentsAt()
-: <a class="el" href="classstk_1_1Delay.html#a7d4c9c21e752f860ba683e9849d14665">stk::Delay</a>
-, <a class="el" href="classstk_1_1DelayA.html#a355422e50c1d2e89385f11aafffd064d">stk::DelayA</a>
-, <a class="el" href="classstk_1_1DelayL.html#a7a84a3a188f2de7cc05f81ad06e04874">stk::DelayL</a>
+: <a class="el" href="classstk_1_1InetWvOut.html#a4c8b6fb25c6d751b7929bec9a2d04a53">stk::InetWvOut</a>
+, <a class="el" href="classstk_1_1TcpClient.html#a46ff34075ef3a0342c396af5fe1aedda">stk::TcpClient</a>
 </li>
 <li>controlChange()
-: <a class="el" href="classstk_1_1FMVoices.html#a24e17888ff4e01edff96d81461d670a8">stk::FMVoices</a>
-, <a class="el" href="classstk_1_1Flute.html#a968b3799338e39df35dcf94fe7ee90a2">stk::Flute</a>
-, <a class="el" href="classstk_1_1Moog.html#acadb54eccab35e3b18b62ffd96c18ac4">stk::Moog</a>
-, <a class="el" href="classstk_1_1BandedWG.html#a16baac1cc6612332d6d0aa40a661c137">stk::BandedWG</a>
-, <a class="el" href="classstk_1_1Shakers.html#a688d9d8318e0c69779868079a7c64157">stk::Shakers</a>
-, <a class="el" href="classstk_1_1Clarinet.html#a63582205ab940101f5f9419fc717ff78">stk::Clarinet</a>
+: <a class="el" href="classstk_1_1ModalBar.html#a84e5b9963b74f0e4657f79d5dea013cb">stk::ModalBar</a>
+, <a class="el" href="classstk_1_1VoicForm.html#a427ca45d3e44e093c11f16e30fc2b550">stk::VoicForm</a>
+, <a class="el" href="classstk_1_1Simple.html#acd14d5368545f5650aeebbbdad65fc52">stk::Simple</a>
+, <a class="el" href="classstk_1_1Saxofony.html#a38efe138bea7af7aeab3652bf0a305ff">stk::Saxofony</a>
+, <a class="el" href="classstk_1_1Modal.html#a9fab49ec164852c381758f5d333f8891">stk::Modal</a>
+, <a class="el" href="classstk_1_1Whistle.html#a7d5d2d24fb0103aae0fb8c6308e2a663">stk::Whistle</a>
+, <a class="el" href="classstk_1_1Sampler.html#ad9c0789f033978165226beb7c8133cc3">stk::Sampler</a>
 , <a class="el" href="classstk_1_1BlowBotl.html#a21a4b2aaaac7afcc67b4abe5ed833bfd">stk::BlowBotl</a>
 , <a class="el" href="classstk_1_1Brass.html#a4d75ac361d11fcc870a330d393dbad80">stk::Brass</a>
 , <a class="el" href="classstk_1_1FM.html#a1db9d177363fb7d8dedb20fa0c9104f1">stk::FM</a>
 , <a class="el" href="classstk_1_1Mandolin.html#abf341aa5e7d751012178ff7b853b73a1">stk::Mandolin</a>
-, <a class="el" href="classstk_1_1Saxofony.html#a38efe138bea7af7aeab3652bf0a305ff">stk::Saxofony</a>
+, <a class="el" href="classstk_1_1BlowHole.html#a0d8ad0201c455894acb1416ffb21614b">stk::BlowHole</a>
+, <a class="el" href="classstk_1_1BandedWG.html#a16baac1cc6612332d6d0aa40a661c137">stk::BandedWG</a>
 , <a class="el" href="classstk_1_1StifKarp.html#a27e76ba187140ae575c1bd2e1ba99b03">stk::StifKarp</a>
-, <a class="el" href="classstk_1_1Modal.html#a9fab49ec164852c381758f5d333f8891">stk::Modal</a>
-, <a class="el" href="classstk_1_1Voicer.html#ab5fe99a639a872c90aed2541417cc896">stk::Voicer</a>
-, <a class="el" href="classstk_1_1Mesh2D.html#acc618a91b288305785644d852cfdaf83">stk::Mesh2D</a>
-, <a class="el" href="classstk_1_1VoicForm.html#a427ca45d3e44e093c11f16e30fc2b550">stk::VoicForm</a>
-, <a class="el" href="classstk_1_1Whistle.html#a7d5d2d24fb0103aae0fb8c6308e2a663">stk::Whistle</a>
+, <a class="el" href="classstk_1_1FMVoices.html#a24e17888ff4e01edff96d81461d670a8">stk::FMVoices</a>
+, <a class="el" href="classstk_1_1Flute.html#a968b3799338e39df35dcf94fe7ee90a2">stk::Flute</a>
+, <a class="el" href="classstk_1_1Voicer.html#ac3abcb8b3d402719426a13ffdb633522">stk::Voicer</a>
 , <a class="el" href="classstk_1_1Bowed.html#ad066af9bb1340b6fcf9002d6922021f4">stk::Bowed</a>
 , <a class="el" href="classstk_1_1Instrmnt.html#a5aecf9f4d4dcecdbef8271c7fe62b2cf">stk::Instrmnt</a>
-, <a class="el" href="classstk_1_1Sampler.html#ad9c0789f033978165226beb7c8133cc3">stk::Sampler</a>
-, <a class="el" href="classstk_1_1Simple.html#acd14d5368545f5650aeebbbdad65fc52">stk::Simple</a>
-, <a class="el" href="classstk_1_1ModalBar.html#a84e5b9963b74f0e4657f79d5dea013cb">stk::ModalBar</a>
-, <a class="el" href="classstk_1_1BlowHole.html#a0d8ad0201c455894acb1416ffb21614b">stk::BlowHole</a>
+, <a class="el" href="classstk_1_1Moog.html#acadb54eccab35e3b18b62ffd96c18ac4">stk::Moog</a>
+, <a class="el" href="classstk_1_1Mesh2D.html#acc618a91b288305785644d852cfdaf83">stk::Mesh2D</a>
+, <a class="el" href="classstk_1_1Clarinet.html#a63582205ab940101f5f9419fc717ff78">stk::Clarinet</a>
+, <a class="el" href="classstk_1_1Shakers.html#a688d9d8318e0c69779868079a7c64157">stk::Shakers</a>
 , <a class="el" href="classstk_1_1Resonate.html#af55feabf25f1f6f996c32574656ffd68">stk::Resonate</a>
-, <a class="el" href="classstk_1_1Voicer.html#ac3abcb8b3d402719426a13ffdb633522">stk::Voicer</a>
+</li>
+<li>Cubic()
+: <a class="el" href="classstk_1_1Cubic.html#a2059a20146f6d7ec0854dc860ca90895">stk::Cubic</a>
 </li>
 </ul>
 </div>
@@ -173,7 +172,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x64.html b/doc/html/functions_func_0x64.html
index d8fdf3b..f9df144 100644
--- a/doc/html/functions_func_0x64.html
+++ b/doc/html/functions_func_0x64.html
@@ -78,7 +78,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x65.html b/doc/html/functions_func_0x65.html
index 9dc8e3d..416377d 100644
--- a/doc/html/functions_func_0x65.html
+++ b/doc/html/functions_func_0x65.html
@@ -73,7 +73,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x66.html b/doc/html/functions_func_0x66.html
index 84d953b..36f03e1 100644
--- a/doc/html/functions_func_0x66.html
+++ b/doc/html/functions_func_0x66.html
@@ -96,6 +96,9 @@
 <li>formantRadius()
 : <a class="el" href="classstk_1_1Phonemes.html#aaa22b87de100770a4995632932c324bb">stk::Phonemes</a>
 </li>
+<li>format()
+: <a class="el" href="classstk_1_1FileRead.html#a6852b303c34f01967be2a7a69221ef0b">stk::FileRead</a>
+</li>
 <li>FormSwep()
 : <a class="el" href="classstk_1_1FormSwep.html#aeb0093d5962acf4b5d582730e8c8bab9">stk::FormSwep</a>
 </li>
@@ -111,7 +114,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x67.html b/doc/html/functions_func_0x67.html
index 7bd25cc..b11b2c7 100644
--- a/doc/html/functions_func_0x67.html
+++ b/doc/html/functions_func_0x67.html
@@ -99,8 +99,13 @@
 <li>getMass()
 : <a class="el" href="classstk_1_1Sphere.html#aa82d922e0b8513364d9d0d473e6239c6">stk::Sphere</a>
 </li>
+<li>getMaximumDelay()
+: <a class="el" href="classstk_1_1Delay.html#a31d348fd15e5b6e23f2984b75968a3ec">stk::Delay</a>
+, <a class="el" href="classstk_1_1DelayA.html#a6ac5c818b6669bf904a4a5a81358bd28">stk::DelayA</a>
+, <a class="el" href="classstk_1_1DelayL.html#acbcb8326db134a26fdad5f16f1a0ba7e">stk::DelayL</a>
+</li>
 <li>getMessage()
-: <a class="el" href="classRtError.html#ac7f467788e29d246333d7af050801164">RtError</a>
+: <a class="el" href="classRtError.html#afd067ba6b46edd37f989cad02cd70b50">RtError</a>
 , <a class="el" href="classRtMidiIn.html#a1ba10ecd276b30a8579c7d60a9c890eb">RtMidiIn</a>
 , <a class="el" href="classstk_1_1StkError.html#ac691cbffe442d9e0760978146df5d9fb">stk::StkError</a>
 </li>
@@ -121,14 +126,14 @@
 , <a class="el" href="classstk_1_1BlitSquare.html#abbda8cb84bcd36fc6d96130e9832a6af">stk::BlitSquare</a>
 </li>
 <li>getPortCount()
-: <a class="el" href="classRtMidi.html#a9a49ef73a1e6007444019a7ae095e195">RtMidi</a>
-, <a class="el" href="classRtMidiIn.html#a62b1b38aa8e5f11cd66f03d59228f4e4">RtMidiIn</a>
+: <a class="el" href="classRtMidiIn.html#a62b1b38aa8e5f11cd66f03d59228f4e4">RtMidiIn</a>
 , <a class="el" href="classRtMidiOut.html#ad6cddbcc7faa20a7be229f765ade0877">RtMidiOut</a>
+, <a class="el" href="classRtMidi.html#a9a49ef73a1e6007444019a7ae095e195">RtMidi</a>
 </li>
 <li>getPortName()
-: <a class="el" href="classRtMidiIn.html#af2961fff09fa01a3d5bc0f0c5a042aaf">RtMidiIn</a>
+: <a class="el" href="classRtMidi.html#a799e2b9f4df39b298518f2b394db3391">RtMidi</a>
+, <a class="el" href="classRtMidiIn.html#af2961fff09fa01a3d5bc0f0c5a042aaf">RtMidiIn</a>
 , <a class="el" href="classRtMidiOut.html#acc4ae0ab71a49ae7629075d5a9cd837c">RtMidiOut</a>
-, <a class="el" href="classRtMidi.html#a799e2b9f4df39b298518f2b394db3391">RtMidi</a>
 </li>
 <li>getPosition()
 : <a class="el" href="classstk_1_1Sphere.html#a91a3e710a7ff0cf160e9d46fca373bfd">stk::Sphere</a>
@@ -140,8 +145,8 @@
 : <a class="el" href="classstk_1_1Sphere.html#a4cf8f763e732bcf9ca79b8602e8ec24a">stk::Sphere</a>
 </li>
 <li>getSize()
-: <a class="el" href="classstk_1_1FileLoop.html#ad86d4f64c44a6f2488779fef24fc1ee7">stk::FileLoop</a>
-, <a class="el" href="classstk_1_1FileWvIn.html#aa8ef94c3ed01af0efc9e968f09207a26">stk::FileWvIn</a>
+: <a class="el" href="classstk_1_1FileWvIn.html#aa8ef94c3ed01af0efc9e968f09207a26">stk::FileWvIn</a>
+, <a class="el" href="classstk_1_1FileLoop.html#ad86d4f64c44a6f2488779fef24fc1ee7">stk::FileLoop</a>
 </li>
 <li>getState()
 : <a class="el" href="classstk_1_1ADSR.html#a87f9918cfa4104a841dc5b44f26f8904">stk::ADSR</a>
@@ -167,8 +172,8 @@
 : <a class="el" href="classstk_1_1WvOut.html#aca11b8991f281beb2b1c4d562c7ff43b">stk::WvOut</a>
 </li>
 <li>getType()
-: <a class="el" href="classstk_1_1StkError.html#aae641cf5ed2b756adbf02fc668fac53e">stk::StkError</a>
-, <a class="el" href="classRtError.html#a4ee7df9728d73f533afbaddcd9ca4d9c">RtError</a>
+: <a class="el" href="classRtError.html#a3e316dc9b9b41fe2f64cabf34beb4fe7">RtError</a>
+, <a class="el" href="classstk_1_1StkError.html#aae641cf5ed2b756adbf02fc668fac53e">stk::StkError</a>
 </li>
 <li>getVelocity()
 : <a class="el" href="classstk_1_1Sphere.html#a43ccf47d5d952f14f1ba0940aa87f4c5">stk::Sphere</a>
@@ -183,7 +188,7 @@
 : <a class="el" href="classstk_1_1Vector3D.html#af1c7389a2b4640cbe594fa33f9e4f805">stk::Vector3D</a>
 </li>
 <li>Granulate()
-: <a class="el" href="classstk_1_1Granulate.html#a78af615a331de9b643dfabb8e106883f">stk::Granulate</a>
+: <a class="el" href="classstk_1_1Granulate.html#aaff22b306824e885191892bbab35b9f6">stk::Granulate</a>
 </li>
 </ul>
 </div>
@@ -191,7 +196,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x68.html b/doc/html/functions_func_0x68.html
index fe500ff..3627186 100644
--- a/doc/html/functions_func_0x68.html
+++ b/doc/html/functions_func_0x68.html
@@ -63,7 +63,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x69.html b/doc/html/functions_func_0x69.html
index 8b3a259..297e994 100644
--- a/doc/html/functions_func_0x69.html
+++ b/doc/html/functions_func_0x69.html
@@ -76,6 +76,9 @@
 <li>inputTick()
 : <a class="el" href="classstk_1_1Mesh2D.html#a688bed8725ef2d8bf4c6465251bd8b86">stk::Mesh2D</a>
 </li>
+<li>inRange()
+: <a class="el" href="classstk_1_1Stk.html#a7dd617f6bf20e55d3ab97b86d8200b2e">stk::Stk</a>
+</li>
 <li>Instrmnt()
 : <a class="el" href="classstk_1_1Instrmnt.html#a6f3c4dc01e0484f0ca4a3b14f1b7caf0">stk::Instrmnt</a>
 </li>
@@ -94,6 +97,7 @@
 <li>isOpen()
 : <a class="el" href="classstk_1_1FileWrite.html#a636436624aa39eb5ba3401a9279a173e">stk::FileWrite</a>
 , <a class="el" href="classstk_1_1FileRead.html#a3f30ed2a9f45493f0369aa2edbf38f70">stk::FileRead</a>
+, <a class="el" href="classstk_1_1FileWvIn.html#aa45344366bca49f71c7153ac5b296e91">stk::FileWvIn</a>
 </li>
 <li>isStreamOpen()
 : <a class="el" href="classRtAudio.html#a3863e45ff81dbe97176de0ee7545917f">RtAudio</a>
@@ -110,7 +114,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x6a.html b/doc/html/functions_func_0x6a.html
index 2b56b73..a5c0c27 100644
--- a/doc/html/functions_func_0x6a.html
+++ b/doc/html/functions_func_0x6a.html
@@ -60,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x6b.html b/doc/html/functions_func_0x6b.html
index a8e59e3..62e4bc3 100644
--- a/doc/html/functions_func_0x6b.html
+++ b/doc/html/functions_func_0x6b.html
@@ -75,7 +75,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x6c.html b/doc/html/functions_func_0x6c.html
index 7433f28..2c0fcb8 100644
--- a/doc/html/functions_func_0x6c.html
+++ b/doc/html/functions_func_0x6c.html
@@ -55,22 +55,22 @@
 : <a class="el" href="classstk_1_1Effect.html#a3d7e2b8942bf7adcc71dfc6dccbb7aa0">stk::Effect</a>
 , <a class="el" href="classstk_1_1Filter.html#ab2d944f649693511dced1df249f0abe6">stk::Filter</a>
 , <a class="el" href="classstk_1_1Instrmnt.html#a277ac5149ec22c33d794dfd462a82d2b">stk::Instrmnt</a>
-, <a class="el" href="classstk_1_1Voicer.html#a50caec57c6a566e4836181774adf5e7b">stk::Voicer</a>
+, <a class="el" href="classstk_1_1Twang.html#ab54245fcb75144a8ffcc879789abc952">stk::Twang</a>
 , <a class="el" href="classstk_1_1Generator.html#a499ad65aa6d939983863ffb922008654">stk::Generator</a>
+, <a class="el" href="classstk_1_1Voicer.html#a50caec57c6a566e4836181774adf5e7b">stk::Voicer</a>
 , <a class="el" href="classstk_1_1WvIn.html#a3ab86e33eff9f962c9ef7b41e3ccb77e">stk::WvIn</a>
 </li>
 <li>lastOut()
-: <a class="el" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba">stk::TwoZero</a>
-, <a class="el" href="classstk_1_1TwoPole.html#a8a4fb4afe3e06c689827ecaec478aad1">stk::TwoPole</a>
-, <a class="el" href="classstk_1_1Asymp.html#aeb868c171e07206e2d5d30f8ce8f4436">stk::Asymp</a>
-, <a class="el" href="classstk_1_1SingWave.html#af1c5286c4a58904241d7b73ff29d4be0">stk::SingWave</a>
+: <a class="el" href="classstk_1_1TwoPole.html#a8a4fb4afe3e06c689827ecaec478aad1">stk::TwoPole</a>
+, <a class="el" href="classstk_1_1TapDelay.html#a517399ddf52455ef083481cbb77c0b5c">stk::TapDelay</a>
+, <a class="el" href="classstk_1_1ADSR.html#aedbcb85346c354139f139b3232f36f39">stk::ADSR</a>
 , <a class="el" href="classstk_1_1SineWave.html#ab788e787e5bb54445dd0769283567224">stk::SineWave</a>
 , <a class="el" href="classstk_1_1RtWvIn.html#a3a4f4035fc01fee4c2423791f9e9317e">stk::RtWvIn</a>
 , <a class="el" href="classstk_1_1PRCRev.html#a47ed5fee4401f0050d6a47d1154e81c6">stk::PRCRev</a>
 , <a class="el" href="classstk_1_1PoleZero.html#a03edf036d1619bb5d33bb41701833232">stk::PoleZero</a>
 , <a class="el" href="classstk_1_1PitShift.html#a782ad7b47c450c1584cebd20570f17e3">stk::PitShift</a>
-, <a class="el" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9">stk::DelayL</a>
-, <a class="el" href="classstk_1_1OnePole.html#ad1ad906374102791a01bfd60844028ec">stk::OnePole</a>
+, <a class="el" href="classstk_1_1OneZero.html#a54e160f62354939876477d9c5a65890c">stk::OneZero</a>
+, <a class="el" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566">stk::DelayA</a>
 , <a class="el" href="classstk_1_1NRev.html#a9f9faa6542271163680c1925309ed788">stk::NRev</a>
 , <a class="el" href="classstk_1_1Noise.html#a1d6c8ed80425cd0cea014bd2e328c823">stk::Noise</a>
 , <a class="el" href="classstk_1_1Modulate.html#addf73f58590ab082f106c9745c5bedc9">stk::Modulate</a>
@@ -78,25 +78,26 @@
 , <a class="el" href="classstk_1_1Instrmnt.html#aaa6bd5e4a5be7f9b0be967daf012872e">stk::Instrmnt</a>
 , <a class="el" href="classstk_1_1InetWvIn.html#acfd578027b2bbcbe4ceefa11e49e8cd2">stk::InetWvIn</a>
 , <a class="el" href="classstk_1_1Iir.html#a5dcae9330f2c52d2bfa1647e6b250a14">stk::Iir</a>
-, <a class="el" href="classstk_1_1OneZero.html#a54e160f62354939876477d9c5a65890c">stk::OneZero</a>
-, <a class="el" href="classstk_1_1Function.html#ae79bd6d0c9f53693b4ca28948d94fc25">stk::Function</a>
+, <a class="el" href="classstk_1_1Granulate.html#a60db060a365fc32fe789cb9bcd042dd3">stk::Granulate</a>
+, <a class="el" href="classstk_1_1OnePole.html#ad1ad906374102791a01bfd60844028ec">stk::OnePole</a>
 , <a class="el" href="classstk_1_1FormSwep.html#a3d8405c24e8539b389daf86fccfe5d70">stk::FormSwep</a>
 , <a class="el" href="classstk_1_1Fir.html#a5182288d564977bf172439f6ecaf2377">stk::Fir</a>
-, <a class="el" href="classstk_1_1TapDelay.html#a517399ddf52455ef083481cbb77c0b5c">stk::TapDelay</a>
-, <a class="el" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd">stk::FileLoop</a>
-, <a class="el" href="classstk_1_1Echo.html#a00a2a5949133a06680b026db7b21cc51">stk::Echo</a>
-, <a class="el" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063">stk::BiQuad</a>
+, <a class="el" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608">stk::FileWvIn</a>
+, <a class="el" href="classstk_1_1SingWave.html#af1c5286c4a58904241d7b73ff29d4be0">stk::SingWave</a>
 , <a class="el" href="classstk_1_1Envelope.html#a31044eab6eaf668ba7e74ea17bed109d">stk::Envelope</a>
-, <a class="el" href="classstk_1_1DelayA.html#a4372d0e178af1cb6ca465affddfb1566">stk::DelayA</a>
+, <a class="el" href="classstk_1_1DelayL.html#a16810ca38fab79276bb8ec51447623a9">stk::DelayL</a>
+, <a class="el" href="classstk_1_1Asymp.html#aeb868c171e07206e2d5d30f8ce8f4436">stk::Asymp</a>
+, <a class="el" href="classstk_1_1Echo.html#a00a2a5949133a06680b026db7b21cc51">stk::Echo</a>
 , <a class="el" href="classstk_1_1Delay.html#a7b563a37eec1773e8e82f9e328aed9b2">stk::Delay</a>
 , <a class="el" href="classstk_1_1Chorus.html#aabcc110787ec3b443c21845b2f06bb3c">stk::Chorus</a>
-, <a class="el" href="classstk_1_1Granulate.html#a60db060a365fc32fe789cb9bcd042dd3">stk::Granulate</a>
-, <a class="el" href="classstk_1_1BlitSaw.html#a254758ecd4166cc4e7d6fced5650a198">stk::BlitSaw</a>
-, <a class="el" href="classstk_1_1Blit.html#a530af82a27731734af4f4b58bce283de">stk::Blit</a>
-, <a class="el" href="classstk_1_1FileWvIn.html#ad17c12e8d51f90f59f0d0c9f6d626608">stk::FileWvIn</a>
-, <a class="el" href="classstk_1_1Voicer.html#a98d843fa1f9fd2ad9a9fb03538dba03a">stk::Voicer</a>
-, <a class="el" href="classstk_1_1ADSR.html#aedbcb85346c354139f139b3232f36f39">stk::ADSR</a>
 , <a class="el" href="classstk_1_1BlitSquare.html#a77972e4e1c53600bf80cf692601ccae1">stk::BlitSquare</a>
+, <a class="el" href="classstk_1_1Function.html#ae79bd6d0c9f53693b4ca28948d94fc25">stk::Function</a>
+, <a class="el" href="classstk_1_1Blit.html#a530af82a27731734af4f4b58bce283de">stk::Blit</a>
+, <a class="el" href="classstk_1_1BiQuad.html#a412f224363b1a222423ecf0cd7be9063">stk::BiQuad</a>
+, <a class="el" href="classstk_1_1FileLoop.html#a826b6dd0968c5abd1020a9fe629a4ffd">stk::FileLoop</a>
+, <a class="el" href="classstk_1_1TwoZero.html#ae9808b0152902d0067ea24ccfba0b4ba">stk::TwoZero</a>
+, <a class="el" href="classstk_1_1Voicer.html#a98d843fa1f9fd2ad9a9fb03538dba03a">stk::Voicer</a>
+, <a class="el" href="classstk_1_1BlitSaw.html#a254758ecd4166cc4e7d6fced5650a198">stk::BlitSaw</a>
 </li>
 <li>LentPitShift()
 : <a class="el" href="classstk_1_1LentPitShift.html#a0eb0c1ba3d8fdb6eaabb1c96c58ed536">stk::LentPitShift</a>
@@ -116,7 +117,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x6d.html b/doc/html/functions_func_0x6d.html
index febaa5d..2a576ec 100644
--- a/doc/html/functions_func_0x6d.html
+++ b/doc/html/functions_func_0x6d.html
@@ -55,7 +55,7 @@
 : <a class="el" href="classstk_1_1Mandolin.html#a5b2aaaf5697cbe57df62b568982f6300">stk::Mandolin</a>
 </li>
 <li>Mesh2D()
-: <a class="el" href="classstk_1_1Mesh2D.html#a156fdff6515dbcd4b493ce0ef051a174">stk::Mesh2D</a>
+: <a class="el" href="classstk_1_1Mesh2D.html#aef48c3c65901f62a8dbdbe606763203e">stk::Mesh2D</a>
 </li>
 <li>Messager()
 : <a class="el" href="classstk_1_1Messager.html#aa4c8f3396345157ccd19395258a253a9">stk::Messager</a>
@@ -84,7 +84,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x6e.html b/doc/html/functions_func_0x6e.html
index 17b9b7d..873fada 100644
--- a/doc/html/functions_func_0x6e.html
+++ b/doc/html/functions_func_0x6e.html
@@ -89,10 +89,10 @@
 , <a class="el" href="classstk_1_1Flute.html#ae371e0d2366ef9fae8d12898204e7b31">stk::Flute</a>
 , <a class="el" href="classstk_1_1FM.html#a56cc61b1923dba2ff80859df4904d4f9">stk::FM</a>
 , <a class="el" href="classstk_1_1Instrmnt.html#a582c77e71cd2c5cb46ba6f78fa0ac6a2">stk::Instrmnt</a>
+, <a class="el" href="classstk_1_1Mandolin.html#a569de60008c218f0939ab9aedd038776">stk::Mandolin</a>
 , <a class="el" href="classstk_1_1Mesh2D.html#a0580962b3cc0dbac092581d0fc15127b">stk::Mesh2D</a>
 , <a class="el" href="classstk_1_1Modal.html#a3483dafe33fa37e98781279810ea808f">stk::Modal</a>
 , <a class="el" href="classstk_1_1Plucked.html#aba5a6b6850874da55c32388e9857d6fc">stk::Plucked</a>
-, <a class="el" href="classstk_1_1PluckTwo.html#a0d5d81db10c145f3d5bafc5775d147bf">stk::PluckTwo</a>
 , <a class="el" href="classstk_1_1BandedWG.html#ac9c3c3ec0e821b1a080774bb55d3b881">stk::BandedWG</a>
 , <a class="el" href="classstk_1_1Resonate.html#a0454a8e9d6ef3a2394b6c348edf0195f">stk::Resonate</a>
 , <a class="el" href="classstk_1_1Sampler.html#a36c3ed945fb3e8db300b7ae01a4a4a76">stk::Sampler</a>
@@ -142,7 +142,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x6f.html b/doc/html/functions_func_0x6f.html
index c3ec95a..f1b6905 100644
--- a/doc/html/functions_func_0x6f.html
+++ b/doc/html/functions_func_0x6f.html
@@ -101,7 +101,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x70.html b/doc/html/functions_func_0x70.html
index 9670958..9ac6be9 100644
--- a/doc/html/functions_func_0x70.html
+++ b/doc/html/functions_func_0x70.html
@@ -57,25 +57,24 @@
 <li>PercFlut()
 : <a class="el" href="classstk_1_1PercFlut.html#ab51f05b79d818ed8ba80fd827a4839c2">stk::PercFlut</a>
 </li>
+<li>phaseDelay()
+: <a class="el" href="classstk_1_1Filter.html#a6453c68dca60f87053c888b3635b7220">stk::Filter</a>
+</li>
 <li>pitchBend()
-: <a class="el" href="classstk_1_1Voicer.html#ab093e46365c99be9d77a9e38fcc780b4">stk::Voicer</a>
+: <a class="el" href="classstk_1_1Voicer.html#ae2ab6a6804960c686509d7f919829ad4">stk::Voicer</a>
 </li>
 <li>PitShift()
 : <a class="el" href="classstk_1_1PitShift.html#a8fdf3ef3b1a94e126a2953c6b8ed8cca">stk::PitShift</a>
 </li>
 <li>pluck()
-: <a class="el" href="classstk_1_1Mandolin.html#a77bf06efc96f2a83e0fe2c91db83dbd3">stk::Mandolin</a>
+: <a class="el" href="classstk_1_1Mandolin.html#a3a2398d39b72e1c330f81f6545ac0f5c">stk::Mandolin</a>
 , <a class="el" href="classstk_1_1Plucked.html#a9c8741ae249b590d24937743caf11f6c">stk::Plucked</a>
 , <a class="el" href="classstk_1_1Sitar.html#afcbccba0e49bf538c190381785c90752">stk::Sitar</a>
 , <a class="el" href="classstk_1_1StifKarp.html#a016ff5971a1b51ea472f7e7fa2d677ee">stk::StifKarp</a>
 , <a class="el" href="classstk_1_1BandedWG.html#a271573afaa2dc655446482bad6745cc1">stk::BandedWG</a>
-, <a class="el" href="classstk_1_1Mandolin.html#a3a2398d39b72e1c330f81f6545ac0f5c">stk::Mandolin</a>
 </li>
 <li>Plucked()
-: <a class="el" href="classstk_1_1Plucked.html#a279ac82759d4184d9ad961e21dacdbca">stk::Plucked</a>
-</li>
-<li>PluckTwo()
-: <a class="el" href="classstk_1_1PluckTwo.html#aa121655f6007003aebb5de425e98d099">stk::PluckTwo</a>
+: <a class="el" href="classstk_1_1Plucked.html#a65eee23eda411e7fd82bf4a555d8dd85">stk::Plucked</a>
 </li>
 <li>PoleZero()
 : <a class="el" href="classstk_1_1PoleZero.html#ad9a46d21ee470d7afcd641807b5e314e">stk::PoleZero</a>
@@ -94,7 +93,7 @@
 </li>
 <li>printMessage()
 : <a class="el" href="classstk_1_1StkError.html#a337437a729f03d48fc56277037ac6fdc">stk::StkError</a>
-, <a class="el" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943">RtError</a>
+, <a class="el" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc">RtError</a>
 </li>
 <li>process()
 : <a class="el" href="classstk_1_1LentPitShift.html#a5af0a9e3902ca6fc7c5d77d861d74445">stk::LentPitShift</a>
@@ -108,7 +107,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x71.html b/doc/html/functions_func_0x71.html
index 1e7b9aa..ef9fe09 100644
--- a/doc/html/functions_func_0x71.html
+++ b/doc/html/functions_func_0x71.html
@@ -60,7 +60,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x72.html b/doc/html/functions_func_0x72.html
index 109de7e..abd69a2 100644
--- a/doc/html/functions_func_0x72.html
+++ b/doc/html/functions_func_0x72.html
@@ -106,7 +106,7 @@
 : <a class="el" href="classRtError.html#aa479a305ccbe56be0fd9137b9b405a37">RtError</a>
 </li>
 <li>RtMidiIn()
-: <a class="el" href="classRtMidiIn.html#a31abb996e5fdc4a8f9dc5a50848e2ee5">RtMidiIn</a>
+: <a class="el" href="classRtMidiIn.html#a1d70da3ef18d24c5b3f0cc01888e093d">RtMidiIn</a>
 </li>
 <li>RtMidiOut()
 : <a class="el" href="classRtMidiOut.html#a8ed1b492900f3410bf91ad53203b9db3">RtMidiOut</a>
@@ -123,7 +123,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x73.html b/doc/html/functions_func_0x73.html
index 9fcfbe0..b96a14f 100644
--- a/doc/html/functions_func_0x73.html
+++ b/doc/html/functions_func_0x73.html
@@ -67,15 +67,20 @@
 : <a class="el" href="classRtMidiOut.html#a0bd8972ef8ac4e8d37ccc4b5d51c2eb3">RtMidiOut</a>
 </li>
 <li>setA1()
-: <a class="el" href="classstk_1_1PoleZero.html#ae3f0fc1182eb06730f09b8137c01779f">stk::PoleZero</a>
+: <a class="el" href="classstk_1_1OnePole.html#a1f99beebd9c4fbdfce6478e40d7625d8">stk::OnePole</a>
+, <a class="el" href="classstk_1_1PoleZero.html#ae3f0fc1182eb06730f09b8137c01779f">stk::PoleZero</a>
 , <a class="el" href="classstk_1_1TwoPole.html#ad0c2f8ddc09ca1eb864515d816ebacdd">stk::TwoPole</a>
 , <a class="el" href="classstk_1_1BiQuad.html#a1c9799e47163fe8a59fd85196c089cb3">stk::BiQuad</a>
-, <a class="el" href="classstk_1_1OnePole.html#a1f99beebd9c4fbdfce6478e40d7625d8">stk::OnePole</a>
+, <a class="el" href="classstk_1_1Cubic.html#af4604c69f138415f9b9ee6944d2b54ef">stk::Cubic</a>
 </li>
 <li>setA2()
 : <a class="el" href="classstk_1_1BiQuad.html#ae28afd560df11435ea54f128d23b9383">stk::BiQuad</a>
+, <a class="el" href="classstk_1_1Cubic.html#afa16d53e6a720936543d0e0ea778f0eb">stk::Cubic</a>
 , <a class="el" href="classstk_1_1TwoPole.html#a309960a8b2cf6858f43f43dc739146ea">stk::TwoPole</a>
 </li>
+<li>setA3()
+: <a class="el" href="classstk_1_1Cubic.html#add4a05676471c4c09b76f5fe430b80fa">stk::Cubic</a>
+</li>
 <li>setAddress()
 : <a class="el" href="classstk_1_1UdpSocket.html#a785594fd882b76d4c280b72a016f026d">stk::UdpSocket</a>
 </li>
@@ -88,6 +93,9 @@
 <li>setAttackRate()
 : <a class="el" href="classstk_1_1ADSR.html#aff18347235fd52ce307c4b5de18a9c62">stk::ADSR</a>
 </li>
+<li>setAttackTarget()
+: <a class="el" href="classstk_1_1ADSR.html#ae0af300e39f83f79776c04a3e83a85b1">stk::ADSR</a>
+</li>
 <li>setAttackTime()
 : <a class="el" href="classstk_1_1ADSR.html#a48885319b8175cd4d6312fdf7980f116">stk::ADSR</a>
 </li>
@@ -106,12 +114,11 @@
 , <a class="el" href="classstk_1_1TwoZero.html#a1f090992845b9c85f3de15dfba583891">stk::TwoZero</a>
 </li>
 <li>setB2()
-: <a class="el" href="classstk_1_1BiQuad.html#a208a654dd3393ed0b2b86ad56d9cf3e1">stk::BiQuad</a>
-, <a class="el" href="classstk_1_1TwoZero.html#a98a7d6d1615753f338f75409d850a9b4">stk::TwoZero</a>
+: <a class="el" href="classstk_1_1TwoZero.html#a98a7d6d1615753f338f75409d850a9b4">stk::TwoZero</a>
+, <a class="el" href="classstk_1_1BiQuad.html#a208a654dd3393ed0b2b86ad56d9cf3e1">stk::BiQuad</a>
 </li>
 <li>setBaseLoopGain()
-: <a class="el" href="classstk_1_1PluckTwo.html#a168f563174e22b221744ef66b35a5277">stk::PluckTwo</a>
-, <a class="el" href="classstk_1_1StifKarp.html#ad1b5de5acf487271d99903cd43e891ce">stk::StifKarp</a>
+: <a class="el" href="classstk_1_1StifKarp.html#ad1b5de5acf487271d99903cd43e891ce">stk::StifKarp</a>
 </li>
 <li>setBlocking()
 : <a class="el" href="classstk_1_1Socket.html#a12f0abb799fbf7d5d2ee6364627cb6ac">stk::Socket</a>
@@ -169,7 +176,7 @@
 : <a class="el" href="classstk_1_1UdpSocket.html#a4267442661257aae2a0f6b48d367fea1">stk::UdpSocket</a>
 </li>
 <li>setDetune()
-: <a class="el" href="classstk_1_1PluckTwo.html#a6b355a495d9122273fb8c88009bf79d6">stk::PluckTwo</a>
+: <a class="el" href="classstk_1_1Mandolin.html#af46367787cd0a21a04655be82d18df08">stk::Mandolin</a>
 </li>
 <li>setDirectGain()
 : <a class="el" href="classstk_1_1Modal.html#a70006135da2ecdc46eff4156504d94e1">stk::Modal</a>
@@ -181,8 +188,8 @@
 : <a class="el" href="classstk_1_1Flute.html#a7c0ef95a3170dafde08b65ee47102969">stk::Flute</a>
 </li>
 <li>setEqualGainZeroes()
-: <a class="el" href="classstk_1_1BiQuad.html#a28881f5876ce5bdcc846367cca9363f7">stk::BiQuad</a>
-, <a class="el" href="classstk_1_1Resonate.html#ad8000ad734634ac7334f4fab09a13a7e">stk::Resonate</a>
+: <a class="el" href="classstk_1_1Resonate.html#ad8000ad734634ac7334f4fab09a13a7e">stk::Resonate</a>
+, <a class="el" href="classstk_1_1BiQuad.html#a28881f5876ce5bdcc846367cca9363f7">stk::BiQuad</a>
 </li>
 <li>setFile()
 : <a class="el" href="classstk_1_1Skini.html#a30eb5f5238c552d042b8eb510aa8d241">stk::Skini</a>
@@ -190,9 +197,6 @@
 <li>setFilterSweepRate()
 : <a class="el" href="classstk_1_1VoicForm.html#a14d8323edda6e8c82ab39d633b8064a8">stk::VoicForm</a>
 </li>
-<li>setFreqAndDetune()
-: <a class="el" href="classstk_1_1PluckTwo.html#a3cd8e9135b1d8a97b87f9486dd3cd671">stk::PluckTwo</a>
-</li>
 <li>setFrequency()
 : <a class="el" href="classstk_1_1BandedWG.html#acf104d4ed663b5f0cd034c8025f4d420">stk::BandedWG</a>
 , <a class="el" href="classstk_1_1Blit.html#a5571562e489947c4beccc206ecccfbdd">stk::Blit</a>
@@ -208,11 +212,11 @@
 , <a class="el" href="classstk_1_1FM.html#a8182c605d51ec623f90f4e07c2b90891">stk::FM</a>
 , <a class="el" href="classstk_1_1FMVoices.html#af47a92f6892f3a5bef5226d4772fc8cb">stk::FMVoices</a>
 , <a class="el" href="classstk_1_1Instrmnt.html#a597efc508ad367a308fa11b8cbdc96a7">stk::Instrmnt</a>
+, <a class="el" href="classstk_1_1Mandolin.html#af5beeafcdfef7b71a5dda14e0c30c7fb">stk::Mandolin</a>
 , <a class="el" href="classstk_1_1Modal.html#a503092926e66667227bb46312a82a264">stk::Modal</a>
 , <a class="el" href="classstk_1_1Moog.html#ab0d66174dd734d55ef7224d6d8f2cb06">stk::Moog</a>
 , <a class="el" href="classstk_1_1PercFlut.html#a24197fb4ae0bf806d8e3f6fe4eb5598c">stk::PercFlut</a>
 , <a class="el" href="classstk_1_1Plucked.html#a1864c705b85633542621ba3ba4491331">stk::Plucked</a>
-, <a class="el" href="classstk_1_1PluckTwo.html#a9f0618a28243b235f6c0f424a236709c">stk::PluckTwo</a>
 , <a class="el" href="classstk_1_1Rhodey.html#a216ff771d88e7e03c46bc477d7ed5e86">stk::Rhodey</a>
 , <a class="el" href="classstk_1_1Sampler.html#a746eaab88793e3e8cdac9f6e59e00ca3">stk::Sampler</a>
 , <a class="el" href="classstk_1_1Saxofony.html#a5844455497f50e4b64beb23f275ac8d1">stk::Saxofony</a>
@@ -221,13 +225,15 @@
 , <a class="el" href="classstk_1_1SingWave.html#ae1ac4a84551f89570ff0842d032a3cba">stk::SingWave</a>
 , <a class="el" href="classstk_1_1Sitar.html#a02acfe592d8d601a37fadb94aaedb074">stk::Sitar</a>
 , <a class="el" href="classstk_1_1StifKarp.html#a51371b8592fc01aba1993ac304962f6e">stk::StifKarp</a>
+, <a class="el" href="classstk_1_1Twang.html#a0043b9d374b73b6660ec2d79475d602c">stk::Twang</a>
 , <a class="el" href="classstk_1_1Voicer.html#a5ee3f8a17e031430486e030520709acf">stk::Voicer</a>
 , <a class="el" href="classstk_1_1VoicForm.html#aeb2b7ffe130e016c847cd7aebfd628ee">stk::VoicForm</a>
 , <a class="el" href="classstk_1_1Whistle.html#a6fd2ded34c6bfda618d80d7068e829d4">stk::Whistle</a>
 , <a class="el" href="classstk_1_1Wurley.html#af00b42ac4011cacc724bf4c9cf16fba4">stk::Wurley</a>
 </li>
 <li>setGain()
-: <a class="el" href="classstk_1_1Filter.html#a827b1bd3a99fa9af408cbd4eb559d212">stk::Filter</a>
+: <a class="el" href="classstk_1_1Cubic.html#a3eca8ac3f81301592476aad7a2e1ec50">stk::Cubic</a>
+, <a class="el" href="classstk_1_1Filter.html#a827b1bd3a99fa9af408cbd4eb559d212">stk::Filter</a>
 , <a class="el" href="classstk_1_1FM.html#a65a8c54556f0c288871876ffad4d9eef">stk::FM</a>
 </li>
 <li>setGainRate()
@@ -259,6 +265,15 @@
 <li>setLip()
 : <a class="el" href="classstk_1_1Brass.html#a2e1a150328504050499c5cb9fa0e536f">stk::Brass</a>
 </li>
+<li>setLoopFilter()
+: <a class="el" href="classstk_1_1Twang.html#a7076c25dd3a06262b3bf927bc64bf89e">stk::Twang</a>
+</li>
+<li>setLoopGain()
+: <a class="el" href="classstk_1_1Twang.html#ad7921c51f38b4e6e32d7db48cc101068">stk::Twang</a>
+</li>
+<li>setLowestFrequency()
+: <a class="el" href="classstk_1_1Twang.html#ae27aa429cbf49f0dd60f0cc6ef41c832">stk::Twang</a>
+</li>
 <li>setMass()
 : <a class="el" href="classstk_1_1Sphere.html#a0db842c9f06b377bcd803391b7126d2f">stk::Sphere</a>
 </li>
@@ -272,6 +287,12 @@
 , <a class="el" href="classstk_1_1Echo.html#a421a6f5f06f8e7df09edd179d397da7d">stk::Echo</a>
 , <a class="el" href="classstk_1_1TapDelay.html#a104b7bd81435a38191e1e43a24cb471d">stk::TapDelay</a>
 </li>
+<li>setMaxOutput()
+: <a class="el" href="classstk_1_1BowTable.html#a634d5063eba886445f4057c823b00ff7">stk::BowTable</a>
+</li>
+<li>setMinOutput()
+: <a class="el" href="classstk_1_1BowTable.html#a9540d5c56cfd4556ab25c25f0612b25d">stk::BowTable</a>
+</li>
 <li>setModDepth()
 : <a class="el" href="classstk_1_1Chorus.html#acb3a55518c919dafa6c19698c1ab3389">stk::Chorus</a>
 </li>
@@ -299,18 +320,18 @@
 : <a class="el" href="classstk_1_1Iir.html#a7a1473446857a14cdbb33cb5afde076c">stk::Iir</a>
 </li>
 <li>setNX()
-: <a class="el" href="classstk_1_1Mesh2D.html#accbad29fd6364f7c2d439bcf837590ec">stk::Mesh2D</a>
+: <a class="el" href="classstk_1_1Mesh2D.html#a6834a52f03b072e18387b799f804527b">stk::Mesh2D</a>
 </li>
 <li>setNY()
-: <a class="el" href="classstk_1_1Mesh2D.html#a4c4c54ad29fcee5654bd2ebaed29d916">stk::Mesh2D</a>
+: <a class="el" href="classstk_1_1Mesh2D.html#a2be2badaccfeb57e52e548f1b7515fbe">stk::Mesh2D</a>
 </li>
 <li>setOffset()
 : <a class="el" href="classstk_1_1BowTable.html#a9adcc3c36085b73d3b877828071a3b2c">stk::BowTable</a>
 , <a class="el" href="classstk_1_1ReedTable.html#ab40ffd675bd7242a210e8630f8919556">stk::ReedTable</a>
 </li>
 <li>setPhase()
-: <a class="el" href="classstk_1_1Blit.html#a58e2197cedfc366145b729256bf365cb">stk::Blit</a>
-, <a class="el" href="classstk_1_1BlitSquare.html#aeface58980a3ec865131f3cad59bbbef">stk::BlitSquare</a>
+: <a class="el" href="classstk_1_1BlitSquare.html#aeface58980a3ec865131f3cad59bbbef">stk::BlitSquare</a>
+, <a class="el" href="classstk_1_1Blit.html#a58e2197cedfc366145b729256bf365cb">stk::Blit</a>
 </li>
 <li>setPhoneme()
 : <a class="el" href="classstk_1_1VoicForm.html#a6ee860f09b9598c1251a9653b50139bb">stk::VoicForm</a>
@@ -322,7 +343,8 @@
 : <a class="el" href="classstk_1_1VoicForm.html#a2e4adfe6542f6103a8ac85c7ea2f2ce5">stk::VoicForm</a>
 </li>
 <li>setPluckPosition()
-: <a class="el" href="classstk_1_1PluckTwo.html#afffb424a2957fc691363ba1227809695">stk::PluckTwo</a>
+: <a class="el" href="classstk_1_1Mandolin.html#a8a0df47cccec5225e26d3b0e702a7c02">stk::Mandolin</a>
+, <a class="el" href="classstk_1_1Twang.html#a48008e3cd55dad6ee846b47ab32f993f">stk::Twang</a>
 </li>
 <li>setPole()
 : <a class="el" href="classstk_1_1OnePole.html#acc1aaa35c6d5ffbbebfe0c4bfa7d1132">stk::OnePole</a>
@@ -331,11 +353,8 @@
 : <a class="el" href="classstk_1_1Sphere.html#acfa3d4475f9c5ab655276473b1816f39">stk::Sphere</a>
 </li>
 <li>setPreset()
-: <a class="el" href="classstk_1_1BandedWG.html#ab1e3a367eef86e6cb372b4ee232e1804">stk::BandedWG</a>
-, <a class="el" href="classstk_1_1ModalBar.html#a3a09a114ccd420ab549b8565eb4928af">stk::ModalBar</a>
-</li>
-<li>setQueueSizeLimit()
-: <a class="el" href="classRtMidiIn.html#a2e15868916737039e0a34d47bffdf188">RtMidiIn</a>
+: <a class="el" href="classstk_1_1ModalBar.html#a3a09a114ccd420ab549b8565eb4928af">stk::ModalBar</a>
+, <a class="el" href="classstk_1_1BandedWG.html#ab1e3a367eef86e6cb372b4ee232e1804">stk::BandedWG</a>
 </li>
 <li>setRadius()
 : <a class="el" href="classstk_1_1Sphere.html#ac3f4f85642307bebe0733662620f0ee2">stk::Sphere</a>
@@ -344,14 +363,14 @@
 : <a class="el" href="classstk_1_1Granulate.html#a02b7b85f21999d4b350beff6a925bd25">stk::Granulate</a>
 </li>
 <li>setRandomGain()
-: <a class="el" href="classstk_1_1Modulate.html#ac6e7a02378facf59916f2460ed5c2fa5">stk::Modulate</a>
-, <a class="el" href="classstk_1_1SingWave.html#a287cf0feecb7eda88328fb2bc0edff92">stk::SingWave</a>
+: <a class="el" href="classstk_1_1SingWave.html#a287cf0feecb7eda88328fb2bc0edff92">stk::SingWave</a>
+, <a class="el" href="classstk_1_1Modulate.html#ac6e7a02378facf59916f2460ed5c2fa5">stk::Modulate</a>
 </li>
 <li>setRate()
 : <a class="el" href="classstk_1_1Envelope.html#ade99b5c7cb974f71f1d2919868d774a0">stk::Envelope</a>
 , <a class="el" href="classstk_1_1FileLoop.html#a13e1f693bc8a29d9051a400087347a3c">stk::FileLoop</a>
-, <a class="el" href="classstk_1_1FileWvIn.html#aacd97ad5f30f9cdc8201b4244aa69901">stk::FileWvIn</a>
 , <a class="el" href="classstk_1_1SineWave.html#ae69b232dd3a33963d25cf6215692d9d5">stk::SineWave</a>
+, <a class="el" href="classstk_1_1FileWvIn.html#aacd97ad5f30f9cdc8201b4244aa69901">stk::FileWvIn</a>
 </li>
 <li>setRatio()
 : <a class="el" href="classstk_1_1FM.html#a58f0898b677750a259036f628ec1a91b">stk::FM</a>
@@ -370,9 +389,9 @@
 </li>
 <li>setResonance()
 : <a class="el" href="classstk_1_1BiQuad.html#a55aaa01fd4156f1fac1168f526e3d969">stk::BiQuad</a>
-, <a class="el" href="classstk_1_1FormSwep.html#aa6fe339cc937260c46e8c169a58d8529">stk::FormSwep</a>
-, <a class="el" href="classstk_1_1TwoPole.html#a00997b12a1cf0a04888124eaf85c565d">stk::TwoPole</a>
 , <a class="el" href="classstk_1_1Resonate.html#a8767e6c05862c183483776ac4cf354f9">stk::Resonate</a>
+, <a class="el" href="classstk_1_1TwoPole.html#a00997b12a1cf0a04888124eaf85c565d">stk::TwoPole</a>
+, <a class="el" href="classstk_1_1FormSwep.html#aa6fe339cc937260c46e8c169a58d8529">stk::FormSwep</a>
 </li>
 <li>setSampleRate()
 : <a class="el" href="classstk_1_1Stk.html#a46e2f55e5a92c717c3893fe23dde88a5">stk::Stk</a>
@@ -409,14 +428,15 @@
 : <a class="el" href="classstk_1_1ADSR.html#a85138fb6bbcc7b7cd85ec8449d68f7d8">stk::ADSR</a>
 </li>
 <li>setSweepRate()
-: <a class="el" href="classstk_1_1SingWave.html#ab80c50b3c8fc05f056221452504aa150">stk::SingWave</a>
-, <a class="el" href="classstk_1_1FormSwep.html#a27ba31acdbe8334da1830e14872fd226">stk::FormSwep</a>
+: <a class="el" href="classstk_1_1FormSwep.html#a27ba31acdbe8334da1830e14872fd226">stk::FormSwep</a>
+, <a class="el" href="classstk_1_1SingWave.html#ab80c50b3c8fc05f056221452504aa150">stk::SingWave</a>
 </li>
 <li>setSweepTime()
 : <a class="el" href="classstk_1_1FormSwep.html#a242edcbe2a6f88393357b5a5ccec43e8">stk::FormSwep</a>
 </li>
 <li>setT60()
-: <a class="el" href="classstk_1_1JCRev.html#a8f4caa6de1e662c76b853ebab814a2eb">stk::JCRev</a>
+: <a class="el" href="classstk_1_1Asymp.html#afa6fcf4bf3060c0c6092701e409d5fbf">stk::Asymp</a>
+, <a class="el" href="classstk_1_1JCRev.html#a8f4caa6de1e662c76b853ebab814a2eb">stk::JCRev</a>
 , <a class="el" href="classstk_1_1NRev.html#a9c0d41a2b9ce7fb9edb2d620ba005e3c">stk::NRev</a>
 , <a class="el" href="classstk_1_1PRCRev.html#a9478ed84e76d12cc66d11716ebfa8b3b">stk::PRCRev</a>
 </li>
@@ -424,9 +444,9 @@
 : <a class="el" href="classstk_1_1TapDelay.html#aa2bbab19ae277dc3689471d4250f00ad">stk::TapDelay</a>
 </li>
 <li>setTarget()
-: <a class="el" href="classstk_1_1Asymp.html#a7b0f7025ba5f268f1e5ce097b209f0ec">stk::Asymp</a>
-, <a class="el" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e">stk::Envelope</a>
+: <a class="el" href="classstk_1_1Envelope.html#a5269bc5dc1d56161ab82b677b5462a3e">stk::Envelope</a>
 , <a class="el" href="classstk_1_1ADSR.html#a428eebd510e464ccd7bb4e5728f80d63">stk::ADSR</a>
+, <a class="el" href="classstk_1_1Asymp.html#a7b0f7025ba5f268f1e5ce097b209f0ec">stk::Asymp</a>
 </li>
 <li>setTargets()
 : <a class="el" href="classstk_1_1FormSwep.html#a2f00d2edf80fbf8f74a284c68caf07d6">stk::FormSwep</a>
@@ -434,6 +454,9 @@
 <li>setTau()
 : <a class="el" href="classstk_1_1Asymp.html#aebd8ebaf6f6c9570d3ee78e1bcbbcbd2">stk::Asymp</a>
 </li>
+<li>setThreshold()
+: <a class="el" href="classstk_1_1Cubic.html#a10ba2b5c858fc2d656d49c676d5561b4">stk::Cubic</a>
+</li>
 <li>setTime()
 : <a class="el" href="classstk_1_1Envelope.html#adeeb1676f9111980a0c1a48a6780c8f7">stk::Envelope</a>
 , <a class="el" href="classstk_1_1Asymp.html#aca998e9c4ae86b4958da59fc9433268c">stk::Asymp</a>
@@ -446,8 +469,8 @@
 </li>
 <li>setValue()
 : <a class="el" href="classstk_1_1Asymp.html#a81881bb8aca615f69bbbfd56267f971c">stk::Asymp</a>
-, <a class="el" href="classstk_1_1Envelope.html#ab8164a90c57616dc8bd55a6e5ba02fb6">stk::Envelope</a>
 , <a class="el" href="classstk_1_1ADSR.html#aa99bf5fca3885bf8d99a3edc4072a4b5">stk::ADSR</a>
+, <a class="el" href="classstk_1_1Envelope.html#ab8164a90c57616dc8bd55a6e5ba02fb6">stk::Envelope</a>
 </li>
 <li>setVelocity()
 : <a class="el" href="classstk_1_1Sphere.html#ac76725a19fe806e9af9841d30faacb11">stk::Sphere</a>
@@ -459,12 +482,12 @@
 : <a class="el" href="classstk_1_1Bowed.html#a7cf229e206a61259d381cf153a1c5096">stk::Bowed</a>
 </li>
 <li>setVibratoGain()
-: <a class="el" href="classstk_1_1SingWave.html#a5276e1e244551d1ca1dcc70ed42e9228">stk::SingWave</a>
-, <a class="el" href="classstk_1_1Modulate.html#a08f2d489a3fba3a10d1f301aed869ed4">stk::Modulate</a>
+: <a class="el" href="classstk_1_1Modulate.html#a08f2d489a3fba3a10d1f301aed869ed4">stk::Modulate</a>
+, <a class="el" href="classstk_1_1SingWave.html#a5276e1e244551d1ca1dcc70ed42e9228">stk::SingWave</a>
 </li>
 <li>setVibratoRate()
-: <a class="el" href="classstk_1_1SingWave.html#a9143162e223ad86682c099d2a6c79ea0">stk::SingWave</a>
-, <a class="el" href="classstk_1_1Modulate.html#a298b25f4b7cc56f2dffae5474a05999d">stk::Modulate</a>
+: <a class="el" href="classstk_1_1Modulate.html#a298b25f4b7cc56f2dffae5474a05999d">stk::Modulate</a>
+, <a class="el" href="classstk_1_1SingWave.html#a9143162e223ad86682c099d2a6c79ea0">stk::SingWave</a>
 </li>
 <li>setVoiced()
 : <a class="el" href="classstk_1_1VoicForm.html#acd504d4d29134a778b08b2229dd0c0c9">stk::VoicForm</a>
@@ -510,7 +533,7 @@
 : <a class="el" href="classstk_1_1SingWave.html#a7a38283d4e42d5f9b96d3ce8c401183a">stk::SingWave</a>
 </li>
 <li>Sitar()
-: <a class="el" href="classstk_1_1Sitar.html#aa645039b4c1609f979775f5ec7e8bd4b">stk::Sitar</a>
+: <a class="el" href="classstk_1_1Sitar.html#a8a2c996ad8b32f98f2bca14aa742bc29">stk::Sitar</a>
 </li>
 <li>size()
 : <a class="el" href="classstk_1_1StkFrames.html#a5c41aae98f77487c004085912d1f8f79">stk::StkFrames</a>
@@ -531,18 +554,18 @@
 : <a class="el" href="classstk_1_1Sphere.html#a73d4fac54fba9aa11a56a34e4198656c">stk::Sphere</a>
 </li>
 <li>start()
-: <a class="el" href="classstk_1_1Thread.html#abcafe21595d9c6ac52b1ae872b34a531">stk::Thread</a>
+: <a class="el" href="classstk_1_1RtWvIn.html#a0ae4012cb269fb70536611b9116142fa">stk::RtWvIn</a>
 , <a class="el" href="classstk_1_1RtWvOut.html#a2e34c9ff845155230e0336ea3729dc45">stk::RtWvOut</a>
-, <a class="el" href="classstk_1_1RtWvIn.html#a0ae4012cb269fb70536611b9116142fa">stk::RtWvIn</a>
+, <a class="el" href="classstk_1_1Thread.html#abcafe21595d9c6ac52b1ae872b34a531">stk::Thread</a>
 </li>
 <li>startBlowing()
-: <a class="el" href="classstk_1_1Clarinet.html#a0e4d016135c3ee291f4d74e9b030caee">stk::Clarinet</a>
+: <a class="el" href="classstk_1_1Brass.html#a02533e02818e2848fb6480106a54ce94">stk::Brass</a>
 , <a class="el" href="classstk_1_1Flute.html#a33b58e80c6ebbd5bd45f90a7a1c6a025">stk::Flute</a>
 , <a class="el" href="classstk_1_1BlowHole.html#a1be64a601f2fbc8e9efaec5a53c55866">stk::BlowHole</a>
-, <a class="el" href="classstk_1_1BlowBotl.html#a926d428669edf9c87a1f88faf01550c4">stk::BlowBotl</a>
-, <a class="el" href="classstk_1_1Saxofony.html#a6e46b18ad2f992dfc3d948f966ec1bf2">stk::Saxofony</a>
-, <a class="el" href="classstk_1_1Brass.html#a02533e02818e2848fb6480106a54ce94">stk::Brass</a>
 , <a class="el" href="classstk_1_1Whistle.html#ade1532d8b10e8b3ce7dfecba86514eaa">stk::Whistle</a>
+, <a class="el" href="classstk_1_1Clarinet.html#a0e4d016135c3ee291f4d74e9b030caee">stk::Clarinet</a>
+, <a class="el" href="classstk_1_1Saxofony.html#a6e46b18ad2f992dfc3d948f966ec1bf2">stk::Saxofony</a>
+, <a class="el" href="classstk_1_1BlowBotl.html#a926d428669edf9c87a1f88faf01550c4">stk::BlowBotl</a>
 </li>
 <li>startBowing()
 : <a class="el" href="classstk_1_1Bowed.html#a519d511ddcc1cf23e897aeacdfe45020">stk::Bowed</a>
@@ -561,7 +584,7 @@
 : <a class="el" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80">RtAudio</a>
 </li>
 <li>StifKarp()
-: <a class="el" href="classstk_1_1StifKarp.html#a946fb588b5b18b12ea2dca221150da66">stk::StifKarp</a>
+: <a class="el" href="classstk_1_1StifKarp.html#a2ac1b3641559e787cf78a017797e9a70">stk::StifKarp</a>
 </li>
 <li>Stk()
 : <a class="el" href="classstk_1_1Stk.html#a9bff83b5a318ff171f94a218ad52226b">stk::Stk</a>
@@ -570,24 +593,24 @@
 : <a class="el" href="classstk_1_1StkError.html#ab6cbc80df11b385b20d244327fb74abb">stk::StkError</a>
 </li>
 <li>StkFrames()
-: <a class="el" href="classstk_1_1StkFrames.html#ac48aabe6cf029c06d2aa8a5fedf3621e">stk::StkFrames</a>
+: <a class="el" href="classstk_1_1StkFrames.html#aa9ad14889de633ba4269f1330be8bedf">stk::StkFrames</a>
 </li>
 <li>stop()
-: <a class="el" href="classstk_1_1RtWvIn.html#a39d0d9702569ee3afa769309e8b2e152">stk::RtWvIn</a>
-, <a class="el" href="classstk_1_1RtWvOut.html#a7368c42b81670c0335b25f14faa08918">stk::RtWvOut</a>
+: <a class="el" href="classstk_1_1RtWvOut.html#a7368c42b81670c0335b25f14faa08918">stk::RtWvOut</a>
+, <a class="el" href="classstk_1_1RtWvIn.html#a39d0d9702569ee3afa769309e8b2e152">stk::RtWvIn</a>
 </li>
 <li>stopBlowing()
-: <a class="el" href="classstk_1_1BlowBotl.html#a91a174c3501aafbbfe6841f6915fe4f3">stk::BlowBotl</a>
-, <a class="el" href="classstk_1_1Brass.html#a8bf1624aca6283fafb830a3f22546199">stk::Brass</a>
-, <a class="el" href="classstk_1_1Flute.html#a65b8e74b1a99bc8bada4e80ebd512058">stk::Flute</a>
-, <a class="el" href="classstk_1_1Whistle.html#a6f529770c888caca50fc35f454c98898">stk::Whistle</a>
-, <a class="el" href="classstk_1_1BlowHole.html#aeb4dfd7d75b1996e15833c0928ed39c4">stk::BlowHole</a>
-, <a class="el" href="classstk_1_1Clarinet.html#ae33627365f66f30c3685dc72cd7fadce">stk::Clarinet</a>
+: <a class="el" href="classstk_1_1Clarinet.html#ae33627365f66f30c3685dc72cd7fadce">stk::Clarinet</a>
 , <a class="el" href="classstk_1_1Saxofony.html#ae792c62c3bcf2fe756387c1f5cd61794">stk::Saxofony</a>
+, <a class="el" href="classstk_1_1Whistle.html#a6f529770c888caca50fc35f454c98898">stk::Whistle</a>
+, <a class="el" href="classstk_1_1Brass.html#a8bf1624aca6283fafb830a3f22546199">stk::Brass</a>
+, <a class="el" href="classstk_1_1BlowHole.html#aeb4dfd7d75b1996e15833c0928ed39c4">stk::BlowHole</a>
+, <a class="el" href="classstk_1_1BlowBotl.html#a91a174c3501aafbbfe6841f6915fe4f3">stk::BlowBotl</a>
+, <a class="el" href="classstk_1_1Flute.html#a65b8e74b1a99bc8bada4e80ebd512058">stk::Flute</a>
 </li>
 <li>stopBowing()
-: <a class="el" href="classstk_1_1BandedWG.html#aa14786c32af030311e2118db3b68a892">stk::BandedWG</a>
-, <a class="el" href="classstk_1_1Bowed.html#aae2a57d8e23536fd37a00af1fe07f21c">stk::Bowed</a>
+: <a class="el" href="classstk_1_1Bowed.html#aae2a57d8e23536fd37a00af1fe07f21c">stk::Bowed</a>
+, <a class="el" href="classstk_1_1BandedWG.html#aa14786c32af030311e2118db3b68a892">stk::BandedWG</a>
 </li>
 <li>stopStream()
 : <a class="el" href="classRtAudio.html#af4c241ff86936ecc8108f0d9dfe3efdd">RtAudio</a>
@@ -610,7 +633,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x74.html b/doc/html/functions_func_0x74.html
index 0144268..61c5f58 100644
--- a/doc/html/functions_func_0x74.html
+++ b/doc/html/functions_func_0x74.html
@@ -54,6 +54,16 @@
 <li>TapDelay()
 : <a class="el" href="classstk_1_1TapDelay.html#a24913411dff23e05995979e42cc51ecc">stk::TapDelay</a>
 </li>
+<li>tapIn()
+: <a class="el" href="classstk_1_1Delay.html#abd0b93da7a12eca94c1e68ec3b3774f1">stk::Delay</a>
+, <a class="el" href="classstk_1_1DelayL.html#a984843567ba3de6543bd13c23457f495">stk::DelayL</a>
+, <a class="el" href="classstk_1_1DelayA.html#adf33f950e60d31d355ea865ae3efd44e">stk::DelayA</a>
+</li>
+<li>tapOut()
+: <a class="el" href="classstk_1_1Delay.html#a4d5e5bab50e4fa062bd3f0e9e2fd19db">stk::Delay</a>
+, <a class="el" href="classstk_1_1DelayA.html#aab723097f4634b23b0cd4ba8762271dc">stk::DelayA</a>
+, <a class="el" href="classstk_1_1DelayL.html#ad16a1f176e93a9beb8e685aafa32579e">stk::DelayL</a>
+</li>
 <li>TcpClient()
 : <a class="el" href="classstk_1_1TcpClient.html#a1e1e2cf0981774147d516efcaf12e786">stk::TcpClient</a>
 </li>
@@ -67,105 +77,116 @@
 : <a class="el" href="classstk_1_1Thread.html#a550db7efe16cd4ef223d9ca69dda384b">stk::Thread</a>
 </li>
 <li>tick()
-: <a class="el" href="classstk_1_1WvOut.html#a7fe517928a0043353ebc2a852b49953c">stk::WvOut</a>
-, <a class="el" href="classstk_1_1WvIn.html#a76718752b0cc1ab767ba4e70d72b9453">stk::WvIn</a>
-, <a class="el" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd">stk::Wurley</a>
-, <a class="el" href="classstk_1_1Whistle.html#a3835e290dae97acfe79e1f7458a39cda">stk::Whistle</a>
-, <a class="el" href="classstk_1_1VoicForm.html#ac12629d2730f582e405b221e1d7b6f29">stk::VoicForm</a>
+: <a class="el" href="classstk_1_1Whistle.html#a46135035da33d0825e3ff0db04b857d4">stk::Whistle</a>
+, <a class="el" href="classstk_1_1VoicForm.html#a619d2995894216181c2dc38fd863fe33">stk::VoicForm</a>
 , <a class="el" href="classstk_1_1Voicer.html#a3fd795b0fce684c470484936ef39aa16">stk::Voicer</a>
 , <a class="el" href="classstk_1_1TwoZero.html#a0ef9deab4fbc7e64511d4b6d38afd185">stk::TwoZero</a>
 , <a class="el" href="classstk_1_1TwoPole.html#a5c9b52082c0d2845a5ca01ca276fe8f8">stk::TwoPole</a>
-, <a class="el" href="classstk_1_1TubeBell.html#afa7422b2a7361f2ebe60ebff887ef36f">stk::TubeBell</a>
+, <a class="el" href="classstk_1_1Twang.html#a089ff55338a22647d94665d6adbeb7ae">stk::Twang</a>
+, <a class="el" href="classstk_1_1TubeBell.html#a664cede881352aea1d300ca93ba416ac">stk::TubeBell</a>
 , <a class="el" href="classstk_1_1TapDelay.html#ad8250d2802326bd3778c00642266d201">stk::TapDelay</a>
-, <a class="el" href="classstk_1_1StifKarp.html#a5cd896c59ee01fa8e21346ebe54365fc">stk::StifKarp</a>
+, <a class="el" href="classstk_1_1StifKarp.html#a7d4afff257faa7ad9ef630f1db1ed93f">stk::StifKarp</a>
 , <a class="el" href="classstk_1_1Sphere.html#adc4709622b77fc91ad6f33be98c86344">stk::Sphere</a>
-, <a class="el" href="classstk_1_1Sitar.html#a811c8d08d78cfbd5061396af7027043e">stk::Sitar</a>
+, <a class="el" href="classstk_1_1Sitar.html#a755cc36fe9cde1942184af0b1ae88f7a">stk::Sitar</a>
 , <a class="el" href="classstk_1_1SingWave.html#ab74d7a305510eec92a9aa1a26bcb5e94">stk::SingWave</a>
-, <a class="el" href="classstk_1_1WvOut.html#a7e20334ec73dde8c6c5edef697812b7e">stk::WvOut</a>
-, <a class="el" href="classstk_1_1SineWave.html#af205d7029046af8a392341cabd58f9de">stk::SineWave</a>
-, <a class="el" href="classstk_1_1Simple.html#aa65326847f8b693f7b5549d18df6e882">stk::Simple</a>
-, <a class="el" href="classstk_1_1Shakers.html#ae06ebba276cef74cb8c83db4e33f21c2">stk::Shakers</a>
-, <a class="el" href="classstk_1_1Saxofony.html#a955d2ea0b3236039851d19b681ca2b0f">stk::Saxofony</a>
-, <a class="el" href="classstk_1_1Sampler.html#a08502c96fa3e5f4c853c781354ed1965">stk::Sampler</a>
+, <a class="el" href="classstk_1_1Wurley.html#a2019cfe262eb755ac939c98bda0383bd">stk::Wurley</a>
+, <a class="el" href="classstk_1_1SineWave.html#a31a55627bf8064919b5e063059260eda">stk::SineWave</a>
+, <a class="el" href="classstk_1_1Simple.html#adff17b07913c312e989f1987e4fb5cc8">stk::Simple</a>
+, <a class="el" href="classstk_1_1Shakers.html#a655713b658ddeb065d755997cac4b62e">stk::Shakers</a>
+, <a class="el" href="classstk_1_1Saxofony.html#a98c686337ea0c2be7683ddc569bb0a1d">stk::Saxofony</a>
+, <a class="el" href="classstk_1_1Sampler.html#a30ef51142f99faf0586e2da78bc6daf6">stk::Sampler</a>
 , <a class="el" href="classstk_1_1RtWvOut.html#a025484fb9849d37ccc254c51929c77ab">stk::RtWvOut</a>
 , <a class="el" href="classstk_1_1RtWvIn.html#a38e698120ae0abf58dde995cba9e47cf">stk::RtWvIn</a>
-, <a class="el" href="classstk_1_1Rhodey.html#a199591ffb4230c653ec7d7ea52e37790">stk::Rhodey</a>
+, <a class="el" href="classstk_1_1Rhodey.html#a9d843b764e5219c8289884d0903462f9">stk::Rhodey</a>
+, <a class="el" href="classstk_1_1WvIn.html#a76718752b0cc1ab767ba4e70d72b9453">stk::WvIn</a>
 , <a class="el" href="classstk_1_1Resonate.html#ab917279f4f57d5d305481426e9bffd98">stk::Resonate</a>
 , <a class="el" href="classstk_1_1ReedTable.html#ae682fdc0a6ec68a9f858f5cd6889113d">stk::ReedTable</a>
 , <a class="el" href="classstk_1_1PRCRev.html#a86e9fe7b68a69326b89e924e9789a00f">stk::PRCRev</a>
 , <a class="el" href="classstk_1_1PoleZero.html#a1b5e97a13c582d97cfaa7fcbd4211b47">stk::PoleZero</a>
-, <a class="el" href="classstk_1_1Plucked.html#adb4a5d731ad2b680120313f03a020c25">stk::Plucked</a>
+, <a class="el" href="classstk_1_1Plucked.html#ab9bb602c6f6867cf00995bc42101c006">stk::Plucked</a>
 , <a class="el" href="classstk_1_1PitShift.html#a4c00529546a282b352aa87e2ece7e6a8">stk::PitShift</a>
-, <a class="el" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054">stk::PercFlut</a>
+, <a class="el" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497">stk::BandedWG</a>
+, <a class="el" href="classstk_1_1BlowHole.html#ad220cd597fa5f6edd043c0783bdc2ec7">stk::BlowHole</a>
 , <a class="el" href="classstk_1_1OneZero.html#a8568a0d8c4aacc64b656b9fe46f217a4">stk::OneZero</a>
 , <a class="el" href="classstk_1_1OnePole.html#a495943f1659f2da6208703a24275defb">stk::OnePole</a>
-, <a class="el" href="classstk_1_1Asymp.html#a64df3b44aa1033b642d7a8a93659580e">stk::Asymp</a>
-, <a class="el" href="classstk_1_1NRev.html#a27d7ee42b73e84c5032215f44f1887d5">stk::NRev</a>
+, <a class="el" href="classstk_1_1NRev.html#a0c44ff635369af0e644728df69d91957">stk::NRev</a>
 , <a class="el" href="classstk_1_1Noise.html#a2f92e91787dc19309305cf246632cd50">stk::Noise</a>
-, <a class="el" href="classstk_1_1Moog.html#ab9635044198c12a5c1b5dbb94245ab5a">stk::Moog</a>
+, <a class="el" href="classstk_1_1Moog.html#aee6aa6373c424e941f963b2709310f4e">stk::Moog</a>
 , <a class="el" href="classstk_1_1Modulate.html#a942eee1bb78318e1b59afeb311748b2d">stk::Modulate</a>
-, <a class="el" href="classstk_1_1Modal.html#ac1fd3f5dcb9b5cbb8bed0bff330c3890">stk::Modal</a>
-, <a class="el" href="classstk_1_1Mesh2D.html#ae8a7e86e4774d8738098c79ab0d5e00a">stk::Mesh2D</a>
-, <a class="el" href="classstk_1_1Mandolin.html#a99f5b51e76c97299dd8c58f27a6d0e62">stk::Mandolin</a>
+, <a class="el" href="classstk_1_1Modal.html#ad2a28e7bd5fdae7d2a6d9fb79bbfb7b0">stk::Modal</a>
+, <a class="el" href="classstk_1_1Mesh2D.html#a0bfe62f0ab05859963571f4a9a569bd8">stk::Mesh2D</a>
+, <a class="el" href="classstk_1_1Mandolin.html#a37134f89e73e3e62ad5dfcfb0300a12d">stk::Mandolin</a>
 , <a class="el" href="classstk_1_1LentPitShift.html#af93de733eedca65de40597bd4a1f7b2a">stk::LentPitShift</a>
 , <a class="el" href="classstk_1_1JetTable.html#a7b261fd07b2325348ef14e3f0ebf8429">stk::JetTable</a>
-, <a class="el" href="classstk_1_1Blit.html#a20a3634131ff890641931c1d04df19ad">stk::Blit</a>
 , <a class="el" href="classstk_1_1JCRev.html#ad6ae1c038bd3e5f8b40f18bed1dc026a">stk::JCRev</a>
-, <a class="el" href="classstk_1_1Instrmnt.html#a4abfe94b5fc8d87b47729fe317222eb9">stk::Instrmnt</a>
+, <a class="el" href="classstk_1_1Instrmnt.html#a34c6733ca145763462d9e44ae3c772b6">stk::Instrmnt</a>
+, <a class="el" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95">stk::FileLoop</a>
 , <a class="el" href="classstk_1_1InetWvOut.html#a0305b3498e0277443a9309799e4ad8b7">stk::InetWvOut</a>
 , <a class="el" href="classstk_1_1InetWvIn.html#a3ccbdb9a4d54ac51ff999ea0ce350212">stk::InetWvIn</a>
 , <a class="el" href="classstk_1_1Iir.html#a60919d8e000bf83613bdd5e002d750f1">stk::Iir</a>
-, <a class="el" href="classstk_1_1HevyMetl.html#a0261504b82845034be67ac573d564ff7">stk::HevyMetl</a>
+, <a class="el" href="classstk_1_1HevyMetl.html#a555f3bf9322fd11150b00bb99476769a">stk::HevyMetl</a>
 , <a class="el" href="classstk_1_1Granulate.html#aa9cc119b1515c5596a95d72f4b65b0c0">stk::Granulate</a>
-, <a class="el" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9">stk::Delay</a>
 , <a class="el" href="classstk_1_1Generator.html#a86bb0421223cf27e25704d5f27b97425">stk::Generator</a>
 , <a class="el" href="classstk_1_1Function.html#a2545fede83a8afcbe11b3bcf3e4d9f42">stk::Function</a>
 , <a class="el" href="classstk_1_1FormSwep.html#a8a16af2b4e169946cedb8fec2bb1417a">stk::FormSwep</a>
-, <a class="el" href="classstk_1_1FMVoices.html#a31111029e36d00230586250df7b4d887">stk::FMVoices</a>
-, <a class="el" href="classstk_1_1FM.html#a81f351fd8732fd6e686735b7b45a4241">stk::FM</a>
-, <a class="el" href="classstk_1_1Flute.html#ab8f307f9a26ef2756ec4c0ea05f3acbe">stk::Flute</a>
+, <a class="el" href="classstk_1_1SineWave.html#af205d7029046af8a392341cabd58f9de">stk::SineWave</a>
+, <a class="el" href="classstk_1_1FMVoices.html#abad16be89b38d4618a07c5d71ab49e26">stk::FMVoices</a>
+, <a class="el" href="classstk_1_1FM.html#a870c602be292d2dcc1b0fd97f515f2ff">stk::FM</a>
+, <a class="el" href="classstk_1_1Flute.html#a86640ddfacea6fd9385bc4e197fe1a28">stk::Flute</a>
 , <a class="el" href="classstk_1_1Fir.html#a53bcdfc2e9ad757d2ec549529b7a9738">stk::Fir</a>
+, <a class="el" href="classstk_1_1Resonate.html#aeefb870c1eeb430160fdca374e8324b3">stk::Resonate</a>
+, <a class="el" href="classstk_1_1Fir.html#afc5fd95f6bf72edaf4ee3060ca947793">stk::Fir</a>
 , <a class="el" href="classstk_1_1Filter.html#a3260a238824c4a748ac057b84b7d3f21">stk::Filter</a>
 , <a class="el" href="classstk_1_1FileWvOut.html#a417f5d967ae4dd425163d36c8563c0dc">stk::FileWvOut</a>
 , <a class="el" href="classstk_1_1FileWvIn.html#ad492f9becef5dfc9202a027bc5ad4580">stk::FileWvIn</a>
-, <a class="el" href="classstk_1_1NRev.html#a0c44ff635369af0e644728df69d91957">stk::NRev</a>
-, <a class="el" href="classstk_1_1FileLoop.html#a037b31918134ed1839a8b48de774ab95">stk::FileLoop</a>
+, <a class="el" href="classstk_1_1PercFlut.html#ac2b2958902c044413a1c7ff3bd0f8054">stk::PercFlut</a>
+, <a class="el" href="classstk_1_1FileLoop.html#a3d91eb1f9c76d1bf6461ce2e4a3f8983">stk::FileLoop</a>
 , <a class="el" href="classstk_1_1Envelope.html#a9341c9dea4fd54c360a4a23254319cf7">stk::Envelope</a>
 , <a class="el" href="classstk_1_1Echo.html#a1778a7da06b222afbe9281c886f678d8">stk::Echo</a>
-, <a class="el" href="classstk_1_1Drummer.html#ad65c63bfad0ffac03db7f56cf706e4ba">stk::Drummer</a>
-, <a class="el" href="classstk_1_1JetTable.html#a3fb5333e6305abdeee7cd83a10ef76b6">stk::JetTable</a>
-, <a class="el" href="classstk_1_1DelayL.html#acdc5d41de53c53d9d4b39ee8a46fb96c">stk::DelayL</a>
+, <a class="el" href="classstk_1_1Drummer.html#ad186a954527a518c47467e6caaa2e2f5">stk::Drummer</a>
+, <a class="el" href="classstk_1_1DelayL.html#a56ee486fb01fbf45d5a3dbad754a838e">stk::DelayL</a>
 , <a class="el" href="classstk_1_1DelayA.html#a94a2998c9b2d1697ed9a747973be0a89">stk::DelayA</a>
 , <a class="el" href="classstk_1_1Delay.html#ade0d544e45e535fd792fe70a2a22da6f">stk::Delay</a>
-, <a class="el" href="classstk_1_1SingWave.html#a45136f9bf5b6f58433d4d65864d9db78">stk::SingWave</a>
-, <a class="el" href="classstk_1_1Granulate.html#a0f8b162c9c309b3cbec3802138a53c24">stk::Granulate</a>
-, <a class="el" href="classstk_1_1Clarinet.html#a4cd08bca954ad434bc636eda957ca8d5">stk::Clarinet</a>
+, <a class="el" href="classstk_1_1WvOut.html#a7fe517928a0043353ebc2a852b49953c">stk::WvOut</a>
+, <a class="el" href="classstk_1_1Cubic.html#aef7887fe7e5131ce48c8488a21d295b9">stk::Cubic</a>
+, <a class="el" href="classstk_1_1Clarinet.html#a059174eb1ab84e306bfad1d8b5833548">stk::Clarinet</a>
 , <a class="el" href="classstk_1_1Chorus.html#abdb8802a83f6b89716316399138e3032">stk::Chorus</a>
-, <a class="el" href="classstk_1_1Brass.html#a4af1b7c4c1b374b65e04ccaa90886321">stk::Brass</a>
+, <a class="el" href="classstk_1_1FormSwep.html#aba0d15e1d102cb0fee0806e1bb05c774">stk::FormSwep</a>
+, <a class="el" href="classstk_1_1Brass.html#a10334fc5573b68f2b5c2819bdba786b8">stk::Brass</a>
 , <a class="el" href="classstk_1_1BowTable.html#aaf72f823f210b18f417337ac7181cde5">stk::BowTable</a>
-, <a class="el" href="classstk_1_1FileLoop.html#a3d91eb1f9c76d1bf6461ce2e4a3f8983">stk::FileLoop</a>
+, <a class="el" href="classstk_1_1Fir.html#a602e5ce0cd93f5103796ffd50ed8c988">stk::Fir</a>
+, <a class="el" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19">stk::BowTable</a>
 , <a class="el" href="classstk_1_1Bowed.html#a4d583369f0b22335fff8cee3ce6f2750">stk::Bowed</a>
+, <a class="el" href="classstk_1_1FileWvIn.html#ada668a0bc0bf89e155ef341de00babc2">stk::FileWvIn</a>
+, <a class="el" href="classstk_1_1BandedWG.html#a6c2ebb66862b173c4835add6847801c9">stk::BandedWG</a>
 , <a class="el" href="classstk_1_1BlowHole.html#a3438c72b975481dae7d51f33f6f6fd94">stk::BlowHole</a>
-, <a class="el" href="classstk_1_1BlowBotl.html#a68501c2422994c8dca50086b3d944119">stk::BlowBotl</a>
-, <a class="el" href="classstk_1_1DelayL.html#a56ee486fb01fbf45d5a3dbad754a838e">stk::DelayL</a>
-, <a class="el" href="classstk_1_1BlitSquare.html#a04366d55cecb4c8a726ea0519683d817">stk::BlitSquare</a>
+, <a class="el" href="classstk_1_1BlowBotl.html#a49e1f536d821a8b2bf133533cb4bc93e">stk::BlowBotl</a>
+, <a class="el" href="classstk_1_1BlitSquare.html#a7df894d40b3d6effbb2a09819356258d">stk::BlitSquare</a>
 , <a class="el" href="classstk_1_1BlitSaw.html#ab53f6ba99ef5c4f8982f6c0f07bf2e1d">stk::BlitSaw</a>
-, <a class="el" href="classstk_1_1Delay.html#a93fe8e45acb933889be812f35810f977">stk::Delay</a>
-, <a class="el" href="classstk_1_1BlitSaw.html#a03536a1f1823ea41649b4a62ba98007c">stk::BlitSaw</a>
+, <a class="el" href="classstk_1_1Instrmnt.html#ad5d070c1fc6f93124dfed2a27b8e3cf1">stk::Instrmnt</a>
 , <a class="el" href="classstk_1_1Blit.html#a528b8dc95499b11d6173cf065d62c717">stk::Blit</a>
 , <a class="el" href="classstk_1_1BiQuad.html#ac9836f0e074ea9516727f27eb9b411aa">stk::BiQuad</a>
-, <a class="el" href="classstk_1_1BowTable.html#a8dc58c69ecda1471dce6d142cb5f4b19">stk::BowTable</a>
+, <a class="el" href="classstk_1_1Chorus.html#a31d5c48d5b4a030040f6bb6b5e2c99cf">stk::Chorus</a>
+, <a class="el" href="classstk_1_1BeeThree.html#a30520efff3fac0674d3c7ab95ac35999">stk::BeeThree</a>
+, <a class="el" href="classstk_1_1Bowed.html#ab7985e95058016201d16f3717039e1cd">stk::Bowed</a>
 , <a class="el" href="classstk_1_1BeeThree.html#a4649b9471bde3b978c20fcafcbef0fc7">stk::BeeThree</a>
-, <a class="el" href="classstk_1_1BlitSquare.html#a7df894d40b3d6effbb2a09819356258d">stk::BlitSquare</a>
+, <a class="el" href="classstk_1_1BowTable.html#a8ad2766def014b62dcbbd8765e133246">stk::BowTable</a>
 , <a class="el" href="classstk_1_1Asymp.html#a2647bc013816f026915b1e92ddd6a322">stk::Asymp</a>
-, <a class="el" href="classstk_1_1BandedWG.html#a44f37146d33354afb085806bd8340497">stk::BandedWG</a>
 , <a class="el" href="classstk_1_1ADSR.html#a97a617c65e62aadb4f88bd10cf437a6a">stk::ADSR</a>
+, <a class="el" href="classstk_1_1Delay.html#aa1a929e0e324417b8a55cbf8770532e9">stk::Delay</a>
+, <a class="el" href="classstk_1_1WvIn.html#a0eda243730408a434856fffed776931e">stk::WvIn</a>
+, <a class="el" href="classstk_1_1Wurley.html#a505f7e6499761f64d0cc4b6419d945c3">stk::Wurley</a>
 , <a class="el" href="classstk_1_1BiQuad.html#a648086962c3cddcaa09c46a002c3e635">stk::BiQuad</a>
 , <a class="el" href="classstk_1_1ADSR.html#af2c0869f86210a55f4f668172373c975">stk::ADSR</a>
+, <a class="el" href="classstk_1_1WvOut.html#a7e20334ec73dde8c6c5edef697812b7e">stk::WvOut</a>
+, <a class="el" href="classstk_1_1Blit.html#a20a3634131ff890641931c1d04df19ad">stk::Blit</a>
 </li>
 <li>TubeBell()
 : <a class="el" href="classstk_1_1TubeBell.html#a7b5de1d681fcb5c2899094dc1ffe0453">stk::TubeBell</a>
 </li>
+<li>Twang()
+: <a class="el" href="classstk_1_1Twang.html#a813e99ee79974707a3afbfcab963c086">stk::Twang</a>
+</li>
 <li>TwoPole()
 : <a class="el" href="classstk_1_1TwoPole.html#a01a2b3b3d286e00a097918ec5f8a287b">stk::TwoPole</a>
 </li>
@@ -178,7 +199,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x75.html b/doc/html/functions_func_0x75.html
index a329ade..c6a975c 100644
--- a/doc/html/functions_func_0x75.html
+++ b/doc/html/functions_func_0x75.html
@@ -63,7 +63,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x76.html b/doc/html/functions_func_0x76.html
index ba6ab1e..6411e7f 100644
--- a/doc/html/functions_func_0x76.html
+++ b/doc/html/functions_func_0x76.html
@@ -69,7 +69,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x77.html b/doc/html/functions_func_0x77.html
index 577089b..af78712 100644
--- a/doc/html/functions_func_0x77.html
+++ b/doc/html/functions_func_0x77.html
@@ -91,7 +91,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_func_0x7e.html b/doc/html/functions_func_0x7e.html
index 3677be9..325390f 100644
--- a/doc/html/functions_func_0x7e.html
+++ b/doc/html/functions_func_0x7e.html
@@ -189,9 +189,6 @@
 <li>~Plucked()
 : <a class="el" href="classstk_1_1Plucked.html#a6232b4a1ed48407fe9e66e1835011b5e">stk::Plucked</a>
 </li>
-<li>~PluckTwo()
-: <a class="el" href="classstk_1_1PluckTwo.html#ac8a0720b08d20741b0d8a312f1cf7e5c">stk::PluckTwo</a>
-</li>
 <li>~PoleZero()
 : <a class="el" href="classstk_1_1PoleZero.html#abeb7feab68b5d8370bd9c2aef94c8541">stk::PoleZero</a>
 </li>
@@ -273,6 +270,9 @@
 <li>~TubeBell()
 : <a class="el" href="classstk_1_1TubeBell.html#ab841ecb52b7be3b896d92b968364b529">stk::TubeBell</a>
 </li>
+<li>~Twang()
+: <a class="el" href="classstk_1_1Twang.html#adae2759ef254101f91aa3a0a5c3fba39">stk::Twang</a>
+</li>
 <li>~TwoPole()
 : <a class="el" href="classstk_1_1TwoPole.html#aabc2e1046f8f908fc78a53b50b00ed9f">stk::TwoPole</a>
 </li>
@@ -297,7 +297,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_type.html b/doc/html/functions_type.html
index 3aa53d4..0afcdee 100644
--- a/doc/html/functions_type.html
+++ b/doc/html/functions_type.html
@@ -30,7 +30,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html
index c3bf158..0ccd2ff 100644
--- a/doc/html/functions_vars.html
+++ b/doc/html/functions_vars.html
@@ -178,7 +178,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/fundamentals.html b/doc/html/fundamentals.html
index f208c44..c56a9f8 100644
--- a/doc/html/fundamentals.html
+++ b/doc/html/fundamentals.html
@@ -67,7 +67,7 @@ Inheritance:</a></h2>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/globals.html b/doc/html/globals.html
index 913c3dd..fce5728 100644
--- a/doc/html/globals.html
+++ b/doc/html/globals.html
@@ -35,7 +35,7 @@ Here is a list of all documented file members with links to the documentation:<u
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/globals_type.html b/doc/html/globals_type.html
index cf18190..c1285dc 100644
--- a/doc/html/globals_type.html
+++ b/doc/html/globals_type.html
@@ -35,7 +35,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/hello.html b/doc/html/hello.html
index 73bc1f5..d888fdf 100644
--- a/doc/html/hello.html
+++ b/doc/html/hello.html
@@ -109,7 +109,7 @@ Error Handling</a></h2>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html
index 5f7be73..85877d1 100644
--- a/doc/html/hierarchy.html
+++ b/doc/html/hierarchy.html
@@ -51,6 +51,7 @@
 </li>
 <li><a class="el" href="classstk_1_1Function.html">stk::Function</a><ul>
 <li><a class="el" href="classstk_1_1BowTable.html">stk::BowTable</a></li>
+<li><a class="el" href="classstk_1_1Cubic.html">stk::Cubic</a></li>
 <li><a class="el" href="classstk_1_1JetTable.html">stk::JetTable</a></li>
 <li><a class="el" href="classstk_1_1ReedTable.html">stk::ReedTable</a></li>
 </ul>
@@ -88,16 +89,13 @@
 <li><a class="el" href="classstk_1_1Wurley.html">stk::Wurley</a></li>
 </ul>
 </li>
+<li><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></li>
 <li><a class="el" href="classstk_1_1Mesh2D.html">stk::Mesh2D</a></li>
 <li><a class="el" href="classstk_1_1Modal.html">stk::Modal</a><ul>
 <li><a class="el" href="classstk_1_1ModalBar.html">stk::ModalBar</a></li>
 </ul>
 </li>
 <li><a class="el" href="classstk_1_1Plucked.html">stk::Plucked</a></li>
-<li><a class="el" href="classstk_1_1PluckTwo.html">stk::PluckTwo</a><ul>
-<li><a class="el" href="classstk_1_1Mandolin.html">stk::Mandolin</a></li>
-</ul>
-</li>
 <li><a class="el" href="classstk_1_1Resonate.html">stk::Resonate</a></li>
 <li><a class="el" href="classstk_1_1Sampler.html">stk::Sampler</a><ul>
 <li><a class="el" href="classstk_1_1Moog.html">stk::Moog</a></li>
@@ -125,6 +123,7 @@
 </li>
 <li><a class="el" href="classstk_1_1Sphere.html">stk::Sphere</a></li>
 <li><a class="el" href="classstk_1_1Thread.html">stk::Thread</a></li>
+<li><a class="el" href="classstk_1_1Twang.html">stk::Twang</a></li>
 <li><a class="el" href="classstk_1_1Vector3D.html">stk::Vector3D</a></li>
 <li><a class="el" href="classstk_1_1Voicer.html">stk::Voicer</a></li>
 <li><a class="el" href="classstk_1_1WvIn.html">stk::WvIn</a><ul>
@@ -154,7 +153,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/index.html b/doc/html/index.html
index 78fe197..436df00 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -10,7 +10,7 @@
 <HR>
 <!-- Generated by Doxygen 1.6.2 -->
 <div class="contents">
-<h1>The Synthesis ToolKit in C++ (STK) </h1><h3 class="version">4.4.2 </h3> 
+<h1>The Synthesis ToolKit in C++ (STK) </h1><h3 class="version">4.4.3 </h3> 
 <BODY BGCOLOR="white">
 <h3><center><a href="http://www.cs.princeton.edu/~prc/">Perry R. Cook</a> & <a href="http://music.mcgill.ca/~gary/">Gary P. Scavone</a></center></h3>
 <p>The <b>Synthesis ToolKit in C++ (STK)</b> is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language. STK was designed to facilitate rapid development of music synthesis and audio processing software, with an emphasis on cross-platform functionality, realtime control, ease of use, and educational example code. The Synthesis ToolKit is extremely portable (it's mostly platform-independent C and C++ code), and it's completely user-extensible (all source included, no unusual libraries, and no hidden drivers). We like to think that this increases the chances that our programs will still work in another 5-10 years. In fact, the ToolKit has been working continuously for nearly 15 years now. STK currently runs with realtime support (audio and MIDI) on Linux, Macintosh OS X, and Windows computer platforms. Generic, non-realtime support has been tested under NeXTStep, Sun, and other platforms and should work with any standard C++ compiler.</p>
@@ -30,7 +30,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/information.html b/doc/html/information.html
index 7e85bd8..c918e5b 100644
--- a/doc/html/information.html
+++ b/doc/html/information.html
@@ -88,7 +88,7 @@ More rationalizations to follow ... </li>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/instruments.html b/doc/html/instruments.html
index 5546267..8516789 100644
--- a/doc/html/instruments.html
+++ b/doc/html/instruments.html
@@ -75,7 +75,7 @@
     dac.<a class="code" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream</a>( &amp;parameters, NULL, format, (<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span>)Stk::sampleRate(), &amp;bufferFrames, &amp;tick, (<span class="keywordtype">void</span> *)&amp;data );
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a>&amp; error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
     <span class="keywordflow">goto</span> cleanup;
   }
 
@@ -94,7 +94,7 @@
     dac.<a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">startStream</a>();
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
     <span class="keywordflow">goto</span> cleanup;
   }
 
@@ -107,7 +107,7 @@
     dac.<a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">closeStream</a>();
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
   }
 
  cleanup:
@@ -116,7 +116,7 @@
   <span class="keywordflow">return</span> 0;
 }
 </pre></div><p>We have used an Instrmnt pointer when referencing the BeeThree instance above, so it would be simple to replace the BeeThree class with any other STK instrument class. It should be noted, however, that a few classes do not respond to the setFrequency() function (e.g., Shakers, Drummer).</p>
-<p>The noteOn() function initiates an instrument attack. Instruments that are continuously excited (e.g., <a class="el" href="classstk_1_1Clarinet.html" title="STK clarinet physical model class.">stk::Clarinet</a>, <a class="el" href="classstk_1_1BeeThree.html" title="STK Hammond-oid organ FM synthesis instrument.">stk::BeeThree</a>) will continue to sound until stopped with a noteOff(). Impulsively excited instrument sounds (e.g., <a class="el" href="classstk_1_1Plucked.html" title="STK plucked string model class.">stk::Plucked</a>, <a class="el" href="classstk_1_1Wurley.html" title="STK Wurlitzer electric piano FM synthesis instrument.">stk::Wurley</a>) typically decay within a few seconds time, requiring subsequent noteOn() messages for re-attack.</p>
+<p>The noteOn() function initiates an instrument attack. Instruments that are continuously excited (e.g., <a class="el" href="classstk_1_1Clarinet.html" title="STK clarinet physical model class.">stk::Clarinet</a>, <a class="el" href="classstk_1_1BeeThree.html" title="STK Hammond-oid organ FM synthesis instrument.">stk::BeeThree</a>) will continue to sound until stopped with a noteOff(). Impulsively excited instrument sounds (e.g., <a class="el" href="classstk_1_1Plucked.html" title="STK basic plucked string class.">stk::Plucked</a>, <a class="el" href="classstk_1_1Wurley.html" title="STK Wurlitzer electric piano FM synthesis instrument.">stk::Wurley</a>) typically decay within a few seconds time, requiring subsequent noteOn() messages for re-attack.</p>
 <p>Instrument parameters can be precisely controlled as demonstrated above. A more flexible approach to instrument control, allowing arbitrary scorefile or realtime updates, is described in the next tutorial chapter.</p>
 <p>[<a href="tutorial.html">Main tutorial page</a>] &nbsp; [<a href="controlin.html">Next tutorial</a>] </p>
 </div>
@@ -124,7 +124,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/links.html b/doc/html/links.html
index 094ae15..9830639 100644
--- a/doc/html/links.html
+++ b/doc/html/links.html
@@ -56,7 +56,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/maillist.html b/doc/html/maillist.html
index 6080156..35d84df 100644
--- a/doc/html/maillist.html
+++ b/doc/html/maillist.html
@@ -21,7 +21,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/main.html b/doc/html/main.html
deleted file mode 100644
index b02de7d..0000000
--- a/doc/html/main.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>The Synthesis ToolKit in C++ (STK)</TITLE>
-<LINK HREF="doxygen.css" REL="stylesheet" TYPE="text/css">
-</HEAD>
-<BODY BGCOLOR="#FFFFFF">
-<CENTER>
-<img src="princeton.gif"> &nbsp; <img src="ccrma.gif"> &nbsp; <img src="mcgill.gif"><P>
-<a class="qindex" href="index.html">Home</a> &nbsp; <a class="qindex" href="information.html">Information</a> &nbsp; <a class="qindex" href="classes.html">Classes</a> &nbsp; <a class="qindex" href="download.html">Download</a> &nbsp; <a class="qindex" href="usage.html">Usage</a> &nbsp; <a class="qindex" href="maillist.html">Mail List</a> &nbsp; <a class="qindex" href="system.html">Requirements</a> &nbsp; <a class="qindex" href="links.html">Links</a> &nbsp; <a class="qindex" href="faq.html">FAQ</a> &nbsp; <a class="qindex" href="tutorial.html">Tutorial</a></CENTER>
-<HR>
-<!-- Generated by Doxygen 1.6.1 -->
-<div class="contents">
-<h1>The Synthesis ToolKit in C++ (STK)</h1><h3>4.4.2 </h3> 
-<BODY BGCOLOR="white">
-<h3><center><a href="http://www.cs.princeton.edu/~prc/">Perry R. Cook</a> & <a href="http://music.mcgill.ca/~gary/">Gary P. Scavone</a></center></h3>
-<p>The <b>Synthesis ToolKit in C++ (STK)</b> is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language. STK was designed to facilitate rapid development of music synthesis and audio processing software, with an emphasis on cross-platform functionality, realtime control, ease of use, and educational example code. The Synthesis ToolKit is extremely portable (it's mostly platform-independent C and C++ code), and it's completely user-extensible (all source included, no unusual libraries, and no hidden drivers). We like to think that this increases the chances that our programs will still work in another 5-10 years. In fact, the ToolKit has been working continuously for nearly 15 years now. STK currently runs with realtime support (audio and MIDI) on Linux, Macintosh OS X, and Windows computer platforms. Generic, non-realtime support has been tested under NeXTStep, Sun, and other platforms and should work with any standard C++ compiler.</p>
-<ul>
-<li><a class="el" href="information.html">General Information</a></li>
-<li><a class="el" href="classes.html">Class Documentation</a></li>
-<li><a class="el" href="download.html">Download, Release Notes, and Bug Fixes</a></li>
-<li><a class="el" href="usage.html">Usage Documentation</a></li>
-<li><a class="el" href="maillist.html">The Mail List</a></li>
-<li><a class="el" href="system.html">System Requirements</a></li>
-<li><a class="el" href="links.html">Miscellaneous Links</a></li>
-<li><a class="el" href="faq.html">Frequently Asked Questions</a></li>
-<li><a class="el" href="tutorial.html">Tutorial</a> </li>
-</ul>
-</div>
-<HR>
-
-<table>
-  <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
-</table>
-
-</BODY>
-</HTML>
diff --git a/doc/html/multichannel.html b/doc/html/multichannel.html
index c1f6c99..3676e35 100644
--- a/doc/html/multichannel.html
+++ b/doc/html/multichannel.html
@@ -65,7 +65,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/namespaces.html b/doc/html/namespaces.html
index b71ac54..dff3ce7 100644
--- a/doc/html/namespaces.html
+++ b/doc/html/namespaces.html
@@ -18,7 +18,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/namespacestk.html b/doc/html/namespacestk.html
index c69755a..d261516 100644
--- a/doc/html/namespacestk.html
+++ b/doc/html/namespacestk.html
@@ -45,6 +45,8 @@
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK chorus effect class.  <a href="classstk_1_1Chorus.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Clarinet.html">Clarinet</a></td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK clarinet physical model class.  <a href="classstk_1_1Clarinet.html#_details">More...</a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Cubic.html">Cubic</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK cubic non-linearity class.  <a href="classstk_1_1Cubic.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Delay.html">Delay</a></td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK non-interpolating delay line class.  <a href="classstk_1_1Delay.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1DelayA.html">DelayA</a></td></tr>
@@ -136,9 +138,7 @@
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PitShift.html">PitShift</a></td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK simple pitch shifter effect class.  <a href="classstk_1_1PitShift.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Plucked.html">Plucked</a></td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK plucked string model class.  <a href="classstk_1_1Plucked.html#_details">More...</a><br/></td></tr>
-<tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PluckTwo.html">PluckTwo</a></td></tr>
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK enhanced plucked string model class.  <a href="classstk_1_1PluckTwo.html#_details">More...</a><br/></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK basic plucked string class.  <a href="classstk_1_1Plucked.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PoleZero.html">PoleZero</a></td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK one-pole, one-zero filter class.  <a href="classstk_1_1PoleZero.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1PRCRev.html">PRCRev</a></td></tr>
@@ -191,6 +191,8 @@
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK thread class.  <a href="classstk_1_1Thread.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1TubeBell.html">TubeBell</a></td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK tubular bell (orchestral chime) <a class="el" href="classstk_1_1FM.html" title="STK abstract FM synthesis base class.">FM</a> synthesis instrument.  <a href="classstk_1_1TubeBell.html#_details">More...</a><br/></td></tr>
+<tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1Twang.html">Twang</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK enhanced plucked string class.  <a href="classstk_1_1Twang.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1TwoPole.html">TwoPole</a></td></tr>
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">STK two-pole filter class.  <a href="classstk_1_1TwoPole.html#_details">More...</a><br/></td></tr>
 <tr><td class="memItemLeft" align="right" valign="top">class &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classstk_1_1TwoZero.html">TwoZero</a></td></tr>
@@ -220,7 +222,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/open.gif b/doc/html/open.gif
new file mode 100644
index 0000000..b903009
Binary files /dev/null and b/doc/html/open.gif differ
diff --git a/doc/html/pages.html b/doc/html/pages.html
index 4469a2a..b02a021 100644
--- a/doc/html/pages.html
+++ b/doc/html/pages.html
@@ -57,7 +57,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/polyvoices.html b/doc/html/polyvoices.html
index d081910..08eebe9 100644
--- a/doc/html/polyvoices.html
+++ b/doc/html/polyvoices.html
@@ -151,7 +151,7 @@
     dac.<a class="code" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream</a>( &amp;parameters, NULL, format, (<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span>)Stk::sampleRate(), &amp;bufferFrames, &amp;tick, (<span class="keywordtype">void</span> *)&amp;data );
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
     <span class="keywordflow">goto</span> cleanup;
   }
 
@@ -175,7 +175,7 @@
     dac.<a class="code" href="classRtAudio.html#aec017a89629ccef66a90b60be22a2f80" title="A function that starts a stream.">startStream</a>();
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
     <span class="keywordflow">goto</span> cleanup;
   }
 
@@ -188,7 +188,7 @@
     dac.<a class="code" href="classRtAudio.html#a90d599002ad32cf250a4cb866f2cc93a" title="A function that closes a stream and frees any associated stream memory.">closeStream</a>();
   }
   <span class="keywordflow">catch</span> ( <a class="code" href="classRtError.html" title="Exception handling class for RtAudio &amp;amp; RtMidi.">RtError</a> &amp;error ) {
-    error.<a class="code" href="classRtError.html#ada41f7472122f45bc5b4677f066e0943" title="Prints thrown error message to stderr.">printMessage</a>();
+    error.<a class="code" href="classRtError.html#a251dcdac396c998c91706dd2dd3b8bfc" title="Prints thrown error message to stderr.">printMessage</a>();
   }
 
  cleanup:
@@ -206,7 +206,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/realtime.html b/doc/html/realtime.html
index e588e8b..ff60b97 100644
--- a/doc/html/realtime.html
+++ b/doc/html/realtime.html
@@ -82,7 +82,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/skini.html b/doc/html/skini.html
index a55efc8..4ae06f4 100644
--- a/doc/html/skini.html
+++ b/doc/html/skini.html
@@ -197,7 +197,7 @@ Using SKINI:</a></h2>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/structRtAudio_1_1DeviceInfo-members.html b/doc/html/structRtAudio_1_1DeviceInfo-members.html
index db16d1b..acfce87 100644
--- a/doc/html/structRtAudio_1_1DeviceInfo-members.html
+++ b/doc/html/structRtAudio_1_1DeviceInfo-members.html
@@ -25,7 +25,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/structRtAudio_1_1DeviceInfo.html b/doc/html/structRtAudio_1_1DeviceInfo.html
index 279c8ea..1724c25 100644
--- a/doc/html/structRtAudio_1_1DeviceInfo.html
+++ b/doc/html/structRtAudio_1_1DeviceInfo.html
@@ -168,7 +168,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/structRtAudio_1_1StreamOptions-members.html b/doc/html/structRtAudio_1_1StreamOptions-members.html
index a14d56a..872405c 100644
--- a/doc/html/structRtAudio_1_1StreamOptions-members.html
+++ b/doc/html/structRtAudio_1_1StreamOptions-members.html
@@ -20,7 +20,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/structRtAudio_1_1StreamOptions.html b/doc/html/structRtAudio_1_1StreamOptions.html
index c3fd267..a07d7a7 100644
--- a/doc/html/structRtAudio_1_1StreamOptions.html
+++ b/doc/html/structRtAudio_1_1StreamOptions.html
@@ -34,11 +34,13 @@
 <li><em>RTAUDIO_MINIMIZE_LATENCY:</em> Attempt to set stream parameters for lowest possible latency.</li>
 <li><em>RTAUDIO_HOG_DEVICE:</em> Attempt grab device for exclusive use.</li>
 <li><em>RTAUDIO_SCHEDULE_REALTIME:</em> Attempt to select realtime scheduling for callback thread.</li>
+<li><em>RTAUDIO_ALSA_USE_DEFAULT:</em> Use the "default" PCM device (ALSA only).</li>
 </ul>
 <p>By default, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> streams pass and receive audio data from the client in an interleaved format. By passing the RTAUDIO_NONINTERLEAVED flag to the <a class="el" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream()</a> function, audio data will instead be presented in non-interleaved buffers. In this case, each buffer argument in the RtAudioCallback function will point to a single array of data, with <code>nFrames</code> samples for each channel concatenated back-to-back. For example, the first sample of data for the second channel would be located at index <code>nFrames</code> (assuming the <code>buffer</code> pointer was recast to the correct data type for the stream).</p>
 <p>Certain audio APIs offer a number of parameters that influence the I/O latency of a stream. By default, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> will attempt to set these parameters internally for robust (glitch-free) performance (though some APIs, like Windows Direct Sound, make this difficult). By passing the RTAUDIO_MINIMIZE_LATENCY flag to the <a class="el" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">openStream()</a> function, internal stream settings will be influenced in an attempt to minimize stream latency, though possibly at the expense of stream performance.</p>
 <p>If the RTAUDIO_HOG_DEVICE flag is set, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> will attempt to open the input and/or output stream device(s) for exclusive use. Note that this is not possible with all supported audio APIs.</p>
 <p>If the RTAUDIO_SCHEDULE_REALTIME flag is set, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> will attempt to select realtime scheduling (round-robin) for the callback thread. The <code>priority</code> parameter will only be used if the RTAUDIO_SCHEDULE_REALTIME flag is set. It defines the thread's realtime priority.</p>
+<p>If the RTAUDIO_ALSA_USE_DEFAULT flag is set, <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> will attempt to open the "default" PCM device when using the ALSA API. Note that this will override any specified input or output device id.</p>
 <p>The <code>numberOfBuffers</code> parameter can be used to control stream latency in the Windows DirectSound, Linux OSS, and Linux Alsa APIs only. A value of two is usually the smallest allowed. Larger numbers can potentially result in more robust stream performance, though likely at the cost of stream latency. The value set by the user is replaced during execution of the <a class="el" href="classRtAudio.html#afacc99740fa4c5606fb35467cdea6da8" title="A public function for opening a stream with the specified parameters.">RtAudio::openStream()</a> function by the value actually used by the system.</p>
 <p>The <code>streamName</code> parameter can be used to set the client name when using the Jack API. By default, the client name is set to RtApiJack. However, if you wish to create multiple instances of <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a> with Jack, each instance must have a unique client name. </p>
 <hr/><h2>Member Data Documentation</h2>
@@ -52,7 +54,7 @@
       </table>
 </div>
 <div class="memdoc">
-<p>A bit-mask of stream flags (RTAUDIO_NONINTERLEAVED, RTAUDIO_MINIMIZE_LATENCY, RTAUDIO_HOG_DEVICE). </p>
+<p>A bit-mask of stream flags (RTAUDIO_NONINTERLEAVED, RTAUDIO_MINIMIZE_LATENCY, RTAUDIO_HOG_DEVICE, RTAUDIO_ALSA_USE_DEFAULT). </p>
 
 </div>
 </div>
@@ -106,7 +108,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/structRtAudio_1_1StreamParameters-members.html b/doc/html/structRtAudio_1_1StreamParameters-members.html
index c16ec5e..bde83b8 100644
--- a/doc/html/structRtAudio_1_1StreamParameters-members.html
+++ b/doc/html/structRtAudio_1_1StreamParameters-members.html
@@ -19,7 +19,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/structRtAudio_1_1StreamParameters.html b/doc/html/structRtAudio_1_1StreamParameters.html
index b2cf537..d0945a4 100644
--- a/doc/html/structRtAudio_1_1StreamParameters.html
+++ b/doc/html/structRtAudio_1_1StreamParameters.html
@@ -78,7 +78,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/structstk_1_1Skini_1_1Message-members.html b/doc/html/structstk_1_1Skini_1_1Message-members.html
index 2063669..1b4605b 100644
--- a/doc/html/structstk_1_1Skini_1_1Message-members.html
+++ b/doc/html/structstk_1_1Skini_1_1Message-members.html
@@ -22,7 +22,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/structstk_1_1Skini_1_1Message.html b/doc/html/structstk_1_1Skini_1_1Message.html
index 5f91d1d..11c75fa 100644
--- a/doc/html/structstk_1_1Skini_1_1Message.html
+++ b/doc/html/structstk_1_1Skini_1_1Message.html
@@ -123,7 +123,7 @@
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/system.html b/doc/html/system.html
index e4e0035..ffe08e7 100644
--- a/doc/html/system.html
+++ b/doc/html/system.html
@@ -40,14 +40,14 @@ If you experience frequent audio input/output "glitches", try increasing the RT_
 <p class="endli"></p>
 </li>
 </ul>
-<p><b>Windows95/98/2000/XP (specific):</b> </p>
+<p><b>Windows95/98/2000/XP/7 (specific):</b> </p>
 <ul>
 <li>
 A soundcard to use realtime audio input/output capabilities. In order to use the <em><b>effects</b></em> project, the soundcard and drivers must support full duplex mode. </li>
 <li>
-<a href="http://www.microsoft.com/directx/">DirectX</a> 5.0 (or higher) runtime libraries to use the precompiled binaries. </li>
+<a href="http://www.microsoft.com/directx/">DirectX</a> 5.0 (or higher) runtime libraries. </li>
 <li>
-Visual C++ .NET for compiling (though a precompiled distribution is available). </li>
+Visual C++ .NET or MinGW for compiling. </li>
 <li>
 For compiling the source (if not already in your system): <ul>
 <li>
@@ -62,7 +62,7 @@ For compiling the source (if not already in your system): <ul>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/tree.html b/doc/html/tree.html
deleted file mode 100644
index b27560c..0000000
--- a/doc/html/tree.html
+++ /dev/null
@@ -1,451 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-    <meta http-equiv="Content-Style-Type" content="text/css" />
-    <meta http-equiv="Content-Language" content="en" />
-    <link rel="stylesheet" href="doxygen.css"/>
-    <title>TreeView</title>
-    <script type="text/javascript">
-    <!-- // Hide script from old browsers
-    
-    function toggleFolder(id, imageNode) 
-    {
-      var folder = document.getElementById(id);
-      var l = imageNode.src.length;
-      if (imageNode.src.substring(l-20,l)=="ftv2folderclosed.png" || 
-          imageNode.src.substring(l-18,l)=="ftv2folderopen.png")
-      {
-        imageNode = imageNode.previousSibling;
-        l = imageNode.src.length;
-      }
-      if (folder == null) 
-      {
-      } 
-      else if (folder.style.display == "block") 
-      {
-        if (imageNode != null) 
-        {
-          imageNode.nextSibling.src = "ftv2folderclosed.png";
-          if (imageNode.src.substring(l-13,l) == "ftv2mnode.png")
-          {
-            imageNode.src = "ftv2pnode.png";
-          }
-          else if (imageNode.src.substring(l-17,l) == "ftv2mlastnode.png")
-          {
-            imageNode.src = "ftv2plastnode.png";
-          }
-        }
-        folder.style.display = "none";
-      } 
-      else 
-      {
-        if (imageNode != null) 
-        {
-          imageNode.nextSibling.src = "ftv2folderopen.png";
-          if (imageNode.src.substring(l-13,l) == "ftv2pnode.png")
-          {
-            imageNode.src = "ftv2mnode.png";
-          }
-          else if (imageNode.src.substring(l-17,l) == "ftv2plastnode.png")
-          {
-            imageNode.src = "ftv2mlastnode.png";
-          }
-        }
-        folder.style.display = "block";
-      }
-    }
-
-    // End script hiding -->        
-    </script>
-  </head>
-
-  <body class="ftvtree">
-    <div class="directory">
-      <h3 class="swap"><span>STK</span></h3>
-      <div style="display: block;">
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="main.html" target="basefrm">The Synthesis ToolKit in C++ (STK)</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classes.html" target="basefrm">Class Documentation</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="compile.html" target="basefrm">Compiling</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="controlin.html" target="basefrm">Control Input</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="crealtime.html" target="basefrm">Realtime Audio (callback)</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="download.html" target="basefrm">Download, Release Notes, and Bug Fixes</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="faq.html" target="basefrm">Frequently Asked Questions</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="filtering.html" target="basefrm">Using Filters</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="fundamentals.html" target="basefrm">STK Fundamentals</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="hello.html" target="basefrm">Hello Sine!</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="information.html" target="basefrm">General Information</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="instruments.html" target="basefrm">Instruments</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="links.html" target="basefrm">Miscellaneous Links</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="maillist.html" target="basefrm">The Mail List</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="multichannel.html" target="basefrm">Multi-Channel I/O</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="polyvoices.html" target="basefrm">Voice Management</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="realtime.html" target="basefrm">Realtime Audio (blocking)</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="skini.html" target="basefrm">Synthesis toolKit Instrument Network Interface (SKINI)</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="system.html" target="basefrm">System Requirements</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="tutorial.html" target="basefrm">Tutorial</a></p>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="usage.html" target="basefrm">Usage Documentation</a></p>
-        <p><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder1', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder1', this)"/><a class="el" href="annotated.html" target="basefrm">Class List</a></p>
-        <div id="folder1">
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1ADSR.html" target="basefrm">stk::ADSR</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Asymp.html" target="basefrm">stk::Asymp</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BandedWG.html" target="basefrm">stk::BandedWG</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BeeThree.html" target="basefrm">stk::BeeThree</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BiQuad.html" target="basefrm">stk::BiQuad</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Blit.html" target="basefrm">stk::Blit</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BlitSaw.html" target="basefrm">stk::BlitSaw</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BlitSquare.html" target="basefrm">stk::BlitSquare</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BlowBotl.html" target="basefrm">stk::BlowBotl</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BlowHole.html" target="basefrm">stk::BlowHole</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Bowed.html" target="basefrm">stk::Bowed</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BowTable.html" target="basefrm">stk::BowTable</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Brass.html" target="basefrm">stk::Brass</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Chorus.html" target="basefrm">stk::Chorus</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Clarinet.html" target="basefrm">stk::Clarinet</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Delay.html" target="basefrm">stk::Delay</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1DelayA.html" target="basefrm">stk::DelayA</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1DelayL.html" target="basefrm">stk::DelayL</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structRtAudio_1_1DeviceInfo.html" target="basefrm">RtAudio::DeviceInfo</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Drummer.html" target="basefrm">stk::Drummer</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Echo.html" target="basefrm">stk::Echo</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Effect.html" target="basefrm">stk::Effect</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Envelope.html" target="basefrm">stk::Envelope</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FileLoop.html" target="basefrm">stk::FileLoop</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FileRead.html" target="basefrm">stk::FileRead</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FileWrite.html" target="basefrm">stk::FileWrite</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FileWvIn.html" target="basefrm">stk::FileWvIn</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FileWvOut.html" target="basefrm">stk::FileWvOut</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Filter.html" target="basefrm">stk::Filter</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Fir.html" target="basefrm">stk::Fir</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Flute.html" target="basefrm">stk::Flute</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FM.html" target="basefrm">stk::FM</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FMVoices.html" target="basefrm">stk::FMVoices</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FormSwep.html" target="basefrm">stk::FormSwep</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Function.html" target="basefrm">stk::Function</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Generator.html" target="basefrm">stk::Generator</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Granulate.html" target="basefrm">stk::Granulate</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1HevyMetl.html" target="basefrm">stk::HevyMetl</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Iir.html" target="basefrm">stk::Iir</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1InetWvIn.html" target="basefrm">stk::InetWvIn</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1InetWvOut.html" target="basefrm">stk::InetWvOut</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Instrmnt.html" target="basefrm">stk::Instrmnt</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1JCRev.html" target="basefrm">stk::JCRev</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1JetTable.html" target="basefrm">stk::JetTable</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Mandolin.html" target="basefrm">stk::Mandolin</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Mesh2D.html" target="basefrm">stk::Mesh2D</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structstk_1_1Skini_1_1Message.html" target="basefrm">stk::Skini::Message</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Messager.html" target="basefrm">stk::Messager</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1MidiFileIn.html" target="basefrm">stk::MidiFileIn</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Modal.html" target="basefrm">stk::Modal</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1ModalBar.html" target="basefrm">stk::ModalBar</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Modulate.html" target="basefrm">stk::Modulate</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Moog.html" target="basefrm">stk::Moog</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Mutex.html" target="basefrm">stk::Mutex</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Noise.html" target="basefrm">stk::Noise</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1NRev.html" target="basefrm">stk::NRev</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1OnePole.html" target="basefrm">stk::OnePole</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1OneZero.html" target="basefrm">stk::OneZero</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1PercFlut.html" target="basefrm">stk::PercFlut</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Phonemes.html" target="basefrm">stk::Phonemes</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1PitShift.html" target="basefrm">stk::PitShift</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Plucked.html" target="basefrm">stk::Plucked</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1PluckTwo.html" target="basefrm">stk::PluckTwo</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1PoleZero.html" target="basefrm">stk::PoleZero</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1PRCRev.html" target="basefrm">stk::PRCRev</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1ReedTable.html" target="basefrm">stk::ReedTable</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Resonate.html" target="basefrm">stk::Resonate</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Rhodey.html" target="basefrm">stk::Rhodey</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classRtAudio.html" target="basefrm">RtAudio</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classRtError.html" target="basefrm">RtError</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classRtMidi.html" target="basefrm">RtMidi</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classRtMidiIn.html" target="basefrm">RtMidiIn</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classRtMidiOut.html" target="basefrm">RtMidiOut</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1RtWvIn.html" target="basefrm">stk::RtWvIn</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1RtWvOut.html" target="basefrm">stk::RtWvOut</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Sampler.html" target="basefrm">stk::Sampler</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Saxofony.html" target="basefrm">stk::Saxofony</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Shakers.html" target="basefrm">stk::Shakers</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Simple.html" target="basefrm">stk::Simple</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1SineWave.html" target="basefrm">stk::SineWave</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1SingWave.html" target="basefrm">stk::SingWave</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Sitar.html" target="basefrm">stk::Sitar</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Skini.html" target="basefrm">stk::Skini</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Socket.html" target="basefrm">stk::Socket</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Sphere.html" target="basefrm">stk::Sphere</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1StifKarp.html" target="basefrm">stk::StifKarp</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Stk.html" target="basefrm">stk::Stk</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1StkError.html" target="basefrm">stk::StkError</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1StkFrames.html" target="basefrm">stk::StkFrames</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structRtAudio_1_1StreamOptions.html" target="basefrm">RtAudio::StreamOptions</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structRtAudio_1_1StreamParameters.html" target="basefrm">RtAudio::StreamParameters</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TapDelay.html" target="basefrm">stk::TapDelay</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TcpClient.html" target="basefrm">stk::TcpClient</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TcpServer.html" target="basefrm">stk::TcpServer</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Thread.html" target="basefrm">stk::Thread</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TubeBell.html" target="basefrm">stk::TubeBell</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TwoPole.html" target="basefrm">stk::TwoPole</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TwoZero.html" target="basefrm">stk::TwoZero</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1UdpSocket.html" target="basefrm">stk::UdpSocket</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Vector3D.html" target="basefrm">stk::Vector3D</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Voicer.html" target="basefrm">stk::Voicer</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1VoicForm.html" target="basefrm">stk::VoicForm</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Whistle.html" target="basefrm">stk::Whistle</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Wurley.html" target="basefrm">stk::Wurley</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1WvIn.html" target="basefrm">stk::WvIn</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1WvOut.html" target="basefrm">stk::WvOut</a></p>
-        </div>
-        <p><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder2', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder2', this)"/><a class="el" href="hierarchy.html" target="basefrm">Class Hierarchy</a></p>
-        <div id="folder2">
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structRtAudio_1_1DeviceInfo.html" target="basefrm">RtAudio::DeviceInfo</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structstk_1_1Skini_1_1Message.html" target="basefrm">stk::Skini::Message</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classRtAudio.html" target="basefrm">RtAudio</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classRtError.html" target="basefrm">RtError</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder3', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder3', this)"/><a class="el" href="classRtMidi.html" target="basefrm">RtMidi</a></p>
-          <div id="folder3">
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classRtMidiIn.html" target="basefrm">RtMidiIn</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classRtMidiOut.html" target="basefrm">RtMidiOut</a></p>
-          </div>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder4', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder4', this)"/><a class="el" href="classstk_1_1Stk.html" target="basefrm">stk::Stk</a></p>
-          <div id="folder4">
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder5', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder5', this)"/><a class="el" href="classstk_1_1Effect.html" target="basefrm">stk::Effect</a></p>
-            <div id="folder5">
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Chorus.html" target="basefrm">stk::Chorus</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Echo.html" target="basefrm">stk::Echo</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1JCRev.html" target="basefrm">stk::JCRev</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1NRev.html" target="basefrm">stk::NRev</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1PitShift.html" target="basefrm">stk::PitShift</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1PRCRev.html" target="basefrm">stk::PRCRev</a></p>
-            </div>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FileRead.html" target="basefrm">stk::FileRead</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FileWrite.html" target="basefrm">stk::FileWrite</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder6', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder6', this)"/><a class="el" href="classstk_1_1Filter.html" target="basefrm">stk::Filter</a></p>
-            <div id="folder6">
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BiQuad.html" target="basefrm">stk::BiQuad</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Delay.html" target="basefrm">stk::Delay</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1DelayA.html" target="basefrm">stk::DelayA</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1DelayL.html" target="basefrm">stk::DelayL</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Fir.html" target="basefrm">stk::Fir</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FormSwep.html" target="basefrm">stk::FormSwep</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Iir.html" target="basefrm">stk::Iir</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1OnePole.html" target="basefrm">stk::OnePole</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1OneZero.html" target="basefrm">stk::OneZero</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1PoleZero.html" target="basefrm">stk::PoleZero</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TapDelay.html" target="basefrm">stk::TapDelay</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TwoPole.html" target="basefrm">stk::TwoPole</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TwoZero.html" target="basefrm">stk::TwoZero</a></p>
-            </div>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder7', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder7', this)"/><a class="el" href="classstk_1_1Function.html" target="basefrm">stk::Function</a></p>
-            <div id="folder7">
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BowTable.html" target="basefrm">stk::BowTable</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1JetTable.html" target="basefrm">stk::JetTable</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1ReedTable.html" target="basefrm">stk::ReedTable</a></p>
-            </div>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder8', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder8', this)"/><a class="el" href="classstk_1_1Generator.html" target="basefrm">stk::Generator</a></p>
-            <div id="folder8">
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1ADSR.html" target="basefrm">stk::ADSR</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Asymp.html" target="basefrm">stk::Asymp</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Blit.html" target="basefrm">stk::Blit</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BlitSaw.html" target="basefrm">stk::BlitSaw</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BlitSquare.html" target="basefrm">stk::BlitSquare</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Envelope.html" target="basefrm">stk::Envelope</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Granulate.html" target="basefrm">stk::Granulate</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Modulate.html" target="basefrm">stk::Modulate</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Noise.html" target="basefrm">stk::Noise</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1SineWave.html" target="basefrm">stk::SineWave</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1SingWave.html" target="basefrm">stk::SingWave</a></p>
-            </div>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder9', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder9', this)"/><a class="el" href="classstk_1_1Instrmnt.html" target="basefrm">stk::Instrmnt</a></p>
-            <div id="folder9">
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BandedWG.html" target="basefrm">stk::BandedWG</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BlowBotl.html" target="basefrm">stk::BlowBotl</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BlowHole.html" target="basefrm">stk::BlowHole</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Bowed.html" target="basefrm">stk::Bowed</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Brass.html" target="basefrm">stk::Brass</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Clarinet.html" target="basefrm">stk::Clarinet</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Drummer.html" target="basefrm">stk::Drummer</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Flute.html" target="basefrm">stk::Flute</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder10', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder10', this)"/><a class="el" href="classstk_1_1FM.html" target="basefrm">stk::FM</a></p>
-              <div id="folder10">
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1BeeThree.html" target="basefrm">stk::BeeThree</a></p>
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FMVoices.html" target="basefrm">stk::FMVoices</a></p>
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1HevyMetl.html" target="basefrm">stk::HevyMetl</a></p>
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1PercFlut.html" target="basefrm">stk::PercFlut</a></p>
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Rhodey.html" target="basefrm">stk::Rhodey</a></p>
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TubeBell.html" target="basefrm">stk::TubeBell</a></p>
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Wurley.html" target="basefrm">stk::Wurley</a></p>
-              </div>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Mesh2D.html" target="basefrm">stk::Mesh2D</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder11', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder11', this)"/><a class="el" href="classstk_1_1Modal.html" target="basefrm">stk::Modal</a></p>
-              <div id="folder11">
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1ModalBar.html" target="basefrm">stk::ModalBar</a></p>
-              </div>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Plucked.html" target="basefrm">stk::Plucked</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder12', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder12', this)"/><a class="el" href="classstk_1_1PluckTwo.html" target="basefrm">stk::PluckTwo</a></p>
-              <div id="folder12">
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Mandolin.html" target="basefrm">stk::Mandolin</a></p>
-              </div>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Resonate.html" target="basefrm">stk::Resonate</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder13', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder13', this)"/><a class="el" href="classstk_1_1Sampler.html" target="basefrm">stk::Sampler</a></p>
-              <div id="folder13">
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Moog.html" target="basefrm">stk::Moog</a></p>
-              </div>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Saxofony.html" target="basefrm">stk::Saxofony</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Shakers.html" target="basefrm">stk::Shakers</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Simple.html" target="basefrm">stk::Simple</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Sitar.html" target="basefrm">stk::Sitar</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1StifKarp.html" target="basefrm">stk::StifKarp</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1VoicForm.html" target="basefrm">stk::VoicForm</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Whistle.html" target="basefrm">stk::Whistle</a></p>
-            </div>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Messager.html" target="basefrm">stk::Messager</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1MidiFileIn.html" target="basefrm">stk::MidiFileIn</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Mutex.html" target="basefrm">stk::Mutex</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Phonemes.html" target="basefrm">stk::Phonemes</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Skini.html" target="basefrm">stk::Skini</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder14', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder14', this)"/><a class="el" href="classstk_1_1Socket.html" target="basefrm">stk::Socket</a></p>
-            <div id="folder14">
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TcpClient.html" target="basefrm">stk::TcpClient</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1TcpServer.html" target="basefrm">stk::TcpServer</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1UdpSocket.html" target="basefrm">stk::UdpSocket</a></p>
-            </div>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Sphere.html" target="basefrm">stk::Sphere</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Thread.html" target="basefrm">stk::Thread</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Vector3D.html" target="basefrm">stk::Vector3D</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1Voicer.html" target="basefrm">stk::Voicer</a></p>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder15', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder15', this)"/><a class="el" href="classstk_1_1WvIn.html" target="basefrm">stk::WvIn</a></p>
-            <div id="folder15">
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder16', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder16', this)"/><a class="el" href="classstk_1_1FileWvIn.html" target="basefrm">stk::FileWvIn</a></p>
-              <div id="folder16">
-                <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FileLoop.html" target="basefrm">stk::FileLoop</a></p>
-              </div>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1InetWvIn.html" target="basefrm">stk::InetWvIn</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1RtWvIn.html" target="basefrm">stk::RtWvIn</a></p>
-            </div>
-            <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2plastnode.png" alt="\" width="16" height="22" onclick="toggleFolder('folder17', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder17', this)"/><a class="el" href="classstk_1_1WvOut.html" target="basefrm">stk::WvOut</a></p>
-            <div id="folder17">
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1FileWvOut.html" target="basefrm">stk::FileWvOut</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1InetWvOut.html" target="basefrm">stk::InetWvOut</a></p>
-              <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2blank.png" alt="&#160;" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1RtWvOut.html" target="basefrm">stk::RtWvOut</a></p>
-            </div>
-          </div>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1StkError.html" target="basefrm">stk::StkError</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="classstk_1_1StkFrames.html" target="basefrm">stk::StkFrames</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structRtAudio_1_1StreamOptions.html" target="basefrm">RtAudio::StreamOptions</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="structRtAudio_1_1StreamParameters.html" target="basefrm">RtAudio::StreamParameters</a></p>
-        </div>
-        <p><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="functions.html" target="basefrm">Class Members</a></p>
-        <p><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder18', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder18', this)"/><a class="el" href="namespaces.html" target="basefrm">Namespace List</a></p>
-        <div id="folder18">
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="namespacestk.html" target="basefrm">stk</a></p>
-        </div>
-        <p><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder19', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder19', this)"/><a class="el" href="files.html" target="basefrm">File List</a></p>
-        <div id="folder19">
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>ADSR.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Asymp.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>BandedWG.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>BeeThree.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>BiQuad.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Blit.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>BlitSaw.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>BlitSquare.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>BlowBotl.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>BlowHole.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Bowed.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>BowTable.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Brass.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Chorus.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Clarinet.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Delay.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>DelayA.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>DelayL.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Drummer.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Echo.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Effect.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Envelope.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>FileLoop.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>FileRead.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>FileWrite.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>FileWvIn.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>FileWvOut.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Filter.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Fir.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Flute.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>FM.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>FMVoices.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>FormSwep.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Function.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Generator.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Granulate.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>HevyMetl.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Iir.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>InetWvIn.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>InetWvOut.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Instrmnt.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>JCRev.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>JetTable.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Mandolin.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Mesh2D.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Messager.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>MidiFileIn.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Modal.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>ModalBar.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Modulate.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Moog.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Mutex.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Noise.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>NRev.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>OnePole.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>OneZero.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>PercFlut.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Phonemes.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>PitShift.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Plucked.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>PluckTwo.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>PoleZero.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>PRCRev.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>ReedTable.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Resonate.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Rhodey.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="RtAudio_8h.html" target="basefrm">RtAudio.h</a></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>RtError.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>RtMidi.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>RtWvIn.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>RtWvOut.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Sampler.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Saxofony.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Shakers.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Simple.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>SineWave.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>SingWave.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Sitar.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Skini.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Socket.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Sphere.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>StifKarp.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Stk.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>TapDelay.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>TcpClient.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>TcpServer.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Thread.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>TubeBell.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>TwoPole.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>TwoZero.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>UdpSocket.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Vector3D.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Voicer.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>VoicForm.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Whistle.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>Wurley.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2node.png" alt="o" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>WvIn.h</b></p>
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><b>WvOut.h</b></p>
-        </div>
-        <p><img src="ftv2pnode.png" alt="o" width="16" height="22" onclick="toggleFolder('folder20', this)"/><img src="ftv2folderclosed.png" alt="+" width="24" height="22" onclick="toggleFolder('folder20', this)"/><a class="el" href="dirs.html" target="basefrm">Directory Hierarchy</a></p>
-        <div id="folder20">
-          <p><img src="ftv2vertline.png" alt="|" width="16" height="22" /><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="dir_ca1e4533604ab7cb0cdaaff730a9c38f.html" target="basefrm">include</a></p>
-        </div>
-        <p><img src="ftv2lastnode.png" alt="\" width="16" height="22" /><img src="ftv2doc.png" alt="*" width="24" height="22" /><a class="el" href="globals.html" target="basefrm">File Members</a></p>
-      </div>
-    </div>
-  </body>
-</html>
-
diff --git a/doc/html/tutorial.html b/doc/html/tutorial.html
index d4cfced..5092c3d 100644
--- a/doc/html/tutorial.html
+++ b/doc/html/tutorial.html
@@ -42,7 +42,7 @@ wish to teach real-time synthesis and processing and wish to use some of our cla
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/html/usage.html b/doc/html/usage.html
index 0a350b8..dc349d6 100644
--- a/doc/html/usage.html
+++ b/doc/html/usage.html
@@ -15,6 +15,7 @@
 <h1><a class="anchor" id="usage">Usage Documentation </a></h1><ul>
 <li><a class="el" href="usage.html#directory">Directory Structure:</a></li>
 <li><a class="el" href="usage.html#compiling">Compiling:</a></li>
+<li><a class="el" href="usage.html#debug">Debugging:</a></li>
 <li><a class="el" href="usage.html#control">Control Data:</a></li>
 <li><a class="el" href="usage.html#voices">Demo: STK Instruments</a></li>
 <li><a class="el" href="usage.html#nort">Demo: Non-Realtime Use</a></li>
@@ -77,11 +78,11 @@ The <em><b>examples</b></em> project contains several simple programs that demon
 Compiling:</a></h2>
 <ul>
 <li>
-<p class="startli"><b>Windows95/98/2000/XP:</b> Realtime support is available using either DirectSound or ASIO audio drivers. For DirectSound support, use the <code>__WINDOWS_DS__</code> preprocessor definition and link with the <code>dsound.lib</code>, <code>winmm.lib</code>, and <code>Wsock32.lib</code> libraries. For ASIO support, use the <code>__WINDOWS_ASIO__</code> preprocessor definition, include all the files in the <code>src/asio/</code> directory (i.e. <code>asio.h,cpp</code>, <code>asiodrivers.h,cpp</code>, ...), and link with the <code>winmm.lib</code>, and <code>Wsock32.lib</code> libraries. In addition, the <code>__LITTLE_ENDIAN__</code> and <code>__WINDOWS_MM__</code> preprocessor definitions are necessary for all Windows systems (<a class="el" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a> uses the Windows MultiMedia MIDI API). A distribution of the release is available with precompiled binaries (using DirectSound) for all the projects. In order for these binaries to function properly, your system must have the DirectX 5.0 (or higher) runtime libraries installed (available from <a href="http://www.microsoft.com/directx/">Microsoft</a>). Further, the <em><b>effects</b></em> project requires that your soundcard and drivers provide full duplex mode capabilities. Visual C++ .NET project files are provided in each project directory as well should you wish to compile your own binaries. It is important to link with the non-debug libraries when compiling "release" program versions and debug libraries when compiling "debug" program versions.</p>
+<p class="startli"><b>Windows95/98/2000/XP/7:</b> Realtime support is available using either DirectSound or ASIO audio drivers. For DirectSound support, use the <code>__WINDOWS_DS__</code> preprocessor definition and link with the <code>dsound.lib</code>, <code>winmm.lib</code>, and <code>Wsock32.lib</code> libraries. For ASIO support, use the <code>__WINDOWS_ASIO__</code> preprocessor definition, include all the files in the <code>src/asio/</code> directory (i.e. <code>asio.h,cpp</code>, <code>asiodrivers.h,cpp</code>, ...), and link with the <code>winmm.lib</code>, and <code>Wsock32.lib</code> libraries. In addition, the <code>__LITTLE_ENDIAN__</code> and <code>__WINDOWS_MM__</code> preprocessor definitions are necessary for all Windows systems (<a class="el" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a> uses the Windows MultiMedia MIDI API). Visual C++ .NET project files are provided in each project directory. As well, the MinGW compiler is supported (see below). It is important to link with the non-debug libraries when compiling "release" program versions and debug libraries when compiling "debug" program versions.</p>
 <p class="endli"></p>
 </li>
 <li>
-<p class="startli"><b>Unix Systems:</b> A GNU <code>configure</code> shell script is included in the distribution for unix-based systems. From the top-level distribution directory, type <code>'./configure'</code> and the script will create <code>Makefiles</code> in each project directory specific to the characteristics of the host computer. Then from within any given project directory (example <code>demo</code>), type <code>'make'</code> to compile the project. In addition, an STK library can be compiled from within the <code>src</code> directory.</p>
+<p class="startli"><b>Unix (and MinGW) Systems:</b> A GNU <code>configure</code> shell script is included in the distribution for unix-based systems. From the top-level distribution directory, type <code>'./configure'</code> and the script will create <code>Makefiles</code> in each project directory specific to the characteristics of the host computer. Then from within any given project directory (example <code>demo</code>), type <code>'make'</code> to compile the project. In addition, an STK library can be compiled from within the <code>src</code> directory.</p>
 <p>Several options can be supplied to the <code>configure</code> script to customize the build behavior: </p>
 <ul>
 <li>
@@ -116,6 +117,9 @@ Compiling:</a></h2>
 <li>
 <b>Generic (non-realtime):</b> Most STK classes are operating system <em>independent</em> and can be compiled using any current C++ compiler. STK assumes big-endian host byte order by default, so if your system is little-endian (i.e. Intel processor), you must provide the <code>__LITTLE_ENDIAN__</code> preprocessor definition to your compiler. The <em><b>demo</b></em> project will compile without realtime support, allowing the use of SKINI scorefiles for input control and output to a variety of soundfile formats. The following classes <em>cannot</em> be used without realtime support: <a class="el" href="classRtAudio.html" title="Realtime audio i/o C++ classes.">RtAudio</a>, RtWvIn, RtWvOut, RtDuplex, <a class="el" href="classRtMidi.html" title="An abstract base class for realtime MIDI input/output.">RtMidi</a>, Socket, Thread, Mutex, TcpWvIn, TcpWvOut. Because of this, it is not possible to compile the <em><b>effects</b></em>, <em><b>ragamatic</b></em>, and most of the <em><b>examples</b></em> projects for non-realtime use. </li>
 </ul>
+<h2><a class="anchor" id="debug">
+Debugging:</a></h2>
+<p>When developing applications with STK, it is recommended that you define the preprocessor definition <code>_STK_DEBUG_</code> when compiling (or specify the <code>--enable-debug</code> option to the <code>configure</code> script). This will enable all levels of function argument and error checking within the STK classes. Without this definition, argument checking does not occur in functions that are expected to be called frequently in an iterative manner.</p>
 <h2><a class="anchor" id="control">
 Control Data:</a></h2>
 <p>All STK programs in this distribution take input control data in the form of <a href="skini.html">SKINI</a> or MIDI messages only. The Messager class unifies the various means of acquiring control data under a single, easy to use set of functions. The way that SKINI messages can be sent to the programs is dependent upon the operating system in use, as well as whether the program is running in realtime or not. In general, it is possible to:</p>
@@ -255,7 +259,7 @@ Polyphony:</a></h2>
 
 <table>
   <tr><td><A HREF="http://ccrma.stanford.edu/software/stk/"><I>The Synthesis ToolKit in C++ (STK)</I></A></td></tr>
-  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2011 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>