From baca57040be58fc7a80985635983e1774608c4fd Mon Sep 17 00:00:00 2001
From: Gary Scavone <gary@music.mcgill.ca>
Date: Sun, 29 Sep 2013 23:15:24 +0200
Subject: [PATCH] Version 4.4.2

---
 INSTALL                             |   2 +-
 Makefile.in                         |  25 +
 README                              |   6 +-
 configure.ac                        |   2 +-
 doc/README-Linux.txt                |   2 +-
 doc/README-MacOSX.txt               |  11 +-
 doc/README-NeXT.txt                 |   2 +-
 doc/README-SGI.txt                  |   2 +-
 doc/README-Win.txt                  |  26 +-
 doc/ReleaseNotes.txt                |  15 +-
 doc/doxygen/Doxyfile                |   2 +-
 doc/doxygen/download.txt            |  14 +-
 doc/doxygen/faq.txt                 |   2 +-
 doc/doxygen/footer.html             |   2 +-
 doc/hierarchy.txt                   |   2 +-
 include/ADSR.h                      |   2 +-
 include/Asymp.h                     |   2 +-
 include/BeeThree.h                  |   2 +-
 include/BiQuad.h                    |   2 +-
 include/BlowBotl.h                  |   2 +-
 include/BlowHole.h                  |   2 +-
 include/BowTable.h                  |   2 +-
 include/Bowed.h                     |   2 +-
 include/Brass.h                     |   2 +-
 include/Chorus.h                    |   2 +-
 include/Clarinet.h                  |   2 +-
 include/Delay.h                     |  10 +-
 include/DelayA.h                    |   2 +-
 include/DelayL.h                    |   2 +-
 include/Drummer.h                   |   2 +-
 include/Echo.h                      |   2 +-
 include/Effect.h                    |   2 +-
 include/Envelope.h                  |   2 +-
 include/FM.h                        |   2 +-
 include/FMVoices.h                  |   2 +-
 include/FileLoop.h                  |   2 +-
 include/FileRead.h                  |   2 +-
 include/FileWrite.h                 |   2 +-
 include/FileWvIn.h                  |   2 +-
 include/FileWvOut.h                 |   2 +-
 include/Filter.h                    |   2 +-
 include/Fir.h                       |   2 +-
 include/Flute.h                     |   2 +-
 include/FormSwep.h                  |   2 +-
 include/Function.h                  |   2 +-
 include/Generator.h                 |   2 +-
 include/Granulate.h                 |   8 +-
 include/HevyMetl.h                  |   2 +-
 include/Iir.h                       |   2 +-
 include/InetWvIn.h                  |   2 +-
 include/InetWvOut.h                 |   2 +-
 include/Instrmnt.h                  |   2 +-
 include/JCRev.h                     |   2 +-
 include/JetTable.h                  |   2 +-
 include/LentPitShift.h              | 267 ++++++++
 include/Mandolin.h                  |   2 +-
 include/Messager.h                  |   2 +-
 include/MidiFileIn.h                |   2 +-
 include/Modal.h                     |   2 +-
 include/ModalBar.h                  |   2 +-
 include/Modulate.h                  |   2 +-
 include/Moog.h                      |   2 +-
 include/Mutex.h                     |   2 +-
 include/NRev.h                      |   2 +-
 include/Noise.h                     |   2 +-
 include/OnePole.h                   |   2 +-
 include/OneZero.h                   |   2 +-
 include/PRCRev.h                    |   2 +-
 include/PercFlut.h                  |   2 +-
 include/Phonemes.h                  |   2 +-
 include/PitShift.h                  |   2 +-
 include/PluckTwo.h                  |   2 +-
 include/Plucked.h                   |   2 +-
 include/PoleZero.h                  |   2 +-
 include/ReedTable.h                 |   2 +-
 include/Resonate.h                  |   2 +-
 include/Rhodey.h                    |   2 +-
 include/RtAudio.h                   |   4 +-
 include/RtMidi.h                    |   4 +-
 include/RtWvIn.h                    |   2 +-
 include/RtWvOut.h                   |   2 +-
 include/SKINI.msg                   |   2 +-
 include/Sampler.h                   |   2 +-
 include/Saxofony.h                  |   2 +-
 include/Shakers.h                   |   2 +-
 include/Simple.h                    |   2 +-
 include/SingWave.h                  |   2 +-
 include/Sitar.h                     |   2 +-
 include/Skini.h                     |   2 +-
 include/Socket.h                    |   2 +-
 include/Sphere.h                    |   2 +-
 include/StifKarp.h                  |   2 +-
 include/Stk.h                       |   6 +-
 include/TapDelay.h                  |   2 +-
 include/TcpClient.h                 |   2 +-
 include/TcpServer.h                 |   2 +-
 include/Thread.h                    |   2 +-
 include/TubeBell.h                  |   2 +-
 include/TwoPole.h                   |   2 +-
 include/TwoZero.h                   |   2 +-
 include/UdpSocket.h                 |   2 +-
 include/Vector3D.h                  |   2 +-
 include/VoicForm.h                  |   2 +-
 include/Voicer.h                    |   9 +-
 include/Whistle.h                   |   2 +-
 include/Wurley.h                    |   2 +-
 include/WvIn.h                      |   2 +-
 include/WvOut.h                     |   2 +-
 projects/demo/Banded                |   1 +
 projects/demo/Makefile.in           |  17 +-
 projects/demo/demo.cpp              |   2 +-
 projects/effects/Makefile.in        |  13 +-
 projects/effects/README-effects.txt |   2 +-
 projects/effects/effects.cpp        |   4 +-
 projects/examples/Makefile.in       |  43 +-
 projects/examples/duplex.cpp        |   4 +-
 projects/examples/foursine.cpp      |   2 +
 projects/examples/grains.cpp        |   1 +
 projects/examples/inetIn.cpp        |   1 +
 projects/examples/inetOut.cpp       |   1 +
 projects/examples/libMakefile.in    |  36 +-
 projects/examples/midiprobe.cpp     |   2 +-
 projects/examples/play.cpp          |   1 +
 projects/examples/playsmf.cpp       |   1 +
 projects/examples/record.cpp        |   1 +
 projects/examples/rtsine.cpp        |   2 +
 projects/examples/sine.cpp          |   2 +
 projects/examples/sineosc.cpp       |   2 +
 projects/examples/test.cpp          |  56 --
 projects/ragamatic/Drone.cpp        |   2 +-
 projects/ragamatic/Drone.h          |   2 +-
 projects/ragamatic/Makefile.in      |  13 +-
 projects/ragamatic/Tabla.cpp        |   2 +-
 projects/ragamatic/Tabla.h          |   2 +-
 projects/ragamatic/VoicDrum.cpp     |   2 +-
 projects/ragamatic/VoicDrum.h       |   2 +-
 projects/ragamatic/ragamat.cpp      |   4 +-
 src/ADSR.cpp                        |   2 +-
 src/Asymp.cpp                       |   2 +-
 src/BeeThree.cpp                    |   2 +-
 src/BiQuad.cpp                      |   2 +-
 src/BlitSquare.cpp                  |   2 +-
 src/BlowBotl.cpp                    |   2 +-
 src/BlowHole.cpp                    |   2 +-
 src/Bowed.cpp                       |   2 +-
 src/Brass.cpp                       |   2 +-
 src/Chorus.cpp                      |   2 +-
 src/Clarinet.cpp                    |   2 +-
 src/Delay.cpp                       |  11 +-
 src/DelayA.cpp                      |   2 +-
 src/DelayL.cpp                      |   2 +-
 src/Drummer.cpp                     |   2 +-
 src/Echo.cpp                        |   2 +-
 src/Envelope.cpp                    |   2 +-
 src/FM.cpp                          |   2 +-
 src/FMVoices.cpp                    |   2 +-
 src/FileLoop.cpp                    |   2 +-
 src/FileRead.cpp                    |   3 +-
 src/FileWrite.cpp                   |   5 +-
 src/FileWvIn.cpp                    |   2 +-
 src/FileWvOut.cpp                   |   2 +-
 src/Fir.cpp                         |   2 +-
 src/Flute.cpp                       |   2 +-
 src/FormSwep.cpp                    |   2 +-
 src/Granulate.cpp                   |   2 +-
 src/HevyMetl.cpp                    |   2 +-
 src/Iir.cpp                         |   2 +-
 src/InetWvIn.cpp                    |   2 +-
 src/InetWvOut.cpp                   |   2 +-
 src/JCRev.cpp                       |   2 +-
 src/LentPitShift.cpp                |  52 ++
 src/Makefile.in                     |  30 +-
 src/Mandolin.cpp                    |   2 +-
 src/Messager.cpp                    |  12 +-
 src/MidiFileIn.cpp                  |   4 +-
 src/Modal.cpp                       |   3 +-
 src/ModalBar.cpp                    |   2 +-
 src/Modulate.cpp                    |   2 +-
 src/Moog.cpp                        |   2 +-
 src/Mutex.cpp                       |   2 +-
 src/NRev.cpp                        |   2 +-
 src/Noise.cpp                       |   2 +-
 src/OnePole.cpp                     |   2 +-
 src/OneZero.cpp                     |   2 +-
 src/PRCRev.cpp                      |   2 +-
 src/PercFlut.cpp                    |   2 +-
 src/Phonemes.cpp                    |   2 +-
 src/PitShift.cpp                    |   2 +-
 src/PluckTwo.cpp                    |   2 +-
 src/Plucked.cpp                     |   2 +-
 src/PoleZero.cpp                    |   2 +-
 src/Resonate.cpp                    |   2 +-
 src/Rhodey.cpp                      |   2 +-
 src/RtAudio.cpp                     | 967 ++++++++++++++--------------
 src/RtMidi.cpp                      | 115 ++--
 src/RtWvIn.cpp                      |   4 +-
 src/RtWvOut.cpp                     |   4 +-
 src/Sampler.cpp                     |   2 +-
 src/Saxofony.cpp                    |   2 +-
 src/Shakers.cpp                     |   5 +-
 src/Simple.cpp                      |   2 +-
 src/SineWave.cpp                    |   2 +-
 src/SingWave.cpp                    |   2 +-
 src/Sitar.cpp                       |   2 +-
 src/Skini.cpp                       |   3 +-
 src/Socket.cpp                      |   2 +-
 src/Sphere.cpp                      |   2 +-
 src/StifKarp.cpp                    |   2 +-
 src/Stk.cpp                         |   2 +-
 src/TapDelay.cpp                    |   2 +-
 src/TcpClient.cpp                   |   4 +-
 src/TcpServer.cpp                   |   2 +-
 src/Thread.cpp                      |   2 +-
 src/TubeBell.cpp                    |   2 +-
 src/TwoPole.cpp                     |   2 +-
 src/TwoZero.cpp                     |   2 +-
 src/UdpSocket.cpp                   |   4 +-
 src/VoicForm.cpp                    |   4 +-
 src/Voicer.cpp                      |  14 +-
 src/Whistle.cpp                     |   2 +-
 src/Wurley.cpp                      |   2 +-
 221 files changed, 1281 insertions(+), 913 deletions(-)
 create mode 100644 Makefile.in
 create mode 100644 include/LentPitShift.h
 create mode 100755 projects/demo/Banded
 delete mode 100644 projects/examples/test.cpp
 create mode 100644 src/LentPitShift.cpp

diff --git a/INSTALL b/INSTALL
index e273e92..184c283 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
 The Synthesis ToolKit in C++ (STK)
 
-By Perry R. Cook and Gary P. Scavone, 1995-2009.
+By Perry R. Cook and Gary P. Scavone, 1995-2010.
 
 The Synthesis ToolKit in C++ can be used in a variety of ways, depending on your particular needs.  Some people just choose the classes they need for a particular project and copy those to their project directory.  Others like to compile and link to a library of object files.  STK was not designed with one particular style of use in mind.
 
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..0ed4442
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,25 @@
+### Do not edit -- Generated by 'configure --with-whatever' from Makefile.in
+
+all :
+	cd src && $(MAKE)
+	cd projects/demo && $(MAKE) libdemo
+	cd projects/effects && $(MAKE) libeffects
+	cd projects/ragamatic && $(MAKE) libragamat
+	cd projects/examples && $(MAKE) -f libMakefile
+
+clean : 
+	-rm -f *~
+	cd src && $(MAKE) clean
+	cd projects/demo && $(MAKE) clean
+	cd projects/effects && $(MAKE) clean
+	cd projects/ragamatic && $(MAKE) clean
+	cd projects/examples && $(MAKE) clean
+
+distclean: clean
+	-rm -rf config.log config.status autom4te.cache Makefile
+	cd src && $(MAKE) distclean
+	cd projects/demo && $(MAKE) distclean
+	cd projects/effects && $(MAKE) distclean
+	cd projects/ragamatic && $(MAKE) distclean
+	cd projects/examples && $(MAKE) distclean
+
diff --git a/README b/README
index 74e27f8..6584e92 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 The Synthesis ToolKit in C++ (STK)
 
-By Perry R. Cook and Gary P. Scavone, 1995-2009.
+By Perry R. Cook and Gary P. Scavone, 1995-2010.
 
 This distribution of the Synthesis ToolKit in C++ (STK) contains the following:
 
@@ -27,7 +27,7 @@ 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 10 years
+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
@@ -146,7 +146,7 @@ LICENSE:
 STK WWW site: http://ccrma.stanford.edu/software/stk/
 
 The Synthesis ToolKit in C++ (STK)
-Copyright (c) 1995-2009 Perry R. Cook and Gary P. Scavone
+Copyright (c) 1995-2010 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
diff --git a/configure.ac b/configure.ac
index de85421..fa9887f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 AC_INIT(STK, 4.4, gary@music.mcgill.ca, stk)
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_SRCDIR(src/Stk.cpp)
-AC_CONFIG_FILES(src/Makefile projects/demo/Makefile projects/effects/Makefile projects/ragamatic/Makefile projects/examples/Makefile projects/examples/libMakefile)
+AC_CONFIG_FILES(Makefile src/Makefile projects/demo/Makefile projects/effects/Makefile projects/ragamatic/Makefile projects/examples/Makefile projects/examples/libMakefile)
 
 # Fill GXX with something before test.
 AC_SUBST( GXX, ["no"] )
diff --git a/doc/README-Linux.txt b/doc/README-Linux.txt
index 0819a33..e5f2976 100644
--- a/doc/README-Linux.txt
+++ b/doc/README-Linux.txt
@@ -1,6 +1,6 @@
 The Synthesis ToolKit in C++ (STK)
 
-By Perry R. Cook and Gary P. Scavone, 1995-2009.
+By Perry R. Cook and Gary P. Scavone, 1995-2010.
 
 Please read the file README and INSTALL for more general STK information.
 
diff --git a/doc/README-MacOSX.txt b/doc/README-MacOSX.txt
index c78ecb0..c2f4be3 100644
--- a/doc/README-MacOSX.txt
+++ b/doc/README-MacOSX.txt
@@ -1,21 +1,16 @@
 The Synthesis ToolKit in C++ (STK)
 
-By Perry R. Cook and Gary P. Scavone, 1995-2009.
+By Perry R. Cook and Gary P. Scavone, 1995-2010.
 
 Please read the file README and INSTALL for more general STK information.
 
 The default realtime support for Macintosh OS X uses the CoreAudio HAL API and is specified during compilation using the __MACOSX_CORE__ preprocessor definition.  There is also support for the JACK audio server using the __UNIX_JACK__ preprocessor definition.
 
-It is necessary to install the OS X developer kit in order to compile STK.  STK was successfully tested on OS X versions 10.5.
-
-The internal Macintosh audio hardware typically supports a sample rate of 44100 Hz only.  The default STK sample rate is now 44100 Hz and all current example programs use this rate.  However, it is possible to manually override this value in some programs from the command-line.  The default sample rate is set in Stk.h.  In addition, the RT_BUFFER_SIZE, specified in Stk.h, could be increased (to a higher power of two) for more robust performance.
-
-There is a potential conflict between the STK Delay class and a Delay() function declared in OSUtils.h (which is included via <CoreServices/CoreServices.h>).  In general, this conflict can be avoided via the use of a namespace (an explicit Delay::Delay declaration), though this made the Windows Visual C++ compiler barf.  If you use STK classes within a project that includes the OSUtils.h file, you will likely need to make changes in STK classes that use the Delay class.
-
+It is necessary to install the OS X developer kit in order to compile STK.  STK was successfully tested on OS X versions 10.6.
 
 Tcl/Tk on OS X:
 
-The tcl/tk interpreter does not ship by default with OS X, but must be downloaded from the internet.  The latest Tcl/Tk Aqua distribution (http://www.apple.com/downloads/macosx/unix_open_source/tcltk.html) has been successfully tested on 10.2 and 10.3 systems.  The default installation will place a link to the wish interpretor at /usr/bin/wish.
+I think that tcl/tk interpreter is now included in the XCode package, since I haven't had to download it for several years now.
 
 It appears that socket support in Tcl/Tk on OS X uses the Nagle algorithm, which produces poor response between changes made in the tcl/tk script and the resulting audio updates.  Note that this is only a problem when using a socket connection from a Tcl/Tk script.
 
diff --git a/doc/README-NeXT.txt b/doc/README-NeXT.txt
index e9f2c7f..2f8d114 100644
--- a/doc/README-NeXT.txt
+++ b/doc/README-NeXT.txt
@@ -1,6 +1,6 @@
 The Synthesis ToolKit in C++ (STK)
 
-By Perry R. Cook and Gary P. Scavone, 1995-2009.
+By Perry R. Cook and Gary P. Scavone, 1995-2010.
 
 Please read the file README and INSTALL for more general STK information.
 
diff --git a/doc/README-SGI.txt b/doc/README-SGI.txt
index 2031c64..9e74c29 100644
--- a/doc/README-SGI.txt
+++ b/doc/README-SGI.txt
@@ -1,6 +1,6 @@
 The Synthesis ToolKit in C++ (STK)
 
-By Perry R. Cook and Gary P. Scavone, 1995-2009.
+By Perry R. Cook and Gary P. Scavone, 1995-2010.
 
 Please read the file README and INSTALL for more general STK information.
 
diff --git a/doc/README-Win.txt b/doc/README-Win.txt
index 442835c..c65832a 100644
--- a/doc/README-Win.txt
+++ b/doc/README-Win.txt
@@ -1,15 +1,15 @@
 The Synthesis ToolKit in C++ (STK)
 
-By Perry R. Cook and Gary P. Scavone, 1995-2009.
+By Perry R. Cook and Gary P. Scavone, 1995-2010.
 
 Please read the file README for more general STK information.
 
 DirectX and WindowsNT Issues:
 -----------------------------
 
-STK is currently distributed with Visual C++ .NET project and workspace files.  It no longer compiles with Visual C++ 6.0.  I gave up attempting to fix all the problems created by such a bad compiler.  This version of STK has been tested using Visual C++ .NET.  As well, the configure script now supprots MinGW.
+STK is currently distributed with Visual C++ .NET project and workspace files.  It no longer compiles with Visual C++ 6.0.  I gave up attempting to fix all the problems created by such a bad compiler.  This version of STK has been tested using Visual C++ .NET.  As well, the configure script now supports MinGW.
 
-IMPORTANT VC++ NOTE: When compiling "release" versions of STK programs, link to the release multithreaded library.  When compiling "debug" versions, link to the debug multithreaded library.  Compiler errors will result otherwise.  Also, the Microsoft folk are up to their old habits of trying to change standards.  The .NET compiler will complain about cerr for some reason.
+IMPORTANT VC++ NOTE: When compiling "release" versions of STK programs, link to the release multithreaded library.  When compiling "debug" versions, link to the debug multithreaded library.  Compiler errors will result otherwise.
 
 Both the DirectSound and Steinberg ASIO audio APIs are supported for realtime audio input/output.  The Visual C++ project files included with this distribution are configured to use the DirectSound API.  In order to use the ASIO API, it is necessary to change the preprocessor definition from __WINDOWS_DS__ to __WINDOWS_ASIO__, as well as include all the files in the /src/include/ directory (i.e. asio.h, asio.cpp, ...).  If you have a good quality soundcard and a native ASIO driver (not emulated), you are likely to get much better input/output response using that.
 
@@ -45,21 +45,6 @@ WINDOWS XP/2000:
 There is a big advantage in using Windows XP/2000 over 95/98 with STK in that piping works, just as under unix.  Also, the scheduler in 2000/XP seems to be much better, so socketed messages don't get clumped together like they do in Windows 95/98.  Simply fire up a script file (ex. StkDemo.bat) by either double-clicking on it or typing it within a shell.
 
 
-WINDOWS 95/98:
-
-PLAY SKINI SCOREFILES IN REALTIME:
-
-	demo Clarinet -or -if scores/streetsf.ski
-
-USE TCL/TK GUIs FOR REALTIME CONTROL:
-
-1. Open a DOS console window and start syntmono (eg. demo Clarinet -or -is).
-
-2. Double click on a Tcl/Tk file in the tcl/ subdirectory of the demo directory (eg. Demo.tcl) from the Windows Explorer to start the GUI.  Select the "communications" menu item and "Socket" and make the connection.
-
-3. Start moving the sliders to control the instrument.
-
-
 USE REALTIME MIDI INPUT FOR CONTROL:
 
 1. Open a DOS console window and start syntmono with MIDI input (eg. demo Clarinet -or -im).
@@ -67,8 +52,3 @@ USE REALTIME MIDI INPUT FOR CONTROL:
    This assumes you already have MIDI setup correctly for your computer.
 
 
-WINDOWS NT ONLY:
-
-Realtime piping seems to work under WindowsNT in much the same way as on Unix platforms.  Thus, it is possible to pipe realtime control data to syntmono under WindowsNT as well.  Note, however, that the DirectSoundCapture API does not exist for WindowsNT, so it is necessary to use an ASIO audio driver and the STK ASIO support.
-
-
diff --git a/doc/ReleaseNotes.txt b/doc/ReleaseNotes.txt
index f8ce588..63e714f 100644
--- a/doc/ReleaseNotes.txt
+++ b/doc/ReleaseNotes.txt
@@ -1,14 +1,23 @@
 The Synthesis ToolKit in C++ (STK)
 
-By Perry R. Cook and Gary P. Scavone, 1995-2009.
+By Perry R. Cook and Gary P. Scavone, 1995-2010.
 
-v4.4.1: (3 June 2009)
+v4.4.2: (4 February 2010)
+- added various header file includes for newer compilers
+- new LentPitShift class (thanks to Francois Germain)
+- added "addTo" function to Delay class
+- updates to RtAudio and RtMidi
+- bug fixes in Voicer class (thanks Richard Dobson!)
+- bug fixes in Granulate class
+- added Makefile.in to compile library and all projects, as well as clean and distclean all
+
+v4.4.1: (3 June 2010)
 - added multi-channel/frame tick() virtual function to WvIn and WvOut abstract base classes (required update to RtWvOut class)
 - updated configure script to select g++ compiler by default
 - in demo.cpp: removed voicer grouping for messages, fixing polyphony when messages are on the same MIDI/SKINI channel
 - updates to RtAudio and RtMidi
 
-v4.4: (30 April 2009)
+v4.4: (30 April 2010)
 - all classes embedded in the "stk" namespace (except RtAudio, RtMidi, and RtError)
 - class WaveLoop renamed FileLoop
 - significant efficiency improvements via code restructuring and inlining
diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile
index 47fbc0a..8a94e93 100644
--- a/doc/doxygen/Doxyfile
+++ b/doc/doxygen/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = STK
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 4.4.1
+PROJECT_NUMBER         = 4.4.2
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/doc/doxygen/download.txt b/doc/doxygen/download.txt
index 55a67dd..38eceee 100644
--- a/doc/doxygen/download.txt
+++ b/doc/doxygen/download.txt
@@ -1,14 +1,24 @@
 /*! \page download Download, Release Notes, and Bug Fixes
 
-\section down Download Version 4.4.1 (3 June 2009):
+\section down Download Version 4.4.2 (4 February 2010):
 
 <UL>
-<LI><A HREF="http://ccrma.stanford.edu/software/stk/release/stk-4.4.1.tar.gz">Source distribution</A></LI>
+<LI><A HREF="http://ccrma.stanford.edu/software/stk/release/stk-4.4.2.tar.gz">Source distribution</A></LI>
 </UL>
 
 
 \section notes Release Notes:
 
+\subsection v4dot4dot2 Version 4.4.2
+
+<ul>
+<li>Added various header file includes for newer compilers.</li>
+<li>Updates to RtAudio and RtMidi.</li>
+<li>New LentPitShift class (thanks to Francois Germain).</li>
+<li>Bug fixes in Voicer class (thanks Richard Dobson!).</li>
+<li>Added Makefile.in to compile library and all projects, as well as clean and distclean.</li>
+</ul>
+
 \subsection v4dot4dot1 Version 4.4.1
 
 <ul>
diff --git a/doc/doxygen/faq.txt b/doc/doxygen/faq.txt
index a6832b4..0e1cc35 100644
--- a/doc/doxygen/faq.txt
+++ b/doc/doxygen/faq.txt
@@ -24,7 +24,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-2009 Perry R. Cook and Gary P. Scavone
+Copyright (c) 1995-2010 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
diff --git a/doc/doxygen/footer.html b/doc/doxygen/footer.html
index 5f78789..01f9019 100644
--- a/doc/doxygen/footer.html
+++ b/doc/doxygen/footer.html
@@ -2,7 +2,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-2009 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
+  <tr><td>&copy;1995-2010 Perry R. Cook and Gary P. Scavone. All Rights Reserved.</td></tr>
 </table>
 
 </BODY>
diff --git a/doc/hierarchy.txt b/doc/hierarchy.txt
index 9e760ef..593436f 100644
--- a/doc/hierarchy.txt
+++ b/doc/hierarchy.txt
@@ -1,6 +1,6 @@
 STK: A ToolKit of Audio Synthesis Classes and Instruments in C++
 
-By Perry R. Cook and Gary P. Scavone, 1995-2009.
+By Perry R. Cook and Gary P. Scavone, 1995-2010.
 
 STK Classes - See the HTML documentation in the html directory for complete information.
 
diff --git a/include/ADSR.h b/include/ADSR.h
index afa6040..de6cb02 100644
--- a/include/ADSR.h
+++ b/include/ADSR.h
@@ -14,7 +14,7 @@ namespace stk {
     messages, keeping track of its state.  The \e state = ADSR::DONE
     after the envelope value reaches 0.0 in the ADSR::RELEASE state.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Asymp.h b/include/Asymp.h
index 3a04707..648f2b6 100644
--- a/include/Asymp.h
+++ b/include/Asymp.h
@@ -26,7 +26,7 @@ namespace stk {
     to \e keyOn and \e keyOff messages by ramping to
     1.0 on keyOn and to 0.0 on keyOff.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/BeeThree.h b/include/BeeThree.h
index b1dfdec..8fa9e37 100644
--- a/include/BeeThree.h
+++ b/include/BeeThree.h
@@ -35,7 +35,7 @@ namespace stk {
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/BiQuad.h b/include/BiQuad.h
index c4640de..19cf61c 100644
--- a/include/BiQuad.h
+++ b/include/BiQuad.h
@@ -13,7 +13,7 @@ namespace stk {
     Methods are provided for creating a resonance or notch in the
     frequency response while maintaining a constant filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/BlowBotl.h b/include/BlowBotl.h
index 306cd43..237a695 100644
--- a/include/BlowBotl.h
+++ b/include/BlowBotl.h
@@ -25,7 +25,7 @@ namespace stk {
        - Vibrato Gain = 1
        - Volume = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/BlowHole.h b/include/BlowHole.h
index c6e75f0..53ac9be 100644
--- a/include/BlowHole.h
+++ b/include/BlowHole.h
@@ -43,7 +43,7 @@ namespace stk {
        - Register State = 1
        - Breath Pressure = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/BowTable.h b/include/BowTable.h
index edf63a9..316bfa7 100644
--- a/include/BowTable.h
+++ b/include/BowTable.h
@@ -13,7 +13,7 @@ namespace stk {
     This class implements a simple bowed string
     non-linear function, as described by Smith (1986).
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Bowed.h b/include/Bowed.h
index b0b0fba..4d36967 100644
--- a/include/Bowed.h
+++ b/include/Bowed.h
@@ -30,7 +30,7 @@ namespace stk {
        - Vibrato Gain = 1
        - Volume = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Brass.h b/include/Brass.h
index 76633d1..1892c73 100644
--- a/include/Brass.h
+++ b/include/Brass.h
@@ -28,7 +28,7 @@ namespace stk {
        - Vibrato Gain = 1
        - Volume = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Chorus.h b/include/Chorus.h
index cab498a..5258cca 100644
--- a/include/Chorus.h
+++ b/include/Chorus.h
@@ -14,7 +14,7 @@ namespace stk {
     This class implements a chorus effect.  It takes a monophonic
     input signal and produces a stereo output signal.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Clarinet.h b/include/Clarinet.h
index 6112045..899055d 100644
--- a/include/Clarinet.h
+++ b/include/Clarinet.h
@@ -31,7 +31,7 @@ namespace stk {
        - Vibrato Gain = 1
        - Breath Pressure = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Delay.h b/include/Delay.h
index 535b742..33f4644 100644
--- a/include/Delay.h
+++ b/include/Delay.h
@@ -17,7 +17,7 @@ namespace stk {
     A non-interpolating delay line is typically used in fixed
     delay-length applications, such as for reverberation.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
@@ -63,6 +63,14 @@ public:
   */
   StkFloat contentsAt( unsigned long tapDelay );
 
+  //! Sum the provided value into the delay line at \e tapDelay samples from the input.
+  /*!
+    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).
+  */
+  StkFloat addTo( unsigned long tapDelay, StkFloat value );
+
   //! Return the last computed output value.
   StkFloat lastOut( void ) const { return lastFrame_[0]; };
 
diff --git a/include/DelayA.h b/include/DelayA.h
index f75842b..f092152 100644
--- a/include/DelayA.h
+++ b/include/DelayA.h
@@ -21,7 +21,7 @@ namespace stk {
     minimum delay possible in this implementation is limited to a
     value of 0.5.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/DelayL.h b/include/DelayL.h
index 77150a7..e7d45d4 100644
--- a/include/DelayL.h
+++ b/include/DelayL.h
@@ -20,7 +20,7 @@ namespace stk {
     delay setting.  The use of higher order Lagrange interpolators can
     typically improve (minimize) this attenuation characteristic.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Drummer.h b/include/Drummer.h
index 9ab9086..4ea2688 100644
--- a/include/Drummer.h
+++ b/include/Drummer.h
@@ -20,7 +20,7 @@ namespace stk {
     of simultaneous voices) via a #define in the
     Drummer.h.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Echo.h b/include/Echo.h
index 2f57f45..473bd40 100644
--- a/include/Echo.h
+++ b/include/Echo.h
@@ -12,7 +12,7 @@ namespace stk {
 
     This class implements an echo effect.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Effect.h b/include/Effect.h
index e4c098b..acae6a9 100644
--- a/include/Effect.h
+++ b/include/Effect.h
@@ -14,7 +14,7 @@ namespace stk {
     subclasses.  It is general enough to support both monophonic and
     polyphonic input/output classes.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Envelope.h b/include/Envelope.h
index 7530dd2..358a7e8 100644
--- a/include/Envelope.h
+++ b/include/Envelope.h
@@ -14,7 +14,7 @@ namespace stk {
     specified \e rate.  It also responds to simple \e keyOn and \e
     keyOff messages, ramping to 1.0 on keyOn and to 0.0 on keyOff.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/FM.h b/include/FM.h
index 93f1a5f..eb2e156 100644
--- a/include/FM.h
+++ b/include/FM.h
@@ -30,7 +30,7 @@ namespace stk {
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/FMVoices.h b/include/FMVoices.h
index a25583a..5f5416e 100644
--- a/include/FMVoices.h
+++ b/include/FMVoices.h
@@ -33,7 +33,7 @@ namespace stk {
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/FileLoop.h b/include/FileLoop.h
index 0050070..e93011a 100644
--- a/include/FileLoop.h
+++ b/include/FileLoop.h
@@ -19,7 +19,7 @@ namespace stk {
     the overloaded one that takes an StkFrames object for
     multi-channel and/or multi-frame data.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/FileRead.h b/include/FileRead.h
index 7bf8414..967572d 100644
--- a/include/FileRead.h
+++ b/include/FileRead.h
@@ -32,7 +32,7 @@ namespace stk {
     filling a matrix row.  The sample rate for
     MAT-files is assumed to be 44100 Hz.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/FileWrite.h b/include/FileWrite.h
index 663f852..1692216 100644
--- a/include/FileWrite.h
+++ b/include/FileWrite.h
@@ -24,7 +24,7 @@ namespace stk {
     type, the data type will automatically be modified.  Compressed
     data types are not supported.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/FileWvIn.h b/include/FileWvIn.h
index dc0caab..64b782b 100644
--- a/include/FileWvIn.h
+++ b/include/FileWvIn.h
@@ -35,7 +35,7 @@ namespace stk {
     See the FileRead class for a description of the supported audio
     file formats.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/FileWvOut.h b/include/FileWvOut.h
index eed517f..e6bf5ae 100644
--- a/include/FileWvOut.h
+++ b/include/FileWvOut.h
@@ -25,7 +25,7 @@ namespace stk {
     Currently, FileWvOut is non-interpolating and the output rate is
     always Stk::sampleRate().
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Filter.h b/include/Filter.h
index 76403f0..79963de 100644
--- a/include/Filter.h
+++ b/include/Filter.h
@@ -14,7 +14,7 @@ namespace stk {
     filter subclasses.  It is general enough to support both
     monophonic and polyphonic input/output classes.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Fir.h b/include/Fir.h
index b33637d..c68dde4 100644
--- a/include/Fir.h
+++ b/include/Fir.h
@@ -23,7 +23,7 @@ namespace stk {
     This structure results in one extra multiply per computed sample,
     but allows easy control of the overall filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Flute.h b/include/Flute.h
index fb4d904..ca7549d 100644
--- a/include/Flute.h
+++ b/include/Flute.h
@@ -32,7 +32,7 @@ namespace stk {
        - Vibrato Gain = 1
        - Breath Pressure = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/FormSwep.h b/include/FormSwep.h
index 905d3db..6155425 100644
--- a/include/FormSwep.h
+++ b/include/FormSwep.h
@@ -13,7 +13,7 @@ namespace stk {
     over time from one frequency setting to another.  It provides
     methods for controlling the sweep rate and target frequency.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Function.h b/include/Function.h
index 12257e8..6ee2ebc 100644
--- a/include/Function.h
+++ b/include/Function.h
@@ -13,7 +13,7 @@ namespace stk {
     implement tables or other types of input to output function
     mappings.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Generator.h b/include/Generator.h
index 45c6838..0256ede 100644
--- a/include/Generator.h
+++ b/include/Generator.h
@@ -13,7 +13,7 @@ namespace stk {
     generator sample-source subclasses.  It is general enough to
     support both monophonic and polyphonic output classes.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Granulate.h b/include/Granulate.h
index 02239d3..afbb701 100644
--- a/include/Granulate.h
+++ b/include/Granulate.h
@@ -21,7 +21,7 @@ namespace stk {
     Chris Rolfe and Damian Keller, though there are likely to be a
     number of differences in the actual implementation.
 
-    by Gary Scavone, 2005 - 2009.
+    by Gary Scavone, 2005 - 2010.
 */
 /***************************************************/
 
@@ -139,7 +139,8 @@ class Granulate: public Generator
     unsigned long decayCount;
     unsigned long delayCount;
     unsigned long counter;
-    unsigned long pointer;
+    //unsigned long pointer;
+    StkFloat pointer;
     unsigned long startPointer;
     unsigned int repeats;
     GrainState state;
@@ -155,7 +156,8 @@ class Granulate: public Generator
   StkFrames data_;
   std::vector<Grain> grains_;
   Noise noise;
-  long gPointer_;
+  //long gPointer_;
+  StkFloat gPointer_;
 
   // Global grain parameters.
   unsigned int gDuration_;
diff --git a/include/HevyMetl.h b/include/HevyMetl.h
index 8bbda78..b16a9d6 100644
--- a/include/HevyMetl.h
+++ b/include/HevyMetl.h
@@ -31,7 +31,7 @@ namespace stk {
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Iir.h b/include/Iir.h
index f349cc7..28f9b47 100644
--- a/include/Iir.h
+++ b/include/Iir.h
@@ -27,7 +27,7 @@ namespace stk {
     This structure results in one extra multiply per computed sample,
     but allows easy control of the overall filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/InetWvIn.h b/include/InetWvIn.h
index 71c10c3..8a6d256 100644
--- a/include/InetWvIn.h
+++ b/include/InetWvIn.h
@@ -31,7 +31,7 @@ namespace stk {
     data type for the incoming stream is signed 16-bit integers,
     though any of the defined StkFormats are permissible.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/InetWvOut.h b/include/InetWvOut.h
index fe4b996..cf10786 100644
--- a/include/InetWvOut.h
+++ b/include/InetWvOut.h
@@ -25,7 +25,7 @@ namespace stk {
     data type is signed 16-bit integers but any of the defined
     StkFormats are permissible.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Instrmnt.h b/include/Instrmnt.h
index ecec1ca..6887b60 100644
--- a/include/Instrmnt.h
+++ b/include/Instrmnt.h
@@ -12,7 +12,7 @@ namespace stk {
   This class provides a common interface for
   all STK instruments.
 
-  by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+  by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/JCRev.h b/include/JCRev.h
index 65ef97c..659e6e8 100644
--- a/include/JCRev.h
+++ b/include/JCRev.h
@@ -17,7 +17,7 @@ namespace stk {
     followed by four parallel comb filters, and two decorrelation
     delay lines in parallel at the output.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/JetTable.h b/include/JetTable.h
index 8059595..73acc57 100644
--- a/include/JetTable.h
+++ b/include/JetTable.h
@@ -16,7 +16,7 @@ namespace stk {
     Consult Fletcher and Rossing, Karjalainen,
     Cook, and others for more information.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/LentPitShift.h b/include/LentPitShift.h
new file mode 100644
index 0000000..f2a535f
--- /dev/null
+++ b/include/LentPitShift.h
@@ -0,0 +1,267 @@
+#ifndef STK_LENLentPitShift_H
+#define STK_LENLentPitShift_H
+
+#include "Effect.h"
+#include "Delay.h"
+
+namespace stk {
+
+/***************************************************/
+/*! \class LentPitShift
+    \brief Pitch shifter effect class based on the Lent algorithm.
+
+    This class implements a pitch shifter using pitch 
+    tracking and sample windowing and shifting.
+
+    by Francois Germain, 2009.
+*/
+/***************************************************/
+
+class LentPitShift : public Effect
+{
+ public:
+  //! Class constructor.
+  LentPitShift( StkFloat periodRatio = 1.0, int tMax = RT_BUFFER_SIZE );
+
+  ~LentPitShift( void ) {
+    delete window;
+    window = NULL;
+    delete dt;
+    dt = NULL;
+    delete dpt;
+    dpt = NULL;
+    delete cumDt;
+    cumDt = NULL;
+  }
+
+  //! Reset and clear all internal state.
+  void clear( void );
+
+  //! Set the pitch shift factor (1.0 produces no shift).
+  void setShift( StkFloat shift );
+
+  //! Input one sample to the filter and return one output.
+  StkFloat tick( StkFloat input );
+
+  //! Take a channel of the StkFrames object as inputs to the filter and replace with corresponding outputs.
+  /*!
+    The StkFrames argument reference is returned.  The \c channel
+    argument must be less than the number of channels in the
+    StkFrames 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 StkError exception.
+  */
+  StkFrames& tick( StkFrames& frames, unsigned int channel = 0 );
+
+  //! Take a channel of the \c iFrames object as inputs to the filter and write outputs to the \c oFrames object.
+  /*!
+    The \c iFrames object reference is returned.  Each channel
+    argument must be less than the number of channels in the
+    corresponding StkFrames 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 StkError exception.
+  */
+  StkFrames& tick( StkFrames& iFrames, StkFrames &oFrames, unsigned int iChannel = 0, unsigned int oChannel = 0 );
+
+ protected:
+
+  //! Apply the effect on the input samples and store it.
+  /*!
+    The samples stored in the input frame vector are processed
+    and the delayed result are stored in the output frame vector
+  */
+  void process( );
+
+  // Frame storage vectors for process function
+  StkFrames inputFrames;
+  StkFrames outputFrames;
+  int ptrFrames;          // writing pointer
+
+  // Input delay line
+  Delay inputLine_;
+  int inputPtr;
+
+  // Output delay line
+  Delay outputLine_;
+  double outputPtr;
+
+  // Pitch tracker variables
+  unsigned long tMax_;    // Maximal period measurable by the pitch tracker.
+  // It is also the size of the window used by the pitch tracker and
+  // the size of the frames that can be computed by the tick function
+
+  StkFloat threshold_; // Threshold of detection for the pitch tracker
+  unsigned long lastPeriod_;    // Result of the last pitch tracking loop
+  StkFloat* dt;        // Array containing the euclidian distance coefficients
+  StkFloat* cumDt;     // Array containing the cumulative sum of the coefficients in dt
+  StkFloat* dpt;       // Array containing the pitch tracking function coefficients
+
+  // Pitch shifter variables
+  StkFloat env[2];     // Coefficients for the linear interpolation when modifying the output samples
+  StkFloat* window;    // Hamming window used for the input portion extraction
+  double periodRatio_; // Ratio of modification of the signal period
+  StkFrames zeroFrame; // Frame of tMax_ zero samples
+
+
+  // Coefficient delay line that could be used for a dynamic calculation of the pitch
+  //Delay* coeffLine_;
+
+};
+
+inline void LentPitShift::process()
+{
+  StkFloat x_t;    // input coefficient
+  StkFloat x_t_T;  // previous input coefficient at T samples
+  StkFloat coeff;  // new coefficient for the difference function
+
+  int alternativePitch = tMax_;  // Global minimum storage
+  lastPeriod_ = tMax_+1;         // Storage of the lowest local minimum under the threshold
+
+  // Loop variables
+  unsigned long delay_;
+  unsigned int n;
+
+  // Initialization of the dt coefficients.  Since the
+  // frames are of tMax_ length, there is no overlapping
+  // between the successive windows where pitch tracking
+  // is performed.
+  for ( delay_=1; delay_<=tMax_; delay_++ )
+    dt[delay_] = 0.;
+
+  // Calculation of the dt coefficients and update of the input delay line.
+  for ( n=0; n<inputFrames.size(); n++ ) {
+    x_t = inputLine_.tick( inputFrames[ n ] );
+    for ( delay_=1; delay_<= tMax_; delay_++ ) {
+      x_t_T = inputLine_.contentsAt( delay_ );
+      coeff = x_t - x_t_T;
+      dt[delay_] += coeff * coeff;
+    }
+  }
+
+  // Calculation of the pitch tracking function and test for the minima.
+  for ( delay_=1; delay_<=tMax_; delay_++ ) {
+    cumDt[delay_] = dt[delay_] + cumDt[delay_-1];
+    dpt[delay_] = dt[delay_] * delay_ / cumDt[delay_];
+
+    // Look for a minimum
+    if ( dpt[delay_-1]-dpt[delay_-2] < 0 && dpt[delay_]-dpt[delay_-1] > 0 ) {
+      // Check if the minimum is under the threshold
+      if ( dpt[delay_-1] < threshold_ ){
+        lastPeriod_ = delay_-1;
+        // If a minimum is found, we can stop the loop
+        break;
+      }
+      else if ( dpt[alternativePitch] > dpt[delay_-1] )
+        // Otherwise we store it if it is the current global minimum
+        alternativePitch = delay_-1;
+    }
+  }
+
+  // Test for the last period length.
+  if ( dpt[delay_]-dpt[delay_-1] < 0 ) {
+    if ( dpt[delay_] < threshold_ )
+      lastPeriod_ = delay_;
+    else if ( dpt[alternativePitch] > dpt[delay_] )
+      alternativePitch = delay_;
+  }
+
+  if ( lastPeriod_ == tMax_+1 )
+    // No period has been under the threshold so we used the global minimum
+    lastPeriod_ = alternativePitch;
+
+  // We put the new zero output coefficients in the output delay line and 
+  // we get the previous calculated coefficients
+  outputLine_.tick( zeroFrame, outputFrames );
+
+  // Initialization of the Hamming window used in the algorithm
+  for ( int n=-(int)lastPeriod_; n<(int)lastPeriod_; n++ )
+    window[n+lastPeriod_] = (1 + cos(PI*n/lastPeriod_)) / 2	;
+
+  int M;  // Index of reading in the input delay line
+  int N;  // Index of writing in the output delay line
+  double sample;  // Temporary storage for the new coefficient
+
+  // We loop for all the frames of length lastPeriod_ presents between inputPtr and tMax_
+  for ( ; inputPtr<(int)(tMax_-lastPeriod_); inputPtr+=lastPeriod_ ) {
+    // Test for the decision of compression/expansion
+    while ( outputPtr < inputPtr ) {
+      // Coefficients for the linear interpolation
+      env[1] = fmod( outputPtr + tMax_, 1.0 );
+      env[0] = 1.0 - env[1];
+      M = tMax_ - inputPtr + lastPeriod_ - 1; // New reading pointer
+      N = 2*tMax_ - (unsigned long)floor(outputPtr + tMax_) + lastPeriod_ - 1; // New writing pointer
+      for ( unsigned int j=0; j<2*lastPeriod_; j++,M--,N-- ) {
+        sample = inputLine_.contentsAt(M) * window[j] / 2.;
+        // Linear interpolation
+        outputLine_.addTo(N, env[0] * sample);
+        outputLine_.addTo(N-1, env[1] * sample);
+      }
+      outputPtr = outputPtr + lastPeriod_ * periodRatio_; // new output pointer
+    }
+  }
+  // Shifting of the pointers waiting for the new frame of length tMax_.
+  outputPtr -= tMax_;
+  inputPtr  -= tMax_;
+}
+
+
+inline StkFloat LentPitShift :: tick( StkFloat input )
+{
+  StkFloat sample;
+
+  inputFrames[ptrFrames] = input;
+
+  sample = outputFrames[ptrFrames++];
+
+  // Check for end condition
+  if ( ptrFrames == (int) inputFrames.size() ){
+    ptrFrames = 0;
+    process( );
+  }
+
+  return sample;
+}
+
+inline StkFrames& LentPitShift :: tick( StkFrames& frames, unsigned int channel )
+{
+#if defined(_STK_DEBUG_)
+  if ( channel >= frames.channels() ) {
+    errorString_ << "LentPitShift::tick(): channel and StkFrames arguments are incompatible!";
+    handleError( StkError::FUNCTION_ARGUMENT );
+  }
+#endif
+
+  StkFloat *samples = &frames[channel];
+  unsigned int hop = frames.channels();
+  for ( unsigned int i=0; i<frames.frames(); i++, samples += hop ) {
+    *samples = tick( *samples );
+  }
+
+  return frames;
+}
+
+inline StkFrames& LentPitShift :: tick( StkFrames& iFrames, StkFrames& oFrames, unsigned int iChannel, unsigned int oChannel )
+{
+#if defined(_STK_DEBUG_)
+  if ( iChannel >= iFrames.channels() || oChannel >= oFrames.channels() ) {
+    errorString_ << "LentPitShift::tick(): channel and StkFrames arguments are incompatible!";
+    handleError( StkError::FUNCTION_ARGUMENT );
+  }
+#endif
+
+  StkFloat *iSamples = &iFrames[iChannel];
+  StkFloat *oSamples = &oFrames[oChannel];
+  unsigned int iHop = iFrames.channels(), oHop = oFrames.channels();
+  for ( unsigned int i=0; i<iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+    *oSamples = tick( *iSamples );
+  }
+
+  return iFrames;
+}
+
+} // stk namespace
+
+#endif
+
diff --git a/include/Mandolin.h b/include/Mandolin.h
index 9ceabe4..9a0af95 100644
--- a/include/Mandolin.h
+++ b/include/Mandolin.h
@@ -31,7 +31,7 @@ namespace stk {
        - String Detuning = 1
        - Microphone Position = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Messager.h b/include/Messager.h
index 1a16db8..a6fa0e4 100644
--- a/include/Messager.h
+++ b/include/Messager.h
@@ -46,7 +46,7 @@ namespace stk {
     This class is primarily for use in STK example programs but it is
     generic enough to work in many other contexts.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/MidiFileIn.h b/include/MidiFileIn.h
index 218bf2a..9758a12 100644
--- a/include/MidiFileIn.h
+++ b/include/MidiFileIn.h
@@ -22,7 +22,7 @@ namespace stk {
     Tempo changes are internally tracked by the class and reflected in
     the values returned by the function getTickSeconds().
 
-    by Gary P. Scavone, 2003 - 2009.
+    by Gary P. Scavone, 2003 - 2010.
 */
 /**********************************************************************/
 
diff --git a/include/Modal.h b/include/Modal.h
index 77ead48..eba0008 100644
--- a/include/Modal.h
+++ b/include/Modal.h
@@ -19,7 +19,7 @@ namespace stk {
     (non-sweeping BiQuad filters), where N is set
     during instantiation.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/ModalBar.h b/include/ModalBar.h
index 7c9dd24..a61cee8 100644
--- a/include/ModalBar.h
+++ b/include/ModalBar.h
@@ -31,7 +31,7 @@ namespace stk {
          - Two Fixed = 7
          - Clump = 8
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Modulate.h b/include/Modulate.h
index 7429985..1b77c9c 100644
--- a/include/Modulate.h
+++ b/include/Modulate.h
@@ -16,7 +16,7 @@ namespace stk {
     modulations to give a nice, natural human
     modulation function.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Moog.h b/include/Moog.h
index ebeccc7..6f6053a 100644
--- a/include/Moog.h
+++ b/include/Moog.h
@@ -22,7 +22,7 @@ namespace stk {
        - Vibrato Gain = 1
        - Gain = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Mutex.h b/include/Mutex.h
index 7f40c6d..57ec712 100644
--- a/include/Mutex.h
+++ b/include/Mutex.h
@@ -29,7 +29,7 @@ namespace stk {
     systems, the pthread library is used. Under
     Windows, critical sections are used.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/NRev.h b/include/NRev.h
index f2d68df..43933d1 100644
--- a/include/NRev.h
+++ b/include/NRev.h
@@ -18,7 +18,7 @@ namespace stk {
     another allpass in series, followed by two allpass filters in
     parallel with corresponding right and left outputs.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Noise.h b/include/Noise.h
index 135bd32..12ecc18 100644
--- a/include/Noise.h
+++ b/include/Noise.h
@@ -13,7 +13,7 @@ namespace stk {
     C rand() function.  The quality of the rand()
     function varies from one OS to another.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/OnePole.h b/include/OnePole.h
index b71d2b5..3ca838f 100644
--- a/include/OnePole.h
+++ b/include/OnePole.h
@@ -13,7 +13,7 @@ namespace stk {
     provided for setting the pole position along the real axis of the
     z-plane while maintaining a constant peak filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/OneZero.h b/include/OneZero.h
index 2fd61db..b3d0aaf 100644
--- a/include/OneZero.h
+++ b/include/OneZero.h
@@ -13,7 +13,7 @@ namespace stk {
   provided for setting the zero position along the real axis of the
   z-plane while maintaining a constant filter gain.
 
-  by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+  by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/PRCRev.h b/include/PRCRev.h
index ac46575..3a0324a 100644
--- a/include/PRCRev.h
+++ b/include/PRCRev.h
@@ -17,7 +17,7 @@ namespace stk {
     allpass and comb delay filters.  This class implements two series
     allpass units and two parallel comb filters.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/PercFlut.h b/include/PercFlut.h
index 8ddc7f8..326d55c 100644
--- a/include/PercFlut.h
+++ b/include/PercFlut.h
@@ -29,7 +29,7 @@ namespace stk {
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Phonemes.h b/include/Phonemes.h
index 94a0214..9b7a084 100644
--- a/include/Phonemes.h
+++ b/include/Phonemes.h
@@ -13,7 +13,7 @@ namespace stk {
     set of 32 static phoneme formant parameters
     and provide access to those values.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/PitShift.h b/include/PitShift.h
index ab6b63f..a1551a2 100644
--- a/include/PitShift.h
+++ b/include/PitShift.h
@@ -13,7 +13,7 @@ namespace stk {
     This class implements a simple pitch shifter
     using delay lines.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/PluckTwo.h b/include/PluckTwo.h
index 95616ac..d39fe6a 100644
--- a/include/PluckTwo.h
+++ b/include/PluckTwo.h
@@ -24,7 +24,7 @@ namespace stk {
     use possibly subject to patents held by
     Stanford University, Yamaha, and others.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Plucked.h b/include/Plucked.h
index c081883..ec3860b 100644
--- a/include/Plucked.h
+++ b/include/Plucked.h
@@ -24,7 +24,7 @@ namespace stk {
     Stanford, bearing the names of Karplus and/or
     Strong.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/PoleZero.h b/include/PoleZero.h
index a064a87..b0299b1 100644
--- a/include/PoleZero.h
+++ b/include/PoleZero.h
@@ -14,7 +14,7 @@ namespace stk {
     coefficient.  Another method is provided to create a DC blocking
     filter.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/ReedTable.h b/include/ReedTable.h
index 777c58c..c4bdaef 100644
--- a/include/ReedTable.h
+++ b/include/ReedTable.h
@@ -20,7 +20,7 @@ namespace stk {
     Smith (1986), Hirschman, Cook, Scavone, and
     others for more information.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Resonate.h b/include/Resonate.h
index 4152ad8..0627eb1 100644
--- a/include/Resonate.h
+++ b/include/Resonate.h
@@ -23,7 +23,7 @@ namespace stk {
        - Zero Radii = 1
        - Envelope Gain = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Rhodey.h b/include/Rhodey.h
index 9f845cb..dce9f8e 100644
--- a/include/Rhodey.h
+++ b/include/Rhodey.h
@@ -33,7 +33,7 @@ namespace stk {
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/RtAudio.h b/include/RtAudio.h
index b9bab05..feb26a3 100644
--- a/include/RtAudio.h
+++ b/include/RtAudio.h
@@ -10,7 +10,7 @@
     RtAudio WWW site: http://www.music.mcgill.ca/~gary/rtaudio/
 
     RtAudio: realtime audio i/o C++ classes
-    Copyright (c) 2001-2009 Gary P. Scavone
+    Copyright (c) 2001-2010 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files
@@ -42,7 +42,7 @@
   \file RtAudio.h
  */
 
-// RtAudio: Version 4.0.6
+// RtAudio: Version 4.0.7
 
 #ifndef __RTAUDIO_H
 #define __RTAUDIO_H
diff --git a/include/RtMidi.h b/include/RtMidi.h
index eab4626..1e3b731 100644
--- a/include/RtMidi.h
+++ b/include/RtMidi.h
@@ -8,7 +8,7 @@
     RtMidi WWW site: http://music.mcgill.ca/~gary/rtmidi/
 
     RtMidi: realtime MIDI i/o C++ classes
-    Copyright (c) 2003-2009 Gary P. Scavone
+    Copyright (c) 2003-2010 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files
@@ -35,7 +35,7 @@
 */
 /**********************************************************************/
 
-// RtMidi: Version 1.0.10
+// RtMidi: Version 1.0.11
 
 #ifndef RTMIDI_H
 #define RTMIDI_H
diff --git a/include/RtWvIn.h b/include/RtWvIn.h
index 8cc5cd0..b1d16c2 100644
--- a/include/RtWvIn.h
+++ b/include/RtWvIn.h
@@ -24,7 +24,7 @@ namespace stk {
     that takes an StkFrames object for multi-channel and/or
     multi-frame data.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/RtWvOut.h b/include/RtWvOut.h
index 8a15f0e..7c02ce1 100644
--- a/include/RtWvOut.h
+++ b/include/RtWvOut.h
@@ -23,7 +23,7 @@ namespace stk {
     that takes a reference to an StkFrames object for multi-channel
     and/or multi-frame data.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/SKINI.msg b/include/SKINI.msg
index a161df9..ea164f7 100644
--- a/include/SKINI.msg
+++ b/include/SKINI.msg
@@ -9,7 +9,7 @@
 
   where <name> is the string used in the SKINI stream.
 
-  by Perry R. Cook, 1995 - 2009.
+  by Perry R. Cook, 1995 - 2010.
 */
 /*********************************************************/
 
diff --git a/include/Sampler.h b/include/Sampler.h
index 433d85b..be6d2d8 100644
--- a/include/Sampler.h
+++ b/include/Sampler.h
@@ -15,7 +15,7 @@ namespace stk {
     This instrument provides an ADSR envelope, a one-pole filter, and
     structures for an arbitrary number of attack and looped files.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Saxofony.h b/include/Saxofony.h
index 56e07dc..45f33b8 100644
--- a/include/Saxofony.h
+++ b/include/Saxofony.h
@@ -44,7 +44,7 @@ namespace stk {
        - Vibrato Gain = 1
        - Breath Pressure = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Shakers.h b/include/Shakers.h
index ecf6d84..dcad1eb 100644
--- a/include/Shakers.h
+++ b/include/Shakers.h
@@ -55,7 +55,7 @@ namespace stk {
         - Little Rocks = 21
         - Tuned Bamboo Chimes = 22
 
-    by Perry R. Cook, 1996 - 2009.
+    by Perry R. Cook, 1996 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Simple.h b/include/Simple.h
index d38af25..b2aeea7 100644
--- a/include/Simple.h
+++ b/include/Simple.h
@@ -25,7 +25,7 @@ namespace stk {
        - Envelope Rate = 11
        - Gain = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/SingWave.h b/include/SingWave.h
index e330e39..fcc3343 100644
--- a/include/SingWave.h
+++ b/include/SingWave.h
@@ -18,7 +18,7 @@ namespace stk {
     Within STK, it is used as an excitation source for other
     instruments.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Sitar.h b/include/Sitar.h
index 8056ec0..8419afa 100644
--- a/include/Sitar.h
+++ b/include/Sitar.h
@@ -25,7 +25,7 @@ namespace stk {
     Stanford, bearing the names of Karplus and/or
     Strong.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Skini.h b/include/Skini.h
index a988c22..6e25b96 100644
--- a/include/Skini.h
+++ b/include/Skini.h
@@ -31,7 +31,7 @@ namespace stk {
 
     \sa \ref skini
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Socket.h b/include/Socket.h
index 6f59eae..a153845 100644
--- a/include/Socket.h
+++ b/include/Socket.h
@@ -31,7 +31,7 @@ namespace stk {
     number of static functions for use with external socket
     descriptors.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Sphere.h b/include/Sphere.h
index 246a145..48a6d76 100644
--- a/include/Sphere.h
+++ b/include/Sphere.h
@@ -13,7 +13,7 @@ namespace stk {
     This class implements a spherical ball with
     radius, mass, position, and velocity parameters.
 
-    by Perry R. Cook, 1995 - 2009.
+    by Perry R. Cook, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/StifKarp.h b/include/StifKarp.h
index a0621d2..002e31f 100644
--- a/include/StifKarp.h
+++ b/include/StifKarp.h
@@ -29,7 +29,7 @@ namespace stk {
        - String Sustain = 11
        - String Stretch = 1
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Stk.h b/include/Stk.h
index 3f2aa6e..46bd641 100644
--- a/include/Stk.h
+++ b/include/Stk.h
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <sstream>
 #include <vector>
-#include <stdlib.h>
+#include <cstdlib>
 
 /*! \namespace stk
     \brief The STK namespace.
@@ -39,7 +39,7 @@ namespace stk {
     STK WWW site: http://ccrma.stanford.edu/software/stk/
 
     The Synthesis ToolKit in C++ (STK)
-    Copyright (c) 1995-2009 Perry R. Cook and Gary P. Scavone
+    Copyright (c) 1995-2010 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
@@ -254,7 +254,7 @@ protected:
     Possible future improvements in this class could include functions
     to convert to and return other data types.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/TapDelay.h b/include/TapDelay.h
index ae1253c..f807092 100644
--- a/include/TapDelay.h
+++ b/include/TapDelay.h
@@ -17,7 +17,7 @@ namespace stk {
     A non-interpolating delay line is typically used in fixed
     delay-length applications, such as for reverberation.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/TcpClient.h b/include/TcpClient.h
index 2e1888a..5bbc24d 100644
--- a/include/TcpClient.h
+++ b/include/TcpClient.h
@@ -26,7 +26,7 @@ namespace stk {
     less than or equal to zero indicate a closed
     or lost connection or the occurence of an error.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/TcpServer.h b/include/TcpServer.h
index 1c04560..dddc69c 100644
--- a/include/TcpServer.h
+++ b/include/TcpServer.h
@@ -26,7 +26,7 @@ namespace stk {
     less than or equal to zero indicate a closed
     or lost connection or the occurence of an error.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Thread.h b/include/Thread.h
index e1a0fdc..079fc80 100644
--- a/include/Thread.h
+++ b/include/Thread.h
@@ -42,7 +42,7 @@ namespace stk {
 
     THREAD_RETURN THREAD_TYPE thread_function(void *ptr)
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/TubeBell.h b/include/TubeBell.h
index 61f6548..6b4d2a7 100644
--- a/include/TubeBell.h
+++ b/include/TubeBell.h
@@ -33,7 +33,7 @@ namespace stk {
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/TwoPole.h b/include/TwoPole.h
index f5ab03d..adb4789 100644
--- a/include/TwoPole.h
+++ b/include/TwoPole.h
@@ -13,7 +13,7 @@ namespace stk {
     provided for creating a resonance in the frequency response while
     maintaining a nearly constant filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/TwoZero.h b/include/TwoZero.h
index caf6f09..443fb85 100644
--- a/include/TwoZero.h
+++ b/include/TwoZero.h
@@ -13,7 +13,7 @@ namespace stk {
     provided for creating a "notch" in the frequency response while
     maintaining a constant filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/UdpSocket.h b/include/UdpSocket.h
index 7e34ba8..b7dfe62 100644
--- a/include/UdpSocket.h
+++ b/include/UdpSocket.h
@@ -24,7 +24,7 @@ namespace stk {
     read/write methods.  Values less than or equal to zero indicate
     the occurence of an error.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Vector3D.h b/include/Vector3D.h
index 69e2aa8..574cc2a 100644
--- a/include/Vector3D.h
+++ b/include/Vector3D.h
@@ -12,7 +12,7 @@ namespace stk {
 
     This class implements a three-dimensional vector.
 
-    by Perry R. Cook, 1995 - 2009.
+    by Perry R. Cook, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/VoicForm.h b/include/VoicForm.h
index 5653589..3617c71 100644
--- a/include/VoicForm.h
+++ b/include/VoicForm.h
@@ -34,7 +34,7 @@ namespace stk {
        - Vibrato Gain = 1
        - Loudness (Spectral Tilt) = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Voicer.h b/include/Voicer.h
index 5a4fd2a..267b18b 100644
--- a/include/Voicer.h
+++ b/include/Voicer.h
@@ -27,7 +27,7 @@ namespace stk {
     Alternately, control changes can be sent to all voices in a given
     group.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
@@ -184,11 +184,10 @@ inline StkFloat Voicer :: tick( unsigned int channel )
       voices_[i].instrument->tick();
       for ( j=0; j<voices_[i].instrument->channelsOut(); j++ ) lastFrame_[j] += voices_[i].instrument->lastOut( j );
     }
-    if ( voices_[i].sounding < 0 ) {
+    if ( voices_[i].sounding < 0 )
       voices_[i].sounding++;
-      if ( voices_[i].sounding == 0 )
-        voices_[i].noteNumber = -1;
-    }
+    if ( voices_[i].sounding == 0 )
+      voices_[i].noteNumber = -1;
   }
 
   return lastFrame_[channel];
diff --git a/include/Whistle.h b/include/Whistle.h
index cf5adfd..965eaa7 100644
--- a/include/Whistle.h
+++ b/include/Whistle.h
@@ -25,7 +25,7 @@ namespace stk {
        - Blowing Frequency Modulation = 2
        - Volume = 128
 
-    by Perry R. Cook  1996 - 2009.
+    by Perry R. Cook  1996 - 2010.
 */
 /***************************************************/
 
diff --git a/include/Wurley.h b/include/Wurley.h
index 6f00299..dead6d7 100644
--- a/include/Wurley.h
+++ b/include/Wurley.h
@@ -33,7 +33,7 @@ namespace stk {
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/WvIn.h b/include/WvIn.h
index 847973c..7baab99 100644
--- a/include/WvIn.h
+++ b/include/WvIn.h
@@ -12,7 +12,7 @@ namespace stk {
     This class provides common functionality for a variety of audio
     data input subclasses.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/include/WvOut.h b/include/WvOut.h
index ebfd013..f779308 100644
--- a/include/WvOut.h
+++ b/include/WvOut.h
@@ -15,7 +15,7 @@ namespace stk {
     Currently, WvOut is non-interpolating and the output rate is
     always Stk::sampleRate().
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/projects/demo/Banded b/projects/demo/Banded
new file mode 100755
index 0000000..be738c7
--- /dev/null
+++ b/projects/demo/Banded
@@ -0,0 +1 @@
+wish < tcl/Banded.tcl | demo BandedWG -or -ip
\ No newline at end of file
diff --git a/projects/demo/Makefile.in b/projects/demo/Makefile.in
index ffb8448..72ddc4d 100644
--- a/projects/demo/Makefile.in
+++ b/projects/demo/Makefile.in
@@ -58,23 +58,26 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\"
 all : $(PROGRAMS)
 
 demo: demo.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o demo demo.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo demo.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
 
 libdemo: demo.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
 
 Md2Skini: Md2Skini.cpp Stk.o RtMidi.o
-	$(CC) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
 
 libMd2Skini: Md2Skini.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp -L../../src -lstk $(LIBRARY)
 
 $(OBJECTS) : Stk.h
 
 clean : 
-	-rm $(OBJECT_PATH)/*.o
-	-rm $(PROGRAMS) *.exe
-	-rm -fR *~ *.dSYM
+	$(RM) -f $(OBJECT_PATH)/*.o
+	$(RM) -f $(PROGRAMS) *.exe
+	$(RM) -fR *~ *.dSYM
+
+distclean: clean
+	$(RM) Makefile
 
 strip : 
 	strip $(PROGRAMS)
diff --git a/projects/demo/demo.cpp b/projects/demo/demo.cpp
index b7c2b74..6eb37e1 100644
--- a/projects/demo/demo.cpp
+++ b/projects/demo/demo.cpp
@@ -9,9 +9,9 @@
 #include "PRCRev.h"
 #include "Voicer.h"
 #include "Skini.h"
+#include "RtAudio.h"
 
 #if defined(__STK_REALTIME__)
-  #include "RtAudio.h"
   #include "Mutex.h"
 #endif
 
diff --git a/projects/effects/Makefile.in b/projects/effects/Makefile.in
index 8cc7bb5..92fd8d0 100644
--- a/projects/effects/Makefile.in
+++ b/projects/effects/Makefile.in
@@ -47,17 +47,20 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\"
 all : $(PROGRAMS)
 
 effects: effects.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o effects effects.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o effects effects.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
 
 libeffects: effects.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o effects effects.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o effects effects.cpp -L../../src -lstk $(LIBRARY)
 
 $(OBJECTS) : Stk.h
 
 clean : 
-	-rm $(OBJECT_PATH)/*.o
-	-rm $(PROGRAMS) *.exe
-	-rm -fR *.dSYM
+	$(RM) -f $(OBJECT_PATH)/*.o
+	$(RM) -f $(PROGRAMS) *.exe
+	$(RM) -fR *~ *.dSYM
+
+distclean: clean
+	$(RM) Makefile
 
 strip : 
 	strip $(PROGRAMS)
diff --git a/projects/effects/README-effects.txt b/projects/effects/README-effects.txt
index d4d7e62..1137820 100644
--- a/projects/effects/README-effects.txt
+++ b/projects/effects/README-effects.txt
@@ -1,6 +1,6 @@
 The Synthesis ToolKit in C++ (STK)
 
-By Perry R. Cook and Gary P. Scavone, 1995-2009.
+By Perry R. Cook and Gary P. Scavone, 1995-2010.
 
 EFFECTS PROJECT:
 
diff --git a/projects/effects/effects.cpp b/projects/effects/effects.cpp
index 9553fa4..616bd64 100644
--- a/projects/effects/effects.cpp
+++ b/projects/effects/effects.cpp
@@ -8,12 +8,13 @@
 #include "NRev.h"
 #include "Echo.h"
 #include "PitShift.h"
+//#include "LentPitShift.h"
 #include "Chorus.h"
 #include "Messager.h"
 #include "RtAudio.h"
 
 #include <signal.h>
-#include <string.h>
+#include <cstring>
 #include <iostream>
 #include <algorithm>
 using std::min;
@@ -42,6 +43,7 @@ struct TickData {
   NRev     nrev;
   Echo     echo;
   PitShift shifter;
+  //LentPitShift shifter;
   Chorus   chorus;
   Envelope envelope;
   Messager messager;
diff --git a/projects/examples/Makefile.in b/projects/examples/Makefile.in
index 3c522b4..3e52373 100644
--- a/projects/examples/Makefile.in
+++ b/projects/examples/Makefile.in
@@ -42,60 +42,63 @@ all : $(PROGRAMS)
 $(OBJECTS) : Stk.h
 
 clean : 
-	-rm $(OBJECT_PATH)/*.o
-	-rm $(PROGRAMS) *.exe
-	-rm -fR *~ *.dSYM
+	$(RM) -f $(OBJECT_PATH)/*.o
+	$(RM) -f $(PROGRAMS) *.exe
+	$(RM) -fR *~ *.dSYM
+
+distclean: clean
+	$(RM) Makefile
 
 strip : 
 	strip $(PROGRAMS)
 
 audioprobe: RtAudio.o @objects@
-	$(CC) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
 
 midiprobe: RtMidi.o
-	$(CC) $(CFLAGS) $(DEFS) -o midiprobe midiprobe.cpp $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o midiprobe midiprobe.cpp $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
 
 play: play.cpp Stk.o FileRead.o FileWvIn.o RtAudio.o
-	$(CC) $(CFLAGS) $(DEFS) -o play play.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o play play.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
 
 record: record.cpp Stk.o FileWrite.o FileWvOut.o RtWvIn.o RtAudio.o Mutex.o
-	$(CC) $(CFLAGS) $(DEFS) -o record record.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/RtWvIn.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o record record.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/RtWvIn.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
 
 sine: sine.cpp Stk.o SineWave.o FileWrite.o FileWvOut.o
-	$(CC) $(CFLAGS) $(DEFS) -o sine sine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o sine sine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(LIBRARY)
 
 duplex: duplex.cpp RtAudio.o
-	$(CC) $(CFLAGS) $(DEFS) -o duplex duplex.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o duplex duplex.cpp $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
 
 inetIn: inetIn.cpp Stk.o InetWvIn.o RtWvOut.o RtAudio.o Socket.o TcpServer.o UdpSocket.o Thread.o Mutex.o
-	$(CC) $(CFLAGS) $(DEFS) -o inetIn inetIn.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/InetWvIn.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/UdpSocket.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o inetIn inetIn.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/InetWvIn.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/UdpSocket.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
 
 inetOut: inetOut.cpp Stk.o FileRead.o FileWvIn.o InetWvOut.o Socket.o TcpClient.o UdpSocket.o Thread.o Mutex.o
-	$(CC) $(CFLAGS) $(DEFS) -o inetOut inetOut.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpClient.o $(OBJECT_PATH)/UdpSocket.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/InetWvOut.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o inetOut inetOut.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpClient.o $(OBJECT_PATH)/UdpSocket.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/InetWvOut.o $(LIBRARY)
 
 sineosc: sineosc.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FileWrite.o FileWvOut.o
-	$(CC) $(CFLAGS) $(DEFS) -o sineosc sineosc.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/FileLoop.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o sineosc sineosc.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileWvOut.o $(OBJECT_PATH)/FileLoop.o $(LIBRARY)
 
 rtsine: rtsine.cpp Stk.o SineWave.o RtWvOut.o RtAudio.o Mutex.o
-	$(CC) $(CFLAGS) $(DEFS) -o rtsine rtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/Mutex.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o rtsine rtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/RtWvOut.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/Mutex.o $(LIBRARY)
 
 crtsine: crtsine.cpp Stk.o SineWave.o RtAudio.o
-	$(CC) $(CFLAGS) $(DEFS) -o crtsine crtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o crtsine crtsine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
 
 bethree: bethree.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FM.o RtAudio.o TwoZero.o SineWave.o ADSR.o BeeThree.o
-	$(CC) $(CFLAGS) $(DEFS) -o bethree bethree.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o bethree bethree.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(LIBRARY)
 
 controlbee: controlbee.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FM.o RtAudio.o TwoZero.o SineWave.o ADSR.o BeeThree.o Messager.o RtMidi.o Socket.o TcpServer.o Thread.o Mutex.o Skini.o
-	$(CC) $(CFLAGS) $(DEFS) -o controlbee controlbee.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(OBJECT_PATH)/Messager.o $(OBJECT_PATH)/RtMidi.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/Skini.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o controlbee controlbee.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(OBJECT_PATH)/Messager.o $(OBJECT_PATH)/RtMidi.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/Skini.o $(LIBRARY)
 
 foursine: foursine.cpp Stk.o SineWave.o FileWrite.o FileWvOut.o
-	$(CC) $(CFLAGS) $(DEFS) -o foursine foursine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o foursine foursine.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/FileWrite.o $(OBJECT_PATH)/FileWvOut.o $(LIBRARY)
 
 threebees: threebees.cpp Stk.o FileRead.o FileWvIn.o FileLoop.o FM.o RtAudio.o TwoZero.o SineWave.o ADSR.o BeeThree.o Messager.o RtMidi.o Socket.o TcpServer.o Thread.o Mutex.o Skini.o Voicer.o
-	$(CC) $(CFLAGS) $(DEFS) -o threebees threebees.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(OBJECT_PATH)/Messager.o $(OBJECT_PATH)/RtMidi.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/Skini.o $(OBJECT_PATH)/Voicer.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o threebees threebees.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/FileWvIn.o $(OBJECT_PATH)/FileLoop.o $(OBJECT_PATH)/FM.o $(OBJECT_PATH)/RtAudio.o $(OBJECT_PATH)/TwoZero.o $(OBJECT_PATH)/SineWave.o $(OBJECT_PATH)/ADSR.o $(OBJECT_PATH)/BeeThree.o $(OBJECT_PATH)/Messager.o $(OBJECT_PATH)/RtMidi.o $(OBJECT_PATH)/Socket.o $(OBJECT_PATH)/TcpServer.o $(OBJECT_PATH)/Thread.o $(OBJECT_PATH)/Mutex.o $(OBJECT_PATH)/Skini.o $(OBJECT_PATH)/Voicer.o $(LIBRARY)
 
 playsmf: playsmf.cpp Stk.o MidiFileIn.o RtMidi.o
-	$(CC) $(CFLAGS) $(DEFS) -o playsmf playsmf.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/MidiFileIn.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o playsmf playsmf.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/MidiFileIn.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
 
 grains: grains.cpp Stk.o Granulate.o Noise.o FileRead.o RtAudio.o
-	$(CC) $(CFLAGS) $(DEFS) -o grains grains.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Granulate.o $(OBJECT_PATH)/Noise.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o grains grains.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/Granulate.o $(OBJECT_PATH)/Noise.o $(OBJECT_PATH)/FileRead.o $(OBJECT_PATH)/RtAudio.o $(LIBRARY)
diff --git a/projects/examples/duplex.cpp b/projects/examples/duplex.cpp
index 5edceae..f3dac55 100644
--- a/projects/examples/duplex.cpp
+++ b/projects/examples/duplex.cpp
@@ -10,8 +10,8 @@
 
 #include "RtAudio.h"
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
 
 /*
 typedef signed long  MY_TYPE;
diff --git a/projects/examples/foursine.cpp b/projects/examples/foursine.cpp
index d0f8e61..347bec8 100644
--- a/projects/examples/foursine.cpp
+++ b/projects/examples/foursine.cpp
@@ -2,6 +2,8 @@
 
 #include "SineWave.h"
 #include "FileWvOut.h"
+#include <cstdlib>
+
 using namespace stk;
 
 int main()
diff --git a/projects/examples/grains.cpp b/projects/examples/grains.cpp
index 801e112..4da778c 100644
--- a/projects/examples/grains.cpp
+++ b/projects/examples/grains.cpp
@@ -4,6 +4,7 @@
 
 #include "Granulate.h"
 #include "RtAudio.h"
+#include <cstdlib>
 
 using namespace stk;
 
diff --git a/projects/examples/inetIn.cpp b/projects/examples/inetIn.cpp
index 97fc22a..b0f5227 100644
--- a/projects/examples/inetIn.cpp
+++ b/projects/examples/inetIn.cpp
@@ -30,6 +30,7 @@
 
 #include "InetWvIn.h"
 #include "RtWvOut.h"
+#include <cstdlib>
 
 using namespace stk;
 
diff --git a/projects/examples/inetOut.cpp b/projects/examples/inetOut.cpp
index 1de041e..fec7ea4 100644
--- a/projects/examples/inetOut.cpp
+++ b/projects/examples/inetOut.cpp
@@ -19,6 +19,7 @@
 
 #include "FileWvIn.h"
 #include "InetWvOut.h"
+#include <cstdlib>
 
 using namespace stk;
 
diff --git a/projects/examples/libMakefile.in b/projects/examples/libMakefile.in
index 6dab44b..cc5706f 100644
--- a/projects/examples/libMakefile.in
+++ b/projects/examples/libMakefile.in
@@ -32,59 +32,59 @@ all : $(PROGRAMS)
 $(OBJECTS) : Stk.h
 
 clean : 
-	-rm $(PROGRAMS) *.exe
+	$(RM) -f $(PROGRAMS) *.exe
 
 strip : 
 	strip $(PROGRAMS)
 
 audioprobe: audioprobe.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o audioprobe audioprobe.cpp -L../../src -lstk $(LIBRARY)
 
 midiprobe: midiprobe.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o midiprobe midiprobe.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o midiprobe midiprobe.cpp -L../../src -lstk $(LIBRARY)
 
 play: play.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o play play.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o play play.cpp -L../../src -lstk $(LIBRARY)
 
 record: record.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o record record.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o record record.cpp -L../../src -lstk $(LIBRARY)
 
 sine: sine.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o sine sine.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o sine sine.cpp -L../../src -lstk $(LIBRARY)
 
 duplex: duplex.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o duplex duplex.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o duplex duplex.cpp -L../../src -lstk $(LIBRARY)
 
 inetIn: inetIn.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o inetIn inetIn.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o inetIn inetIn.cpp -L../../src -lstk $(LIBRARY)
 
 inetOut: inetOut.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o inetOut inetOut.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o inetOut inetOut.cpp -L../../src -lstk $(LIBRARY)
 
 sineosc: sineosc.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o sineosc sineosc.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o sineosc sineosc.cpp -L../../src -lstk $(LIBRARY)
 
 rtsine: rtsine.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o rtsine rtsine.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o rtsine rtsine.cpp -L../../src -lstk $(LIBRARY)
 
 crtsine: crtsine.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o crtsine crtsine.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o crtsine crtsine.cpp -L../../src -lstk $(LIBRARY)
 
 bethree: bethree.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o bethree bethree.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o bethree bethree.cpp -L../../src -lstk $(LIBRARY)
 
 controlbee: controlbee.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o controlbee controlbee.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o controlbee controlbee.cpp -L../../src -lstk $(LIBRARY)
 
 foursine: foursine.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o foursine foursine.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o foursine foursine.cpp -L../../src -lstk $(LIBRARY)
 
 threebees: threebees.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o threebees threebees.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o threebees threebees.cpp -L../../src -lstk $(LIBRARY)
 
 playsmf: playsmf.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o playsmf playsmf.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o playsmf playsmf.cpp -L../../src -lstk $(LIBRARY)
 
 grains: grains.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o grains grains.cpp -L../../src -lstk $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o grains grains.cpp -L../../src -lstk $(LIBRARY)
 
diff --git a/projects/examples/midiprobe.cpp b/projects/examples/midiprobe.cpp
index 9fdb242..06d9497 100644
--- a/projects/examples/midiprobe.cpp
+++ b/projects/examples/midiprobe.cpp
@@ -5,7 +5,7 @@
 // by Gary Scavone, 2003-2004.
 
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
 #include "RtMidi.h"
 
 int main()
diff --git a/projects/examples/play.cpp b/projects/examples/play.cpp
index fef3e63..98f3312 100644
--- a/projects/examples/play.cpp
+++ b/projects/examples/play.cpp
@@ -18,6 +18,7 @@
 
 #include <signal.h>
 #include <iostream>
+#include <cstdlib>
 
 using namespace stk;
 
diff --git a/projects/examples/playsmf.cpp b/projects/examples/playsmf.cpp
index b46de7d..94702ba 100644
--- a/projects/examples/playsmf.cpp
+++ b/projects/examples/playsmf.cpp
@@ -8,6 +8,7 @@
 #include "MidiFileIn.h"
 #include "RtMidi.h"
 #include <signal.h>
+#include <cstdlib>
 
 bool done = false;
 static void finish(int ignore){ done = true; }
diff --git a/projects/examples/record.cpp b/projects/examples/record.cpp
index d3b6a7e..748ed7e 100644
--- a/projects/examples/record.cpp
+++ b/projects/examples/record.cpp
@@ -24,6 +24,7 @@
 
 #include "RtWvIn.h"
 #include "FileWvOut.h"
+#include <cstdlib>
 
 using namespace stk;
 
diff --git a/projects/examples/rtsine.cpp b/projects/examples/rtsine.cpp
index bb42403..d4b084d 100644
--- a/projects/examples/rtsine.cpp
+++ b/projects/examples/rtsine.cpp
@@ -2,6 +2,8 @@
 
 #include "SineWave.h"
 #include "RtWvOut.h"
+#include <cstdlib>
+
 using namespace stk;
 
 int main()
diff --git a/projects/examples/sine.cpp b/projects/examples/sine.cpp
index 84ca398..b58b337 100644
--- a/projects/examples/sine.cpp
+++ b/projects/examples/sine.cpp
@@ -14,6 +14,8 @@
 
 #include "SineWave.h"
 #include "FileWvOut.h"
+#include <cstdlib>
+
 using namespace stk;
 
 void usage(void) {
diff --git a/projects/examples/sineosc.cpp b/projects/examples/sineosc.cpp
index f6d46e3..cad0b75 100644
--- a/projects/examples/sineosc.cpp
+++ b/projects/examples/sineosc.cpp
@@ -2,6 +2,8 @@
 
 #include "FileLoop.h"
 #include "FileWvOut.h"
+#include <cstdlib>
+
 using namespace stk;
 
 int main()
diff --git a/projects/examples/test.cpp b/projects/examples/test.cpp
deleted file mode 100644
index fa0d739..0000000
--- a/projects/examples/test.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// sineosc.cpp STK tutorial program
-
-#include "FileWvIn.h"
-#include "RtWvOut.h"
-using namespace stk;
-
-int main()
-{
-  // Set the global sample rate before creating class instances.
-  Stk::setSampleRate( 44100.0 );
-
-  int nFrames = 100000;
-  WvIn *input;
-  //  FileWvOut output;
-  WvOut *output;
-
-  try {
-    // Load the sine wave file.
-    input = new FileWvIn( "hellosine.wav" );
-
-    // Open a 16-bit, one-channel WAV formatted output file
-    //   output = new FileWvOut( "hellosine.wav", 1, FileWrite::FILE_WAV, Stk::STK_SINT16 );
-    output = new RtWvOut();
-  }
-  catch ( StkError & ) {
-    exit( 1 );
-  }
-
-  //input.setFrequency( 440.0 );
-
-  // Option 1: Use StkFrames
-  /*
-  StkFrames frames( nFrames, 1 );
-  try {
-    output->tick( input->tick( frames ) );
-  }
-  catch ( StkError & ) {
-    exit( 1 );
-  }
-  */
-
-  // Option 2: Single-sample computations
-  for ( int i=0; i<nFrames; i++ ) {
-    try {
-      output->tick( input->tick() );
-    }
-    catch ( StkError & ) {
-      exit( 1 );
-    }
-  }
-
-  delete output;
-  delete input;
-
-  return 0;
-}
diff --git a/projects/ragamatic/Drone.cpp b/projects/ragamatic/Drone.cpp
index bcf903e..f0b2a97 100644
--- a/projects/ragamatic/Drone.cpp
+++ b/projects/ragamatic/Drone.cpp
@@ -13,7 +13,7 @@
     Stanford, bearing the names of Karplus and/or
     Strong.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/projects/ragamatic/Drone.h b/projects/ragamatic/Drone.h
index 9d1cd6e..b44aac0 100644
--- a/projects/ragamatic/Drone.h
+++ b/projects/ragamatic/Drone.h
@@ -24,7 +24,7 @@ namespace stk {
     Stanford, bearing the names of Karplus and/or
     Strong.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/projects/ragamatic/Makefile.in b/projects/ragamatic/Makefile.in
index 22a5308..42d025d 100644
--- a/projects/ragamatic/Makefile.in
+++ b/projects/ragamatic/Makefile.in
@@ -48,17 +48,20 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\"
 all : $(PROGRAMS)
 
 ragamat: ragamat.cpp $(OBJECTS)
-	$(CC) $(CFLAGS) $(DEFS) -o ragamat ragamat.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o ragamat ragamat.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
 
 libragamat: ragamat.cpp Tabla.cpp Drone.cpp VoicDrum.cpp
-	$(CC) $(CFLAGS) $(DEFS) -o ragamat Tabla.cpp Drone.cpp VoicDrum.cpp ragamat.cpp -L../../src $(LIBRARY) -lstk
+	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o ragamat Tabla.cpp Drone.cpp VoicDrum.cpp ragamat.cpp -L../../src $(LIBRARY) -lstk
 
 $(OBJECTS) : Stk.h
 
 clean : 
-	-rm $(OBJECT_PATH)/*.o
-	-rm $(PROGRAMS) *.exe
-	-rm -fR *.dSYM
+	$(RM) -f $(OBJECT_PATH)/*.o
+	$(RM) -f $(PROGRAMS) *.exe
+	$(RM) -fR *~ *.dSYM
+
+distclean: clean
+	$(RM) Makefile
 
 strip : 
 	strip $(PROGRAMS)
diff --git a/projects/ragamatic/Tabla.cpp b/projects/ragamatic/Tabla.cpp
index 32320c5..2a07def 100644
--- a/projects/ragamatic/Tabla.cpp
+++ b/projects/ragamatic/Tabla.cpp
@@ -8,7 +8,7 @@
     sample rates.  You can specify the maximum polyphony (maximum
     number of simultaneous voices) in Tabla.h.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/projects/ragamatic/Tabla.h b/projects/ragamatic/Tabla.h
index ea8a910..4ba95e5 100644
--- a/projects/ragamatic/Tabla.h
+++ b/projects/ragamatic/Tabla.h
@@ -17,7 +17,7 @@ namespace stk {
     sample rates.  You can specify the maximum polyphony (maximum
     number of simultaneous voices) in Tabla.h.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/projects/ragamatic/VoicDrum.cpp b/projects/ragamatic/VoicDrum.cpp
index ce8c4c7..21ed1f2 100644
--- a/projects/ragamatic/VoicDrum.cpp
+++ b/projects/ragamatic/VoicDrum.cpp
@@ -8,7 +8,7 @@
     sample rates.  You can specify the maximum polyphony (maximum
     number of simultaneous voices) in VoicDrum.h.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/projects/ragamatic/VoicDrum.h b/projects/ragamatic/VoicDrum.h
index 7c1451e..ae0edb5 100644
--- a/projects/ragamatic/VoicDrum.h
+++ b/projects/ragamatic/VoicDrum.h
@@ -17,7 +17,7 @@ namespace stk {
     sample rates.  You can specify the maximum polyphony (maximum
     number of simultaneous voices) in VoicDrum.h.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/projects/ragamatic/ragamat.cpp b/projects/ragamatic/ragamat.cpp
index b0ac11d..5f3174f 100644
--- a/projects/ragamatic/ragamat.cpp
+++ b/projects/ragamatic/ragamat.cpp
@@ -11,9 +11,11 @@
 #include "RtAudio.h"
 
 #include <signal.h>
-#include <string.h>
+#include <cstring>
 #include <iostream>
 #include <algorithm>
+#include <cstdlib>
+
 using std::min;
 using namespace stk;
 
diff --git a/src/ADSR.cpp b/src/ADSR.cpp
index e609b72..958ab13 100644
--- a/src/ADSR.cpp
+++ b/src/ADSR.cpp
@@ -7,7 +7,7 @@
     messages, keeping track of its state.  The \e state = ADSR::DONE
     after the envelope value reaches 0.0 in the ADSR::RELEASE state.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Asymp.cpp b/src/Asymp.cpp
index 3a0c25f..c379b24 100644
--- a/src/Asymp.cpp
+++ b/src/Asymp.cpp
@@ -19,7 +19,7 @@
     to \e keyOn and \e keyOff messages by ramping to
     1.0 on keyOn and to 0.0 on keyOff.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/BeeThree.cpp b/src/BeeThree.cpp
index cfc9dce..9272b3b 100644
--- a/src/BeeThree.cpp
+++ b/src/BeeThree.cpp
@@ -28,7 +28,7 @@
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/BiQuad.cpp b/src/BiQuad.cpp
index e091296..b9de9a5 100644
--- a/src/BiQuad.cpp
+++ b/src/BiQuad.cpp
@@ -6,7 +6,7 @@
     Methods are provided for creating a resonance or notch in the
     frequency response while maintaining a constant filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/BlitSquare.cpp b/src/BlitSquare.cpp
index 330756a..6d7e44a 100644
--- a/src/BlitSquare.cpp
+++ b/src/BlitSquare.cpp
@@ -26,7 +26,7 @@
     in the presence of significant aliasing.
 
     Based on initial code of Robin Davies, 2005
-    Modified algorithm code by Gary Scavone, 2005 - 2009.
+    Modified algorithm code by Gary Scavone, 2005 - 2010.
 */
 /***************************************************/
 
diff --git a/src/BlowBotl.cpp b/src/BlowBotl.cpp
index 25ba8bb..456d4d8 100644
--- a/src/BlowBotl.cpp
+++ b/src/BlowBotl.cpp
@@ -12,7 +12,7 @@
        - Vibrato Gain = 1
        - Volume = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/BlowHole.cpp b/src/BlowHole.cpp
index ec271f1..b411870 100644
--- a/src/BlowHole.cpp
+++ b/src/BlowHole.cpp
@@ -29,7 +29,7 @@
        - Register State = 1
        - Breath Pressure = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Bowed.cpp b/src/Bowed.cpp
index d314ed6..e9a6830 100644
--- a/src/Bowed.cpp
+++ b/src/Bowed.cpp
@@ -17,7 +17,7 @@
        - Vibrato Gain = 1
        - Volume = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Brass.cpp b/src/Brass.cpp
index c346ead..0e3cf13 100644
--- a/src/Brass.cpp
+++ b/src/Brass.cpp
@@ -16,7 +16,7 @@
        - Vibrato Gain = 1
        - Volume = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Chorus.cpp b/src/Chorus.cpp
index d0f58de..7e968ba 100644
--- a/src/Chorus.cpp
+++ b/src/Chorus.cpp
@@ -5,7 +5,7 @@
     This class implements a chorus effect.  It takes a monophonic
     input signal and produces a stereo output signal.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Clarinet.cpp b/src/Clarinet.cpp
index 2c5856d..d07b19a 100644
--- a/src/Clarinet.cpp
+++ b/src/Clarinet.cpp
@@ -18,7 +18,7 @@
        - Vibrato Gain = 1
        - Breath Pressure = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Delay.cpp b/src/Delay.cpp
index aedec9a..fd3efb4 100644
--- a/src/Delay.cpp
+++ b/src/Delay.cpp
@@ -10,7 +10,7 @@
     A non-interpolating delay line is typically used in fixed
     delay-length applications, such as for reverberation.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
@@ -118,4 +118,13 @@ StkFloat Delay :: contentsAt( unsigned long tapDelay )
   return inputs_[tap];
 }
 
+StkFloat Delay :: addTo( unsigned long tapDelay, StkFloat value )
+{
+  long tap = inPoint_ - tapDelay - 1;
+  while ( tap < 0 ) // Check for wraparound.
+    tap += inputs_.size();
+
+  return inputs_[tap]+= value;
+}
+
 } // stk namespace
diff --git a/src/DelayA.cpp b/src/DelayA.cpp
index 31454da..c5d320c 100644
--- a/src/DelayA.cpp
+++ b/src/DelayA.cpp
@@ -14,7 +14,7 @@
     minimum delay possible in this implementation is limited to a
     value of 0.5.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/DelayL.cpp b/src/DelayL.cpp
index 0003ed1..02e3fbb 100644
--- a/src/DelayL.cpp
+++ b/src/DelayL.cpp
@@ -13,7 +13,7 @@
     delay setting.  The use of higher order Lagrange interpolators can
     typically improve (minimize) this attenuation characteristic.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Drummer.cpp b/src/Drummer.cpp
index 37dddd5..829911a 100644
--- a/src/Drummer.cpp
+++ b/src/Drummer.cpp
@@ -11,7 +11,7 @@
     of simultaneous voices) via a #define in the
     Drummer.h.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Echo.cpp b/src/Echo.cpp
index e911778..5d75790 100644
--- a/src/Echo.cpp
+++ b/src/Echo.cpp
@@ -4,7 +4,7 @@
 
     This class implements an echo effect.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Envelope.cpp b/src/Envelope.cpp
index 9322f8e..2d33fe1 100644
--- a/src/Envelope.cpp
+++ b/src/Envelope.cpp
@@ -7,7 +7,7 @@
     specified \e rate.  It also responds to simple \e keyOn and \e
     keyOff messages, ramping to 1.0 on keyOn and to 0.0 on keyOff.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/FM.cpp b/src/FM.cpp
index c1ca204..d55e2a6 100644
--- a/src/FM.cpp
+++ b/src/FM.cpp
@@ -19,7 +19,7 @@
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/FMVoices.cpp b/src/FMVoices.cpp
index b9fcea6..84e364c 100644
--- a/src/FMVoices.cpp
+++ b/src/FMVoices.cpp
@@ -26,7 +26,7 @@
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/FileLoop.cpp b/src/FileLoop.cpp
index 56cfdec..528d057 100644
--- a/src/FileLoop.cpp
+++ b/src/FileLoop.cpp
@@ -12,7 +12,7 @@
     the overloaded one that takes an StkFrames object for
     multi-channel and/or multi-frame data.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/FileRead.cpp b/src/FileRead.cpp
index b0bae9b..774f417 100644
--- a/src/FileRead.cpp
+++ b/src/FileRead.cpp
@@ -32,8 +32,9 @@
 #include "FileRead.h"
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <string.h>
+#include <cstring>
 #include <cmath>
+#include <cstdio>
 
 namespace stk {
 
diff --git a/src/FileWrite.cpp b/src/FileWrite.cpp
index e2e2e60..d50e73a 100644
--- a/src/FileWrite.cpp
+++ b/src/FileWrite.cpp
@@ -17,12 +17,13 @@
     type, the data type will automatically be modified.  Compressed
     data types are not supported.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
 #include "FileWrite.h"
-#include <string.h>
+#include <cstring>
+#include <cstdio>
 #include <cmath>
 
 namespace stk {
diff --git a/src/FileWvIn.cpp b/src/FileWvIn.cpp
index 557308d..f3c38b5 100644
--- a/src/FileWvIn.cpp
+++ b/src/FileWvIn.cpp
@@ -27,7 +27,7 @@
     See the FileRead class for a description of the supported audio
     file formats.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/FileWvOut.cpp b/src/FileWvOut.cpp
index 1dd4b1e..04ee5c5 100644
--- a/src/FileWvOut.cpp
+++ b/src/FileWvOut.cpp
@@ -17,7 +17,7 @@
     Currently, FileWvOut is non-interpolating and the output rate is
     always Stk::sampleRate().
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Fir.cpp b/src/Fir.cpp
index 4f4fdf7..2465009 100644
--- a/src/Fir.cpp
+++ b/src/Fir.cpp
@@ -16,7 +16,7 @@
     This structure results in one extra multiply per computed sample,
     but allows easy control of the overall filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Flute.cpp b/src/Flute.cpp
index e8bb553..c136cb8 100644
--- a/src/Flute.cpp
+++ b/src/Flute.cpp
@@ -18,7 +18,7 @@
        - Vibrato Gain = 1
        - Breath Pressure = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/FormSwep.cpp b/src/FormSwep.cpp
index 32a73ec..b47d75d 100644
--- a/src/FormSwep.cpp
+++ b/src/FormSwep.cpp
@@ -6,7 +6,7 @@
     over time from one frequency setting to another.  It provides
     methods for controlling the sweep rate and target frequency.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Granulate.cpp b/src/Granulate.cpp
index 482dbdc..7d3ef83 100644
--- a/src/Granulate.cpp
+++ b/src/Granulate.cpp
@@ -11,7 +11,7 @@
     Chris Rolfe and Damian Keller, though there are likely to be a
     number of differences in the actual implementation.
 
-    by Gary Scavone, 2005 - 2009.
+    by Gary Scavone, 2005 - 2010.
 */
 /***************************************************/
 
diff --git a/src/HevyMetl.cpp b/src/HevyMetl.cpp
index 55ba230..1ff75a6 100644
--- a/src/HevyMetl.cpp
+++ b/src/HevyMetl.cpp
@@ -22,7 +22,7 @@
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Iir.cpp b/src/Iir.cpp
index 1aba722..e1224fa 100644
--- a/src/Iir.cpp
+++ b/src/Iir.cpp
@@ -20,7 +20,7 @@
     This structure results in one extra multiply per computed sample,
     but allows easy control of the overall filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/InetWvIn.cpp b/src/InetWvIn.cpp
index 477974d..d78350e 100644
--- a/src/InetWvIn.cpp
+++ b/src/InetWvIn.cpp
@@ -20,7 +20,7 @@
     data type for the incoming stream is signed 16-bit integers,
     though any of the defined StkFormats are permissible.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/InetWvOut.cpp b/src/InetWvOut.cpp
index 5076680..c86203f 100644
--- a/src/InetWvOut.cpp
+++ b/src/InetWvOut.cpp
@@ -17,7 +17,7 @@
     data type is signed 16-bit integers but any of the defined
     StkFormats are permissible.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/JCRev.cpp b/src/JCRev.cpp
index c965b8c..763b49b 100644
--- a/src/JCRev.cpp
+++ b/src/JCRev.cpp
@@ -9,7 +9,7 @@
     followed by four parallel comb filters, and two decorrelation
     delay lines in parallel at the output.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/LentPitShift.cpp b/src/LentPitShift.cpp
new file mode 100644
index 0000000..7dfe23a
--- /dev/null
+++ b/src/LentPitShift.cpp
@@ -0,0 +1,52 @@
+/***************************************************/
+/*! \class LentPitShift
+    \brief Pitch shifter effect class based on the Lent algorithm.
+
+    This class implements a pitch shifter using pitch 
+    tracking and sample windowing and shifting.
+
+    by Francois Germain, 2009.
+*/
+/***************************************************/
+
+#include "LentPitShift.h"
+
+namespace stk {
+
+LentPitShift::LentPitShift( StkFloat periodRatio, int tMax )
+  : inputFrames(0.,tMax,1), outputFrames(0.,tMax,1), ptrFrames(0), inputPtr(0), outputPtr(0.), tMax_(tMax), periodRatio_(periodRatio), zeroFrame(0., tMax, 1)
+{
+	window = new StkFloat[2*tMax_]; // Allocation of the array for the hamming window
+	threshold_ = 0.1;               // Default threshold for pitch tracking
+
+	dt = new StkFloat[tMax+1]; // Allocation of the euclidian distance coefficient array.  The first one is never used.
+	cumDt = new StkFloat[tMax+1];  // Allocation of the cumulative sum array
+	cumDt[0] = 0.;                 // Initialization of the first coefficient of the cumulative sum
+	dpt = new StkFloat[tMax+1];    // Allocation of the pitch tracking function coefficient array
+	dpt[0]   = 1.;                 // Initialization of the first coefficient of dpt which is always the same
+
+	// Initialisation of the input and output delay lines
+	inputLine_.setMaximumDelay( 3 * tMax_ );
+	// The delay is choosed such as the coefficients are not read before being finalised.
+	outputLine_.setMaximumDelay( 3 * tMax_ );
+	outputLine_.setDelay( 3 * tMax_ );
+
+	//Initialization of the delay line of pitch tracking coefficients
+	//coeffLine_ = new Delay[512];
+	//for(int i=0;i<tMax_;i++)
+	//	coeffLine_[i] = new Delay( tMax_, tMax_ );
+}
+
+void LentPitShift :: clear()
+{
+	inputLine_.clear();
+	outputLine_.clear();
+}
+
+void LentPitShift :: setShift( StkFloat shift )
+{
+  if ( shift <= 0.0 ) periodRatio_ = 1.0;
+  periodRatio_ = 1.0 / shift; 
+}
+
+} // stk namespace
diff --git a/src/Makefile.in b/src/Makefile.in
index fe62150..76cc328 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -2,8 +2,13 @@
 ### libstk Makefile - for various flavors of unix
 
 LIBRARY = libstk.a
+SHAREDLIB = libstk.so
+MAJOR = 4
+RELEASE = 4.4.2
+
 AR = ar -rsc
 RM = /bin/rm
+LN = /bin/ln
 OBJECT_PATH = @object_path@
 vpath %.o $(OBJECT_PATH)
 
@@ -14,7 +19,7 @@ OBJECTS	=	Stk.o Generator.o Noise.o Blit.o BlitSaw.o BlitSquare.o Granulate.o \
 					BiQuad.o FormSwep.o Delay.o DelayL.o DelayA.o \
 					\
 					Effect.o PRCRev.o JCRev.o NRev.o \
-					Chorus.o Echo.o PitShift.o \
+					Chorus.o Echo.o PitShift.o LentPitShift.o \
 					Function.o ReedTable.o JetTable.o BowTable.o \
 					Voicer.o Vector3D.o Sphere.o \
 					\
@@ -39,7 +44,8 @@ CC       = @CXX@
 DEFS     = @CPPFLAGS@
 DEFS    += @byte_order@
 CFLAGS   = @CXXFLAGS@
-CFLAGS  += $(INCLUDE) -Iinclude
+CFLAGS  += $(INCLUDE) -Iinclude -fPIC
+LIBS     = @LIBS@
 
 REALTIME = @realtime@
 ifeq ($(REALTIME),yes)
@@ -61,12 +67,24 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\"
 all : $(LIBRARY)
 
 $(LIBRARY) : $(OBJECTS)
-	/bin/rm -f $(LIBRARY)
+	$(RM) -f $(LIBRARY)
 	$(AR) $(LIBRARY) $(OBJECT_PATH)/*.o
 
+$(SHAREDLIB).$(RELEASE) : $(OBJECTS)
+	$(RM) -f $(@) $(SHAREDLIB).$(MAJOR) $(SHAREDLIB)
+	$(CC) $(LDFLAGS) -fPIC -shared -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
+	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB).$(MAJOR)
+	$(LN) -s $(SHAREDLIB).$(RELEASE) $(SHAREDLIB)
+#	$(CC) $(LDFLAGS) -fPIC -shared -Wl,-soname,$(SHAREDLIB).$(MAJOR) -o $(@) $(OBJECT_PATH)/*.o $(LIBS)
+
 $(OBJECTS) : Stk.h
 
 clean : 
-	-rm $(OBJECT_PATH)/*.o
-	-rm $(LIBRARY)
-	-rm -fR *.dSYM
+	$(RM) -f $(OBJECT_PATH)/*.o
+	$(RM) -f $(LIBRARY)
+	$(RM) -f $(SHAREDLIB)*
+	$(RM) -f *~
+	$(RM) -fR *.dSYM
+
+distclean: clean
+	$(RM) Makefile
\ No newline at end of file
diff --git a/src/Mandolin.cpp b/src/Mandolin.cpp
index 1f3e1d2..6c76cc2 100644
--- a/src/Mandolin.cpp
+++ b/src/Mandolin.cpp
@@ -23,7 +23,7 @@
        - String Detuning = 1
        - Microphone Position = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Messager.cpp b/src/Messager.cpp
index e93ee81..2136094 100644
--- a/src/Messager.cpp
+++ b/src/Messager.cpp
@@ -28,7 +28,7 @@
     This class is primarily for use in STK example programs but it is
     generic enough to work in many other contexts.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
@@ -162,8 +162,6 @@ bool Messager :: startStdInput()
   return true;
 }
 
-//} // stk namespace
-
 THREAD_RETURN THREAD_TYPE stdinHandler(void *ptr)
 {
   Messager::MessagerData *data = (Messager::MessagerData *) ptr;
@@ -220,8 +218,6 @@ void midiHandler( double timeStamp, std::vector<unsigned char> *bytes, void *ptr
   data->mutex.unlock();
 }
 
-//namespace stk {
-
 bool Messager :: startMidiInput( int port )
 {
   if ( data_.sources == STK_FILE ) {
@@ -304,8 +300,6 @@ bool Messager :: startSocketInput( int port )
   return true;
 }
 
-//} // stk namespace
-
 #if (defined(__OS_IRIX__) || defined(__OS_LINUX__) || defined(__OS_MACOSX__))
   #include <sys/time.h>
   #include <errno.h>
@@ -428,7 +422,7 @@ THREAD_RETURN THREAD_TYPE socketHandler(void *ptr)
   return NULL;
 }
 
-} // stk namespace
-
 #endif
 
+} // stk namespace
+
diff --git a/src/MidiFileIn.cpp b/src/MidiFileIn.cpp
index 8cb6abc..17fce6f 100644
--- a/src/MidiFileIn.cpp
+++ b/src/MidiFileIn.cpp
@@ -11,12 +11,12 @@
     Tempo changes are internally tracked by the class and reflected in
     the values returned by the function getTickSeconds().
 
-    by Gary P. Scavone, 2003 - 2009.
+    by Gary P. Scavone, 2003 - 2010.
 */
 /**********************************************************************/
 
 #include "MidiFileIn.h"
-#include <string.h>
+#include <cstring>
 #include <iostream>
 
 namespace stk {
diff --git a/src/Modal.cpp b/src/Modal.cpp
index 7f28175..7f2dadc 100644
--- a/src/Modal.cpp
+++ b/src/Modal.cpp
@@ -7,11 +7,12 @@
     (non-sweeping BiQuad filters), where N is set
     during instantiation.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
 #include "Modal.h"
+#include <cstdlib>
 
 namespace stk {
 
diff --git a/src/ModalBar.cpp b/src/ModalBar.cpp
index 58ed0d6..d1f1a9a 100644
--- a/src/ModalBar.cpp
+++ b/src/ModalBar.cpp
@@ -24,7 +24,7 @@
          - Two Fixed = 7
          - Clump = 8
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Modulate.cpp b/src/Modulate.cpp
index d5e1b4d..39743ca 100644
--- a/src/Modulate.cpp
+++ b/src/Modulate.cpp
@@ -6,7 +6,7 @@
     modulations to give a nice, natural human
     modulation function.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Moog.cpp b/src/Moog.cpp
index 632b3c4..5c326fa 100644
--- a/src/Moog.cpp
+++ b/src/Moog.cpp
@@ -14,7 +14,7 @@
        - Vibrato Gain = 1
        - Gain = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Mutex.cpp b/src/Mutex.cpp
index 5730d98..896decf 100644
--- a/src/Mutex.cpp
+++ b/src/Mutex.cpp
@@ -7,7 +7,7 @@
     systems, the pthread library is used. Under
     Windows, critical sections are used.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/NRev.cpp b/src/NRev.cpp
index 09e4de3..3c81f81 100644
--- a/src/NRev.cpp
+++ b/src/NRev.cpp
@@ -10,7 +10,7 @@
     another allpass in series, followed by two allpass filters in
     parallel with corresponding right and left outputs.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Noise.cpp b/src/Noise.cpp
index 3ca4028..063487e 100644
--- a/src/Noise.cpp
+++ b/src/Noise.cpp
@@ -6,7 +6,7 @@
     C rand() function.  The quality of the rand()
     function varies from one OS to another.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/OnePole.cpp b/src/OnePole.cpp
index 7f0994c..0c33b4d 100644
--- a/src/OnePole.cpp
+++ b/src/OnePole.cpp
@@ -6,7 +6,7 @@
     provided for setting the pole position along the real axis of the
     z-plane while maintaining a constant peak filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/OneZero.cpp b/src/OneZero.cpp
index 61ff5cd..7d7fcac 100644
--- a/src/OneZero.cpp
+++ b/src/OneZero.cpp
@@ -6,7 +6,7 @@
     provided for setting the zero position along the real axis of the
     z-plane while maintaining a constant filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/PRCRev.cpp b/src/PRCRev.cpp
index c5cf64a..7fd4cb2 100644
--- a/src/PRCRev.cpp
+++ b/src/PRCRev.cpp
@@ -10,7 +10,7 @@
     two series allpass units and two parallel comb
     filters.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/PercFlut.cpp b/src/PercFlut.cpp
index d019508..5ca3dd8 100644
--- a/src/PercFlut.cpp
+++ b/src/PercFlut.cpp
@@ -22,7 +22,7 @@
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Phonemes.cpp b/src/Phonemes.cpp
index fa5c0e4..da7d52d 100644
--- a/src/Phonemes.cpp
+++ b/src/Phonemes.cpp
@@ -6,7 +6,7 @@
     set of 32 static phoneme formant parameters
     and provide access to those values.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/PitShift.cpp b/src/PitShift.cpp
index 58facf3..d2f5212 100644
--- a/src/PitShift.cpp
+++ b/src/PitShift.cpp
@@ -5,7 +5,7 @@
     This class implements a simple pitch shifter
     using delay lines.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/PluckTwo.cpp b/src/PluckTwo.cpp
index 4a7b0b0..c5c2740 100644
--- a/src/PluckTwo.cpp
+++ b/src/PluckTwo.cpp
@@ -14,7 +14,7 @@
     use possibly subject to patents held by
     Stanford University, Yamaha, and others.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Plucked.cpp b/src/Plucked.cpp
index 7b04351..0cb239a 100644
--- a/src/Plucked.cpp
+++ b/src/Plucked.cpp
@@ -13,7 +13,7 @@
     Stanford, bearing the names of Karplus and/or
     Strong.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/PoleZero.cpp b/src/PoleZero.cpp
index 76951ad..b90d203 100644
--- a/src/PoleZero.cpp
+++ b/src/PoleZero.cpp
@@ -7,7 +7,7 @@
     coefficient.  Another method is provided to create a DC blocking
     filter.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Resonate.cpp b/src/Resonate.cpp
index 5e2d717..9ceb722 100644
--- a/src/Resonate.cpp
+++ b/src/Resonate.cpp
@@ -13,7 +13,7 @@
        - Zero Radii = 1
        - Envelope Gain = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Rhodey.cpp b/src/Rhodey.cpp
index a093cdc..0fa7950 100644
--- a/src/Rhodey.cpp
+++ b/src/Rhodey.cpp
@@ -26,7 +26,7 @@
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/RtAudio.cpp b/src/RtAudio.cpp
index 8d47585..78259e9 100644
--- a/src/RtAudio.cpp
+++ b/src/RtAudio.cpp
@@ -10,7 +10,7 @@
     RtAudio WWW site: http://www.music.mcgill.ca/~gary/rtaudio/
 
     RtAudio: realtime audio i/o C++ classes
-    Copyright (c) 2001-2009 Gary P. Scavone
+    Copyright (c) 2001-2010 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files
@@ -38,13 +38,13 @@
 */
 /************************************************************************/
 
-// RtAudio: Version 4.0.6
+// RtAudio: Version 4.0.7
 
 #include "RtAudio.h"
 #include <iostream>
 #include <cstdlib>
 #include <cstring>
-#include <limits.h>
+#include <climits>
 
 // Static variable definitions.
 const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
@@ -435,7 +435,8 @@ unsigned int RtApiCore :: getDeviceCount( void )
 {
   // Find out how many audio devices there are, if any.
   UInt32 dataSize;
-  OSStatus result = AudioHardwareGetPropertyInfo( kAudioHardwarePropertyDevices, &dataSize, NULL );
+  AudioObjectPropertyAddress propertyAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+  OSStatus result = AudioObjectGetPropertyDataSize( kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize );
   if ( result != noErr ) {
     errorText_ = "RtApiCore::getDeviceCount: OS-X error getting device info!";
     error( RtError::WARNING );
@@ -452,9 +453,8 @@ unsigned int RtApiCore :: getDefaultInputDevice( void )
 
   AudioDeviceID id;
   UInt32 dataSize = sizeof( AudioDeviceID );
-  OSStatus result = AudioHardwareGetProperty( kAudioHardwarePropertyDefaultInputDevice,
-                                              &dataSize, &id );
-
+  AudioObjectPropertyAddress property = { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+  OSStatus result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property, 0, NULL, &dataSize, &id );
   if ( result != noErr ) {
     errorText_ = "RtApiCore::getDefaultInputDevice: OS-X system error getting device.";
     error( RtError::WARNING );
@@ -463,7 +463,8 @@ unsigned int RtApiCore :: getDefaultInputDevice( void )
 
   dataSize *= nDevices;
   AudioDeviceID deviceList[ nDevices ];
-  result = AudioHardwareGetProperty( kAudioHardwarePropertyDevices, &dataSize, (void *) &deviceList );
+  property.mSelector = kAudioHardwarePropertyDevices;
+  result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property, 0, NULL, &dataSize, (void *) &deviceList );
   if ( result != noErr ) {
     errorText_ = "RtApiCore::getDefaultInputDevice: OS-X system error getting device IDs.";
     error( RtError::WARNING );
@@ -485,18 +486,18 @@ unsigned int RtApiCore :: getDefaultOutputDevice( void )
 
   AudioDeviceID id;
   UInt32 dataSize = sizeof( AudioDeviceID );
-  OSStatus result = AudioHardwareGetProperty( kAudioHardwarePropertyDefaultOutputDevice,
-                                              &dataSize, &id );
-
+  AudioObjectPropertyAddress property = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+  OSStatus result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property, 0, NULL, &dataSize, &id );
   if ( result != noErr ) {
     errorText_ = "RtApiCore::getDefaultOutputDevice: OS-X system error getting device.";
     error( RtError::WARNING );
     return 0;
   }
 
-  dataSize *= nDevices;
+  dataSize = sizeof( AudioDeviceID ) * nDevices;
   AudioDeviceID deviceList[ nDevices ];
-  result = AudioHardwareGetProperty( kAudioHardwarePropertyDevices, &dataSize, (void *) &deviceList );
+  property.mSelector = kAudioHardwarePropertyDevices;
+  result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property, 0, NULL, &dataSize, (void *) &deviceList );
   if ( result != noErr ) {
     errorText_ = "RtApiCore::getDefaultOutputDevice: OS-X system error getting device IDs.";
     error( RtError::WARNING );
@@ -530,7 +531,11 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
 
   AudioDeviceID deviceList[ nDevices ];
   UInt32 dataSize = sizeof( AudioDeviceID ) * nDevices;
-  OSStatus result = AudioHardwareGetProperty( kAudioHardwarePropertyDevices, &dataSize, (void *) &deviceList );
+  AudioObjectPropertyAddress property = { kAudioHardwarePropertyDevices,
+                                          kAudioObjectPropertyScopeGlobal,
+                                          kAudioObjectPropertyElementMaster };
+  OSStatus result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property,
+                                                0, NULL, &dataSize, (void *) &deviceList );
   if ( result != noErr ) {
     errorText_ = "RtApiCore::getDeviceInfo: OS-X system error getting device IDs.";
     error( RtError::WARNING );
@@ -541,39 +546,43 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
 
   // Get the device name.
   info.name.erase();
-  char	name[256];
-  dataSize = 256;
-  result = AudioDeviceGetProperty( id, 0, false,
-                                   kAudioDevicePropertyDeviceManufacturer,
-                                   &dataSize, name );
-
+  CFStringRef cfname;
+  dataSize = sizeof( CFStringRef );
+  property.mSelector = kAudioObjectPropertyManufacturer;
+  result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, &cfname );
   if ( result != noErr ) {
     errorStream_ << "RtApiCore::probeDeviceInfo: system error (" << getErrorCode( result ) << ") getting device manufacturer.";
     errorText_ = errorStream_.str();
     error( RtError::WARNING );
     return info;
   }
-  info.name.append( (const char *)name, strlen(name) );
-  info.name.append( ": " );
 
-  dataSize = 256;
-  result = AudioDeviceGetProperty( id, 0, false,
-                                   kAudioDevicePropertyDeviceName,
-                                   &dataSize, name );
+  const char *mname = CFStringGetCStringPtr( cfname, CFStringGetSystemEncoding() );
+  info.name.append( (const char *)mname, strlen(mname) );
+  info.name.append( ": " );
+  CFRelease( cfname );
+
+  property.mSelector = kAudioObjectPropertyName;
+  result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, &cfname );
   if ( result != noErr ) {
     errorStream_ << "RtApiCore::probeDeviceInfo: system error (" << getErrorCode( result ) << ") getting device name.";
     errorText_ = errorStream_.str();
     error( RtError::WARNING );
     return info;
   }
+
+  const char *name = CFStringGetCStringPtr( cfname, CFStringGetSystemEncoding() );
   info.name.append( (const char *)name, strlen(name) );
+  CFRelease( cfname );
 
   // Get the output stream "configuration".
   AudioBufferList	*bufferList = nil;
-  result = AudioDeviceGetPropertyInfo( id, 0, false,
-                                       kAudioDevicePropertyStreamConfiguration,
-                                       &dataSize, NULL );
-  if (result != noErr || dataSize == 0) {
+  property.mSelector = kAudioDevicePropertyStreamConfiguration;
+  property.mScope = kAudioDevicePropertyScopeOutput;
+  //  property.mElement = kAudioObjectPropertyElementWildcard;
+  dataSize = 0;
+  result = AudioObjectGetPropertyDataSize( id, &property, 0, NULL, &dataSize );
+  if ( result != noErr || dataSize == 0 ) {
     errorStream_ << "RtApiCore::getDeviceInfo: system error (" << getErrorCode( result ) << ") getting output stream configuration info for device (" << device << ").";
     errorText_ = errorStream_.str();
     error( RtError::WARNING );
@@ -588,10 +597,8 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
     return info;
   }
 
-  result = AudioDeviceGetProperty( id, 0, false,
-                                   kAudioDevicePropertyStreamConfiguration,
-                                   &dataSize, bufferList );
-  if ( result != noErr ) {
+  result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, bufferList );
+  if ( result != noErr || dataSize == 0 ) {
     free( bufferList );
     errorStream_ << "RtApiCore::getDeviceInfo: system error (" << getErrorCode( result ) << ") getting output stream configuration for device (" << device << ").";
     errorText_ = errorStream_.str();
@@ -606,10 +613,9 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
   free( bufferList );
 
   // Get the input stream "configuration".
-  result = AudioDeviceGetPropertyInfo( id, 0, true,
-                                       kAudioDevicePropertyStreamConfiguration,
-                                       &dataSize, NULL );
-  if (result != noErr || dataSize == 0) {
+  property.mScope = kAudioDevicePropertyScopeInput;
+  result = AudioObjectGetPropertyDataSize( id, &property, 0, NULL, &dataSize );
+  if ( result != noErr || dataSize == 0 ) {
     errorStream_ << "RtApiCore::getDeviceInfo: system error (" << getErrorCode( result ) << ") getting input stream configuration info for device (" << device << ").";
     errorText_ = errorStream_.str();
     error( RtError::WARNING );
@@ -624,10 +630,8 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
     return info;
   }
 
-  result = AudioDeviceGetProperty( id, 0, true,
-                                   kAudioDevicePropertyStreamConfiguration,
-                                   &dataSize, bufferList );
-  if ( result != noErr ) {
+  result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, bufferList );
+  if (result != noErr || dataSize == 0) {
     free( bufferList );
     errorStream_ << "RtApiCore::getDeviceInfo: system error (" << getErrorCode( result ) << ") getting input stream configuration for device (" << device << ").";
     errorText_ = errorStream_.str();
@@ -650,10 +654,9 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
   if ( info.outputChannels == 0 ) isInput = true;
 
   // Determine the supported sample rates.
-  result = AudioDeviceGetPropertyInfo( id, 0, isInput,
-                                       kAudioDevicePropertyAvailableNominalSampleRates,
-                                       &dataSize, NULL );
-
+  property.mSelector = kAudioDevicePropertyAvailableNominalSampleRates;
+  if ( isInput == false ) property.mScope = kAudioDevicePropertyScopeOutput;
+  result = AudioObjectGetPropertyDataSize( id, &property, 0, NULL, &dataSize );
   if ( result != kAudioHardwareNoError || dataSize == 0 ) {
     errorStream_ << "RtApiCore::getDeviceInfo: system error (" << getErrorCode( result ) << ") getting sample rate info.";
     errorText_ = errorStream_.str();
@@ -663,10 +666,7 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
 
   UInt32 nRanges = dataSize / sizeof( AudioValueRange );
   AudioValueRange rangeList[ nRanges ];
-  result = AudioDeviceGetProperty( id, 0, isInput,
-                                   kAudioDevicePropertyAvailableNominalSampleRates,
-                                   &dataSize, &rangeList );
-
+  result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, &rangeList );
   if ( result != kAudioHardwareNoError ) {
     errorStream_ << "RtApiCore::getDeviceInfo: system error (" << getErrorCode( result ) << ") getting sample rates.";
     errorText_ = errorStream_.str();
@@ -698,10 +698,10 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
   // no interest to the client.
   info.nativeFormats = RTAUDIO_FLOAT32;
 
-  if ( getDefaultOutputDevice() == device )
-    info.isDefaultOutput = true;
-  if ( getDefaultInputDevice() == device )
-    info.isDefaultInput = true;
+  if ( info.outputChannels > 0 )
+    if ( getDefaultOutputDevice() == device ) info.isDefaultOutput = true;
+  if ( info.inputChannels > 0 )
+    if ( getDefaultInputDevice() == device ) info.isDefaultInput = true;
 
   info.probed = true;
   return info;
@@ -724,29 +724,24 @@ OSStatus callbackHandler( AudioDeviceID inDevice,
     return kAudioHardwareNoError;
 }
 
-OSStatus deviceListener( AudioDeviceID inDevice,
-                         UInt32 channel,
-                         Boolean isInput,
-                         AudioDevicePropertyID propertyID,
+OSStatus deviceListener( AudioObjectID inDevice,
+                         UInt32 nAddresses,
+                         const AudioObjectPropertyAddress properties[],
                          void* handlePointer )
 {
   CoreHandle *handle = (CoreHandle *) handlePointer;
-  if ( propertyID == kAudioDeviceProcessorOverload ) {
-    if ( isInput )
-      handle->xrun[1] = true;
-    else
-      handle->xrun[0] = true;
+  for ( UInt32 i=0; i<nAddresses; i++ ) {
+    if ( properties[i].mSelector == kAudioDeviceProcessorOverload ) {
+      if ( properties[i].mScope == kAudioDevicePropertyScopeInput )
+        handle->xrun[1] = true;
+      else
+        handle->xrun[0] = true;
+    }
   }
 
   return kAudioHardwareNoError;
 }
 
-static bool hasProperty( AudioDeviceID id, UInt32 channel, bool isInput, AudioDevicePropertyID property )
-{
-  OSStatus result = AudioDeviceGetPropertyInfo( id, channel, isInput, property, NULL, NULL );
-  return result == 0;
-}
-
 bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned int channels,
                                    unsigned int firstChannel, unsigned int sampleRate,
                                    RtAudioFormat format, unsigned int *bufferSize,
@@ -768,7 +763,11 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
 
   AudioDeviceID deviceList[ nDevices ];
   UInt32 dataSize = sizeof( AudioDeviceID ) * nDevices;
-  OSStatus result = AudioHardwareGetProperty( kAudioHardwarePropertyDevices, &dataSize, (void *) &deviceList );
+  AudioObjectPropertyAddress property = { kAudioHardwarePropertyDevices,
+                                          kAudioObjectPropertyScopeGlobal,
+                                          kAudioObjectPropertyElementMaster };
+  OSStatus result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property,
+                                                0, NULL, &dataSize, (void *) &deviceList );
   if ( result != noErr ) {
     errorText_ = "RtApiCore::probeDeviceOpen: OS-X system error getting device IDs.";
     return FAILURE;
@@ -778,25 +777,19 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
 
   // Setup for stream mode.
   bool isInput = false;
-  if ( mode == INPUT ) isInput = true;
-
-  // Set or disable "hog" mode.
-  dataSize = sizeof( UInt32 );
-  UInt32 doHog = 0;
-  if ( options && options->flags & RTAUDIO_HOG_DEVICE ) doHog = 1;
-  result = AudioHardwareSetProperty( kAudioHardwarePropertyHogModeIsAllowed, dataSize, &doHog );
-  if ( result != noErr ) {
-    errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") setting 'hog' state!";
-    errorText_ = errorStream_.str();
-    return FAILURE;
+  if ( mode == INPUT ) {
+    isInput = true;
+    property.mScope = kAudioDevicePropertyScopeInput;
   }
+  else
+    property.mScope = kAudioDevicePropertyScopeOutput;
 
   // Get the stream "configuration".
-  AudioBufferList	*bufferList;
-  result = AudioDeviceGetPropertyInfo( id, 0, isInput,
-                                       kAudioDevicePropertyStreamConfiguration,
-                                       &dataSize, NULL );
-  if (result != noErr || dataSize == 0) {
+  AudioBufferList	*bufferList = nil;
+  dataSize = 0;
+  property.mSelector = kAudioDevicePropertyStreamConfiguration;
+  result = AudioObjectGetPropertyDataSize( id, &property, 0, NULL, &dataSize );
+  if ( result != noErr || dataSize == 0 ) {
     errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") getting stream configuration info for device (" << device << ").";
     errorText_ = errorStream_.str();
     return FAILURE;
@@ -809,11 +802,8 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
     return FAILURE;
   }
 
-  result = AudioDeviceGetProperty( id, 0, isInput,
-                                   kAudioDevicePropertyStreamConfiguration,
-                                   &dataSize, bufferList );
-  if ( result != noErr ) {
-    free( bufferList );
+  result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, bufferList );
+  if (result != noErr || dataSize == 0) {
     errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") getting stream configuration for device (" << device << ").";
     errorText_ = errorStream_.str();
     return FAILURE;
@@ -888,9 +878,9 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
   // Determine the buffer size.
   AudioValueRange	bufferRange;
   dataSize = sizeof( AudioValueRange );
-  result = AudioDeviceGetProperty( id, 0, isInput,
-                                   kAudioDevicePropertyBufferFrameSizeRange,
-                                   &dataSize, &bufferRange );
+  property.mSelector = kAudioDevicePropertyBufferFrameSizeRange;
+  result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, &bufferRange );
+
   if ( result != noErr ) {
     errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") getting buffer size range for device (" << device << ").";
     errorText_ = errorStream_.str();
@@ -905,9 +895,8 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
   // need to make this setting for the master channel.
   UInt32 theSize = (UInt32) *bufferSize;
   dataSize = sizeof( UInt32 );
-  result = AudioDeviceSetProperty( id, NULL, 0, isInput,
-                                   kAudioDevicePropertyBufferFrameSize,
-                                   dataSize, &theSize );
+  property.mSelector = kAudioDevicePropertyBufferFrameSize;
+  result = AudioObjectSetPropertyData( id, &property, 0, NULL, dataSize, &theSize );
 
   if ( result != noErr ) {
     errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") setting the buffer size for device (" << device << ").";
@@ -927,30 +916,75 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
   stream_.bufferSize = *bufferSize;
   stream_.nBuffers = 1;
 
-  // Get the stream ID(s) so we can set the stream format.  We'll have
-  // to do this for each stream.
+  // Check and if necessary, change the sample rate for the device.
+  Float64 nominalRate;
+  dataSize = sizeof( Float64 );
+  property.mSelector = kAudioDevicePropertyNominalSampleRate;
+  result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, &nominalRate );
+
+  if ( result != noErr ) {
+    errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") getting current sample rate.";
+    errorText_ = errorStream_.str();
+    return FAILURE;
+  }
+
+  // Only change the sample rate if off by more than 1 Hz.
+  if ( fabs( nominalRate - (double)sampleRate ) > 1.0 ) {
+    nominalRate = (Float64) sampleRate;
+    result = AudioObjectSetPropertyData( id, &property, 0, NULL, dataSize, &nominalRate );
+
+    if ( result != noErr ) {
+      errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") setting sample rate for device (" << device << ").";
+      errorText_ = errorStream_.str();
+      return FAILURE;
+    }
+  }
+
+  // Try to set "hog" mode ... it's not clear to me this is working.
+  if ( options && options->flags & RTAUDIO_HOG_DEVICE ) {
+    pid_t hog_pid;
+    dataSize = sizeof( hog_pid );
+    property.mSelector = kAudioDevicePropertyHogMode;
+    result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, &hog_pid );
+    if ( result != noErr ) {
+      errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") getting 'hog' state!";
+      errorText_ = errorStream_.str();
+      return FAILURE;
+    }
+
+    if ( hog_pid != getpid() ) {
+      hog_pid = getpid();
+      result = AudioObjectSetPropertyData( id, &property, 0, NULL, dataSize, &hog_pid );
+      if ( result != noErr ) {
+        errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") setting 'hog' state!";
+        errorText_ = errorStream_.str();
+        return FAILURE;
+      }
+    }
+  }
+
+  // Get the stream ID(s) so we can set the stream format.
   AudioStreamID streamIDs[ nStreams ];
   dataSize = nStreams * sizeof( AudioStreamID );
-  result = AudioDeviceGetProperty( id, 0, isInput,
-                                   kAudioDevicePropertyStreams,
-                                   &dataSize, &streamIDs );
+  property.mSelector = kAudioDevicePropertyStreams;
+  result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, &streamIDs );
+
   if ( result != noErr ) {
     errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") getting stream ID(s) for device (" << device << ").";
     errorText_ = errorStream_.str();
     return FAILURE;
   }
 
-  // Now set the stream format.  Also, check the physical format of the
-  // device and change that if necessary.
+  // Now set the stream format for each stream.  Also, check the
+  // physical format of the device and change that if necessary.
   AudioStreamBasicDescription	description;
   dataSize = sizeof( AudioStreamBasicDescription );
 
   bool updateFormat;
   for ( UInt32 i=0; i<streamCount; i++ ) {
 
-    result = AudioStreamGetProperty( streamIDs[firstStream+i], 0,
-                                     kAudioStreamPropertyVirtualFormat,
-                                     &dataSize, &description );
+    property.mSelector = kAudioStreamPropertyVirtualFormat;
+    result = AudioObjectGetPropertyData( streamIDs[firstStream+i], &property, 0, NULL, &dataSize, &description );
 
     if ( result != noErr ) {
       errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") getting stream format for device (" << device << ").";
@@ -973,9 +1007,7 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
     }
 
     if ( updateFormat ) {
-      result = AudioStreamSetProperty( streamIDs[firstStream+i], NULL, 0,
-                                       kAudioStreamPropertyVirtualFormat,
-                                       dataSize, &description );
+      result = AudioObjectSetPropertyData( streamIDs[firstStream+i], &property, 0, NULL, dataSize, &description );
       if ( result != noErr ) {
         errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") setting sample rate or data format for device (" << device << ").";
         errorText_ = errorStream_.str();
@@ -984,9 +1016,8 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
     }
 
     // Now check the physical format.
-    result = AudioStreamGetProperty( streamIDs[firstStream+i], 0,
-                                     kAudioStreamPropertyPhysicalFormat,
-                                     &dataSize, &description );
+    property.mSelector = kAudioStreamPropertyPhysicalFormat;
+    result = AudioObjectGetPropertyData( streamIDs[firstStream+i], &property, 0, NULL,  &dataSize, &description );
     if ( result != noErr ) {
       errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") getting stream physical format for device (" << device << ").";
       errorText_ = errorStream_.str();
@@ -1000,34 +1031,44 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
 
       // We'll try higher bit rates first and then work our way down.
       testDescription.mBitsPerChannel = 32;
+      testDescription.mBytesPerFrame =  testDescription.mBitsPerChannel/8 * testDescription.mChannelsPerFrame;
+      testDescription.mBytesPerPacket = testDescription.mBytesPerFrame * testDescription.mFramesPerPacket;
       formatFlags = description.mFormatFlags | kLinearPCMFormatFlagIsFloat & ~kLinearPCMFormatFlagIsSignedInteger;
       testDescription.mFormatFlags = formatFlags;
-      result = AudioStreamSetProperty( streamIDs[firstStream+i], NULL, 0, kAudioStreamPropertyPhysicalFormat, dataSize, &testDescription );
+      result = AudioObjectSetPropertyData( streamIDs[firstStream+i], &property, 0, NULL, dataSize, &testDescription );
       if ( result == noErr ) continue;
 
       testDescription = description;
       testDescription.mBitsPerChannel = 32;
+      testDescription.mBytesPerFrame =  testDescription.mBitsPerChannel/8 * testDescription.mChannelsPerFrame;
+      testDescription.mBytesPerPacket = testDescription.mBytesPerFrame * testDescription.mFramesPerPacket;
       formatFlags = (description.mFormatFlags | kLinearPCMFormatFlagIsSignedInteger) & ~kLinearPCMFormatFlagIsFloat;
       testDescription.mFormatFlags = formatFlags;
-      result = AudioStreamSetProperty( streamIDs[firstStream+i], NULL, 0, kAudioStreamPropertyPhysicalFormat, dataSize, &testDescription );
+      result = AudioObjectSetPropertyData( streamIDs[firstStream+i], &property, 0, NULL, dataSize, &testDescription );
       if ( result == noErr ) continue;
 
       testDescription = description;
       testDescription.mBitsPerChannel = 24;
+      testDescription.mBytesPerFrame =  testDescription.mBitsPerChannel/8 * testDescription.mChannelsPerFrame;
+      testDescription.mBytesPerPacket = testDescription.mBytesPerFrame * testDescription.mFramesPerPacket;
       testDescription.mFormatFlags = formatFlags;
-      result = AudioStreamSetProperty( streamIDs[firstStream+i], NULL, 0, kAudioStreamPropertyPhysicalFormat, dataSize, &testDescription );
+      result = AudioObjectSetPropertyData( streamIDs[firstStream+i], &property, 0, NULL, dataSize, &testDescription );
       if ( result == noErr ) continue;
 
       testDescription = description;
       testDescription.mBitsPerChannel = 16;
+      testDescription.mBytesPerFrame =  testDescription.mBitsPerChannel/8 * testDescription.mChannelsPerFrame;
+      testDescription.mBytesPerPacket = testDescription.mBytesPerFrame * testDescription.mFramesPerPacket;
       testDescription.mFormatFlags = formatFlags;
-      result = AudioStreamSetProperty( streamIDs[firstStream+i], NULL, 0, kAudioStreamPropertyPhysicalFormat, dataSize, &testDescription );
+      result = AudioObjectSetPropertyData( streamIDs[firstStream+i], &property, 0, NULL, dataSize, &testDescription );
       if ( result == noErr ) continue;
 
       testDescription = description;
       testDescription.mBitsPerChannel = 8;
+      testDescription.mBytesPerFrame =  testDescription.mBitsPerChannel/8 * testDescription.mChannelsPerFrame;
+      testDescription.mBytesPerPacket = testDescription.mBytesPerFrame * testDescription.mFramesPerPacket;
       testDescription.mFormatFlags = formatFlags;
-      result = AudioStreamSetProperty( streamIDs[firstStream+i], NULL, 0, kAudioStreamPropertyPhysicalFormat, dataSize, &testDescription );
+      result = AudioObjectSetPropertyData( streamIDs[firstStream+i], &property, 0, NULL, dataSize, &testDescription );
       if ( result != noErr ) {
         errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") setting physical data format for device (" << device << ").";
         errorText_ = errorStream_.str();
@@ -1036,17 +1077,17 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
     }
   }
 
+
   // Get the stream latency.  There can be latency in both the device
   // and the stream.  First, attempt to get the device latency on the
   // master channel or the first open channel.  Errors that might
   // occur here are not deemed critical.
 
-  // ***** CHECK THIS ***** //
-  UInt32 latency, channel = 0;
+  UInt32 latency;
   dataSize = sizeof( UInt32 );
-  AudioDevicePropertyID property = kAudioDevicePropertyLatency;
-  if ( hasProperty( id, channel, isInput, property ) == true ) {
-    result = AudioDeviceGetProperty( id, channel, isInput, property, &dataSize, &latency );
+  property.mSelector = kAudioDevicePropertyLatency;
+  if ( AudioObjectHasProperty( id, &property ) == true ) {
+    result = AudioObjectGetPropertyData( id, &property, 0, NULL, &dataSize, &latency );
     if ( result == kAudioHardwareNoError ) stream_.latency[ mode ] = latency;
     else {
       errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") getting device latency for device (" << device << ").";
@@ -1057,7 +1098,7 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
 
   // Now try to get the stream latency.  For multiple streams, I assume the
   // latency is equal for each.
-  result = AudioStreamGetProperty( streamIDs[firstStream], 0, property, &dataSize, &latency );
+  result = AudioObjectGetPropertyData( streamIDs[firstStream], &property, 0, NULL, &dataSize, &latency );
   if ( result == kAudioHardwareNoError ) stream_.latency[ mode ] += latency;
   else {
     errorStream_ << "RtApiCore::probeDeviceOpen: system error (" << getErrorCode( result ) << ") getting stream latency for device (" << device << ").";
@@ -1190,9 +1231,8 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
   }
 
   // Setup the device property listener for over/underload.
-  result = AudioDeviceAddPropertyListener( id, 0, isInput,
-                                           kAudioDeviceProcessorOverload,
-                                           deviceListener, (void *) handle );
+  property.mSelector = kAudioDeviceProcessorOverload;
+  result = AudioObjectAddPropertyListener( id, &property, deviceListener, (void *) handle );
 
   return SUCCESS;
 
@@ -1340,7 +1380,9 @@ void RtApiCore :: stopStream( void )
       pthread_cond_wait( &handle->condition, &stream_.mutex ); // block until signaled
     }
 
+    MUTEX_UNLOCK( &stream_.mutex );
     result = AudioDeviceStop( handle->id[0], callbackHandler );
+    MUTEX_LOCK( &stream_.mutex );
     if ( result != noErr ) {
       errorStream_ << "RtApiCore::stopStream: system error (" << getErrorCode( result ) << ") stopping callback procedure on device (" << stream_.device[0] << ").";
       errorText_ = errorStream_.str();
@@ -1720,6 +1762,7 @@ const char* RtApiCore :: getErrorCode( OSStatus code )
 
 #include <jack/jack.h>
 #include <unistd.h>
+#include <cstdio>
 
 // A structure to hold various information related to the Jack API
 // implementation.
@@ -1736,6 +1779,7 @@ struct JackHandle {
     :client(0), drainCounter(0), internalDrain(false) { ports[0] = 0; ports[1] = 0; xrun[0] = false; xrun[1] = false; }
 };
 
+ThreadHandle threadId;
 void jackSilentError( const char * ) {};
 
 RtApiJack :: RtApiJack()
@@ -1884,6 +1928,19 @@ int jackCallbackHandler( jack_nframes_t nframes, void *infoPointer )
   return 0;
 }
 
+// This function will be called by a spawned thread when the Jack
+// server signals that it is shutting down.  It is necessary to handle
+// it this way because the jackShutdown() function must return before
+// the jack_deactivate() function (in closeStream()) will return.
+extern "C" void *jackCloseStream( void *ptr )
+{
+  CallbackInfo *info = (CallbackInfo *) ptr;
+  RtApiJack *object = (RtApiJack *) info->object;
+
+  object->closeStream();
+
+  pthread_exit( NULL );
+}
 void jackShutdown( void *infoPointer )
 {
   CallbackInfo *info = (CallbackInfo *) infoPointer;
@@ -1896,7 +1953,7 @@ void jackShutdown( void *infoPointer )
   // other problem occurred and we should close the stream.
   if ( object->isStreamRunning() == false ) return;
 
-  object->closeStream();
+  pthread_create( &threadId, NULL, jackCloseStream, info );
   std::cerr << "\nRtApiJack: the Jack server is shutting down this client ... stream stopped and closed!!\n" << std::endl;
 }
 
@@ -2352,8 +2409,7 @@ bool RtApiJack :: callbackEvent( unsigned long nframes )
   // Check if we were draining the stream and signal is finished.
   if ( handle->drainCounter > 3 ) {
     if ( handle->internalDrain == true ) {
-      ThreadHandle id;
-      pthread_create( &id, NULL, jackStopStream, info );
+      pthread_create( &threadId, NULL, jackStopStream, info );
     }
     else
       pthread_cond_signal( &handle->condition );
@@ -2630,10 +2686,10 @@ RtAudio::DeviceInfo RtApiAsio :: getDeviceInfo( unsigned int device )
   else if ( channelInfo.type == ASIOSTFloat64MSB || channelInfo.type == ASIOSTFloat64LSB )
     info.nativeFormats |= RTAUDIO_FLOAT64;
 
-  if ( getDefaultOutputDevice() == device )
-    info.isDefaultOutput = true;
-  if ( getDefaultInputDevice() == device )
-    info.isDefaultInput = true;
+  if ( info.outputChannels > 0 )
+    if ( getDefaultOutputDevice() == device ) info.isDefaultOutput = true;
+  if ( info.inputChannels > 0 )
+    if ( getDefaultInputDevice() == device ) info.isDefaultInput = true;
 
   info.probed = true;
   drivers.removeCurrentDriver();
@@ -3413,13 +3469,14 @@ static const char* getAsioErrorString( ASIOError result )
 
 // Modified by Robin Davies, October 2005
 // - Improvements to DirectX pointer chasing. 
-// - Backdoor RtDsStatistics hook provides DirectX performance information.
 // - Bug fix for non-power-of-two Asio granularity used by Edirol PCR-A30.
 // - Auto-call CoInitialize for DSOUND and ASIO platforms.
 // Various revisions for RtAudio 4.0 by Gary Scavone, April 2007
+// Changed device query structure for RtAudio 4.0.7, January 2010
 
 #include <dsound.h>
 #include <assert.h>
+#include <algorithm>
 
 #if defined(__MINGW32__)
   // missing from latest mingw winapi
@@ -3435,14 +3492,6 @@ static const char* getAsioErrorString( ASIOError result )
 #pragma comment( lib, "winmm.lib" ) // then, auto-link winmm.lib. Otherwise, it has to be added manually.
 #endif
 
-static inline DWORD dsPointerDifference( DWORD laterPointer, DWORD earlierPointer, DWORD bufferSize )
-{
-  if ( laterPointer > earlierPointer )
-    return laterPointer - earlierPointer;
-  else
-    return laterPointer - earlierPointer + bufferSize;
-}
-
 static inline DWORD dsPointerBetween( DWORD pointer, DWORD laterPointer, DWORD earlierPointer, DWORD bufferSize )
 {
   if ( pointer > bufferSize ) pointer -= bufferSize;
@@ -3468,25 +3517,6 @@ struct DsHandle {
     :drainCounter(0), internalDrain(false) { id[0] = 0; id[1] = 0; buffer[0] = 0; buffer[1] = 0; xrun[0] = false; xrun[1] = false; bufferPointer[0] = 0; bufferPointer[1] = 0; }
 };
 
-/*
-RtApiDs::RtDsStatistics RtApiDs::statistics;
-
-// Provides a backdoor hook to monitor for DirectSound read overruns and write underruns.
-RtApiDs::RtDsStatistics RtApiDs::getDsStatistics()
-{
-  RtDsStatistics s = statistics;
-
-  // update the calculated fields.
-  if ( s.inputFrameSize != 0 )
-    s.latency += s.readDeviceSafeLeadBytes * 1.0 / s.inputFrameSize / s.sampleRate;
-
-  if ( s.outputFrameSize != 0 )
-    s.latency += (s.writeDeviceSafeLeadBytes + s.writeDeviceBufferLeadBytes) * 1.0 / s.outputFrameSize / s.sampleRate;
-
-  return s;
-}
-*/
-
 // Declarations for utility functions, callbacks, and structures
 // specific to the DirectSound implementation.
 static BOOL CALLBACK deviceQueryCallback( LPGUID lpguid,
@@ -3494,23 +3524,22 @@ static BOOL CALLBACK deviceQueryCallback( LPGUID lpguid,
                                           LPCTSTR module,
                                           LPVOID lpContext );
 
-static char* getErrorString( int code );
+static const char* getErrorString( int code );
 
 extern "C" unsigned __stdcall callbackHandler( void *ptr );
 
-struct EnumInfo {
-  bool isInput;
-  bool getDefault;
-  bool findIndex;
-  unsigned int counter;
-  unsigned int index;
-  LPGUID id;
+struct DsDevice {
+  LPGUID id[2];
+  bool validId[2];
+  bool found;
   std::string name;
 
-  EnumInfo()
-    : isInput(false), getDefault(false), findIndex(false), counter(0), index(0) {}
+  DsDevice()
+  : found(false) { validId[0] = false; validId[1] = false; }
 };
 
+std::vector< DsDevice > dsDevices;
+
 RtApiDs :: RtApiDs()
 {
   // Dsound will run both-threaded. If CoInitialize fails, then just
@@ -3526,105 +3555,82 @@ RtApiDs :: ~RtApiDs()
   if ( stream_.state != STREAM_CLOSED ) closeStream();
 }
 
-unsigned int RtApiDs :: getDefaultInputDevice( void )
+// The DirectSound default output is always the first device.
+unsigned int RtApiDs :: getDefaultOutputDevice( void )
 {
-  // Count output devices.
-  EnumInfo info;
-  HRESULT result = DirectSoundEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &info );
-  if ( FAILED( result ) ) {
-    errorStream_ << "RtApiDs::getDefaultOutputDevice: error (" << getErrorString( result ) << ") counting output devices!";
-    errorText_ = errorStream_.str();
-    error( RtError::WARNING );
-    return 0;
-  }
-
-  // Now enumerate input devices until we find the id = NULL.
-  info.isInput = true;
-  info.getDefault = true;
-  result = DirectSoundCaptureEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &info );
-  if ( FAILED( result ) ) {
-    errorStream_ << "RtApiDs::getDefaultInputDevice: error (" << getErrorString( result ) << ") enumerating input devices!";
-    errorText_ = errorStream_.str();
-    error( RtError::WARNING );
-    return 0;
-  }
-
-  if ( info.counter > 0 ) return info.counter - 1;
   return 0;
 }
 
-unsigned int RtApiDs :: getDefaultOutputDevice( void )
+// The DirectSound default input is always the first input device,
+// which is the first capture device enumerated.
+unsigned int RtApiDs :: getDefaultInputDevice( void )
 {
-  // Enumerate output devices until we find the id = NULL.
-  EnumInfo info;
-  info.getDefault = true;
-  HRESULT result = DirectSoundEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &info );
-  if ( FAILED( result ) ) {
-    errorStream_ << "RtApiDs::getDefaultOutputDevice: error (" << getErrorString( result ) << ") enumerating output devices!";
-    errorText_ = errorStream_.str();
-    error( RtError::WARNING );
-    return 0;
-  }
-
-  if ( info.counter > 0 ) return info.counter - 1;
   return 0;
 }
 
 unsigned int RtApiDs :: getDeviceCount( void )
 {
-  // Count DirectSound devices.
-  EnumInfo info;
-  HRESULT result = DirectSoundEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &info );
+  // Set query flag for previously found devices to false, so that we
+  // can check for any devices that have disappeared.
+  for ( unsigned int i=0; i<dsDevices.size(); i++ )
+    dsDevices[i].found = false;
+
+  // Query DirectSound devices.
+  bool isInput = false;
+  HRESULT result = DirectSoundEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &isInput );
   if ( FAILED( result ) ) {
     errorStream_ << "RtApiDs::getDeviceCount: error (" << getErrorString( result ) << ") enumerating output devices!";
     errorText_ = errorStream_.str();
     error( RtError::WARNING );
   }
 
-  // Count DirectSoundCapture devices.
-  info.isInput = true;
-  result = DirectSoundCaptureEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &info );
+  // Query DirectSoundCapture devices.
+  isInput = true;
+  result = DirectSoundCaptureEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &isInput );
   if ( FAILED( result ) ) {
     errorStream_ << "RtApiDs::getDeviceCount: error (" << getErrorString( result ) << ") enumerating input devices!";
     errorText_ = errorStream_.str();
     error( RtError::WARNING );
   }
 
-  return info.counter;
+  // Clean out any devices that may have disappeared.
+  std::vector< DsDevice > :: iterator it;
+  for ( it=dsDevices.begin(); it < dsDevices.end(); it++ )
+    if ( it->found == false ) dsDevices.erase( it );
+
+  return dsDevices.size();
 }
 
 RtAudio::DeviceInfo RtApiDs :: getDeviceInfo( unsigned int device )
 {
-  // Because DirectSound always enumerates input and output devices
-  // separately (and because we don't attempt to combine devices
-  // internally), none of our "devices" will ever be duplex.
-
   RtAudio::DeviceInfo info;
   info.probed = false;
 
-  // Enumerate through devices to find the id (if it exists).  Note
-  // that we have to do the output enumeration first, even if this is
-  // an input device, in order for the device counter to be correct.
-  EnumInfo dsinfo;
-  dsinfo.findIndex = true;
-  dsinfo.index = device;
-  HRESULT result = DirectSoundEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &dsinfo );
-  if ( FAILED( result ) ) {
-    errorStream_ << "RtApiDs::getDeviceInfo: error (" << getErrorString( result ) << ") enumerating output devices!";
-    errorText_ = errorStream_.str();
-    error( RtError::WARNING );
+  if ( dsDevices.size() == 0 ) {
+    // Force a query of all devices
+    getDeviceCount();
+    if ( dsDevices.size() == 0 ) {
+      errorText_ = "RtApiDs::getDeviceInfo: no devices found!";
+      error( RtError::INVALID_USE );
+    }
   }
 
-  if ( dsinfo.name.empty() ) goto probeInput;
+  if ( device >= dsDevices.size() ) {
+    errorText_ = "RtApiDs::getDeviceInfo: device ID is invalid!";
+    error( RtError::INVALID_USE );
+  }
+
+  HRESULT result;
+  if ( dsDevices[ device ].validId[0] == false ) goto probeInput;
 
   LPDIRECTSOUND output;
   DSCAPS outCaps;
-  result = DirectSoundCreate( dsinfo.id, &output, NULL );
+  result = DirectSoundCreate( dsDevices[ device ].id[0], &output, NULL );
   if ( FAILED( result ) ) {
-    errorStream_ << "RtApiDs::getDeviceInfo: error (" << getErrorString( result ) << ") opening output device (" << dsinfo.name << ")!";
+    errorStream_ << "RtApiDs::getDeviceInfo: error (" << getErrorString( result ) << ") opening output device (" << dsDevices[ device ].name << ")!";
     errorText_ = errorStream_.str();
     error( RtError::WARNING );
-    return info;
+    goto probeInput;
   }
 
   outCaps.dwSize = sizeof( outCaps );
@@ -3634,7 +3640,7 @@ RtAudio::DeviceInfo RtApiDs :: getDeviceInfo( unsigned int device )
     errorStream_ << "RtApiDs::getDeviceInfo: error (" << getErrorString( result ) << ") getting capabilities!";
     errorText_ = errorStream_.str();
     error( RtError::WARNING );
-    return info;
+    goto probeInput;
   }
 
   // Get output channel information.
@@ -3657,28 +3663,18 @@ RtAudio::DeviceInfo RtApiDs :: getDeviceInfo( unsigned int device )
   if ( getDefaultOutputDevice() == device )
     info.isDefaultOutput = true;
 
-  // Copy name and return.
-  info.name = dsinfo.name;
-
-  info.probed = true;
-  return info;
+  if ( dsDevices[ device ].validId[1] == false ) {
+    info.name = dsDevices[ device ].name;
+    info.probed = true;
+    return info;
+  }
 
  probeInput:
 
-  dsinfo.isInput = true;
-  result = DirectSoundCaptureEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &dsinfo );
-  if ( FAILED( result ) ) {
-    errorStream_ << "RtApiDs::getDeviceInfo: error (" << getErrorString( result ) << ") enumerating input devices!";
-    errorText_ = errorStream_.str();
-    error( RtError::WARNING );
-  }
-
-  if ( dsinfo.name.empty() ) return info;
-
   LPDIRECTSOUNDCAPTURE input;
-  result = DirectSoundCaptureCreate( dsinfo.id, &input, NULL );
+  result = DirectSoundCaptureCreate( dsDevices[ device ].id[1], &input, NULL );
   if ( FAILED( result ) ) {
-    errorStream_ << "RtApiDs::getDeviceInfo: error (" << getErrorString( result ) << ") opening input device (" << dsinfo.name << ")!";
+    errorStream_ << "RtApiDs::getDeviceInfo: error (" << getErrorString( result ) << ") opening input device (" << dsDevices[ device ].name << ")!";
     errorText_ = errorStream_.str();
     error( RtError::WARNING );
     return info;
@@ -3689,7 +3685,7 @@ RtAudio::DeviceInfo RtApiDs :: getDeviceInfo( unsigned int device )
   result = input->GetCaps( &inCaps );
   if ( FAILED( result ) ) {
     input->Release();
-    errorStream_ << "RtApiDs::getDeviceInfo: error (" << getErrorString( result ) << ") getting object capabilities (" << dsinfo.name << ")!";
+    errorStream_ << "RtApiDs::getDeviceInfo: error (" << getErrorString( result ) << ") getting object capabilities (" << dsDevices[ device ].name << ")!";
     errorText_ = errorStream_.str();
     error( RtError::WARNING );
     return info;
@@ -3699,6 +3695,7 @@ RtAudio::DeviceInfo RtApiDs :: getDeviceInfo( unsigned int device )
   info.inputChannels = inCaps.dwChannels;
 
   // Get sample rate and format information.
+  std::vector<unsigned int> rates;
   if ( inCaps.dwChannels == 2 ) {
     if ( inCaps.dwFormats & WAVE_FORMAT_1S16 ) info.nativeFormats |= RTAUDIO_SINT16;
     if ( inCaps.dwFormats & WAVE_FORMAT_2S16 ) info.nativeFormats |= RTAUDIO_SINT16;
@@ -3710,16 +3707,16 @@ RtAudio::DeviceInfo RtApiDs :: getDeviceInfo( unsigned int device )
     if ( inCaps.dwFormats & WAVE_FORMAT_96S08 ) info.nativeFormats |= RTAUDIO_SINT8;
 
     if ( info.nativeFormats & RTAUDIO_SINT16 ) {
-      if ( inCaps.dwFormats & WAVE_FORMAT_1S16 ) info.sampleRates.push_back( 11025 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_2S16 ) info.sampleRates.push_back( 22050 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_4S16 ) info.sampleRates.push_back( 44100 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_96S16 ) info.sampleRates.push_back( 96000 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_1S16 ) rates.push_back( 11025 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_2S16 ) rates.push_back( 22050 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_4S16 ) rates.push_back( 44100 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_96S16 ) rates.push_back( 96000 );
     }
     else if ( info.nativeFormats & RTAUDIO_SINT8 ) {
-      if ( inCaps.dwFormats & WAVE_FORMAT_1S08 ) info.sampleRates.push_back( 11025 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_2S08 ) info.sampleRates.push_back( 22050 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_4S08 ) info.sampleRates.push_back( 44100 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_96S08 ) info.sampleRates.push_back( 44100 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_1S08 ) rates.push_back( 11025 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_2S08 ) rates.push_back( 22050 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_4S08 ) rates.push_back( 44100 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_96S08 ) rates.push_back( 96000 );
     }
   }
   else if ( inCaps.dwChannels == 1 ) {
@@ -3733,16 +3730,16 @@ RtAudio::DeviceInfo RtApiDs :: getDeviceInfo( unsigned int device )
     if ( inCaps.dwFormats & WAVE_FORMAT_96M08 ) info.nativeFormats |= RTAUDIO_SINT8;
 
     if ( info.nativeFormats & RTAUDIO_SINT16 ) {
-      if ( inCaps.dwFormats & WAVE_FORMAT_1M16 ) info.sampleRates.push_back( 11025 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_2M16 ) info.sampleRates.push_back( 22050 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_4M16 ) info.sampleRates.push_back( 44100 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_96M16 ) info.sampleRates.push_back( 96000 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_1M16 ) rates.push_back( 11025 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_2M16 ) rates.push_back( 22050 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_4M16 ) rates.push_back( 44100 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_96M16 ) rates.push_back( 96000 );
     }
     else if ( info.nativeFormats & RTAUDIO_SINT8 ) {
-      if ( inCaps.dwFormats & WAVE_FORMAT_1M08 ) info.sampleRates.push_back( 11025 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_2M08 ) info.sampleRates.push_back( 22050 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_4M08 ) info.sampleRates.push_back( 44100 );
-      if ( inCaps.dwFormats & WAVE_FORMAT_96M08 ) info.sampleRates.push_back( 96000 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_1M08 ) rates.push_back( 11025 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_2M08 ) rates.push_back( 22050 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_4M08 ) rates.push_back( 44100 );
+      if ( inCaps.dwFormats & WAVE_FORMAT_96M08 ) rates.push_back( 96000 );
     }
   }
   else info.inputChannels = 0; // technically, this would be an error
@@ -3751,11 +3748,28 @@ RtAudio::DeviceInfo RtApiDs :: getDeviceInfo( unsigned int device )
 
   if ( info.inputChannels == 0 ) return info;
 
-  if ( getDefaultInputDevice() == device )
-    info.isDefaultInput = true;
+  // Copy the supported rates to the info structure but avoid duplication.
+  bool found;
+  for ( unsigned int i=0; i<rates.size(); i++ ) {
+    found = false;
+    for ( unsigned int j=0; j<info.sampleRates.size(); j++ ) {
+      if ( rates[i] == info.sampleRates[j] ) {
+        found = true;
+        break;
+      }
+    }
+    if ( found == false ) info.sampleRates.push_back( rates[i] );
+  }
+  sort( info.sampleRates.begin(), info.sampleRates.end() );
+
+  // If device opens for both playback and capture, we determine the channels.
+  if ( info.outputChannels > 0 && info.inputChannels > 0 )
+    info.duplexChannels = (info.outputChannels > info.inputChannels) ? info.inputChannels : info.outputChannels;
+
+  if ( device == 0 ) info.isDefaultInput = true;
 
   // Copy name and return.
-  info.name = dsinfo.name;
+  info.name = dsDevices[ device ].name;
   info.probed = true;
   return info;
 }
@@ -3770,35 +3784,28 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     return FAILURE;
   }
 
-  // Enumerate through devices to find the id (if it exists).  Note
-  // that we have to do the output enumeration first, even if this is
-  // an input device, in order for the device counter to be correct.
-  EnumInfo dsinfo;
-  dsinfo.findIndex = true;
-  dsinfo.index = device;
-  HRESULT result = DirectSoundEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &dsinfo );
-  if ( FAILED( result ) ) {
-    errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") enumerating output devices!";
-    errorText_ = errorStream_.str();
+  unsigned int nDevices = dsDevices.size();
+  if ( nDevices == 0 ) {
+    // This should not happen because a check is made before this function is called.
+    errorText_ = "RtApiDs::probeDeviceOpen: no devices found!";
+    return FAILURE;
+  }
+
+  if ( device >= nDevices ) {
+    // This should not happen because a check is made before this function is called.
+    errorText_ = "RtApiDs::probeDeviceOpen: device ID is invalid!";
     return FAILURE;
   }
 
   if ( mode == OUTPUT ) {
-    if ( dsinfo.name.empty() ) {
+    if ( dsDevices[ device ].validId[0] == false ) {
       errorStream_ << "RtApiDs::probeDeviceOpen: device (" << device << ") does not support output!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
   }
   else { // mode == INPUT
-    dsinfo.isInput = true;
-    HRESULT result = DirectSoundCaptureEnumerate( (LPDSENUMCALLBACK) deviceQueryCallback, &dsinfo );
-    if ( FAILED( result ) ) {
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") enumerating input devices!";
-      errorText_ = errorStream_.str();
-      return FAILURE;
-    }
-    if ( dsinfo.name.empty() ) {
+    if ( dsDevices[ device ].validId[1] == false ) {
       errorStream_ << "RtApiDs::probeDeviceOpen: device (" << device << ") does not support input!";
       errorText_ = errorStream_.str();
       return FAILURE;
@@ -3809,9 +3816,11 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
   // instead of GetForegroundWindow() is supposed to avoid problems
   // that occur when the application's window is not the foreground
   // window.  Also, if the application window closes before the
-  // DirectSound buffer, DirectSound can crash.  However, for console
-  // applications, no sound was produced when using GetDesktopWindow().
-  HWND hWnd = GetForegroundWindow();
+  // DirectSound buffer, DirectSound can crash.  In the past, I had
+  // problems when using GetDesktopWindow() but it seems fine now
+  // (January 2010).  I'll leave it commented here.
+  // HWND hWnd = GetForegroundWindow();
+  HWND hWnd = GetDesktopWindow();
 
   // Check the numberOfBuffers parameter and limit the lowest value to
   // two.  This is a judgement call and a value of two is probably too
@@ -3821,6 +3830,10 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
   if ( options && options->flags & RTAUDIO_MINIMIZE_LATENCY ) nBuffers = 2;
   if ( nBuffers < 2 ) nBuffers = 3;
 
+  // Check the lower range of the user-specified buffer size and set
+  // (arbitrarily) to a lower bound of 32.
+  if ( *bufferSize < 32 ) *bufferSize = 32;
+
   // Create the wave format structure.  The data format setting will
   // be determined later.
   WAVEFORMATEX waveFormat;
@@ -3829,19 +3842,20 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
   waveFormat.nChannels = channels + firstChannel;
   waveFormat.nSamplesPerSec = (unsigned long) sampleRate;
 
-  // Determine the device buffer size. By default, 32k, but we will
-  // grow it to make allowances for very large software buffer sizes.
-  DWORD dsBufferSize = 0;
+  // Determine the device buffer size. By default, we'll use the value
+  // defined above (32K), but we will grow it to make allowances for
+  // very large software buffer sizes.
+  DWORD dsBufferSize = MINIMUM_DEVICE_BUFFER_SIZE;;
   DWORD dsPointerLeadTime = 0;
-  long bufferBytes = MINIMUM_DEVICE_BUFFER_SIZE; // sound cards will always *knock wood* support this
 
   void *ohandle = 0, *bhandle = 0;
+  HRESULT result;
   if ( mode == OUTPUT ) {
 
     LPDIRECTSOUND output;
-    result = DirectSoundCreate( dsinfo.id, &output, NULL );
+    result = DirectSoundCreate( dsDevices[ device ].id[0], &output, NULL );
     if ( FAILED( result ) ) {
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") opening output device (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") opening output device (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
@@ -3851,14 +3865,14 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     result = output->GetCaps( &outCaps );
     if ( FAILED( result ) ) {
       output->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") getting capabilities (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") getting capabilities (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
 
     // Check channel information.
     if ( channels + firstChannel == 2 && !( outCaps.dwFlags & DSCAPS_PRIMARYSTEREO ) ) {
-      errorStream_ << "RtApiDs::getDeviceInfo: the output device (" << dsinfo.name << ") does not support stereo playback.";
+      errorStream_ << "RtApiDs::getDeviceInfo: the output device (" << dsDevices[ device ].name << ") does not support stereo playback.";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
@@ -3882,8 +3896,8 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     dsPointerLeadTime = nBuffers * (*bufferSize) * (waveFormat.wBitsPerSample / 8) * channels;
 
     // If the user wants an even bigger buffer, increase the device buffer size accordingly.
-    while ( dsPointerLeadTime * 2U > (DWORD) bufferBytes )
-      bufferBytes *= 2;
+    while ( dsPointerLeadTime * 2U > dsBufferSize )
+      dsBufferSize *= 2;
 
     // Set cooperative level to DSSCL_EXCLUSIVE ... sound stops when window focus changes.
     // result = output->SetCooperativeLevel( hWnd, DSSCL_EXCLUSIVE );
@@ -3891,7 +3905,7 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     result = output->SetCooperativeLevel( hWnd, DSSCL_PRIORITY );
     if ( FAILED( result ) ) {
       output->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") setting cooperative level (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") setting cooperative level (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
@@ -3910,7 +3924,7 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     result = output->CreateSoundBuffer( &bufferDescription, &buffer, NULL );
     if ( FAILED( result ) ) {
       output->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") accessing primary buffer (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") accessing primary buffer (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
@@ -3919,20 +3933,19 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     result = buffer->SetFormat( &waveFormat );
     if ( FAILED( result ) ) {
       output->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") setting primary buffer format (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") setting primary buffer format (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
 
     // Setup the secondary DS buffer description.
-    dsBufferSize = (DWORD) bufferBytes;
     ZeroMemory( &bufferDescription, sizeof( DSBUFFERDESC ) );
     bufferDescription.dwSize = sizeof( DSBUFFERDESC );
     bufferDescription.dwFlags = ( DSBCAPS_STICKYFOCUS |
                                   DSBCAPS_GLOBALFOCUS |
                                   DSBCAPS_GETCURRENTPOSITION2 |
                                   DSBCAPS_LOCHARDWARE );  // Force hardware mixing
-    bufferDescription.dwBufferBytes = bufferBytes;
+    bufferDescription.dwBufferBytes = dsBufferSize;
     bufferDescription.lpwfxFormat = &waveFormat;
 
     // Try to create the secondary DS buffer.  If that doesn't work,
@@ -3946,7 +3959,7 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
       result = output->CreateSoundBuffer( &bufferDescription, &buffer, NULL );
       if ( FAILED( result ) ) {
         output->Release();
-        errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") creating secondary buffer (" << dsinfo.name << ")!";
+        errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") creating secondary buffer (" << dsDevices[ device ].name << ")!";
         errorText_ = errorStream_.str();
         return FAILURE;
       }
@@ -3959,21 +3972,21 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     if ( FAILED( result ) ) {
       output->Release();
       buffer->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") getting buffer settings (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") getting buffer settings (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
 
-    bufferBytes = dsbcaps.dwBufferBytes;
+    dsBufferSize = dsbcaps.dwBufferBytes;
 
     // Lock the DS buffer
     LPVOID audioPtr;
     DWORD dataLen;
-    result = buffer->Lock( 0, bufferBytes, &audioPtr, &dataLen, NULL, NULL, 0 );
+    result = buffer->Lock( 0, dsBufferSize, &audioPtr, &dataLen, NULL, NULL, 0 );
     if ( FAILED( result ) ) {
       output->Release();
       buffer->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") locking buffer (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") locking buffer (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
@@ -3986,12 +3999,11 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     if ( FAILED( result ) ) {
       output->Release();
       buffer->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") unlocking buffer (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") unlocking buffer (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
 
-    dsBufferSize = bufferBytes;
     ohandle = (void *) output;
     bhandle = (void *) buffer;
   }
@@ -3999,9 +4011,9 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
   if ( mode == INPUT ) {
 
     LPDIRECTSOUNDCAPTURE input;
-    result = DirectSoundCaptureCreate( dsinfo.id, &input, NULL );
+    result = DirectSoundCaptureCreate( dsDevices[ device ].id[1], &input, NULL );
     if ( FAILED( result ) ) {
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") opening input device (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") opening input device (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
@@ -4011,7 +4023,7 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     result = input->GetCaps( &inCaps );
     if ( FAILED( result ) ) {
       input->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") getting input capabilities (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") getting input capabilities (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
@@ -4055,17 +4067,16 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     dsPointerLeadTime = nBuffers * (*bufferSize) * (waveFormat.wBitsPerSample / 8) * channels;
 
     // If the user wants an even bigger buffer, increase the device buffer size accordingly.
-    while ( dsPointerLeadTime * 2U > (DWORD) bufferBytes )
-      bufferBytes *= 2;
+    while ( dsPointerLeadTime * 2U > dsBufferSize )
+      dsBufferSize *= 2;
 
     // Setup the secondary DS buffer description.
-    dsBufferSize = bufferBytes;
     DSCBUFFERDESC bufferDescription;
     ZeroMemory( &bufferDescription, sizeof( DSCBUFFERDESC ) );
     bufferDescription.dwSize = sizeof( DSCBUFFERDESC );
     bufferDescription.dwFlags = 0;
     bufferDescription.dwReserved = 0;
-    bufferDescription.dwBufferBytes = bufferBytes;
+    bufferDescription.dwBufferBytes = dsBufferSize;
     bufferDescription.lpwfxFormat = &waveFormat;
 
     // Create the capture buffer.
@@ -4073,7 +4084,7 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     result = input->CreateCaptureBuffer( &bufferDescription, &buffer, NULL );
     if ( FAILED( result ) ) {
       input->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") creating input buffer (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") creating input buffer (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
@@ -4085,21 +4096,26 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     if ( FAILED( result ) ) {
       input->Release();
       buffer->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") getting buffer settings (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") getting buffer settings (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
 
-    bufferBytes = dscbcaps.dwBufferBytes;
+    dsBufferSize = dscbcaps.dwBufferBytes;
+
+    // NOTE: We could have a problem here if this is a duplex stream
+    // and the play and capture hardware buffer sizes are different
+    // (I'm actually not sure if that is a problem or not).
+    // Currently, we are not verifying that.
 
     // Lock the capture buffer
     LPVOID audioPtr;
     DWORD dataLen;
-    result = buffer->Lock( 0, bufferBytes, &audioPtr, &dataLen, NULL, NULL, 0 );
+    result = buffer->Lock( 0, dsBufferSize, &audioPtr, &dataLen, NULL, NULL, 0 );
     if ( FAILED( result ) ) {
       input->Release();
       buffer->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") locking input buffer (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") locking input buffer (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
@@ -4112,12 +4128,11 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     if ( FAILED( result ) ) {
       input->Release();
       buffer->Release();
-      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") unlocking input buffer (" << dsinfo.name << ")!";
+      errorStream_ << "RtApiDs::probeDeviceOpen: error (" << getErrorString( result ) << ") unlocking input buffer (" << dsDevices[ device ].name << ")!";
       errorText_ = errorStream_.str();
       return FAILURE;
     }
 
-    dsBufferSize = bufferBytes;
     ohandle = (void *) input;
     bhandle = (void *) buffer;
   }
@@ -4143,7 +4158,7 @@ bool RtApiDs :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigned
     stream_.doConvertBuffer[mode] = true;
 
   // Allocate necessary internal buffers
-  bufferBytes = stream_.nUserChannels[mode] * *bufferSize * formatBytes( stream_.userFormat );
+  long bufferBytes = stream_.nUserChannels[mode] * *bufferSize * formatBytes( stream_.userFormat );
   stream_.userBuffer[mode] = (char *) calloc( bufferBytes, 1 );
   if ( stream_.userBuffer[mode] == NULL ) {
     errorText_ = "RtApiDs::probeDeviceOpen: error allocating user buffer memory.";
@@ -4321,22 +4336,15 @@ void RtApiDs :: startStream()
     return;
   }
 
-  // Increase scheduler frequency on lesser windows (a side-effect of
-  // increasing timer accuracy).  On greater windows (Win2K or later),
-  // this is already in effect.
-
   MUTEX_LOCK( &stream_.mutex );
   
   DsHandle *handle = (DsHandle *) stream_.apiHandle;
 
+  // Increase scheduler frequency on lesser windows (a side-effect of
+  // increasing timer accuracy).  On greater windows (Win2K or later),
+  // this is already in effect.
   timeBeginPeriod( 1 ); 
 
-  /*
-    memset( &statistics, 0, sizeof( statistics ) );
-    statistics.sampleRate = stream_.sampleRate;
-    statistics.writeDeviceBufferLeadBytes = handle->dsPointerLeadTime[0];
-  */
-
   buffersRolling = false;
   duplexPrerollBytes = 0;
 
@@ -4347,7 +4355,6 @@ void RtApiDs :: startStream()
 
   HRESULT result = 0;
   if ( stream_.mode == OUTPUT || stream_.mode == DUPLEX ) {
-    //statistics.outputFrameSize = formatBytes( stream_.deviceFormat[0] ) * stream_.nDeviceChannels[0];
 
     LPDIRECTSOUNDBUFFER buffer = (LPDIRECTSOUNDBUFFER) handle->buffer[0];
     result = buffer->Play( 0, 0, DSBPLAY_LOOPING );
@@ -4359,7 +4366,6 @@ void RtApiDs :: startStream()
   }
 
   if ( stream_.mode == INPUT || stream_.mode == DUPLEX ) {
-    //statistics.inputFrameSize = formatBytes( stream_.deviceFormat[1]) * stream_.nDeviceChannels[1];
 
     LPDIRECTSOUNDCAPTUREBUFFER buffer = (LPDIRECTSOUNDCAPTUREBUFFER) handle->buffer[1];
     result = buffer->Start( DSCBSTART_LOOPING );
@@ -4504,7 +4510,7 @@ void RtApiDs :: abortStream()
 void RtApiDs :: callbackEvent()
 {
   if ( stream_.state == STREAM_STOPPED ) {
-    Sleep(50); // sleep 50 milliseconds
+    Sleep( 50 ); // sleep 50 milliseconds
     return;
   }
 
@@ -4560,14 +4566,9 @@ void RtApiDs :: callbackEvent()
   }
 
   HRESULT result;
-  DWORD currentWritePos, safeWritePos;
-  DWORD currentReadPos, safeReadPos;
-  DWORD leadPos;
-  UINT nextWritePos;
-
-#ifdef GENERATE_DEBUG_LOG
-  DWORD writeTime, readTime;
-#endif
+  DWORD currentWritePointer, safeWritePointer;
+  DWORD currentReadPointer, safeReadPointer;
+  UINT nextWritePointer;
 
   LPVOID buffer1 = NULL;
   LPVOID buffer2 = NULL;
@@ -4577,63 +4578,79 @@ void RtApiDs :: callbackEvent()
   char *buffer;
   long bufferBytes;
 
-  if ( stream_.mode == DUPLEX && !buffersRolling ) {
-    //assert( handle->dsBufferSize[0] == handle->dsBufferSize[1] );
+  if ( buffersRolling == false ) {
+    if ( stream_.mode == DUPLEX ) {
+      //assert( handle->dsBufferSize[0] == handle->dsBufferSize[1] );
 
-    // It takes a while for the devices to get rolling. As a result,
-    // there's no guarantee that the capture and write device pointers
-    // will move in lockstep.  Wait here for both devices to start
-    // rolling, and then set our buffer pointers accordingly.
-    // e.g. Crystal Drivers: the capture buffer starts up 5700 to 9600
-    // bytes later than the write buffer.
+      // It takes a while for the devices to get rolling. As a result,
+      // there's no guarantee that the capture and write device pointers
+      // will move in lockstep.  Wait here for both devices to start
+      // rolling, and then set our buffer pointers accordingly.
+      // e.g. Crystal Drivers: the capture buffer starts up 5700 to 9600
+      // bytes later than the write buffer.
 
-    // Stub: a serious risk of having a pre-emptive scheduling round
-    // take place between the two GetCurrentPosition calls... but I'm
-    // really not sure how to solve the problem.  Temporarily boost to
-    // Realtime priority, maybe; but I'm not sure what priority the
-    // DirectSound service threads run at. We *should* be roughly
-    // within a ms or so of correct.
+      // Stub: a serious risk of having a pre-emptive scheduling round
+      // take place between the two GetCurrentPosition calls... but I'm
+      // really not sure how to solve the problem.  Temporarily boost to
+      // Realtime priority, maybe; but I'm not sure what priority the
+      // DirectSound service threads run at. We *should* be roughly
+      // within a ms or so of correct.
 
-    LPDIRECTSOUNDBUFFER dsWriteBuffer = (LPDIRECTSOUNDBUFFER) handle->buffer[0];
-    LPDIRECTSOUNDCAPTUREBUFFER dsCaptureBuffer = (LPDIRECTSOUNDCAPTUREBUFFER) handle->buffer[1];
+      LPDIRECTSOUNDBUFFER dsWriteBuffer = (LPDIRECTSOUNDBUFFER) handle->buffer[0];
+      LPDIRECTSOUNDCAPTUREBUFFER dsCaptureBuffer = (LPDIRECTSOUNDCAPTUREBUFFER) handle->buffer[1];
 
-    DWORD initialWritePos, initialSafeWritePos;
-    DWORD initialReadPos, initialSafeReadPos;
+      DWORD startSafeWritePointer, startSafeReadPointer;
 
-    result = dsWriteBuffer->GetCurrentPosition( &initialWritePos, &initialSafeWritePos );
-    if ( FAILED( result ) ) {
-      errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") getting current write position!";
-      errorText_ = errorStream_.str();
-      error( RtError::SYSTEM_ERROR );
-    }
-    result = dsCaptureBuffer->GetCurrentPosition( &initialReadPos, &initialSafeReadPos );
-    if ( FAILED( result ) ) {
-      errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") getting current read position!";
-      errorText_ = errorStream_.str();
-      error( RtError::SYSTEM_ERROR );
-    }
-    while ( true ) {
-      result = dsWriteBuffer->GetCurrentPosition( &currentWritePos, &safeWritePos );
+      result = dsWriteBuffer->GetCurrentPosition( NULL, &startSafeWritePointer );
       if ( FAILED( result ) ) {
         errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") getting current write position!";
         errorText_ = errorStream_.str();
         error( RtError::SYSTEM_ERROR );
       }
-      result = dsCaptureBuffer->GetCurrentPosition( &currentReadPos, &safeReadPos );
+      result = dsCaptureBuffer->GetCurrentPosition( NULL, &startSafeReadPointer );
       if ( FAILED( result ) ) {
         errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") getting current read position!";
         errorText_ = errorStream_.str();
         error( RtError::SYSTEM_ERROR );
       }
-      if ( safeWritePos != initialSafeWritePos && safeReadPos != initialSafeReadPos ) break;
-      Sleep( 1 );
+      while ( true ) {
+        result = dsWriteBuffer->GetCurrentPosition( NULL, &safeWritePointer );
+        if ( FAILED( result ) ) {
+          errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") getting current write position!";
+          errorText_ = errorStream_.str();
+          error( RtError::SYSTEM_ERROR );
+        }
+        result = dsCaptureBuffer->GetCurrentPosition( NULL, &safeReadPointer );
+        if ( FAILED( result ) ) {
+          errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") getting current read position!";
+          errorText_ = errorStream_.str();
+          error( RtError::SYSTEM_ERROR );
+        }
+        if ( safeWritePointer != startSafeWritePointer && safeReadPointer != startSafeReadPointer ) break;
+        Sleep( 1 );
+      }
+
+      //assert( handle->dsBufferSize[0] == handle->dsBufferSize[1] );
+
+      handle->bufferPointer[0] = safeWritePointer + handle->dsPointerLeadTime[0];
+      if ( handle->bufferPointer[0] >= handle->dsBufferSize[0] ) handle->bufferPointer[0] -= handle->dsBufferSize[0];
+      handle->bufferPointer[1] = safeReadPointer;
+    }
+    else if ( stream_.mode == OUTPUT ) {
+
+      // Set the proper nextWritePosition after initial startup.
+      LPDIRECTSOUNDBUFFER dsWriteBuffer = (LPDIRECTSOUNDBUFFER) handle->buffer[0];
+      result = dsWriteBuffer->GetCurrentPosition( &currentWritePointer, &safeWritePointer );
+      if ( FAILED( result ) ) {
+        errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") getting current write position!";
+        errorText_ = errorStream_.str();
+        error( RtError::SYSTEM_ERROR );
+      }
+      handle->bufferPointer[0] = safeWritePointer + handle->dsPointerLeadTime[0];
+      if ( handle->bufferPointer[0] >= handle->dsBufferSize[0] ) handle->bufferPointer[0] -= handle->dsBufferSize[0];
     }
 
-    //assert( handle->dsBufferSize[0] == handle->dsBufferSize[1] );
-
     buffersRolling = true;
-    handle->bufferPointer[0] = ( safeWritePos + handle->dsPointerLeadTime[0] );
-    handle->bufferPointer[1] = safeReadPos;
   }
 
   if ( stream_.mode == OUTPUT || stream_.mode == DUPLEX ) {
@@ -4668,62 +4685,51 @@ void RtApiDs :: callbackEvent()
       for ( int i=0; i<bufferBytes; i++ ) buffer[i] = (unsigned char) ( buffer[i] + 128 );
 
     DWORD dsBufferSize = handle->dsBufferSize[0];
-    nextWritePos = handle->bufferPointer[0];
+    nextWritePointer = handle->bufferPointer[0];
 
-    DWORD endWrite;
+    DWORD endWrite, leadPointer;
     while ( true ) {
       // Find out where the read and "safe write" pointers are.
-      result = dsBuffer->GetCurrentPosition( &currentWritePos, &safeWritePos );
+      result = dsBuffer->GetCurrentPosition( &currentWritePointer, &safeWritePointer );
       if ( FAILED( result ) ) {
         errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") getting current write position!";
         errorText_ = errorStream_.str();
         error( RtError::SYSTEM_ERROR );
       }
 
-      leadPos = safeWritePos + handle->dsPointerLeadTime[0];
-      if ( leadPos > dsBufferSize ) leadPos -= dsBufferSize;
-      if ( leadPos < nextWritePos ) leadPos += dsBufferSize; // unwrap offset
-      endWrite = nextWritePos + bufferBytes;
+      // We will copy our output buffer into the region between
+      // safeWritePointer and leadPointer.  If leadPointer is not
+      // beyond the next endWrite position, wait until it is.
+      leadPointer = safeWritePointer + handle->dsPointerLeadTime[0];
+      //std::cout << "safeWritePointer = " << safeWritePointer << ", leadPointer = " << leadPointer << ", nextWritePointer = " << nextWritePointer << std::endl;
+      if ( leadPointer > dsBufferSize ) leadPointer -= dsBufferSize;
+      if ( leadPointer < nextWritePointer ) leadPointer += dsBufferSize; // unwrap offset
+      endWrite = nextWritePointer + bufferBytes;
 
       // Check whether the entire write region is behind the play pointer.
-      if ( leadPos >= endWrite ) break;
+      if ( leadPointer >= endWrite ) break;
 
-      // If we are here, then we must wait until the play pointer gets
-      // beyond the write region.  The approach here is to use the
-      // Sleep() function to suspend operation until safePos catches
-      // up. Calculate number of milliseconds to wait as:
-      //   time = distance * (milliseconds/second) * fudgefactor /
-      //          ((bytes/sample) * (samples/second))
-      // A "fudgefactor" less than 1 is used because it was found
-      // that sleeping too long was MUCH worse than sleeping for
-      // several shorter periods.
-      double millis = ( endWrite - leadPos ) * 900.0;
+      // If we are here, then we must wait until the leadPointer advances
+      // beyond the end of our next write region. We use the
+      // Sleep() function to suspend operation until that happens.
+      double millis = ( endWrite - leadPointer ) * 1000.0;
       millis /= ( formatBytes( stream_.deviceFormat[0]) * stream_.nDeviceChannels[0] * stream_.sampleRate);
       if ( millis < 1.0 ) millis = 1.0;
-      if ( millis > 50.0 ) {
-        static int nOverruns = 0;
-        ++nOverruns;
-      }
       Sleep( (DWORD) millis );
     }
 
-    //if ( statistics.writeDeviceSafeLeadBytes < dsPointerDifference( safeWritePos, currentWritePos, handle->dsBufferSize[0] ) ) {
-    //  statistics.writeDeviceSafeLeadBytes = dsPointerDifference( safeWritePos, currentWritePos, handle->dsBufferSize[0] );
-    //}
-
-    if ( dsPointerBetween( nextWritePos, safeWritePos, currentWritePos, dsBufferSize )
-         || dsPointerBetween( endWrite, safeWritePos, currentWritePos, dsBufferSize ) ) { 
+    if ( dsPointerBetween( nextWritePointer, safeWritePointer, currentWritePointer, dsBufferSize )
+         || dsPointerBetween( endWrite, safeWritePointer, currentWritePointer, dsBufferSize ) ) { 
       // We've strayed into the forbidden zone ... resync the read pointer.
-      //++statistics.numberOfWriteUnderruns;
       handle->xrun[0] = true;
-      nextWritePos = safeWritePos + handle->dsPointerLeadTime[0] - bufferBytes + dsBufferSize;
-      while ( nextWritePos >= dsBufferSize ) nextWritePos -= dsBufferSize;
-      handle->bufferPointer[0] = nextWritePos;
-      endWrite = nextWritePos + bufferBytes;
+      nextWritePointer = safeWritePointer + handle->dsPointerLeadTime[0] - bufferBytes;
+      if ( nextWritePointer >= dsBufferSize ) nextWritePointer -= dsBufferSize;
+      handle->bufferPointer[0] = nextWritePointer;
+      endWrite = nextWritePointer + bufferBytes;
     }
 
     // Lock free space in the buffer
-    result = dsBuffer->Lock( nextWritePos, bufferBytes, &buffer1,
+    result = dsBuffer->Lock( nextWritePointer, bufferBytes, &buffer1,
                              &bufferSize1, &buffer2, &bufferSize2, 0 );
     if ( FAILED( result ) ) {
       errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") locking buffer during playback!";
@@ -4742,8 +4748,8 @@ void RtApiDs :: callbackEvent()
       errorText_ = errorStream_.str();
       error( RtError::SYSTEM_ERROR );
     }
-    nextWritePos = ( nextWritePos + bufferSize1 + bufferSize2 ) % dsBufferSize;
-    handle->bufferPointer[0] = nextWritePos;
+    nextWritePointer = ( nextWritePointer + bufferSize1 + bufferSize2 ) % dsBufferSize;
+    handle->bufferPointer[0] = nextWritePointer;
 
     if ( handle->drainCounter ) {
       handle->drainCounter++;
@@ -4766,19 +4772,19 @@ void RtApiDs :: callbackEvent()
     }
 
     LPDIRECTSOUNDCAPTUREBUFFER dsBuffer = (LPDIRECTSOUNDCAPTUREBUFFER) handle->buffer[1];
-    long nextReadPos = handle->bufferPointer[1];
+    long nextReadPointer = handle->bufferPointer[1];
     DWORD dsBufferSize = handle->dsBufferSize[1];
 
     // Find out where the write and "safe read" pointers are.
-    result = dsBuffer->GetCurrentPosition( &currentReadPos, &safeReadPos );
+    result = dsBuffer->GetCurrentPosition( &currentReadPointer, &safeReadPointer );
     if ( FAILED( result ) ) {
       errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") getting current read position!";
       errorText_ = errorStream_.str();
       error( RtError::SYSTEM_ERROR );
     }
 
-    if ( safeReadPos < (DWORD)nextReadPos ) safeReadPos += dsBufferSize; // unwrap offset
-    DWORD endRead = nextReadPos + bufferBytes;
+    if ( safeReadPointer < (DWORD)nextReadPointer ) safeReadPointer += dsBufferSize; // unwrap offset
+    DWORD endRead = nextReadPointer + bufferBytes;
 
     // Handling depends on whether we are INPUT or DUPLEX. 
     // If we're in INPUT mode then waiting is a good thing. If we're in DUPLEX mode,
@@ -4795,60 +4801,54 @@ void RtApiDs :: callbackEvent()
     // zeros from the read buffer while the pointers sync up.
 
     if ( stream_.mode == DUPLEX ) {
-      if ( safeReadPos < endRead ) {
+      if ( safeReadPointer < endRead ) {
         if ( duplexPrerollBytes <= 0 ) {
           // Pre-roll time over. Be more agressive.
-          int adjustment = endRead-safeReadPos;
+          int adjustment = endRead-safeReadPointer;
 
           handle->xrun[1] = true;
-          //++statistics.numberOfReadOverruns;
           // Two cases:
           //   - large adjustments: we've probably run out of CPU cycles, so just resync exactly,
           //     and perform fine adjustments later.
           //   - small adjustments: back off by twice as much.
           if ( adjustment >= 2*bufferBytes )
-            nextReadPos = safeReadPos-2*bufferBytes;
+            nextReadPointer = safeReadPointer-2*bufferBytes;
           else
-            nextReadPos = safeReadPos-bufferBytes-adjustment;
+            nextReadPointer = safeReadPointer-bufferBytes-adjustment;
 
-          //statistics.readDeviceSafeLeadBytes = currentReadPos-nextReadPos;
-          //if ( statistics.readDeviceSafeLeadBytes < 0) statistics.readDeviceSafeLeadBytes += dsBufferSize;
-          if ( nextReadPos < 0 ) nextReadPos += dsBufferSize;
+          if ( nextReadPointer < 0 ) nextReadPointer += dsBufferSize;
 
         }
         else {
           // In pre=roll time. Just do it.
-          nextReadPos = safeReadPos-bufferBytes;
-          while ( nextReadPos < 0 ) nextReadPos += dsBufferSize;
+          nextReadPointer = safeReadPointer - bufferBytes;
+          while ( nextReadPointer < 0 ) nextReadPointer += dsBufferSize;
         }
-        endRead = nextReadPos + bufferBytes;
+        endRead = nextReadPointer + bufferBytes;
       }
     }
     else { // mode == INPUT
-      while ( safeReadPos < endRead ) {
+      while ( safeReadPointer < endRead ) {
         // See comments for playback.
-        double millis = (endRead - safeReadPos) * 900.0;
+        double millis = (endRead - safeReadPointer) * 1000.0;
         millis /= ( formatBytes(stream_.deviceFormat[1]) * stream_.nDeviceChannels[1] * stream_.sampleRate);
         if ( millis < 1.0 ) millis = 1.0;
         Sleep( (DWORD) millis );
 
-        // Wake up, find out where we are now
-        result = dsBuffer->GetCurrentPosition( &currentReadPos, &safeReadPos );
+        // Wake up and find out where we are now.
+        result = dsBuffer->GetCurrentPosition( &currentReadPointer, &safeReadPointer );
         if ( FAILED( result ) ) {
           errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") getting current read position!";
           errorText_ = errorStream_.str();
           error( RtError::SYSTEM_ERROR );
         }
       
-        if ( safeReadPos < (DWORD)nextReadPos ) safeReadPos += dsBufferSize; // unwrap offset
+        if ( safeReadPointer < (DWORD)nextReadPointer ) safeReadPointer += dsBufferSize; // unwrap offset
       }
     }
 
-    //if (statistics.readDeviceSafeLeadBytes < dsPointerDifference( currentReadPos, nextReadPos, dsBufferSize ) )
-    //  statistics.readDeviceSafeLeadBytes = dsPointerDifference( currentReadPos, nextReadPos, dsBufferSize );
-
     // Lock free space in the buffer
-    result = dsBuffer->Lock( nextReadPos, bufferBytes, &buffer1,
+    result = dsBuffer->Lock( nextReadPointer, bufferBytes, &buffer1,
                              &bufferSize1, &buffer2, &bufferSize2, 0 );
     if ( FAILED( result ) ) {
       errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") locking capture buffer!";
@@ -4868,14 +4868,14 @@ void RtApiDs :: callbackEvent()
     }
 
     // Update our buffer offset and unlock sound buffer
-    nextReadPos = ( nextReadPos + bufferSize1 + bufferSize2 ) % dsBufferSize;
+    nextReadPointer = ( nextReadPointer + bufferSize1 + bufferSize2 ) % dsBufferSize;
     dsBuffer->Unlock( buffer1, bufferSize1, buffer2, bufferSize2 );
     if ( FAILED( result ) ) {
       errorStream_ << "RtApiDs::callbackEvent: error (" << getErrorString( result ) << ") unlocking capture buffer!";
       errorText_ = errorStream_.str();
       error( RtError::SYSTEM_ERROR );
     }
-    handle->bufferPointer[1] = nextReadPos;
+    handle->bufferPointer[1] = nextReadPointer;
 
     // No byte swapping necessary in DirectSound implementation.
 
@@ -4887,20 +4887,6 @@ void RtApiDs :: callbackEvent()
     if ( stream_.doConvertBuffer[1] )
       convertBuffer( stream_.userBuffer[1], stream_.deviceBuffer, stream_.convertInfo[1] );
   }
-#ifdef GENERATE_DEBUG_LOG
-  if ( currentDebugLogEntry < debugLog.size() )
-    {
-      TTickRecord &r = debugLog[currentDebugLogEntry++];
-      r.currentReadPointer = currentReadPos;
-      r.safeReadPointer = safeReadPos;
-      r.currentWritePointer = currentWritePos;
-      r.safeWritePointer = safeWritePos;
-      r.readTime = readTime;
-      r.writeTime = writeTime;
-      r.nextReadPointer = handles[1].bufferPointer;
-      r.nextWritePointer = handles[0].bufferPointer;
-    }
-#endif
 
  unlock:
   MUTEX_UNLOCK( &stream_.mutex );
@@ -4949,10 +4935,11 @@ static BOOL CALLBACK deviceQueryCallback( LPGUID lpguid,
                                           LPCTSTR module,
                                           LPVOID lpContext )
 {
-  EnumInfo *info = (EnumInfo *) lpContext;
+  bool *isInput = (bool *) lpContext;
 
   HRESULT hr;
-  if ( info->isInput == true ) {
+  bool validDevice = false;
+  if ( *isInput == true ) {
     DSCCAPS caps;
     LPDIRECTSOUNDCAPTURE object;
 
@@ -4963,7 +4950,7 @@ static BOOL CALLBACK deviceQueryCallback( LPGUID lpguid,
     hr = object->GetCaps( &caps );
     if ( hr == DS_OK ) {
       if ( caps.dwChannels > 0 && caps.dwFormats > 0 )
-        info->counter++;
+        validDevice = true;
     }
     object->Release();
   }
@@ -4977,23 +4964,49 @@ static BOOL CALLBACK deviceQueryCallback( LPGUID lpguid,
     hr = object->GetCaps( &caps );
     if ( hr == DS_OK ) {
       if ( caps.dwFlags & DSCAPS_PRIMARYMONO || caps.dwFlags & DSCAPS_PRIMARYSTEREO )
-        info->counter++;
+        validDevice = true;
     }
     object->Release();
   }
 
-  if ( info->getDefault && lpguid == NULL ) return FALSE;
+  // If good device, then save its name and guid.
+  std::string name = convertTChar( description );
+  if ( name == "Primary Sound Driver" || name == "Primary Sound Capture Driver" )
+    name = "Default Device";
+  if ( validDevice ) {
+    for ( unsigned int i=0; i<dsDevices.size(); i++ ) {
+      if ( dsDevices[i].name == name ) {
+        dsDevices[i].found = true;
+        if ( *isInput ) {
+          dsDevices[i].id[1] = lpguid;
+          dsDevices[i].validId[1] = true;
+        }
+        else {
+          dsDevices[i].id[0] = lpguid;
+          dsDevices[i].validId[0] = true;
+        }
+        return TRUE;
+      }
+    }
 
-  if ( info->findIndex && info->counter > info->index ) {
-    info->id = lpguid;
-    info->name = convertTChar( description );
-    return FALSE;
+    DsDevice device;
+    device.name = name;
+    device.found = true;
+    if ( *isInput ) {
+      device.id[1] = lpguid;
+      device.validId[1] = true;
+    }
+    else {
+      device.id[0] = lpguid;
+      device.validId[0] = true;
+    }
+    dsDevices.push_back( device );
   }
 
   return TRUE;
 }
 
-static char* getErrorString( int code )
+static const char* getErrorString( int code )
 {
   switch ( code ) {
 
diff --git a/src/RtMidi.cpp b/src/RtMidi.cpp
index 4b73921..de8b6ae 100644
--- a/src/RtMidi.cpp
+++ b/src/RtMidi.cpp
@@ -8,7 +8,7 @@
     RtMidi WWW site: http://music.mcgill.ca/~gary/rtmidi/
 
     RtMidi: realtime MIDI i/o C++ classes
-    Copyright (c) 2003-2009 Gary P. Scavone
+    Copyright (c) 2003-2010 Gary P. Scavone
 
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation files
@@ -35,7 +35,7 @@
 */
 /**********************************************************************/
 
-// RtMidi: Version 1.0.10
+// RtMidi: Version 1.0.11
 
 #include "RtMidi.h"
 #include <sstream>
@@ -166,6 +166,7 @@ RtMidiOut :: RtMidiOut( const std::string clientName ) : RtMidi()
 // OS-X CoreMIDI header files.
 #include <CoreMIDI/CoreMIDI.h>
 #include <CoreAudio/HostTime.h>
+#include <CoreServices/CoreServices.h>
 
 // A structure to hold variables related to the CoreMIDI API
 // implementation.
@@ -226,7 +227,7 @@ void midiInputCallback( const MIDIPacketList *list, void *procRef, void *srcRef
       // We have a continuing, segmented sysex message.
       if ( !( data->ignoreFlags & 0x01 ) ) {
         // If we're not ignoring sysex messages, copy the entire packet.
-        for ( unsigned int j=0; j<nBytes; j++ )
+        for ( unsigned int j=0; j<nBytes; ++j )
           message.bytes.push_back( packet->data[j] );
       }
       continueSysex = packet->data[nBytes-1] != 0xF7;
@@ -368,7 +369,7 @@ void RtMidiIn :: openPort( unsigned int portNumber, const std::string portName )
 
   // Get the desired input source identifier.
   MIDIEndpointRef endpoint = MIDIGetSource( portNumber );
-  if ( endpoint == NULL ) {
+  if ( endpoint == 0 ) {
     MIDIPortDispose( port );
     MIDIClientDispose( data->client );
     errorString_ = "RtMidiIn::openPort: error getting MIDI input source reference.";
@@ -451,7 +452,7 @@ CFStringRef EndpointName( MIDIEndpointRef endpoint, bool isExternal )
 
   MIDIEntityRef entity = NULL;
   MIDIEndpointGetEntity( endpoint, &entity );
-  if ( entity == NULL )
+  if ( entity == 0 )
     // probably virtual
     return result;
 
@@ -465,9 +466,9 @@ CFStringRef EndpointName( MIDIEndpointRef endpoint, bool isExternal )
     }
   }
   // now consider the device's name
-  MIDIDeviceRef device = NULL;
+  MIDIDeviceRef device = 0;
   MIDIEntityGetDevice( entity, &device );
-  if ( device == NULL )
+  if ( device == 0 )
     return result;
 
   str = NULL;
@@ -665,7 +666,7 @@ void RtMidiOut :: openPort( unsigned int portNumber, const std::string portName
 
   // Get the desired output port identifier.
   MIDIEndpointRef destination = MIDIGetDestination( portNumber );
-  if ( destination == NULL ) {
+  if ( destination == 0 ) {
     MIDIPortDispose( port );
     MIDIClientDispose( data->client );
     errorString_ = "RtMidiOut::openPort: error getting MIDI output destination reference.";
@@ -1042,7 +1043,7 @@ unsigned int portInfo( snd_seq_t *seq, snd_seq_port_info_t *pinfo, unsigned int
       unsigned int caps = snd_seq_port_info_get_capability( pinfo );
       if ( ( caps & type ) != type ) continue;
       if ( count == portNumber ) return 1;
-      count++;
+      ++count;
 		}
 	}
 
@@ -1225,8 +1226,8 @@ RtMidiIn :: ~RtMidiIn()
   if ( data->vport >= 0 ) snd_seq_delete_port( data->seq, data->vport );
 #ifndef AVOID_TIMESTAMPING
   snd_seq_free_queue( data->seq, data->queue_id );
-  snd_seq_close( data->seq );
 #endif
+  snd_seq_close( data->seq );
   delete data;
 }
 
@@ -1458,7 +1459,7 @@ void RtMidiOut :: sendMessage( std::vector<unsigned char> *message )
   snd_seq_ev_set_source(&ev, data->vport);
   snd_seq_ev_set_subs(&ev);
   snd_seq_ev_set_direct(&ev);
-  for ( unsigned int i=0; i<nBytes; i++ ) data->buffer[i] = message->at(i);
+  for ( unsigned int i=0; i<nBytes; ++i ) data->buffer[i] = message->at(i);
   result = snd_midi_event_encode( data->coder, data->buffer, (long)nBytes, &ev );
   if ( result < (int)nBytes ) {
     errorString_ = "RtMidiOut::sendMessage: event parsing error!";
@@ -1564,7 +1565,7 @@ extern "C" void *irixMidiHandler( void *ptr )
         if ( continueSysex ) {
           // We have a continuing, segmented sysex message.  Append
           // the new bytes to our existing message.
-          for ( int i=0; i<event.msglen; i++ )
+          for ( int i=0; i<event.msglen; ++i )
             message.bytes.push_back( event.sysexmsg[i] );
           if ( event.sysexmsg[event.msglen-1] == 0xF7 ) continueSysex = false;
           if ( !continueSysex ) {
@@ -1858,11 +1859,11 @@ void RtMidiOut :: sendMessage( std::vector<unsigned char> *message )
     event.msg[0] = 0xF0;
     event.msglen = nBytes;
     buffer = (char *) malloc( nBytes );
-    for ( int i=0; i<nBytes; i++ ) buffer[i] = message->at(i);
+    for ( int i=0; i<nBytes; ++i ) buffer[i] = message->at(i);
     event.sysexmsg = buffer;
   }
   else {
-    for ( int i=0; i<nBytes; i++ )
+    for ( int i=0; i<nBytes; ++i )
       event.msg[i] = message->at(i);
   }
 
@@ -1897,6 +1898,9 @@ void RtMidiOut :: sendMessage( std::vector<unsigned char> *message )
 #include <windows.h>
 #include <mmsystem.h>
 
+#define  RT_SYSEX_BUFFER_SIZE 1024
+#define  RT_SYSEX_BUFFER_COUNT 4
+
 // A structure to hold variables related to the CoreMIDI API
 // implementation.
 struct WinMidiData {
@@ -1904,11 +1908,9 @@ struct WinMidiData {
   HMIDIOUT outHandle;  // Handle to Midi Output Device
   DWORD lastTime;
   RtMidiIn::MidiMessage message;
-  LPMIDIHDR sysexBuffer;
+  LPMIDIHDR sysexBuffer[RT_SYSEX_BUFFER_COUNT];
 };
 
-#define  RT_SYSEX_BUFFER_SIZE 1024
-
 //*********************************************************************//
 //  API: Windows MM
 //  Class Definitions: RtMidiIn
@@ -1920,7 +1922,7 @@ static void CALLBACK midiInputCallback( HMIDIOUT hmin,
                                         DWORD midiMessage,
                                         DWORD timestamp )
 {
-  if ( inputStatus != MIM_DATA && inputStatus != MIM_LONGDATA ) return;
+  if ( inputStatus != MIM_DATA && inputStatus != MIM_LONGDATA && inputStatus != MIM_LONGERROR ) return;
 
   //RtMidiIn::RtMidiInData *data = static_cast<RtMidiIn::RtMidiInData *> (instancePtr);
   RtMidiIn::RtMidiInData *data = (RtMidiIn::RtMidiInData *)instancePtr;
@@ -1960,13 +1962,13 @@ static void CALLBACK midiInputCallback( HMIDIOUT hmin,
 
     // Copy bytes to our MIDI message.
     unsigned char *ptr = (unsigned char *) &midiMessage;
-    for ( int i=0; i<nBytes; i++ ) apiData->message.bytes.push_back( *ptr++ );
+    for ( int i=0; i<nBytes; ++i ) apiData->message.bytes.push_back( *ptr++ );
   }
-  else { // Sysex message ( MIM_LONGDATA )
+  else { // Sysex message ( MIM_LONGDATA or MIM_LONGERROR )
     MIDIHDR *sysex = ( MIDIHDR *) midiMessage; 
-    if ( !( data->ignoreFlags & 0x01 ) ) {  
+    if ( !( data->ignoreFlags & 0x01 ) && inputStatus != MIM_LONGERROR ) {  
       // Sysex message and we're not ignoring it
-      for ( int i=0; i<(int)sysex->dwBytesRecorded; i++ )
+      for ( int i=0; i<(int)sysex->dwBytesRecorded; ++i )
         apiData->message.bytes.push_back( sysex->lpData[i] );
     }
 
@@ -1978,9 +1980,9 @@ static void CALLBACK midiInputCallback( HMIDIOUT hmin,
     // buffer when an application closes and in this case, we should
     // avoid requeueing it, else the computer suddenly reboots after
     // one or two minutes.
-    if ( apiData->sysexBuffer->dwBytesRecorded > 0 ) {
-      //if ( sysex->dwBytesRecorded > 0 ) {
-      MMRESULT result = midiInAddBuffer( apiData->inHandle, apiData->sysexBuffer, sizeof(MIDIHDR) );
+	if ( apiData->sysexBuffer[sysex->dwUser]->dwBytesRecorded > 0 ) {
+    //if ( sysex->dwBytesRecorded > 0 ) {
+      MMRESULT result = midiInAddBuffer( apiData->inHandle, apiData->sysexBuffer[sysex->dwUser], sizeof(MIDIHDR) );
       if ( result != MMSYSERR_NOERROR )
         std::cerr << "\nRtMidiIn::midiInputCallback: error sending sysex to Midi device!!\n\n";
 
@@ -2054,25 +2056,28 @@ void RtMidiIn :: openPort( unsigned int portNumber, const std::string /*portName
     error( RtError::DRIVER_ERROR );
   }
 
-  // Allocate and init the sysex buffer.
-  data->sysexBuffer = (MIDIHDR*) new char[ sizeof(MIDIHDR) ];
-  data->sysexBuffer->lpData = new char[ RT_SYSEX_BUFFER_SIZE ];
-  data->sysexBuffer->dwBufferLength = RT_SYSEX_BUFFER_SIZE;
-  data->sysexBuffer->dwFlags = 0;
+  // Allocate and init the sysex buffers.
+  for ( int i=0; i<RT_SYSEX_BUFFER_COUNT; ++i ) {
+    data->sysexBuffer[i] = (MIDIHDR*) new char[ sizeof(MIDIHDR) ];
+    data->sysexBuffer[i]->lpData = new char[ RT_SYSEX_BUFFER_SIZE ];
+    data->sysexBuffer[i]->dwBufferLength = RT_SYSEX_BUFFER_SIZE;
+    data->sysexBuffer[i]->dwUser = i; // We use the dwUser parameter as buffer indicator
+    data->sysexBuffer[i]->dwFlags = 0;
 
-  result = midiInPrepareHeader( data->inHandle, data->sysexBuffer, sizeof(MIDIHDR) );
-  if ( result != MMSYSERR_NOERROR ) {
-    midiInClose( data->inHandle );
-    errorString_ = "RtMidiIn::openPort: error starting Windows MM MIDI input port (PrepareHeader).";
-    error( RtError::DRIVER_ERROR );
-  }
+    result = midiInPrepareHeader( data->inHandle, data->sysexBuffer[i], sizeof(MIDIHDR) );
+    if ( result != MMSYSERR_NOERROR ) {
+      midiInClose( data->inHandle );
+      errorString_ = "RtMidiIn::openPort: error starting Windows MM MIDI input port (PrepareHeader).";
+      error( RtError::DRIVER_ERROR );
+    }
 
-  // Register the buffer.
-  result = midiInAddBuffer( data->inHandle, data->sysexBuffer, sizeof(MIDIHDR) );
-  if ( result != MMSYSERR_NOERROR ) {
-    midiInClose( data->inHandle );
-    errorString_ = "RtMidiIn::openPort: error starting Windows MM MIDI input port (AddBuffer).";
-    error( RtError::DRIVER_ERROR );
+    // Register the buffer.
+    result = midiInAddBuffer( data->inHandle, data->sysexBuffer[i], sizeof(MIDIHDR) );
+    if ( result != MMSYSERR_NOERROR ) {
+      midiInClose( data->inHandle );
+      errorString_ = "RtMidiIn::openPort: error starting Windows MM MIDI input port (AddBuffer).";
+      error( RtError::DRIVER_ERROR );
+    }
   }
 
   result = midiInStart( data->inHandle );
@@ -2099,13 +2104,15 @@ void RtMidiIn :: closePort( void )
     midiInReset( data->inHandle );
     midiInStop( data->inHandle );
 
-    int result = midiInUnprepareHeader(data->inHandle, data->sysexBuffer, sizeof(MIDIHDR));
-    delete [] data->sysexBuffer->lpData;
-    delete [] data->sysexBuffer;
-    if ( result != MMSYSERR_NOERROR ) {
-      midiInClose( data->inHandle );
-      errorString_ = "RtMidiIn::openPort: error closing Windows MM MIDI input port (midiInUnprepareHeader).";
-      error( RtError::DRIVER_ERROR );
+    for ( int i=0; i<RT_SYSEX_BUFFER_COUNT; ++i ) {
+      int result = midiInUnprepareHeader(data->inHandle, data->sysexBuffer[i], sizeof(MIDIHDR));
+      delete [] data->sysexBuffer[i]->lpData;
+      delete [] data->sysexBuffer[i];
+      if ( result != MMSYSERR_NOERROR ) {
+        midiInClose( data->inHandle );
+        errorString_ = "RtMidiIn::openPort: error closing Windows MM MIDI input port (midiInUnprepareHeader).";
+        error( RtError::DRIVER_ERROR );
+      }
     }
 
     midiInClose( data->inHandle );
@@ -2145,7 +2152,7 @@ std::string RtMidiIn :: getPortName( unsigned int portNumber )
   // UNICODE (thanks to Eduardo Coutinho!).
   //std::string stringName = std::string( deviceCaps.szPname );
   char nameString[MAXPNAMELEN];
-  for( int i=0; i<MAXPNAMELEN; i++ )
+  for( int i=0; i<MAXPNAMELEN; ++i )
     nameString[i] = (char)( deviceCaps.szPname[i] );
 
   std::string stringName( nameString );
@@ -2179,7 +2186,7 @@ std::string RtMidiOut :: getPortName( unsigned int portNumber )
   // UNICODE (thanks to Eduardo Coutinho!).
   //std::string stringName = std::string( deviceCaps.szPname );
   char nameString[MAXPNAMELEN];
-  for( int i=0; i<MAXPNAMELEN; i++ )
+  for( int i=0; i<MAXPNAMELEN; ++i )
     nameString[i] = (char)( deviceCaps.szPname[i] );
 
   std::string stringName( nameString );
@@ -2284,7 +2291,7 @@ void RtMidiOut :: sendMessage( std::vector<unsigned char> *message )
     }
 
     // Copy data to buffer.
-    for ( unsigned int i=0; i<nBytes; i++ ) buffer[i] = message->at(i);
+    for ( unsigned int i=0; i<nBytes; ++i ) buffer[i] = message->at(i);
 
     // Create and prepare MIDIHDR structure.
     MIDIHDR sysex;
@@ -2323,9 +2330,9 @@ void RtMidiOut :: sendMessage( std::vector<unsigned char> *message )
     // Pack MIDI bytes into double word.
     DWORD packet;
     unsigned char *ptr = (unsigned char *) &packet;
-    for ( unsigned int i=0; i<nBytes; i++ ) {
+    for ( unsigned int i=0; i<nBytes; ++i ) {
       *ptr = message->at(i);
-      ptr++;
+      ++ptr;
     }
 
     // Send the message immediately.
diff --git a/src/RtWvIn.cpp b/src/RtWvIn.cpp
index 837950b..8daf9fa 100644
--- a/src/RtWvIn.cpp
+++ b/src/RtWvIn.cpp
@@ -15,12 +15,12 @@
     that takes an StkFrames object for multi-channel and/or
     multi-frame data.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
 #include "RtWvIn.h"
-#include <string.h>
+#include <cstring>
 
 namespace stk {
 
diff --git a/src/RtWvOut.cpp b/src/RtWvOut.cpp
index 98ee3e5..17c8c06 100644
--- a/src/RtWvOut.cpp
+++ b/src/RtWvOut.cpp
@@ -14,12 +14,12 @@
     that takes a reference to an StkFrames object for multi-channel
     and/or multi-frame data.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
 #include "RtWvOut.h"
-#include <string.h>
+#include <cstring>
 
 namespace stk {
 
diff --git a/src/Sampler.cpp b/src/Sampler.cpp
index ee9e2e6..7dd2bfc 100644
--- a/src/Sampler.cpp
+++ b/src/Sampler.cpp
@@ -5,7 +5,7 @@
     This instrument provides an ADSR envelope, a one-pole filter, and
     structures for an arbitrary number of attack and looped files.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Saxofony.cpp b/src/Saxofony.cpp
index 548102b..b9c8b75 100644
--- a/src/Saxofony.cpp
+++ b/src/Saxofony.cpp
@@ -31,7 +31,7 @@
        - Vibrato Gain = 1
        - Breath Pressure = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Shakers.cpp b/src/Shakers.cpp
index c2e4f6f..77565b3 100644
--- a/src/Shakers.cpp
+++ b/src/Shakers.cpp
@@ -48,14 +48,15 @@
         - Little Rocks = 21
         - Tuned Bamboo Chimes = 22
 
-    by Perry R. Cook, 1996 - 2009.
+    by Perry R. Cook, 1996 - 2010.
 */
 /***************************************************/
 
 #include "Shakers.h"
 #include "SKINI.msg"
-#include <string.h>
+#include <cstring>
 #include <cmath>
+#include <cstdlib>
 
 namespace stk {
 
diff --git a/src/Simple.cpp b/src/Simple.cpp
index ebf3a58..5426fff 100644
--- a/src/Simple.cpp
+++ b/src/Simple.cpp
@@ -13,7 +13,7 @@
        - Envelope Rate = 11
        - Gain = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/SineWave.cpp b/src/SineWave.cpp
index 2b1bb67..3bd8ecf 100644
--- a/src/SineWave.cpp
+++ b/src/SineWave.cpp
@@ -9,7 +9,7 @@
 
     The "table" length, set in SineWave.h, is 2048 samples by default.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/SingWave.cpp b/src/SingWave.cpp
index 3a76c27..336693b 100644
--- a/src/SingWave.cpp
+++ b/src/SingWave.cpp
@@ -9,7 +9,7 @@
     Within STK, it is used as an excitation source for other
     instruments.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Sitar.cpp b/src/Sitar.cpp
index 9591be5..14035e7 100644
--- a/src/Sitar.cpp
+++ b/src/Sitar.cpp
@@ -13,7 +13,7 @@
     Stanford, bearing the names of Karplus and/or
     Strong.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Skini.cpp b/src/Skini.cpp
index 4563f12..f15250a 100644
--- a/src/Skini.cpp
+++ b/src/Skini.cpp
@@ -19,12 +19,13 @@
 
     See also SKINI.txt.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
 #include "Skini.h"
 #include "SKINI.tbl"
+#include <cstdlib>
 
 namespace stk {
 
diff --git a/src/Socket.cpp b/src/Socket.cpp
index f7c21fc..ba20ce3 100644
--- a/src/Socket.cpp
+++ b/src/Socket.cpp
@@ -5,7 +5,7 @@
     This class provides common functionality for TCP and UDP internet
     socket server and client subclasses.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Sphere.cpp b/src/Sphere.cpp
index b5d6390..707a67f 100644
--- a/src/Sphere.cpp
+++ b/src/Sphere.cpp
@@ -5,7 +5,7 @@
     This class implements a spherical ball with
     radius, mass, position, and velocity parameters.
 
-    by Perry R. Cook, 1995 - 2009.
+    by Perry R. Cook, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/StifKarp.cpp b/src/StifKarp.cpp
index 98aeaf8..df29f7c 100644
--- a/src/StifKarp.cpp
+++ b/src/StifKarp.cpp
@@ -17,7 +17,7 @@
        - String Sustain = 11
        - String Stretch = 1
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Stk.cpp b/src/Stk.cpp
index b26a826..1a6f740 100644
--- a/src/Stk.cpp
+++ b/src/Stk.cpp
@@ -22,7 +22,7 @@
     STK WWW site: http://ccrma.stanford.edu/software/stk/
 
     The Synthesis ToolKit in C++ (STK)
-    Copyright (c) 1995-2009 Perry R. Cook and Gary P. Scavone
+    Copyright (c) 1995-2010 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
diff --git a/src/TapDelay.cpp b/src/TapDelay.cpp
index ee7371a..a519d46 100644
--- a/src/TapDelay.cpp
+++ b/src/TapDelay.cpp
@@ -10,7 +10,7 @@
     A non-interpolating delay line is typically used in fixed
     delay-length applications, such as for reverberation.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/TcpClient.cpp b/src/TcpClient.cpp
index 167f085..44e1999 100644
--- a/src/TcpClient.cpp
+++ b/src/TcpClient.cpp
@@ -19,12 +19,12 @@
     less than or equal to zero indicate a closed
     or lost connection or the occurence of an error.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
 #include "TcpClient.h"
-#include <string.h>
+#include <cstring>
 
 namespace stk {
 
diff --git a/src/TcpServer.cpp b/src/TcpServer.cpp
index 7f413f4..7ae930f 100644
--- a/src/TcpServer.cpp
+++ b/src/TcpServer.cpp
@@ -19,7 +19,7 @@
     less than or equal to zero indicate a closed
     or lost connection or the occurence of an error.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Thread.cpp b/src/Thread.cpp
index 2d49171..dc1a473 100644
--- a/src/Thread.cpp
+++ b/src/Thread.cpp
@@ -16,7 +16,7 @@
 
     THREAD_RETURN THREAD_TYPE thread_function(void *ptr)
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/TubeBell.cpp b/src/TubeBell.cpp
index 43cd416..e534574 100644
--- a/src/TubeBell.cpp
+++ b/src/TubeBell.cpp
@@ -26,7 +26,7 @@
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/TwoPole.cpp b/src/TwoPole.cpp
index 9ffcf60..b8ab30d 100644
--- a/src/TwoPole.cpp
+++ b/src/TwoPole.cpp
@@ -6,7 +6,7 @@
     provided for creating a resonance in the frequency response while
     maintaining a nearly constant filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/TwoZero.cpp b/src/TwoZero.cpp
index 2ced9e6..e3ed25b 100644
--- a/src/TwoZero.cpp
+++ b/src/TwoZero.cpp
@@ -6,7 +6,7 @@
     provided for creating a "notch" in the frequency response while
     maintaining a constant filter gain.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
diff --git a/src/UdpSocket.cpp b/src/UdpSocket.cpp
index 7a7605b..d31557e 100644
--- a/src/UdpSocket.cpp
+++ b/src/UdpSocket.cpp
@@ -17,12 +17,12 @@
     read/write methods.  Values less than or equal to zero indicate
     the occurence of an error.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
 #include "UdpSocket.h"
-#include <string.h>
+#include <cstring>
 
 namespace stk {
 
diff --git a/src/VoicForm.cpp b/src/VoicForm.cpp
index 75e6e4e..0d4cfef 100644
--- a/src/VoicForm.cpp
+++ b/src/VoicForm.cpp
@@ -21,14 +21,14 @@
        - Vibrato Gain = 1
        - Loudness (Spectral Tilt) = 128
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
 #include "VoicForm.h"
 #include "Phonemes.h"
 #include "SKINI.msg"
-#include <string.h>
+#include <cstring>
 #include <cmath>
 
 namespace stk {
diff --git a/src/Voicer.cpp b/src/Voicer.cpp
index 5814fbf..bf8549c 100644
--- a/src/Voicer.cpp
+++ b/src/Voicer.cpp
@@ -19,7 +19,7 @@
     Alternately, control changes can be sent to all voices in a given
     group.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/
 
@@ -165,10 +165,10 @@ void Voicer :: setFrequency( long tag, StkFloat noteNumber )
 void Voicer :: pitchBend( StkFloat value, int group )
 {
   StkFloat pitchScaler;
-  if ( value < 64.0 )
-    pitchScaler = pow(0.5, (64.0-value)/64.0);
+  if ( value < 8192.0 )
+    pitchScaler = pow( 0.5, (8192.0-value) / 8192.0 );
   else
-    pitchScaler = pow(2.0, (value-64.0)/64.0);
+    pitchScaler = pow( 2.0, (value-8192.0) / 8192.0 );
   for ( unsigned int i=0; i<voices_.size(); i++ ) {
     if ( voices_[i].group == group )
       voices_[i].instrument->setFrequency( (StkFloat) (voices_[i].frequency * pitchScaler) );
@@ -178,10 +178,10 @@ void Voicer :: pitchBend( StkFloat value, int group )
 void Voicer :: pitchBend( long tag, StkFloat value )
 {
   StkFloat pitchScaler;
-  if ( value < 64.0 )
-    pitchScaler = pow(0.5, (64.0-value)/64.0);
+  if ( value < 8192.0 )
+    pitchScaler = pow( 0.5, (8192.0-value) / 8192.0 );
   else
-    pitchScaler = pow(2.0, (value-64.0)/64.0);
+    pitchScaler = pow( 2.0, (value-8192.0) / 8192.0 );
   for ( unsigned int i=0; i<voices_.size(); i++ ) {
     if ( voices_[i].tag == tag ) {
       voices_[i].instrument->setFrequency( (StkFloat) (voices_[i].frequency * pitchScaler) );
diff --git a/src/Whistle.cpp b/src/Whistle.cpp
index ab0bd5e..bb28850 100644
--- a/src/Whistle.cpp
+++ b/src/Whistle.cpp
@@ -12,7 +12,7 @@
        - Blowing Frequency Modulation = 2
        - Volume = 128
 
-    by Perry R. Cook  1996 - 2009.
+    by Perry R. Cook  1996 - 2010.
 */
 /***************************************************/
 
diff --git a/src/Wurley.cpp b/src/Wurley.cpp
index 1f1412e..88bd9fe 100644
--- a/src/Wurley.cpp
+++ b/src/Wurley.cpp
@@ -26,7 +26,7 @@
     type who should worry about this (making
     money) worry away.
 
-    by Perry R. Cook and Gary P. Scavone, 1995 - 2009.
+    by Perry R. Cook and Gary P. Scavone, 1995 - 2010.
 */
 /***************************************************/