Fixed MIDI playback on Linux. Still need configure files for libscorealign and portmidi. (I tweaked makefiles by hand to build and test with EXPERIMENTAL_MIDI_OUT and EXPERIMENTAL_SCOREALIGN.) Also, I updated portmidi files, including some bug fixes from the portmidi project.

2010-10-01 17:59:18 +00:00 · 2010-10-01 17:59:18 +00:00 · 6fa857c3ae
parent 576dfe6653
commit 6fa857c3ae
39 changed files with 375 additions and 5373 deletions
--- a/lib-src/libscorealign/audiomixerreader.cpp
+++ b/lib-src/libscorealign/audiomixerreader.cpp
@ -2,8 +2,10 @@
 *
 * 17-Jun-08  RBD created based on audiofilereader.cpp
 */
-#include "assert.h"
-#include "stdlib.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include "audioreader.h"
 #include "allegro.h"
 #include "scorealign.h"
@ -75,5 +77,5 @@ void Audio_mixer_reader::print_info()
 {
    printf("   Audacity mixer at @ %p\n", mixer);
    printf("   sample rate %g\n", get_sample_rate());
-    printf("   total frames %d\n", get_frames());
+    printf("   total frames %ld\n", get_frames());
 }
--- a/lib-src/libscorealign/audioreader.cpp
+++ b/lib-src/libscorealign/audioreader.cpp
@ -3,9 +3,11 @@
 * 14-Jul-08  RBD
 */

-#include "assert.h"
-#include "stdio.h"
-#include "math.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
 #include "sautils.h"
 #include "string.h"
 #include <fstream>
--- a/lib-src/libscorealign/comp_chroma.cpp
+++ b/lib-src/libscorealign/comp_chroma.cpp
@ -1,4 +1,9 @@
+/* comp_chroma.cpp -- compute chroma distance
+ *
+ * 2008 RBD
+ */

+#include <string.h>
 #include <math.h>
 #include <fstream>
 #include <algorithm>
--- a/lib-src/libscorealign/curvefit.cpp
+++ b/lib-src/libscorealign/curvefit.cpp
@ -3,11 +3,12 @@
 *  scorealign
 *
 *  Created by Roger Dannenberg on 10/20/07.
- *  Copyright 2007 __MyCompanyName__. All rights reserved.
 *
 */

-#include "assert.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 #include <math.h>
 #include "comp_chroma.h"
 #include "sautils.h"
--- a/lib-src/libscorealign/fft3/FFT3.cpp
+++ b/lib-src/libscorealign/fft3/FFT3.cpp
@ -360,7 +360,7 @@ int NumWindowFuncs3()
   return 4;
 }

-char *WindowFuncName3(int whichFunction)
+const char *WindowFuncName3(int whichFunction)
 {
   switch (whichFunction) {
   default:
--- a/lib-src/libscorealign/fft3/FFT3.h
+++ b/lib-src/libscorealign/fft3/FFT3.h
@ -94,7 +94,7 @@ void WindowFunc3(int whichFunction, int NumSamples, float *data);
 * Returns the name of the windowing function (for UI display)
 */

-char *WindowFuncName3(int whichFunction);
+const char *WindowFuncName3(int whichFunction);

 /*
 * Returns the number of windowing functions supported
--- a/lib-src/libscorealign/license.txt
+++ b/lib-src/libscorealign/license.txt
@ -0,0 +1,40 @@
+/*
+ * Scorealign: Chromagram and dynamic programming based audio alignment
+ *
+ * license.txt -- a copy of the Scorealign copyright notice and 
+ *                license information
+ *
+ * Latest version available at: http://sourceforge.net/projects/portmedia
+ *
+ * Copyright (c) 2008-2010 Roger B. Dannenberg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire Scorealign license; however, 
+ * the PortMusic community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the 
+ * license above.
+ */
--- a/lib-src/libscorealign/scorealign-glue.cpp
+++ b/lib-src/libscorealign/scorealign-glue.cpp
@ -3,6 +3,8 @@
 * 21-Jul-08 RBD
 */

+#include <stdlib.h>
+#include <string.h>
 #include "allegro.h"
 #include "audioreader.h"
 #include "scorealign.h"
--- a/lib-src/portmidi/pm_cl/README_CL.txt
+++ b/lib-src/portmidi/pm_cl/README_CL.txt
@ -1,104 +0,0 @@
-README_CL.txt for PortMidi
-Roger B. Dannenberg
-17 Jan 2007
-
-This is a Common Lisp interface to PortMidi.
-
-On Mac OSX, you need to build PortMidi as a dynamic link library
-before you can use PortMidi from Common Lisp.
-
-You can build PortMidi as a dynamic link library by running this:
-
-cd portmidi
-make -F pm_mac/Makefile.osx install-with-xcode
-
-This is just a shortcut for:
-
-cd portmidi/pm_mac
-sudo xcodebuild -project pm_mac.xcodeproj -configuration Deployment install DSTROOT=/
-
-You can check the file and the architecture for which it is built using:
-    file /usr/local/lib/libportmidi.dylib
-
-If you've done this install of portmidi, then you should also have 
-   /usr/local/include/portmidi.h
-This will be necessary to successfully build the cffi interface below.
-
-To test PortMidi with Common Lisp, I (RBD) am using SBCL, which I 
-downloaded from http://prdownloads.sourceforge.net/sbcl. Currently, I use 
-    sbcl-0.9.17-x86-darwin-binary.tar.bz2
-To install this, I unpacked it by just double-clicking in the finder. Then, 
-from a command window, I became root using "sudo sh", and then typed:
-# INSTALL_ROOT=/usr/local
-# sh install.sh
-# exit
-
-I also downloaded cffi-061012.tar.gz from 
-    http://common-lisp.net/project/cffi/tarballs/?M=D
-
-To compile cffi, use the following, where "/Lisp/cffi/" is replaced by 
-the actual directory of cffi, e.g. 
-    "/Users/rbd/sbcl-0.9.17-x86-darwin/cffi-061012":
-
-% sbcl
-* (require 'asdf)
-* (push "/Lisp/cffi/" asdf:*central-registry*)
-* (asdf:oos 'asdf:load-op :cffi)
-* (quit)
-
-Download Common Music's portmidi module from cvs and build the c side:
-(Replace "/Lisp" with your lisp directory, e.g. 
-"/Users/rbd/sbcl-0.9.17-x86-darwin". These cvs commands will create
-a new directory, portmidi.)
-
-% cd /Lisp
-% export CVSROOT=:pserver:anonymous@commonmusic.cvs.sourceforge.net:/cvsroot/commonmusic
-% cvs login   # press Return at password prompt
-% cvs checkout portmidi
-% cd portmidi
-% ./configure
-% make
-% cd ..
-
-Now compile/load the portmidi module just like cffi. Again, change
-"/Lisp/cffi/" and "/Lisp/portmidi" to correspond to your local file system.
-(Note that /Lisp becomes your lisp directory, and "cffi" becomes your
-cffi folder name, e.g. "cffi-061012".
-
-% sbcl
-* (require 'asdf)
-* (push "/Lisp/cffi/" asdf:*central-registry*)
-* (asdf:oos 'asdf:load-op :cffi)
-* (push "/Lisp/portmidi/" asdf:*central-registry*)
-* (asdf:oos 'asdf:load-op :portmidi)
-
-Look in the file /Lisp/portmidi/test.lisp for a test of the lisp interface to
-portmidi. For example, while still running sbcl:
-
-* (pm:portmidi)  ; initialize portmidi
-* (pt:start) ; start time
-* (pt:time) ; get time
-* (pprint (pm:GetDeviceInfo)) ; get list of devices
-((:ID 0 :NAME "IAC Driver Bus 1" :TYPE :INPUT :OPEN NIL)
- (:ID 1 :NAME "IAC Driver Bus 1" :TYPE :OUTPUT :OPEN NIL))
-
-Notice that test.lisp assumes MIDI input devices are connected
-and uses some hard-wired device numbers, so it may not run
-as is without error.
-
-Since test.lisp uses some Common Music calls, I (RBD) wrote a
-simpler test, test-no-cm.lisp, which is in the same folder as
-this (README_CL.txt) file. To use it, first check that the 
-values for outid (4) and inid (1) actually match PortMidi device
-id's for output and input devices, and make sure the input
-device is a keyboard that can generate a middle-C -- otherwise
-the program will hang waiting for input. Run sbcl from this
-pm_cl folder, and type:
-
-(load "test-no-cm.lisp")
-
-The program pauses frequently by calling (READ), so you
-should type t or something, then <RETURN> to continue.
-
-
-(Thanks to Leigh Smith and Rick Taube)
--- a/lib-src/portmidi/pm_cl/cffi-portmidi.lisp
+++ b/lib-src/portmidi/pm_cl/cffi-portmidi.lisp
@ -1,384 +0,0 @@
-;;; **********************************************************************
-;;; Copyright (C) 2005 Heinrich Taube, <taube (at) uiuc (dot) edu>
-;;;
-;;; This program is free software; you can redistribute it and/or
-;;; modify it under the terms of the Lisp Lesser Gnu Public License.
-;;; See http://www.cliki.net/LLGPL for the text of this agreement.
-;;; **********************************************************************
-
-
-;;; A CFFI interface to Portmidi. Should run in most Common Lisp
-;;; implementations on Linux, OS X and Windows. For information about
-;;; CFFI see http://common-lisp.net/project/cffi/
-
-(in-package :cl-user)
-
-(defvar *libportmidi*
-  (let ((type #+(or darwin macos macosx) "dylib"
-              #+(or linux linux-target (and unix pc386) freebsd) "so"
-              #+(or win32 microsoft-32 cygwin) "dll")
-        (paths (list "/usr/lib/" "/usr/local/lib/" *load-pathname*)))
-    (loop for d in paths
-       for p = (make-pathname :name "libportmidi" :type type 
-                              :defaults d)
-       when (probe-file p) do (return p)
-       finally  
-         (error "Library \"portmidi.~A\" not found. Fix *libportmidi*."
-                type))))
-
-;;; linux: guess i need to load porttime.so first (?) osx doesnt seem
-;;; to need this lib at all...
-
-#+(or linux (and clisp unix (not macos)))
-(let ((lpt (merge-pathnames "libporttime" *libportmidi*)))
-  (if (probe-file lpt)
-      (cffi:load-foreign-library lpt)
-      (error "Porttime: ~a not found. Fix *libportmidi* path." lpt)))
-
-;;; load portmidi lib
-
-(cffi:load-foreign-library *libportmidi*)
-
-(defpackage :portmidi
-  (:use :common-lisp) 
-  (:nicknames :pm :pt)
-  (:shadow :initialize :terminate :time :start :stop :abort 
-           :close :read :write :poll)
-  (:export :Initialize :Terminate 
-           :HasHostError :GetErrorText :GetHostErrorText 
-           :CountDevices :GetDefaultInputDeviceID
-           :GetDefaultOutputDeviceID :GetDeviceInfo
-           :Message :Message.status :Message.data1 :Message.data2
-           :Event.message :Event.timestamp 
-           ;; event buffers added to api
-           :EventBufferNew :EventBufferFree :EventBufferElt
-           :EventBufferMap
-           :OpenInput :OpenOutput :SetFilter :SetChannelMask
-           :Abort :Close :Read :Write :Poll :WriteShort :WriteSysex
-           ;; filtering constants
-           :filt-active :filt-sysex :filt-clock :filt-play :filt-f9 
-           :filt-fd :filt-reset :filt-note :filt-channel-aftertouch
-           :filt-poly-aftertouch :filt-program :filt-control
-           :filt-pitchbend :filt-mtc :filt-song-position 
-           :filt-song-select :filt-tune :filt-tick :filt-undefined
-           :filt-realtime  :filt-aftertouch :filt-systemcommon
-           ;; porttime.
-           :Start :Stop :Started :Time
-           ;; initialization insurers added to api
-           :portmidi :*portmidi* ))
-
-(in-package :portmidi)
-
-(cffi:defcstruct pm-device-info 
-		 (struct-version :int) 
-		 (interf :pointer) 
-		 (name :pointer) 
-		 (input :int) 
-		 (output :int) 
-		 (opened :int))
-
-(cffi:define-foreign-type pm-message () ':long)
-(cffi:define-foreign-type pm-timestamp () ':long)
-(cffi:defcstruct pm-event 
-		 (message pm-message) 
-		 (timestamp pm-timestamp))
-(cffi:define-foreign-type pm-error () ':int)
-
-(cffi:define-foreign-type port-midi-stream () ':void)
-(cffi:define-foreign-type pm-device-id () ':int)
-(cffi:define-foreign-type pm-time-proc-ptr () ':pointer)
-(cffi:defcfun ("Pm_WriteSysEx" pm-write-sys-ex) pm-error (stream :pointer) (when pm-timestamp) (msg :pointer)) 
-(cffi:defcfun ("Pm_WriteShort" pm-write-short) pm-error (stream :pointer) (when pm-timestamp) (msg :long)) 
-(cffi:defcfun ("Pm_Write" pm-write) pm-error (stream :pointer) (buffer :pointer) (length :long)) 
-(cffi:defcfun ("Pm_Poll" pm-poll) pm-error (stream :pointer)) 
-(cffi:defcfun ("Pm_Read" pm-read) pm-error (stream :pointer) (buffer :pointer) (length :long)) 
-(cffi:defcfun ("Pm_Close" pm-close) pm-error (stream :pointer)) 
-(cffi:defcfun ("Pm_Abort" pm-abort) pm-error (stream :pointer)) 
-;(cffi:defcfun ("Pm_SetChannelMask" pm-set-channel-mask) pm-error (stream :pointer) (mask :int)) 
-(cffi:defcfun ("Pm_SetFilter" pm-set-filter) pm-error (stream :pointer) (filters :long)) 
-(cffi:defcfun ("Pm_OpenOutput" pm-open-output) pm-error (stream :pointer) (output-device pm-device-id) (output-driver-info :pointer) (buffer-size :long) (time-proc pm-time-proc-ptr) (time-info :pointer) (latency :long)) 
-(cffi:defcfun ("Pm_OpenInput" pm-open-input) pm-error (stream :pointer) (input-device pm-device-id) (input-driver-info :pointer) (buffer-size :long) (time-proc pm-time-proc-ptr) (time-info :pointer)) 
-(cffi:defcfun ("Pm_GetDeviceInfo" pm-get-device-info) :pointer (id pm-device-id)) 
-(cffi:defcfun ("Pm_GetDefaultOutputDeviceID" pm-get-default-output-device-id) pm-device-id) 
-(cffi:defcfun ("Pm_GetDefaultInputDeviceID" pm-get-default-input-device-id) pm-device-id) 
-(cffi:defcfun ("Pm_CountDevices" pm-count-devices) :int) 
-(cffi:defcfun ("Pm_GetHostErrorText" pm-get-host-error-text) :void (msg :pointer) (len :unsigned-int)) 
-(cffi:defcfun ("Pm_GetErrorText" pm-get-error-text) :pointer (errnum pm-error)) 
-(cffi:defcfun ("Pm_HasHostError" pm-has-host-error) :int (stream :pointer)) 
-(cffi:defcfun ("Pm_Terminate" pm-terminate) pm-error) 
-(cffi:defcfun ("Pm_Initialize" pm-initialize) pm-error)
-
-;;; porttime.h
-
-(cffi:define-foreign-type pt-error () ':int)
-(cffi:define-foreign-type pt-timestamp () ':long)
-(cffi:defcfun ("Pt_Start" pt-start) pt-error (a :int) (b :pointer) (c :pointer))
-(cffi:defcfun ("Pt_Stop" pt-stop) pt-error )
-(cffi:defcfun ("Pt_Started" pt-started) :int)
-(cffi:defcfun ("Pt_Time" pt-time) pt-timestamp)
- 
-(defconstant true 1) 
-(defconstant false 0)
-(defconstant pmNoError 0)
-(defconstant pmHostError -10000)
-(defconstant pm-no-device -1)
-(defconstant pm-default-sysex-buffer-size 1024) 
-(defconstant filt-active 1) 
-(defconstant filt-sysex 2) 
-(defconstant filt-clock 4) 
-(defconstant filt-play 8) 
-(defconstant filt-f9 16) 
-(defconstant filt-fd 32) 
-(defconstant filt-reset 64) 
-(defconstant filt-note 128) 
-(defconstant filt-channel-aftertouch 256) 
-(defconstant filt-poly-aftertouch 512) 
-(defconstant filt-program 1024) 
-(defconstant filt-control 2048) 
-(defconstant filt-pitchbend 4096) 
-(defconstant filt-mtc 8192) 
-(defconstant filt-song-position 16384) 
-(defconstant filt-song-select 32768) 
-(defconstant filt-tune 65536) 
-(defconstant filt-tick filt-f9)
-(defconstant filt-undefined (logior filt-f9 filt-fd))
-(defconstant filt-realtime (logior filt-active filt-sysex
-                                      filt-clock filt-play
-                                      filt-undefined filt-reset))
-(defconstant filt-aftertouch (logior filt-channel-aftertouch
-                                        filt-poly-aftertouch ))
-(defconstant filt-systemcommon (logior filt-mtc filt-song-position
-                                          filt-song-select filt-tune))
-(defvar *portmidi* nil) ; t if loaded
-
-;;;
-;;; utils
-;;;
-
-(defvar host-error-text (make-string 256 :initial-element #\*))
-
-(defmacro with-pm-error (form)
-  (let ((v (gensym)))
-    `(let ((,v ,form))
-       (if (not (= ,v pmNoError))
-	   (if (= ,v pmHostError)
-	       (cffi:with-foreign-string (host-error host-error-text)
-		 (pm-get-host-error-text host-error
-					 (length host-error-text))
-		 (error "Host error is: ~a"
-			(cffi:foreign-string-to-lisp host-error)))
-	       (error (cffi:foreign-string-to-lisp
-		       (pm-get-error-text ,v))))
-           ,v))))
-
-(defun portmidi ()
-  ;; initializer, call before using lib
-  (or *portmidi*
-      (progn (pm-initialize)
-             (setq *portmidi* t))))
-
-(defun Message (status data1 data2)
-  ;; portmidi messages are just unsigneds
-  (logior (logand (ash data2 16) #xFF0000)
-          (logand (ash data1 08) #xFF00)
-          (logand status #xFF)))
-
-(defun Message.status (m)
-  (logand m #xFF))
-
-(defun Message.data1 (m)
-  (logand (ash m -08) #xFF))
-
-(defun Message.data2 (m)
-  (logand (ash m -16) #xFF))
-
-;;; accessors 
-
-(defun DeviceInfo.interf (ptr)
-  (cffi:foreign-string-to-lisp 
-   (cffi:foreign-slot-value ptr 'pm-device-info 'interf)))
-
-(defun DeviceInfo.name (ptr)
-  (cffi:foreign-string-to-lisp
-   (cffi:foreign-slot-value ptr 'pm-device-info 'name)))
-
-(defun DeviceInfo.input (ptr)
-  (if (= (cffi:foreign-slot-value ptr 'pm-device-info 'input) 0)
-      nil
-    t))
-
-(defun DeviceInfo.output (ptr)
-  (if (= (cffi:foreign-slot-value ptr 'pm-device-info 'output) 0)
-      nil
-    t))
-
-(defun DeviceInfo.opened (ptr)
-  (if (= (cffi:foreign-slot-value ptr 'pm-device-info 'opened) 0)
-      nil
-    t))
-
-(defun Event.message (e &optional (v nil vp))
-  (if vp
-      (progn 
-	(setf (cffi:foreign-slot-value e 'pm-event 'message) v)
-	v)
-    (cffi:foreign-slot-value e 'pm-event 'message)))
-    
-(defun Event.timestamp (e &optional (v nil vp))
-  (if vp
-      (progn 
-	(setf (cffi:foreign-slot-value e 'pm-event 'timestamp) v)
-	v)
-    (cffi:foreign-slot-value e 'pm-event 'timestamp)))
-
-;;; functions
-
-(defun Initialize ()
-  (with-pm-error (pm-initialize)))
-
-(defun terminate ()
-  (with-pm-error (pm-terminate)))
-
-
-(defun HasHostError (pms) 
-  (pm-has-host-error pms))
-
-(defun GetErrorText (err) 
-  (pm-get-error-text err))
-
-; how do i do this?
-;(progn
-;  (defalien "pm-GetHostErrorText" void (a c-string) (b unsigned-int))
-;  (defun GetHostErrorText () 
-;    (pm-GetHostErrorText 256)))
-
-(defun CountDevices ()
-  (portmidi)
-  (pm-count-devices ))
-
-(defun GetDefaultInputDeviceID ()
-  (let ((id (pm-get-default-input-device-id )))
-    (if (= id pm-no-device) nil id)))
-
-(defun GetDefaultOutputDeviceID ()
-  (let ((id (pm-get-default-output-device-id )))
-    (if (= id pm-no-device) nil id)))
-
-;replaced by lispy version end of file.
-;(defun GetDeviceInfo (id) (pm-get-device-info id))
-
-(defun OpenInput (device bufsiz)
-  ;; portmidi: timer must be running before opening
-  (unless (Started) (Start))
-  (cffi:with-foreign-object (p1 :pointer)
-    (let ((err (pm-open-input p1 device (cffi:null-pointer)
-                              bufsiz (cffi:null-pointer) (cffi:null-pointer))))
-        (if (= err pmNoError)
-            (cffi:mem-ref p1 :pointer)
-            (error (pm-get-error-text err))))))
-
-(defun OpenOutput (device bufsiz latency)
-  (unless (Started) (Start))
-  (cffi:with-foreign-object (p1 :pointer) ;(p (* PortMidi))
-    (let ((err (pm-open-output p1 device (cffi:null-pointer)
-                               bufsiz (cffi:null-pointer) (cffi:null-pointer)
-                               latency)))
-      (if (= err pmNoError)
-          (cffi:mem-ref p1 :pointer)
-          (error (pm-get-error-text err))))))
-
-(defun SetFilter (a filts) 
-  (with-pm-error
-    (pm-set-filter a filts)))
-
-;(defun SetChannelMask (pms mask)
-;  (with-pm-error (pm-set-channel-mask pms mask)))
-
-(defun Abort (pms)
-  (with-pm-error (pm-abort pms)))
-
-(defun Close (pms)
-  (with-pm-error (pm-close pms)))
-
-(defun EventBufferFree (buf)
-  (cffi:foreign-free buf))
-
-(defun EventBufferNew (len)
-  (cffi:foreign-alloc 'pm-event :count len))
-
-(defun EventBufferElt (buf i)
-  ;; buf is POINTER to buf
-  (cffi:mem-aref buf 'pm-event i))
-
-(defun EventBufferSet (buffer index timestamp message)
-  (setf (cffi:foreign-slot-value
-         (cffi:mem-aref buffer 'pm-event index) 'pm-event 'timestamp)
-        timestamp)
-  (setf (cffi:foreign-slot-value
-         (cffi:mem-aref buffer 'pm-event index) 'pm-event 'message)
-        message)
-  (values))
-
-(defun EventBufferMap (fn buf end)
-  (loop for i below end
-     for e = (EventBufferElt buf i)
-     do (funcall fn (Event.message e) (Event.timestamp e)))
- (values))
-
-(defun Read (pms *evbuf len) 
-  (let ((res (pm-read pms *evbuf len)))
-    (if (< res 0)
-        (error (pm-get-error-text res))
-        res)))
-
-(defun Poll (pms)
-  (let ((res (pm-poll pms)))
-    (cond ((= res 0) nil)
-          ((= res 1) t)
-          (t (error (pm-get-error-text res))))))
-
-(defun Write (pms *evbuf len)
-  (with-pm-error (pm-write pms *evbuf len)))
-
-(defun WriteShort (pms when msg)
-  (with-pm-error (pm-write-short pms when msg)))
-
-(defun WriteSysex (pms when string)
-  (cffi:with-foreign-string (ptr string)
-    (with-pm-error (pm-write-sys-ex pms when ptr))))
-
-;;; porttime.h
-
-(defun Started ()
-  (let ((res (pt-started)))
-    (if (= res false) nil t)))
-
-(defun Start ()
-  ;; NB: This has to be called before opening output or input.
-  ;; it seems that if its called 2x we get an error.
-  (unless (Started)
-    (with-pm-error (pt-start 1 (cffi:null-pointer) (cffi:null-pointer))))
-  (values))
-
-(defun Stop ()
-  (when (Started)
-    (with-pm-error (pt-stop)))
-  (values))
-
-(defun Time ()
-  (pt-time))
-
-(defun GetDeviceInfo (&optional id)
-  (flet ((getone (id)
-           (let ((d (pm-get-device-info id)))
-             (list :id id
-                   :name  (DeviceInfo.name d)
-                   :type (if (DeviceInfo.input d) ':input ':output)
-                   :open (DeviceInfo.opened d)))))
-    ;; make sure lib is initialized before checking devices
-    (portmidi)
-    (if id (getone id)
-        (loop for i below (CountDevices)
-           collect (getone i)))))
-
-(pushnew ':portmidi *features*)
--- a/lib-src/portmidi/pm_cl/test-no-cm.lisp
+++ b/lib-src/portmidi/pm_cl/test-no-cm.lisp
@ -1,112 +0,0 @@
-;; this is a half-baked sequence of PortMidi calls to test the interface
-;; No calls to Common Music are made, hence test-no-cm.lisp
-
-; setup cffi if it has not been done already
-(if (not (boundp '*clpath*))
-    (load "setup-pm.lisp"))
-
-(defun println (s) (print s) (terpri))
-
-;; initialize portmidi lib
-(pm:portmidi)
-;; timer testing
-(pt:Start )
-(pt:Started)
-(format t "time is ~A, type something~%" (pt:Time))
-(read)
-(format t "time is ~A, type something~%" (pt:Time))
-(read)
-(pt:Time)
-(format t "time is ~A, type something~%" (pt:Time))
-
-;; device testing
-(pm:CountDevices)
-(pprint (pm:GetDeviceInfo ))
-(defparameter inid (pm:GetDefaultInputDeviceID ))
-(pm:GetDeviceInfo inid)
-(defparameter outid (pm:GetDefaultOutputDeviceID ))
-(pm:GetDeviceInfo outid)
-;; output testing
-(defparameter outid 4) ; 4 = my SimpleSynth
-(defparameter outdev (pm:OpenOutput outid 100 1000))
-(pm:getDeviceInfo outid) ; :OPEN should be T
-;; message tests
-(defun pm (m &optional (s t))
-  (format s "#<message :op ~2,'0x :ch ~2,'0d :data1 ~3,'0d :data2 ~3,'0d>"
-          (ash (logand (pm:Message.status m) #xf0) -4)
-          (logand (pm:Message.status m) #x0f)
-          (pm:Message.data1 m)
-          (pm:Message.data2 m)))
-(defparameter on (pm:message #b10010000 60 64))
-(terpri)
-(pm on)
-(pm:Message.status on)
-(logand (ash (pm:Message.status on) -4) #x0f)
-(pm:Message.data1 on)
-(pm:Message.data2 on)
-(pm:WriteShort outdev (+ (pm:time) 100) on)
-(defparameter off (pm:message #b10000000 60 64))
-(terpri)
-(pm off)
-(terpri)
-(println "type something for note off")
-(read)
-(pm:WriteShort outdev (+ (pm:time) 100) off)
-(println "type something to close output device")
-(read)
-(pm:Close outdev)
-;; event buffer testing
-(defparameter buff (pm:EventBufferNew 8))
-(loop for i below 8 for x = (pm:EventBufferElt buff i) 
-   ;; set buffer events
-   do
-     (pm:Event.message x (pm:message #b1001000 (+ 60 i) (+ 100 i)))
-     (pm:Event.timestamp x (* 1000 i)))
-(loop for i below 8 for x = (pm:EventBufferElt buff i) 
-   ;; check buffer contents
-   collect (list (pm:Event.timestamp x)
-                 (pm:Message.data1 (pm:Event.message x))
-                 (pm:Message.data2 (pm:Event.message x))))
-(pm:EventBufferFree buff)
-;; input testing -- requires external midi keyboard
-(println (pm:GetDeviceInfo ))
-(defparameter inid 1) ; 1 = my external keyboard
-(defparameter indev (pm:OpenInput inid 256)) 
-(pm:GetDeviceInfo inid) ; :OPEN should be T
-(pm:SetFilter indev pm:filt-realtime) ; ignore active sensing etc.
-(println "poll says:")
-(println (pm:Poll indev))
-(println "play midi keyboard and type something")
-(read)
-;;
-;; ...play midi keyboard, then ...
-;;
-(println "poll says")
-(println (pm:Poll indev))
-(defparameter buff (pm:EventBufferNew 32))
-(defparameter num (pm:Read indev buff 32))
-(println "pm:Read gets")
-(println num)
-(println "input messages:")
-(pm:EventBufferMap (lambda (a b) b (terpri) (pm a))
-                   buff num)
-(pm:Poll indev)
-
-(println "play keyboard, to stop, play middle-C")
-
-;;; recv testing
-
-(defparameter pitch 0)
-(loop while (/= pitch 60) do
-  (let ((n (pm:Read indev buff 1)))
-    (cond ((= n 1)
-           (pm:EventBufferMap
-                (lambda (a b) 
-                   b (pm a) (terpri)
-                   (setf pitch (pm:Message.data1 a)))
-                buff n)))))
-
-(pm:EventBufferFree buff)
-(pm:Close indev)
-
-
--- a/lib-src/portmidi/pm_mac/Makefile.osx
+++ b/lib-src/portmidi/pm_mac/Makefile.osx
@ -1,188 +1,129 @@
-# MAKEFILE FOR PORTMIDI AND PORTTIME
-
-VFLAGS = -g
-
-
-# For debugging, define PM_CHECK_ERRORS
-PMFLAGS = -DPM_CHECK_ERRORS
-# Otherwise do not define PM_CHECK_ERRORS
-# PMFLAGS = 
-# Dynamic Lib is built without PM_CHECK_ERRORS
-PMDLFLAGS = 
-# Path for installation of dynamic libraries
-PF = /usr/local
-# Architecture for static libs
-ARCH = -arch ppc -arch i386
-
-pmlib = pm_mac/libportmidi.a
-
-CC = gcc $(VFLAGS) $(PMFLAGS) $(ARCH) -g -Ipm_common -Iporttime
-
-MACLIB = -framework CoreMIDI -framework CoreFoundation -framework CoreAudio \
-	 -framework CoreServices
-
-PMSRC =  pm_mac/pmmac.c pm_common/pmutil.c pm_common/portmidi.c \
-   pm_mac/pmmacosxcm.c pm_mac/readbinaryplist.c pm_mac/finddefault.c
-
-PTSRC = porttime/porttime.c porttime/ptmacosx_mach.c
-
-pmobjects = pm_common/pmutil.o pm_mac/pmmac.o  \
-	pm_common/portmidi.o pm_mac/pmmacosxcm.o \
-	pm_mac/finddefault.o pm_mac/readbinaryplist.o \
-	porttime/porttime.o porttime/ptmacosx_mach.o 
-
-current: all
-
-all: $(pmlib) $(ptlib) pm_test/test pm_test/sysex pm_test/midithread \
-	pm_test/latency pm_test/midithru pm_test/qtest pm_test/mm
-	echo $$'\n\
-**** For instructions: make -f pm_mac\Makefile.osx help ****\n'
-
-help:
-	echo $$'\n\n\
-This is help for portmidi/pm_mac/Makefile.osx\n\n\
-Flags for static library and apps are $(PMFLAGS)\n\
-Flags for dynamic library are $(PMDLFLAGS)\n\
-Installation path for dylib is $(PF)\n\
-You might want to change these.\n\n\
-To build a static library and test applications,\n        \
-make -f pm_mac/Makefile.osx\n\
-To build and install dynamic library, note you must use\n\
-"cleanest" to remove .o and dylib, especially if this\n\
-library uses different compiler flags:\n        \
-make -f pm_mac/Makefile.osx cleanest\n        \
-make -f pm_mac/Makefile.osx dylib\n\
-To install dynamic library to /usr/local,\n        \
-sudo make -f pm_mac/Makefile.osx install\n\
-To install universal dynamic library with xcode,\n        \
-make -f pm_mac/Makefile.osx install-with-xcode\n\
-To make dynamic library for Java,\n        \
-make -f pm_mac/Makefile.osx cleanest\n        \
-make -f pm_mac/Makefile.osx jni\n\
-To make PmDefaults Java application,\n        \
-make -f pm_mac/Makefile.osx pmdefaults\n\n'
-
-$(pmlib): pm_mac/Makefile.osx $(pmobjects)
-	rm -rf $(pmlib)
-	ar -crs $(pmlib) $(pmobjects)
-
-pm_mac/pmmacosxcm.o: pm_mac/Makefile.osx pm_mac/pmmacosxcm.c pm_mac/pmmacosxcm.h
-	$(CC) -c pm_mac/pmmacosxcm.c -o pm_mac/pmmacosxcm.o
-
-pm_mac/readbinaryplist.o: pm_mac/Makefile.osx pm_mac/readbinaryplist.c pm_mac/readbinaryplist.h
-	$(CC) -c -I/Developer/Headers/FlatCarbon \
-	pm_mac/readbinaryplist.c -o pm_mac/readbinaryplist.o
-
-pm_mac/finddefault.o: pm_mac/Makefile.osx pm_mac/finddefault.c pm_mac/pmmacosxcm.h
-	$(CC) -c pm_mac/finddefault.c -o pm_mac/finddefault.o
-
-pm_test/test: pm_mac/Makefile.osx pm_test/test.o $(pmlib)
-	$(CC) pm_test/test.o -o pm_test/test $(pmlib) $(MACLIB)
-
-pm_test/sysex: pm_mac/Makefile.osx pm_test/sysex.o $(pmlib)
-	$(CC) pm_test/sysex.o -o pm_test/sysex $(pmlib) $(MACLIB)
-
-pm_test/midithread: pm_mac/Makefile.osx pm_test/midithread.o $(pmlib)
-	$(CC) pm_test/midithread.o -o pm_test/midithread \
-        $(pmlib) $(MACLIB)
-
-pm_test/latency: pm_mac/Makefile.osx $(pmlib) pm_test/latency.o 
-	$(CC) pm_test/latency.o -o pm_test/latency $(pmlib) \
-        $(MACLIB) -lpthread -lm
-
-pm_test/midithru: pm_mac/Makefile.osx $(pmlib) pm_test/midithru.o 
-	$(CC) pm_test/midithru.o -o pm_test/midithru $(pmlib) \
-        $(MACLIB) -lpthread -lm
-
-pm_test/mm: pm_mac/Makefile.osx pm_test/mm.o $(pmlib)
-	$(CC) pm_test/mm.o -o pm_test/mm $(pmlib) $(MACLIB)
-
-porttime/ptlinux.o: pm_mac/Makefile.osx porttime/ptlinux.c
-	$(CC) -c porttime/ptlinux.c -o porttime/ptlinux.o
-
-pm_test/qtest: pm_mac/Makefile.osx pm_test/qtest.o $(pmlib)
-	$(CC) pm_test/qtest.o -o pm_test/qtest $(pmlib) $(MACLIB)
-
-clean:
-	rm -f *.o *~ core* */*.o */*~ */core* pm_test/*/pm_dll.dll 
-	rm -f *.opt *.ncb *.plg pm_win/Debug/pm_dll.lib pm_win/Release/pm_dll.lib
-	rm -f pm_test/*.opt pm_test/*.ncb
-	rm -f pm_java/pmjni/*.o pm_java/pmjni/*~ pm_java/*.h
-
-cleaner: clean
-	rm -rf pm_mac/build
-	rm -f *.dylib
-	rm -f pm_mac/*.dylib
-	rm -f pm_java/pmjni/*.jnilib
-
-cleanest: cleaner
-	rm -f $(pmlib) porttime/libporttime.dylib pm_mac/libportmidi.dylib
-	rm -f pm_test/test pm_test/sysex pm_test/midithread
-	rm -f pm_test/latency pm_test/midithru pm_test/qtest pm_test/mm
-	rm -f pm_java/*/*.class
-	rm -f pm_java/pmjni/jportmidi_JPortMidiApi_PortMidiStream.h
-
-backup: cleanest
-	cd ..; zip -r portmidi.zip portmidi
-
-dylib: pm_mac/libportmidi.dylib
-
-pm_mac/libportmidi.dylib: $(PMSRC) $(PTSRC)
-	cc -single_module -g $(PMDLFLAGS) -Iporttime -Ipm_common $(ARCH) \
-          -dynamiclib $(PMSRC) $(PTSRC) -o pm_mac/libportmidi.dylib \
-	  -flat_namespace -undefined suppress \
-	  -framework CoreMIDI -framework CoreFoundation \
-	  -framework CoreAudio -framework CoreServices
-
-install: porttime/porttime.h pm_common/portmidi.h \
-	   pm_mac/libportmidi.dylib
-	install porttime/porttime.h  $(PF)/include/
-	install pm_common/portmidi.h $(PF)/include
-	install pm_mac/libportmidi.dylib $(PF)/lib/
-
-# note - this uses xcode to build and install portmidi universal binaries
-install-with-xcode:
-	sudo xcodebuild -project pm_mac/pm_mac.xcodeproj \
-		-configuration Deployment install DSTROOT=/
-
-##### build java interface and application ######
-
-jni: pm_java/pmjni/libpmjni.jnilib
-
-pm_java/pmjni/libpmjni.jnilib: $(PMSRC) pm_java/jportmidi/JPortMidiApi.class pm_java/pmjni/jportmidi_JPortMidiApi.h pm_java/pmjni/pmjni.c
-	cc -single_module -g -Iporttime -Ipm_common \
-          -Ipm_java/pmjni -I/System/Library/Frameworks/JavaVM.framework/Headers \
-	  -I/Developer/Headers/FlatCarbon \
-          $(ARCH) -dynamiclib $(PMSRC) $(PTSRC) pm_java/pmjni/pmjni.c \
-          -o pm_java/pmjni/libpmjni.jnilib \
-          -flat_namespace -undefined suppress \
-          -framework CoreMIDI -framework CoreFoundation -framework CoreAudio \
-          -framework JavaVM
-
-pm_java/pmjni/jportmidi_JPortMidiApi.h: pm_java/jportmidi/JPortMidiApi.class
-	cd pm_java; javah jportmidi.JPortMidiApi
-	mv pm_java/jportmidi_JportMidiApi.h pm_java/pmjni
-
-JAVASRC = pmdefaults/PmDefaultsFrame.java \
-	    pmdefaults/PmDefaults.java \
-	    jportmidi/JPortMidiApi.java jportmidi/JPortMidi.java \
-	    jportmidi/JPortMidiException.java
-
-# this compiles ALL of the java code
-pm_java/jportmidi/JPortMidiApi.class: $(JAVASRC:%=pm_java/%)
-	cd pm_java; javac $(JAVASRC)
-
-pmdefaults: pm_java/pmjni/libpmjni.jnilib pm_java/jportmidi/JPortMidiApi.class
-	echo "pmdefaults java application is made"
-
-###### test plist reader #######
-PLHDR = pm_mac/readbinaryplist.h
-PLSRC = pm_mac/plisttest.c pm_mac/readbinaryplist.c
-pm_mac/plisttest: $(PLHDR) $(PLSRC)
-	cc -g -Ipm_mac \
-	    -I/Developer/Headers/FlatCarbon \
-	    -I/System/Library/Frameworks/CoreFoundation.framework/Headers \
-	    -I/System/Library/Frameworks/CoreServices.framework/Headers \
-	    $(PLSRC) -o pm_mac/plisttest \
-	    -framework CoreFoundation -framework CoreServices
-
+# MAKEFILE FOR PORTMIDI
+
+# Roger B. Dannenberg
+# Sep 2009
+
+# NOTE: you can use
+#     make -f pm_osx/Makefile.osx configuration=Release
+# to override the default Debug configuration
+configuration=Release
+
+PF=/usr/local
+
+# For debugging, define PM_CHECK_ERRORS
+ifeq ($(configuration),Release)
+    CONFIG = Release
+else
+    CONFIG = Debug
+endif
+
+current: all
+
+all: $(CONFIG)/CMakeCache.txt
+	cd $(CONFIG); make
+
+$(CONFIG)/CMakeCache.txt:
+	rm -f CMakeCache.txt
+	mkdir -p $(CONFIG)
+	cd $(CONFIG); cmake .. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=$(CONFIG)
+
+
+**** For instructions: make -f pm_mac\Makefile.osx help ****\n'
+
+help:
+	echo $$'\n\n\
+This is help for portmidi/pm_mac/Makefile.osx\n\n\
+Installation path for dylib is $(PF)\n\
+To build Release version libraries and test applications,\n        \
+make -f pm_mac/Makefile.osx\n\
+To build Debug version libraries and test applications,\n        \
+make -f pm_mac/Makefile.osx configuration=Debug\n\
+To install universal dynamic library,\n        \
+sudo make -f pm_mac/Makefile.osx install\n\
+To install universal dynamic library with xcode,\n        \
+make -f pm_mac/Makefile.osx install-with-xcode\n\
+To make PmDefaults Java application,\n        \
+make -f pm_mac/Makefile.osx pmdefaults\n\n        \
+configuration = $(configuration)\n'
+
+
+clean:
+	rm -f *.o *~ core* */*.o */*/*.o */*~ */core* pm_test/*/pm_dll.dll 
+	rm -f *.opt *.ncb *.plg pm_win/Debug/pm_dll.lib pm_win/Release/pm_dll.lib
+	rm -f pm_test/*.opt pm_test/*.ncb
+	rm -f pm_java/pmjni/*.o pm_java/pmjni/*~ pm_java/*.h
+	rm -rf Release/CMakeFiles Debug/CMakeFiles
+	rm -rf pm_mac/pmdefaults/lib pm_mac/pmdefaults/src
+
+cleaner: clean
+	rm -rf pm_mac/build
+	rm -rf pm_mac/Debug pm_mac/Release pm_test/Debug pm_test/Release
+	rm -f Debug/*.dylib Release/*.dylib
+	rm -f pm_java/pmjni/Debug/*.jnilib
+	rm -f pm_java/pmjni/Release/*.jnilib
+
+cleanest: cleaner
+	rm -f Debug/libportmidi_s.a Release/libportmidi_s.a
+	rm -f pm_test/Debug/test pm_test/Debug/sysex pm_test/Debug/midithread
+	rm -f pm_test/Debug/latency pm_test/Debug/midithru
+	rm -f pm_test/Debug/qtest pm_test/Debug/mm
+	rm -f pm_test/Release/test pm_test/Release/sysex pm_test/Release/midithread
+	rm -f pm_test/Release/latency pm_test/Release/midithru
+	rm -f pm_test/Release/qtest pm_test/Release/mm
+	rm -f pm_java/*/*.class
+	rm -f pm_java/pmjni/jportmidi_JPortMidiApi_PortMidiStream.h
+
+backup: cleanest
+	cd ..; zip -r portmidi.zip portmidi
+
+install: porttime/porttime.h pm_common/portmidi.h \
+	   $(CONFIG)/libportmidi.dylib
+	install porttime/porttime.h  $(PF)/include/
+	install pm_common/portmidi.h $(PF)/include
+	install $(CONFIG)/libportmidi.dylib $(PF)/lib/
+
+# note - this uses xcode to build and install portmidi universal binaries
+install-with-xcode:
+	sudo xcodebuild -project pm_mac/pm_mac.xcodeproj \
+		-configuration Release install DSTROOT=/
+
+##### build pmdefault ######
+
+pm_java/pmjni/jportmidi_JPortMidiApi.h: pm_java/jportmidi/JPortMidiApi.class
+	cd pm_java; javah jportmidi.JPortMidiApi
+	mv pm_java/jportmidi_JportMidiApi.h pm_java/pmjni
+
+JAVASRC = pmdefaults/PmDefaultsFrame.java \
+	    pmdefaults/PmDefaults.java \
+	    jportmidi/JPortMidiApi.java jportmidi/JPortMidi.java \
+	    jportmidi/JPortMidiException.java
+
+# this compiles ALL of the java code
+pm_java/jportmidi/JPortMidiApi.class: $(JAVASRC:%=pm_java/%)
+	cd pm_java; javac $(JAVASRC)
+
+$(CONFIG)/libpmjni.dylib:
+	mkdir -p $(CONFIG)
+	cd $(CONFIG); make -f ../pm_mac/$(MAKEFILE)
+
+pmdefaults: $(CONFIG)/libpmjni.dylib pm_java/jportmidi/JPortMidiApi.class
+ifeq ($(CONFIG),Debug)
+	echo "Error: you cannot build pmdefaults in a Debug configuration \n\
+    You should use configuration=Release in the Makefile command line. "
+	@exit 2
+endif
+	xcodebuild -project pm_mac/pm_mac.xcodeproj \
+            -configuration Release -target PmDefaults
+	echo "pmdefaults java application is made"
+
+###### test plist reader #######
+PLHDR = pm_mac/readbinaryplist.h
+PLSRC = pm_mac/plisttest.c pm_mac/readbinaryplist.c
+pm_mac/plisttest: $(PLHDR) $(PLSRC)
+	cc $(VFLAGS) -Ipm_mac \
+	    -I/Developer/Headers/FlatCarbon \
+	    -I/System/Library/Frameworks/CoreFoundation.framework/Headers \
+	    -I/System/Library/Frameworks/CoreServices.framework/Headers \
+	    $(PLSRC) -o pm_mac/$(CONFIG)/plisttest \
+	    -framework CoreFoundation -framework CoreServices
+
--- a/lib-src/portmidi/pm_mac/README_MAC.txt
+++ b/lib-src/portmidi/pm_mac/README_MAC.txt
@ -1,18 +1,30 @@
 README_MAC.txt for PortMidi
 Roger Dannenberg
 20 nov 2009
+revised 20 Sep 2010 for Xcode 3.2.4 and CMake 8.2-2

-To build PortMidi for Mac OS X, you must install Xcode, and
-if you want to build from the command line, you should install
+To build PortMidi for Mac OS X, you must install Xcode and
 CMake.

-CMake can build either Makefiles or Xcode projects, or you
-can use the pre-built Xcode project. These approaches are 
-described in separate sections below.
+CMake can build either command-line Makefiles or Xcode projects.
+These approaches are described in separate sections below.

 ==== CLEANING UP ====
-You can remove previously built apps, object code, and libraries by
-running "cd pm_mac; sh cleanslate.sh"
+(Skip this for now, but later you might want start from a clean
+slate.)
+
+Start in the portmedia/portmidi directory.
+
+make -f pm_mac/Makefile.osx clean
+
+will remove .o, CMakeFiles, and other intermediate files.
+
+Using "cleaner" instead of "clean" will also remove jni-related 
+intermediate files.
+
+Using "cleanest" instead of "clean" or "cleaner" will also remove
+application binaries and the portmidi libraries. (It will not 
+uninstall anything, however.)

 ==== USING CMAKE (AND COMMAND LINE TOOLS) ====

@ -50,19 +62,41 @@ You should now make the pmdefaults.app:

 make -f pm_mac/Makefile.osx pmdefaults

-NOTES: xcode is likely to crash after building pmdefaults, but
-       pmdefaults should be OK (it will be in Release)
-   Once you get started, you can run make directly in the 
-       Debug or Release directories
+NOTE: pmdefaults.app will be in pm_mac/Release/. 

+Please copy pmdefaults.app to your Applications folder or wherever 
+you would normally expect to find it.

-==== USING XCODE ====
+==== USING CMAKE TO BUILD Xcode PROJECT ====

-(1) Open portmidi/portmidi.xcodeproj with Xcode and 
+Before you can use Xcode, you need a portmidi.xcodeproj file.
+CMake builds a location-dependent Xcode project, so unfortunately
+it is not easy to provide an Xcode project that is ready to use.
+Therefore, you should make your own. Once you have it, you can
+use it almost like any other Xcode project, and you will not have
+to go back to CMake.
+
+(1) Install CMake if you do not have it already.
+
+(2) Open portmedia/portmidi/CMakeLists.txt with CMake
+
+(3) Use Configure and Generate buttons
+
+(4) This creates portmedia/portmidi/portmidi.xcodeproj.
+
+Note: You will also use pm_mac/pm_mac.xcodeproj, which
+is not generated by CMake.
+
+(5) Open portmidi/portmidi.xcodeproj with Xcode and 
 build what you need. The simplest thing is to build the
 ALL_BUILD target. The default will be to build the Debug
 version, but you may want to change this to Release. 

+NOTE: ALL_BUILD may report errors. Try simply building again
+or rebuilding specific targets that fail until they build
+without errors. There appears to be a race condition or
+missing dependencies in the build system.
+
 The Debug version is compiled with PM_CHECK_ERRORS, and the
 Release version is not. PM_CHECK_ERRORS will print an error
 message and exit your program if any error is returned from
@ -78,24 +112,25 @@ want to build a Java application using PortMidi. Since I have
 not figured out how to use CMake to make an OS X Java application,
 use pm_mac/pm_mac.xcodeproj as follows:

-(2) open pm_mac/pm_mac.xcodeproj
+(6) open pm_mac/pm_mac.xcodeproj

-(3) pm_java/pmjni/portmidi_JportmidiApi.h is needed
+(7) pm_java/pmjni/portmidi_JportmidiApi.h is needed
 by libpmjni.jnilib, the Java native interface library. Since
 portmidi_JportmidiApi.h is included with PortMidi, you can skip
-to step 4, but if you really want to rebuild everything from 
-scratch, build the JPortMidiHeaders project.
+to step 8, but if you really want to rebuild everything from 
+scratch, build the JPortMidiHeaders project first, and continue
+with step 8:

-(4) If you did not build libpmjni.dylib using portmidi.xcodeproj,
+(8) If you did not build libpmjni.dylib using portmidi.xcodeproj,
 do it now. (It depends on portmidi_JportmidiApi.h, and the 
 PmDefaults project depends on libpmjni.dylib.)

-(5) Returning to pm_mac.xcodeproj, build the PmDefaults program.
+(9) Returning to pm_mac.xcodeproj, build the PmDefaults program.

-(6) If you wish, copy pm_mac/build/Deployment/PmDefaults.app to
+(10) If you wish, copy pm_mac/build/Deployment/PmDefaults.app to
 your applications folder.

-(7) If you want to install libportmidi.dylib, first make it with 
+(11) If you want to install libportmidi.dylib, first make it with 
 Xcode, then
    sudo make -f pm_mac/Makefile.osx install
 This command will install /usr/local/include/{porttime.h, portmidi.h} 
@ -104,36 +139,11 @@ Note that the "install" function of xcode creates portmidi/Release
 and does not install the library to /usr/local/lib, so please use
 the command line installer.

-==== USING CMAKE TO BUILD Xcode PROJECT ====
-
-(1) Install CMake if you do not have it already.
-
-(2) Open portmedia/portmidi/CMakeLists.txt with CMake
-
-(3) Use Configure and Generate buttons
-
-(4) This creates portmedia/portmidi/portmidi.xcodeproj.
-
-(5) Follow the directions above using Xcode to compile
-PortMidi.
-
-Notes: 
-   (1) You will also use pm_mac/pm_mac.xcodeproj, which
-is not generated by CMake.
-   (2) The portmidi.xcodeproj created by CMake will have absolute
-paths and depend on CMake, so it will not be very portable to other 
-machines or even directories. You can cd to pm_mac and run 
-clean_up_project.sh to convert pm_mac.xcodeproj to use relative 
-paths and to remove the scripts that run CMake. You'll first have 
-to modify pm_mac/clean_up_project.awk to contain the particular
-absolute path or your portmidi project. Also, this is a pretty simple
-and probably fragile hack to make a stand-alone xcode project. I
-don't recommend it. Instead, either use CMake all the time, or use
-the portmidi.xcodeproj you get with the distribution.
-

 CHANGELOG

+20-Sep-2010 Roger B. Dannenberg
+    Adapted to Xcode 3.2.4
 20-Nov-2009 Roger B. Dannenberg
    Added some install instructions
 26-Sep-2009 Roger B. Dannenberg
--- a/lib-src/portmidi/pm_mac/pmmacosxcm.c
+++ b/lib-src/portmidi/pm_mac/pmmacosxcm.c
@ -5,7 +5,7 @@
 * and subsequent work by Andrew Zeldis and Zico Kolter
 * and Roger B. Dannenberg
 *
- * $Id: pmmacosxcm.c,v 1.1 2009-06-24 20:37:25 gswillia Exp $
+ * $Id: pmmacosx.c,v 1.17 2002/01/27 02:40:40 jon Exp $
 */
 
 /* Notes:
@ -38,17 +38,34 @@
 #include <CoreServices/CoreServices.h>
 #include <CoreMIDI/MIDIServices.h>
 #include <CoreAudio/HostTime.h>
+#include <unistd.h>

 #define PACKET_BUFFER_SIZE 1024
+/* maximum overall data rate (OS X limit is 15000 bytes/second) */
+#define MAX_BYTES_PER_S 14000

-/* this is very strange: if I put in a reasonable 
-   number here, e.g. 128, which would allow sysex data
-   to be sent 128 bytes at a time, then I lose sysex
-   data in my loopback test. With a buffer size of 4,
-   we put at most 4 bytes in a packet (but maybe many
-   packets in a packetList), and everything works fine.
+/* Apple reports that packets are dropped when the MIDI bytes/sec
+   exceeds 15000. This is computed by "tracking the number of MIDI 
+   bytes scheduled into 1-second buckets over the last six seconds
+   and averaging these counts." 
+
+   This is apparently based on timestamps, not on real time, so 
+   we have to avoid constructing packets that schedule high speed
+   output even if the actual writes are delayed (which was my first
+   solution).
+
+   The LIMIT_RATE symbol, if defined, enables code to modify 
+   timestamps as follows:
+     After each packet is formed, the next allowable timestamp is
+     computed as this_packet_time + this_packet_len * delay_per_byte
+
+     This is the minimum timestamp allowed in the next packet. 
+
+     Note that this distorts accurate timestamps somewhat.
 */
-#define SYSEX_BUFFER_SIZE 4
+#define LIMIT_RATE 1
+
+#define SYSEX_BUFFER_SIZE 128

 #define VERBOSE_ON 1
 #define VERBOSE if (VERBOSE_ON)
@ -75,7 +92,7 @@ extern pm_fns_node pm_macosx_out_dictionary;
 typedef struct midi_macosxcm_struct {
    PmTimestamp sync_time; /* when did we last determine delta? */
    UInt64 delta;	/* difference between stream time and real time in ns */
-    UInt64 last_time;	/* last output time */
+    UInt64 last_time;	/* last output time in host units*/
    int first_message;  /* tells midi_write to sychronize timestamps */
    int sysex_mode;     /* middle of sending sysex */
    uint32_t sysex_word; /* accumulate data when receiving sysex */
@ -90,6 +107,11 @@ typedef struct midi_macosxcm_struct {
    /* allow for running status (is running status possible here? -rbd): -cpr */
    unsigned char last_command; 
    int32_t last_msg_length;
+    /* limit midi data rate (a CoreMidi requirement): */
+    UInt64 min_next_time; /* when can the next send take place? */
+    int byte_count; /* how many bytes in the next packet list? */
+    Float64 us_per_host_tick; /* host clock frequency, units of min_next_time */
+    UInt64 host_ticks_per_byte; /* host clock units per byte at maximum rate */
 } midi_macosxcm_node, *midi_macosxcm_type;

 /* private function declarations */
@ -405,7 +427,11 @@ midi_out_open(PmInternal *midi, void *driverInfo)
    m->packet = NULL;
    m->last_command = 0;
    m->last_msg_length = 0;
-
+    m->min_next_time = 0;
+    m->byte_count = 0;
+    m->us_per_host_tick = 1000000.0 / AudioGetHostClockFrequency();
+    m->host_ticks_per_byte = (UInt64) (1000000.0 / 
+                                       (m->us_per_host_tick * MAX_BYTES_PER_S));
    return pmNoError;
 }

@ -451,8 +477,17 @@ midi_write_flush(PmInternal *midi, PmTimestamp timestamp)
    assert(endpoint);
    if (m->packet != NULL) {
        /* out of space, send the buffer and start refilling it */
+        /* before we can send, maybe delay to limit data rate. OS X allows
+         * 15KB/s. */
+        UInt64 now = AudioGetCurrentHostTime();
+        if (now < m->min_next_time) {
+            usleep((useconds_t) 
+                   ((m->min_next_time - now) * m->us_per_host_tick));
+        }
        macHostError = MIDISend(portOut, endpoint, m->packetList);
        m->packet = NULL; /* indicate no data in packetList now */
+        m->min_next_time = now + m->byte_count * m->host_ticks_per_byte;
+        m->byte_count = 0;
        if (macHostError != noErr) goto send_packet_error;
    }
    return pmNoError;
@ -475,9 +510,11 @@ send_packet(PmInternal *midi, Byte *message, unsigned int messageLength,
    midi_macosxcm_type m = (midi_macosxcm_type) midi->descriptor;
    assert(m);
    
+    /* printf("add %d to packet %p len %d\n", message[0], m->packet, messageLength); */
    m->packet = MIDIPacketListAdd(m->packetList, sizeof(m->packetBuffer), 
                                  m->packet, timestamp, messageLength, 
                                  message);
+    m->byte_count += messageLength;
    if (m->packet == NULL) {
        /* out of space, send the buffer and start refilling it */
        /* make midi->packet non-null to fool midi_write_flush into sending */
@ -522,9 +559,6 @@ midi_write_short(PmInternal *midi, PmEvent *event)
    /* if latency == 0, midi->now is not valid. We will just set it to zero */
    if (midi->latency == 0) when = 0;
    when_ns = ((UInt64) (when + midi->latency) * (UInt64) 1000000) + m->delta;
-    /* make sure we don't go backward in time */
-    if (when_ns < m->last_time) when_ns = m->last_time;
-    m->last_time = when_ns;
    timestamp = (MIDITimeStamp) AudioConvertNanosToHostTime(when_ns);

    message[0] = Pm_MessageStatus(what);
@ -532,6 +566,15 @@ midi_write_short(PmInternal *midi, PmEvent *event)
    message[2] = Pm_MessageData2(what);
    messageLength = midi_length(what);
        
+    /* make sure we go foreward in time */
+    if (timestamp < m->min_next_time) timestamp = m->min_next_time;
+
+    #ifdef LIMIT_RATE
+        if (timestamp < m->last_time)
+            timestamp = m->last_time;
+	m->last_time = timestamp + messageLength * m->host_ticks_per_byte;
+    #endif
+
    /* Add this message to the packet list */
    return send_packet(midi, message, messageLength, timestamp);
 }
@ -569,8 +612,16 @@ midi_end_sysex(PmInternal *midi, PmTimestamp when)
    midi_macosxcm_type m = (midi_macosxcm_type) midi->descriptor;
    assert(m);
    
-    /* make sure we don't go backward in time */
-    if (m->sysex_timestamp < m->last_time) m->sysex_timestamp = m->last_time;
+    /* make sure we go foreward in time */
+    if (m->sysex_timestamp < m->min_next_time) 
+        m->sysex_timestamp = m->min_next_time;
+
+    #ifdef LIMIT_RATE
+        if (m->sysex_timestamp < m->last_time) 
+            m->sysex_timestamp = m->last_time;
+        m->last_time = m->sysex_timestamp + m->sysex_byte_count *
+                                            m->host_ticks_per_byte;
+    #endif
    
    /* now send what's in the buffer */
    err = send_packet(midi, m->sysex_buffer, m->sysex_byte_count,
--- a/lib-src/portmidi/pm_mingw/eclipse/README.txt
+++ b/lib-src/portmidi/pm_mingw/eclipse/README.txt
@ -15,6 +15,9 @@ of PortMidi, so these files may be out-of-date or have other problems.
 Feel free to submit updates or discuss the possibility of maintaining
 these or some equivalent files for MinGw.

+Update, 20 Sep 2010: CMake supports Code::Blocks in conjunction with
+MinGW.
+
 Roger Dannenberg
 18-Oct-2008

--- a/lib-src/portmidi/pm_mingw/msys/README-MSYS.txt
+++ b/lib-src/portmidi/pm_mingw/msys/README-MSYS.txt
@ -0,0 +1,8 @@
+Old code was removed from this directory because CMake provides an
+up-to-date way to use MinGW. See portmidi/pm_mingw/README-MINGW.txt.
+
+Roger Dannenberg
+20-Sep-2010
+
+
+
--- a/lib-src/portmidi/pm_mingw/msys/README.txt
+++ b/lib-src/portmidi/pm_mingw/msys/README.txt
@ -1,3 +0,0 @@
-The file SConstruct comes from Michael Gogins (24 Oct 2008). Although
-not currently maintained or tested (volunteers welcome!), this might
-be useful for anyone with MinGW/MSys installed. -RBD
--- a/lib-src/portmidi/pm_mingw/msys/SConstruct
+++ b/lib-src/portmidi/pm_mingw/msys/SConstruct
--- a/lib-src/portmidi/pm_test/latency-VC9.vcproj
+++ b/lib-src/portmidi/pm_test/latency-VC9.vcproj
@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Latency"
-	ProjectGUID="{EDC3A027-917B-4D23-AE70-73C409B47F85}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Latency Debug VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\latency.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../porttime,../pm_common"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\$(OutDir)\latency.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/verbose:lib"
-				AdditionalDependencies="portmidi.lib porttime.lib winmm.lib"
-				OutputFile=".\$(OutDir)\latency.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Debug VC9&quot;;&quot;..\porttime\Debug VC9&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\$(OutDir)\latency.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\latency.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Latency Release VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\latency.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../porttime,../pm_common"
-				PreprocessorDefinitions="WIN32;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\$(OutDir)\latency.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib winmm.lib"
-				OutputFile=".\$(OutDir)\latency.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Release VC9&quot;;&quot;..\porttime\Release VC9&quot;"
-				ProgramDatabaseFile=".\$(OutDir)\latency.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\latency.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="latency.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/latency.vcproj
+++ b/lib-src/portmidi/pm_test/latency.vcproj
@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="latency"
-	ProjectGUID="{EDC3A027-917B-4D23-AE70-73C409B47F85}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\latencyDebug"
-			IntermediateDirectory=".\latencyDebug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\latencyDebug/latency.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../porttime,../pm_common"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\latencyDebug/latency.pch"
-				AssemblerListingLocation=".\latencyDebug/"
-				ObjectFile=".\latencyDebug/"
-				ProgramDataBaseFileName=".\latencyDebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/verbose:lib"
-				AdditionalDependencies="..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib winmm.lib"
-				OutputFile=".\latencyDebug/latency.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\latencyDebug/latency.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\latencyDebug/latency.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\latencyRelease"
-			IntermediateDirectory=".\latencyRelease"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\latencyRelease/latency.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../porttime,../pm_common"
-				PreprocessorDefinitions="WIN32;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\latencyRelease/latency.pch"
-				AssemblerListingLocation=".\latencyRelease/"
-				ObjectFile=".\latencyRelease/"
-				ProgramDataBaseFileName=".\latencyRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib winmm.lib"
-				OutputFile=".\latencyRelease/latency.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\latencyRelease/latency.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\latencyRelease/latency.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\latencyDebug/latency.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../porttime,../pm_common"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\latencyDebug/latency.pch"
-				AssemblerListingLocation=".\latencyDebug/"
-				ObjectFile=".\latencyDebug/"
-				ProgramDataBaseFileName=".\latencyDebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/verbose:lib"
-				AdditionalDependencies="..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib winmm.lib"
-				OutputFile=".\latencyDebug/latency.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\latencyDebug/latency.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\latencyDebug/latency.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\latencyRelease/latency.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../porttime,../pm_common"
-				PreprocessorDefinitions="WIN32;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\latencyRelease/latency.pch"
-				AssemblerListingLocation=".\latencyRelease/"
-				ObjectFile=".\latencyRelease/"
-				ProgramDataBaseFileName=".\latencyRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib winmm.lib"
-				OutputFile=".\latencyRelease/latency.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\latencyRelease/latency.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\latencyRelease/latency.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="latency.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/midithread-VC9.vcproj
+++ b/lib-src/portmidi/pm_test/midithread-VC9.vcproj
@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="MidiThread"
-	ProjectGUID="{4E555AA6-B348-41C9-A685-0B76149BBBAF}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="MidiThread Debug VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\midithread.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\$(OutDir)\midithread.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib winmm.lib"
-				OutputFile=".\$(OutDir)\midithread.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Debug VC9&quot;;&quot;..\porttime\Debug VC9&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\$(OutDir)\midithread.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\midithread.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="MidiThread Release VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\midithread.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\$(OutDir)\midithread.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib winmm.lib"
-				OutputFile=".\$(OutDir)\midithread.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Release VC9&quot;;&quot;..\porttime\Release VC9&quot;"
-				ProgramDatabaseFile=".\$(OutDir)\midithread.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\midithread.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="midithread.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/midithread.vcproj
+++ b/lib-src/portmidi/pm_test/midithread.vcproj
@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="midithread"
-	ProjectGUID="{4E555AA6-B348-41C9-A685-0B76149BBBAF}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\midithreadDebug"
-			IntermediateDirectory=".\midithreadDebug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\midithreadDebug/midithread.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\midithreadDebug/midithread.pch"
-				AssemblerListingLocation=".\midithreadDebug/"
-				ObjectFile=".\midithreadDebug/"
-				ProgramDataBaseFileName=".\midithreadDebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib winmm.lib"
-				OutputFile=".\midithreadDebug/midithread.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\midithreadDebug/midithread.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\midithreadDebug/midithread.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\midithreadRelease"
-			IntermediateDirectory=".\midithreadRelease"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\midithreadRelease/midithread.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\midithreadRelease/midithread.pch"
-				AssemblerListingLocation=".\midithreadRelease/"
-				ObjectFile=".\midithreadRelease/"
-				ProgramDataBaseFileName=".\midithreadRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib winmm.lib"
-				OutputFile=".\midithreadRelease/midithread.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\midithreadRelease/midithread.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\midithreadRelease/midithread.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\midithreadDebug/midithread.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\midithreadDebug/midithread.pch"
-				AssemblerListingLocation=".\midithreadDebug/"
-				ObjectFile=".\midithreadDebug/"
-				ProgramDataBaseFileName=".\midithreadDebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib winmm.lib"
-				OutputFile=".\midithreadDebug/midithread.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\midithreadDebug/midithread.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\midithreadDebug/midithread.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\midithreadRelease/midithread.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\midithreadRelease/midithread.pch"
-				AssemblerListingLocation=".\midithreadRelease/"
-				ObjectFile=".\midithreadRelease/"
-				ProgramDataBaseFileName=".\midithreadRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib winmm.lib"
-				OutputFile=".\midithreadRelease/midithread.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\midithreadRelease/midithread.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\midithreadRelease/midithread.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="midithread.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/midithru-VC9.vcproj
+++ b/lib-src/portmidi/pm_test/midithru-VC9.vcproj
@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="MidiThru"
-	ProjectGUID="{B4B4240D-7022-4C47-838F-913B4878E938}"
-	RootNamespace="MidiThru"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="MidiThru Debug VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\midithru.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\$(OutDir)\midithru.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib winmm.lib"
-				OutputFile=".\$(OutDir)\midithru.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Debug VC9&quot;;&quot;..\porttime\Debug VC9&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\$(OutDir)\midithru.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\midithru.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="MidiThru Release VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\midithru.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\$(OutDir)\midithru.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib winmm.lib"
-				OutputFile=".\$(OutDir)\midithru.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Release VC9&quot;;&quot;..\porttime\Release VC9&quot;"
-				ProgramDatabaseFile=".\$(OutDir)\midithru.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\midithru.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="midithru.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/midithru.vcproj
+++ b/lib-src/portmidi/pm_test/midithru.vcproj
@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="midithru"
-	ProjectGUID="{B4B4240D-7022-4C47-838F-913B4878E938}"
-	RootNamespace="midithru"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\midithruDebug"
-			IntermediateDirectory=".\midithruDebug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\midithruDebug/midithru.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\midithruDebug/midithru.pch"
-				AssemblerListingLocation=".\midithruDebug/"
-				ObjectFile=".\midithruDebug/"
-				ProgramDataBaseFileName=".\midithruDebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib winmm.lib"
-				OutputFile=".\midithruDebug/midithru.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\midithruDebug/midithru.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\midithruDebug/midithru.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\midithruRelease"
-			IntermediateDirectory=".\midithruRelease"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\midithruRelease/midithru.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\midithruRelease/midithru.pch"
-				AssemblerListingLocation=".\midithruRelease/"
-				ObjectFile=".\midithruRelease/"
-				ProgramDataBaseFileName=".\midithruRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib winmm.lib"
-				OutputFile=".\midithruRelease/midithru.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\midithruRelease/midithru.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\midithruRelease/midithru.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\midithruDebug/midithru.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\midithruDebug/midithru.pch"
-				AssemblerListingLocation=".\midithruDebug/"
-				ObjectFile=".\midithruDebug/"
-				ProgramDataBaseFileName=".\midithruDebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib winmm.lib"
-				OutputFile=".\midithruDebug/midithru.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\midithruDebug/midithru.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\midithruDebug/midithru.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\midithruRelease/midithru.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\midithruRelease/midithru.pch"
-				AssemblerListingLocation=".\midithruRelease/"
-				ObjectFile=".\midithruRelease/"
-				ProgramDataBaseFileName=".\midithruRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib winmm.lib"
-				OutputFile=".\midithruRelease/midithru.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\midithruRelease/midithru.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\midithruRelease/midithru.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="midithru.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/mm-VC9.vcproj
+++ b/lib-src/portmidi/pm_test/mm-VC9.vcproj
@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="MidiMonitor"
-	ProjectGUID="{2FC1D7B8-E434-4D6F-A50D-AB262C825BCD}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="MidiMonitor Debug VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\mm.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\$(OutDir)\mm.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/VERBOSE:LIB"
-				AdditionalDependencies="portmidi.lib porttime.lib odbc32.lib odbccp32.lib winmm.lib"
-				OutputFile=".\$(OutDir)\mm.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Debug VC9&quot;;&quot;..\porttime\Debug VC9&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\$(OutDir)\mm.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\mm.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="MidiMonitor Release VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\mm.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;DEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\$(OutDir)\mm.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib odbc32.lib odbccp32.lib winmm.lib"
-				OutputFile=".\$(OutDir)\mm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Release VC9&quot;;&quot;..\porttime\Release VC9&quot;"
-				ProgramDatabaseFile=".\$(OutDir)\mm.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\mm.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="mm.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/mm.c
+++ b/lib-src/portmidi/pm_test/mm.c
@ -48,6 +48,7 @@
 #define MIDI_ACTIVE_SENSING 0xfe
 #define MIDI_SYS_RESET  0xff

+#define MIDI_ALL_SOUND_OFF 0x78
 #define MIDI_RESET_CONTROLLERS 0x79
 #define MIDI_LOCAL	0x7a
 #define MIDI_ALL_OFF	0x7b
@ -345,7 +346,7 @@ private void output(PmMessage data)
    } else if (command == MIDI_CTRL) {
               /* controls 121 (MIDI_RESET_CONTROLLER) to 127 are channel
                * mode messages. */
-        if (Pm_MessageData1(data) < MIDI_RESET_CONTROLLERS) {
+        if (Pm_MessageData1(data) < MIDI_ALL_SOUND_OFF) {
            showbytes(data, 3, verbose);
            if (verbose) {
                printf("CtrlChg Chan %2d Ctrl %2d Val %2d\n",
@ -355,8 +356,11 @@ private void output(PmMessage data)
            showbytes(data, 3, verbose);
            if (verbose) {
                switch (Pm_MessageData1(data)) {
+                  case MIDI_ALL_SOUND_OFF:
+                      printf("All Sound Off, Chan %2d\n", chan);
+                    break;
                  case MIDI_RESET_CONTROLLERS:
-                    printf("Reset All Controllers\n");
+                    printf("Reset All Controllers, Chan %2d\n", chan);
                    break;
                  case MIDI_LOCAL:
                    printf("LocCtrl Chan %2d %s\n",
--- a/lib-src/portmidi/pm_test/mm.vcproj
+++ b/lib-src/portmidi/pm_test/mm.vcproj
@ -1,445 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="mm"
-	ProjectGUID="{2FC1D7B8-E434-4D6F-A50D-AB262C825BCD}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\mmRelease"
-			IntermediateDirectory=".\mmRelease"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\mmRelease/mm.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;DEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\mmRelease/mm.pch"
-				AssemblerListingLocation=".\mmRelease/"
-				ObjectFile=".\mmRelease/"
-				ProgramDataBaseFileName=".\mmRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib"
-				OutputFile=".\mmRelease/mm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\mmRelease/mm.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\mmRelease/mm.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\mmDebug"
-			IntermediateDirectory=".\mmDebug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\mmDebug/mm.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\mmDebug/mm.pch"
-				AssemblerListingLocation=".\mmDebug/"
-				ObjectFile=".\mmDebug/"
-				ProgramDataBaseFileName=".\mmDebug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/VERBOSE:LIB"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib"
-				OutputFile=".\mmDebug/mm.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\mmDebug/mm.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\mmDebug/mm.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\mmDebug/mm.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\mmDebug/mm.pch"
-				AssemblerListingLocation=".\mmDebug/"
-				ObjectFile=".\mmDebug/"
-				ProgramDataBaseFileName=".\mmDebug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/VERBOSE:LIB"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib"
-				OutputFile=".\mmDebug/mm.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\mmDebug/mm.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\mmDebug/mm.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\mmRelease/mm.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;DEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\mmRelease/mm.pch"
-				AssemblerListingLocation=".\mmRelease/"
-				ObjectFile=".\mmRelease/"
-				ProgramDataBaseFileName=".\mmRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib"
-				OutputFile=".\mmRelease/mm.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\mmRelease/mm.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\mmRelease/mm.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="mm.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/qtest-VC9.vcproj
+++ b/lib-src/portmidi/pm_test/qtest-VC9.vcproj
@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="QTest"
-	ProjectGUID="{8C30CCF4-0D5F-4CC0-9EF3-76D491B829DF}"
-	RootNamespace="QTest"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="QTest Debug VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib odbc32.lib odbccp32.lib winmm.lib"
-				OutputFile=".\$(OutDir)\qtest.exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Debug VC9&quot;;&quot;..\porttime\Debug VC9&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="QTest Release VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib odbc32.lib odbccp32.lib winmm.lib"
-				OutputFile=".\$(OutDir)\qtest.exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Release VC9&quot;;&quot;..\porttime\Release VC9&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\qtest.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/qtest.vcproj
+++ b/lib-src/portmidi/pm_test/qtest.vcproj
@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="qtest"
-	ProjectGUID="{8C30CCF4-0D5F-4CC0-9EF3-76D491B829DF}"
-	RootNamespace="qtest"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\qtestDebug"
-			IntermediateDirectory=".\qtestDebug"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib"
-				OutputFile=".\qtestDebug\qtest.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\qtestRelease"
-			IntermediateDirectory=".\qtestRelease"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib"
-				OutputFile=".\qtestRelease\qtest.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib"
-				OutputFile=".\qtestDebug\qtest.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib"
-				OutputFile=".\qtestRelease\qtest.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\qtest.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/sysex-VC9.vcproj
+++ b/lib-src/portmidi/pm_test/sysex-VC9.vcproj
@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Sysex"
-	ProjectGUID="{300F59F8-5E94-492B-A899-0EB2B1140E20}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Sysex Debug VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\sysex.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\pm_common,..\porttime"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\$(OutDir)\sysex.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib odbc32.lib odbccp32.lib winmm.lib"
-				OutputFile=".\$(OutDir)\sysex.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Debug VC9&quot;;&quot;..\porttime\Debug VC9&quot;"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\$(OutDir)\sysex.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-				Profile="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\sysex.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Sysex Release VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\sysex.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\pm_common,..\porttime"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\$(OutDir)\sysex.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib odbc32.lib odbccp32.lib winmm.lib"
-				OutputFile=".\$(OutDir)\sysex.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Release VC9&quot;;&quot;..\porttime\Release VC9&quot;"
-				ProgramDatabaseFile=".\$(OutDir)\sysex.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\sysex.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="sysex.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/sysex.c
+++ b/lib-src/portmidi/pm_test/sysex.c
@ -64,6 +64,8 @@ void loopback_test()
    int data;
    PmEvent event;
    int shift;
+    long total_bytes = 0;
+    int32_t begin_time;

    Pt_Start(1, 0, 0);
    
@ -87,6 +89,7 @@ void loopback_test()

    srand((unsigned int) Pt_Time()); /* seed for random numbers */

+    begin_time = Pt_Time();
    while (1) {
        PmError count;
        int32_t start_time;
@ -157,14 +160,19 @@ void loopback_test()
            }
        }
        if (error_position >= 0) {
-            printf("Error at byte %d: sent %x recd %x\n", error_position, 
+            printf("Error at byte %d: sent %x recd %x.\n", error_position, 
                   expected, actual);
+            break;
        } else if (i != len + 2) {
-            printf("Error: byte %d not received\n", i);
+            printf("Error: byte %d not received.\n", i);
+            break;
        } else {
-            printf("Correctly ");
+            int seconds = (Pt_Time() - begin_time) / 1000;
+	    if (seconds == 0) seconds = 1;
+            printf("Correctly received %d byte sysex message.\n", i);
+	    total_bytes += i;
+	    printf("Cummulative bytes/sec: %d\n", total_bytes / seconds);
        }
-        printf("received %d byte sysex message.\n", i);
    }
 cleanup:
    Pm_Close(midi_out);
--- a/lib-src/portmidi/pm_test/sysex.vcproj
+++ b/lib-src/portmidi/pm_test/sysex.vcproj
@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="sysex"
-	ProjectGUID="{300F59F8-5E94-492B-A899-0EB2B1140E20}"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\sysexDebug"
-			IntermediateDirectory=".\sysexDebug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\sysexDebug/sysex.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\pm_common,..\porttime"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\sysexDebug/sysex.pch"
-				AssemblerListingLocation=".\sysexDebug/"
-				ObjectFile=".\sysexDebug/"
-				ProgramDataBaseFileName=".\sysexDebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib"
-				OutputFile=".\sysexDebug/sysex.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\sysexDebug/sysex.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-				Profile="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\sysexDebug/sysex.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\sysexRelease"
-			IntermediateDirectory=".\sysexRelease"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\sysexRelease/sysex.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\pm_common,..\porttime"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\sysexRelease/sysex.pch"
-				AssemblerListingLocation=".\sysexRelease/"
-				ObjectFile=".\sysexRelease/"
-				ProgramDataBaseFileName=".\sysexRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib"
-				OutputFile=".\sysexRelease/sysex.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\sysexRelease/sysex.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\sysexRelease/sysex.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\sysexDebug/sysex.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\pm_common,..\porttime"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\sysexDebug/sysex.pch"
-				AssemblerListingLocation=".\sysexDebug/"
-				ObjectFile=".\sysexDebug/"
-				ProgramDataBaseFileName=".\sysexDebug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib"
-				OutputFile=".\sysexDebug/sysex.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\sysexDebug/sysex.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-				Profile="false"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\sysexDebug/sysex.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\sysexRelease/sysex.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\pm_common,..\porttime"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\sysexRelease/sysex.pch"
-				AssemblerListingLocation=".\sysexRelease/"
-				ObjectFile=".\sysexRelease/"
-				ProgramDataBaseFileName=".\sysexRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib"
-				OutputFile=".\sysexRelease/sysex.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\sysexRelease/sysex.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\sysexRelease/sysex.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="sysex.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/test-VC9.vcproj
+++ b/lib-src/portmidi/pm_test/test-VC9.vcproj
@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="Test"
-	ProjectGUID="{49FA3196-A8F8-4E22-98C3-F3A5197CD06D}"
-	RootNamespace="Test"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Test Debug VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\test.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\$(OutDir)\test.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/VERBOSE:LIB"
-				AdditionalDependencies="portmidi.lib porttime.lib odbc32.lib odbccp32.lib winmm.lib"
-				OutputFile=".\$(OutDir)\test.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Debug VC9&quot;;&quot;..\porttime\Debug VC9&quot;"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\$(OutDir)\test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\test.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Test Release VC9|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\$(OutDir)\test.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;DEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\$(OutDir)\test.pch"
-				AssemblerListingLocation=".\$(OutDir)\"
-				ObjectFile=".\$(OutDir)\"
-				ProgramDataBaseFileName=".\$(OutDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="portmidi.lib porttime.lib odbc32.lib odbccp32.lib winmm.lib"
-				OutputFile=".\$(OutDir)\test.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;..\pm_win\Release VC9&quot;;&quot;..\porttime\Release VC9&quot;"
-				ProgramDatabaseFile=".\$(OutDir)\test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\$(OutDir)\test.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="test.c"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_test/test.vcproj
+++ b/lib-src/portmidi/pm_test/test.vcproj
@ -1,448 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="test"
-	ProjectGUID="{49FA3196-A8F8-4E22-98C3-F3A5197CD06D}"
-	RootNamespace="test"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\testRelease"
-			IntermediateDirectory=".\testRelease"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\testRelease/test.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;DEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\testRelease/test.pch"
-				AssemblerListingLocation=".\testRelease/"
-				ObjectFile=".\testRelease/"
-				ProgramDataBaseFileName=".\testRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib"
-				OutputFile=".\testRelease/test.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\testRelease/test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\testRelease/test.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\testDebug"
-			IntermediateDirectory=".\testDebug"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\testDebug/test.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\testDebug/test.pch"
-				AssemblerListingLocation=".\testDebug/"
-				ObjectFile=".\testDebug/"
-				ProgramDataBaseFileName=".\testDebug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/VERBOSE:LIB"
-				AdditionalDependencies="advapi32.lib winmm.lib ..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib $(NOINHERIT)"
-				OutputFile=".\testDebug/test.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\testDebug/test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\testDebug/test.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Debug|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\testDebug/test.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\testDebug/test.pch"
-				AssemblerListingLocation=".\testDebug/"
-				ObjectFile=".\testDebug/"
-				ProgramDataBaseFileName=".\testDebug/"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions="/VERBOSE:LIB"
-				AdditionalDependencies="advapi32.lib winmm.lib ..\pm_win\Debug\portmidi.lib ..\porttime\Debug\porttime.lib $(NOINHERIT)"
-				OutputFile=".\testDebug/test.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\testDebug/test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\testDebug/test.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Unicode Release|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\testRelease/test.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../pm_common,../porttime"
-				PreprocessorDefinitions="WIN32;DEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\testRelease/test.pch"
-				AssemblerListingLocation=".\testRelease/"
-				ObjectFile=".\testRelease/"
-				ProgramDataBaseFileName=".\testRelease/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib winmm.lib ..\pm_win\Release\portmidi.lib ..\porttime\Release\porttime.lib"
-				OutputFile=".\testRelease/test.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\testRelease/test.pdb"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\testRelease/test.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="test.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Unicode Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/lib-src/portmidi/pm_win/README_WIN.txt
+++ b/lib-src/portmidi/pm_win/README_WIN.txt
@ -79,6 +79,8 @@ TO COMPILE PORTMIDI:
        - these are absolute paths to the Java SDK; you'll need to install the
          Java SDK (from Sun) and update these directories in order to build
          this project.
+        - similarly, the Linker->Input->Additional Dependencies list has a
+          path to the jvm.lib file, which needs to be correct(ed).

 6)  use Build->Batch Build ... to build everything in the project
 	
--- a/lib-src/portmidi/pm_win/pmwinmm.c
+++ b/lib-src/portmidi/pm_win/pmwinmm.c
@ -43,9 +43,11 @@ static void CALLBACK winmm_in_callback(HMIDIIN hMidiIn,
 static void CALLBACK winmm_streamout_callback(HMIDIOUT hmo, UINT wMsg,
                                              DWORD dwInstance, DWORD dwParam1, 
                                              DWORD dwParam2);
+#ifdef USE_SYSEX_BUFFERS
 static void CALLBACK winmm_out_callback(HMIDIOUT hmo, UINT wMsg,
                                        DWORD dwInstance, DWORD dwParam1, 
                                        DWORD dwParam2);
+#endif

 extern pm_fns_node pm_winmm_in_dictionary;
 extern pm_fns_node pm_winmm_out_dictionary;
@ -1314,7 +1316,7 @@ static void CALLBACK winmm_out_callback(HMIDIOUT hmo, UINT wMsg,
           hdr, wMsg, MOM_DONE);
    */
    if (wMsg == MOM_DONE) {
-        MMRETURN ret = midiOutUnprepareHeader(m->handle.out, hdr, 
+        MMRESULT ret = midiOutUnprepareHeader(m->handle.out, hdr, 
                                              sizeof(MIDIHDR));
        assert(ret == MMSYSERR_NOERROR);
    }
--- a/lib-src/portmidi/porttime/ptlinux.c
+++ b/lib-src/portmidi/porttime/ptlinux.c
@ -40,6 +40,7 @@ CHANGE LOG
 static int time_started_flag = FALSE;
 static struct timeb time_offset = {0, 0, 0, 0};
 static pthread_t pt_thread_pid;
+static int pt_thread_created = FALSE;

 /* note that this is static data -- we only need one copy */
 typedef struct {
@ -91,6 +92,7 @@ PtError Pt_Start(int resolution, PtCallback *callback, void *userData)
        res = pthread_create(&pt_thread_pid, NULL, 
                             Pt_CallbackProc, parms);
        if (res != 0) return ptHostError;
+        pt_thread_created = TRUE;
    }
    time_started_flag = TRUE;
    return ptNoError;
@ -101,7 +103,10 @@ PtError Pt_Stop()
 {
    /* printf("Pt_Stop called\n"); */
    pt_callback_proc_id++;
-    pthread_join(pt_thread_pid, NULL);
+    if (pt_thread_created) {
+        pthread_join(pt_thread_pid, NULL);
+        pt_thread_created = FALSE;
+    }
    time_started_flag = FALSE;
    return ptNoError;
 }
--- a/lib-src/portsmf/allegro.cpp
+++ b/lib-src/portsmf/allegro.cpp
@ -3450,6 +3450,7 @@ Alg_event_ptr Alg_iterator::next(bool *note_on, void **cookie_ptr,

 void Alg_iterator::request_note_off()
 {
+    assert(index >= 0 && index < events_ptr->length());
    insert(events_ptr, index, false, cookie, offset);
 }

@ -3473,7 +3474,7 @@ void Alg_seq::merge_tracks()
    long notes_index = 0;

    Alg_event_ptr event;
-    while (event = iterator.next()) {
+    while ((event = iterator.next())) {
        notes[notes_index++] = event;
    }
    track_list.reset(); // don't need them any more
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@ -1363,12 +1363,11 @@ bool AudioIO::StartPortMidiStream()
      for (i = 0; i < Pm_CountDevices(); i++) {
         const PmDeviceInfo *info = Pm_GetDeviceInfo(i);
         if (!info) continue;
+         if (!info->output) continue;
         wxString interf(info->interf, wxConvLocal);
         wxString name(info->name, wxConvLocal);
-         wxString device = wxString::Format(wxT("%s: %s"),
-                                            interf.c_str(),
-                                            name.c_str());
-        if (wxStrcmp(device, playbackDeviceName) == 0) {
+         interf.Append(wxT(": ")).Append(name);
+        if (wxStrcmp(interf, playbackDeviceName) == 0) {
            playbackDevice = i;
         }
      }
@ -1515,14 +1514,16 @@ void AudioIO::StopStream()
      // now we can assume "ownership" of the mMidiStream
      // if output in progress, send all off, etc.
      AllNotesOff();
-      // Note: this code is here for future consideration. It's
-      // possible sometimes to abort some messages waiting in the 
-      // output buffers, but if you do that, you might leave notes
-      // hanging. It seems better to deliver all-off messages and
-      // flush all the messages, even if that delays things by
-      // the midi latency.
-      // wxMilliSleep(40); // deliver the all-off messages
-      // Pm_Abort(mMidiStream);
+      // AllNotesOff() should be sufficient to stop everything, but
+      // in Linux, if you Pm_Close() immediately, it looks like 
+      // messages are dropped. ALSA then seems to send All Sound Off
+      // and Reset All Controllers messages, but not all synthesizers
+      // respond to these messages. This is probably a bug in PortMidi
+      // if the All Off messages do not get out, but for security,
+      // delay a bit so that messages can be delivered before closing
+      // the stream. It should take about 16ms to send All Off messages,
+      // so this will add 24ms latency.
+      wxMilliSleep(40); // deliver the all-off messages
      Pm_Close(mMidiStream);
      mMidiStream = NULL;
      mIterator->end();
@ -2709,7 +2710,7 @@ void AudioIO::OutputEvent()
         Pm_WriteShort(mMidiStream, timestamp, 
                    Pm_Message((int) (command + channel), 
                                  (long) data1, (long) data2));
-         //printf("Pm_WriteShort %x @ %d\n", 
+         //printf("Pm_WriteShort %lx @ %d\n", 
         //       Pm_Message((int) (command + channel), 
         //                  (long) data1, (long) data2), timestamp);
      }
@ -2833,9 +2834,10 @@ PmTimestamp AudioIO::MidiTime()

 void AudioIO::AllNotesOff()
 {
-  for (int chan = 0; chan < 16; chan++) {
-     Pm_WriteShort(mMidiStream, 0, Pm_Message(0xB0 + chan, 0x7B, 0));
-  }
+   printf("AudioIO::AllNotesOff()\n");
+   for (int chan = 0; chan < 16; chan++) {
+      Pm_WriteShort(mMidiStream, 0, Pm_Message(0xB0 + chan, 0x7B, 0));
+   }
 }

 #endif