Update portmidi to SVN r227.

lib-src/portmidi/pm_mac/Makefile.osx

@@ -23,12 +23,12 @@ all: $(CONFIG)/CMakeCache.txt
 	cd $(CONFIG); make
 
 $(CONFIG)/CMakeCache.txt:
-	rm -f CMakeCache.txt
+	rm -f $(CONFIG)/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'
+**** For instructions: make -f pm_mac/Makefile.osx help ****\n'
 
 help:
 	echo $$'\n\n\
@@ -63,6 +63,8 @@ cleaner: clean
 	rm -f pm_java/pmjni/Release/*.jnilib
 
 cleanest: cleaner
+	rm -f Debug/CMakeCache.txt Release/CMakeCache.txt
+	rm -f CMakeCache.txt
 	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

lib-src/portmidi/pm_mac/README_MAC.txt

@@ -1,7 +1,7 @@
 README_MAC.txt for PortMidi
 Roger Dannenberg
 20 nov 2009
-revised 20 Sep 2010 for Xcode 3.2.4 and CMake 8.2-2
+revised 20 Sep 2010 for Xcode 4.3.2 and CMake 2.8.8
 
 To build PortMidi for Mac OS X, you must install Xcode and
 CMake.
@@ -69,7 +69,9 @@ you would normally expect to find it.
 
 ==== USING CMAKE TO BUILD Xcode PROJECT ====
 
-Before you can use Xcode, you need a portmidi.xcodeproj file.
+Before you can use Xcode, you need a portmidi.xcodeproj file,
+and this is created with CMake.
+
 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
@@ -80,7 +82,8 @@ to go back to CMake.
 
 (2) Open portmedia/portmidi/CMakeLists.txt with CMake
 
-(3) Use Configure and Generate buttons
+(3) Use Configure and Generate buttons -- for CMAKE_OSX_SYSROOT, use
+    /Developer/SDKs/MacOSX10.6.sdk (rather than 10.7)
 
 (4) This creates portmedia/portmidi/portmidi.xcodeproj.
 

lib-src/portmidi/pm_mac/pmdefaults/make/build.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="pmdefaults" default="jar" basedir="..">
+
+	<!-- Global Properties -->
+	<property environment="env"/>
+	
+    
+	<!-- building in Xcode -->
+	<condition property="product" value="${env.PRODUCT_NAME}">
+		<isset property="env.PRODUCT_NAME"/>
+	</condition>
+    
+	<condition property="src" value="${env.SRCROOT}/src">
+		<isset property="env.SRCROOT"/>
+	</condition>
+	
+	<condition property="obj" value="${env.OBJECT_FILE_DIR}">
+		<isset property="env.OBJECT_FILE_DIR"/>
+	</condition>
+    
+	<condition property="dst" value="${env.BUILT_PRODUCTS_DIR}">
+		<isset property="env.BUILT_PRODUCTS_DIR"/>
+	</condition>
+	
+    
+	<!-- building from the command line -->
+	<condition property="src" value="src">
+		<not>
+			<isset property="src"/>
+		</not>
+	</condition>
+    
+	<condition property="obj" value="build/obj">
+		<not>
+			<isset property="obj"/>
+		</not>
+	</condition>
+	
+	<condition property="dst" value="build">
+		<not>
+			<isset property="dst"/>
+		</not>
+	</condition>
+	
+	<condition property="product" value="pmdefaults">
+		<not>
+			<isset property="product"/>
+		</not>
+	</condition>
+	
+	
+	<!-- Targets -->
+	<target name="init" description="Create build directories">
+        <mkdir dir="${obj}/${product}"/>
+		<mkdir dir="${dst}"/>
+	</target>
+	
+	<target name="compile" depends="init" description="Compile">
+		<javac destdir="${obj}/${product}" deprecation="on" source="1.5" target="1.5" fork="true" debug="true" debuglevel="lines,source">
+			<src path="${src}/java"/>
+			<classpath path="${src}/../lib/eawt-stubs.jar"/>
+		</javac>
+	</target>
+	
+	<target name="copy" depends="init" description="Copy resources">
+		
+	</target>
+	
+	<target name="jar" depends="compile, copy" description="Assemble Jar file">
+		<jar jarfile="${dst}/${product}.jar" basedir="${obj}/${product}" manifest="resources/Manifest" index="true"/>
+	</target>
+	
+	<target name="install" depends="jar" description="Alias for 'jar'">
+		<!-- sent by Xcode -->
+	</target>
+	
+	<target name="clean" description="Removes build directories">
+		<!-- sent by Xcode -->
+		<delete dir="${obj}/${product}"/>
+		<delete file="${dst}/${product}.jar"/>
+	</target>
+	
+	<target name="installhdrs" description="">
+		<!-- sent by Xcode -->
+		<echo>"Nothing to do for install-headers phase"</echo>
+	</target>
+</project>

lib-src/portmidi/pm_mac/pmdefaults/make/find-classrefs.sh

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Prints all class references made by all classes in a Jar file
+# Depends on the output formatting of javap
+
+# create a temporary working directory
+dir=`mktemp -d $TMPDIR/classrefs.XXXXXX`
+
+asm_dump="$dir/asm_dump"
+all_classes="$dir/all_classes"
+
+# for each class in a Jar file, dump the full assembly
+javap -c -classpath "$1" `/usr/bin/jar tf "$1" | grep "\.class" | sort | xargs | sed -e 's/\.class//g'` > $asm_dump
+
+# dump the initial list of all classes in the Jar file
+/usr/bin/jar tf $1 | grep "\.class" | sed -e 's/\.class//g' >> $all_classes
+
+# dump all static class references
+cat $asm_dump | grep //class | awk -F"//class " '{print $2}' | sort | uniq >> $all_classes
+
+# dump all references to classes made in methods
+cat $asm_dump | grep //Method | awk -F"//Method " '{print $2}' | sort | uniq | grep "\." | awk -F"." '{print $1}' | sort | uniq >> $all_classes
+
+# dump all references to classes by direct field access
+cat $asm_dump | grep //Field | awk -F"//Field " '{print $2}' | sort | uniq | grep "\:L" | awk -F"\:L" '{print $2}' | sort | uniq | awk -F"\;" '{print $1}' >> $all_classes
+
+# sort and reformat
+sort $all_classes | uniq | grep -v "\"" | sed -e 's/\//\./g'
+
+# cleanup
+rm -rf $dir

lib-src/portmidi/pm_mac/pmdefaults/resources/English.lproj/Credits.rtf

@@ -0,0 +1,14 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf320
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs24 \cf0 Author:
+\b0 \
+	Roger B. Dannenberg\
+\
+
+\b With special thanks to:
+\b0 \
+	National Science Foundation\
+}

lib-src/portmidi/pm_mac/pmdefaults/resources/Info.plist

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>JavaApplicationStub</string>
+	<key>CFBundleIconFile</key>
+	<string>pmdefaults.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>PmDefaults</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>Java</key>
+	<dict>
+		<key>ClassPath</key>
+		<string>$JAVAROOT/pmdefaults.jar</string>
+		<key>JVMVersion</key>
+		<string>1.5+</string>
+		<key>MainClass</key>
+		<string>pmdefaults.PmDefaults</string>
+		<key>Properties</key>
+		<dict>
+			<key>apple.laf.useScreenMenuBar</key>
+			<string>true</string>
+		</dict>
+	</dict>
+</dict>
+</plist>

lib-src/portmidi/pm_mac/pmdefaults/resources/Manifest

@@ -0,0 +1 @@
+Main-Class: pmdefaults/PmDefaults

lib-src/portmidi/pm_mac/pmmacosxcm.c

@@ -825,8 +825,10 @@ static CFStringRef ConnectedEndpointName(MIDIEndpointRef endpoint)
     CFRelease(connections);
   }
   if (anyStrings)
-    return result;
-  
+    return result; // caller should release result
+
+  CFRelease(result);
+
   // Here, either the endpoint had no connections, or we failed to obtain names for any of them.
   return EndpointName(endpoint, false);
 }