diff -uN -r --exclude=Makefile --exclude='*.exe' --exclude='*.o' --exclude='*.a' --exclude='*~' --exclude='*.org' --exclude='*.orig' --exclude='*.bak' --exclude='*.rej' --exclude=config.cache --exclude=config.status --exclude=config.h --exclude='*.log' --exclude=CVS --exclude=.cvsignore --exclude='*.Plo' --exclude=libtool ../libao-0.8.6.org/configure ./configure
--- ../libao-0.8.6.org/configure	2005-01-12 07:08:26.000000000 +0900
+++ ./configure	2005-08-26 04:26:02.000000000 +0900
@@ -19121,9 +19121,10 @@
                 PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
         *-darwin*)
                 PLUGIN_LDFLAGS="-module -avoid-version"
-                DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore"
-                CFLAGS="-D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore"
-                PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char -Ddlsym=dlsym_auto_underscore" ;;
+                DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
+                CFLAGS="-D__NO_MATH_INLINES -fsigned-char"
+                LIBS="-Wl,-framework -Wl,CoreAudio"
+                PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
         *)
                 PLUGIN_LDFLAGS="-export-dynamic -avoid-version"
                 DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char"
@@ -19223,7 +19224,7 @@
 	DLOPEN_FLAG='(RTLD_LAZY)'
 	SHARED_LIB_EXT='.sl'
 	;;
-    *openbsd* | *netbsd* | *solaris2.7)
+    *darwin* | *openbsd* | *netbsd* | *solaris2.7)
 	DLOPEN_FLAG='(RTLD_LAZY)'
 	SHARED_LIB_EXT='.so'
 	;;
diff -uN -r --exclude=Makefile --exclude='*.exe' --exclude='*.o' --exclude='*.a' --exclude='*~' --exclude='*.org' --exclude='*.orig' --exclude='*.bak' --exclude='*.rej' --exclude=config.cache --exclude=config.status --exclude=config.h --exclude='*.log' --exclude=CVS --exclude=.cvsignore --exclude='*.Plo' --exclude=libtool ../libao-0.8.6.org/src/plugins/macosx/ao_macosx.c ./src/plugins/macosx/ao_macosx.c
--- ../libao-0.8.6.org/src/plugins/macosx/ao_macosx.c	2004-11-09 17:20:26.000000000 +0900
+++ ./src/plugins/macosx/ao_macosx.c	2005-08-26 04:26:02.000000000 +0900
@@ -173,6 +173,26 @@
 	return 0;
     }
 
+	if (internal->outputStreamBasicDescription.mChannelsPerFrame != format->channels)
+	{
+		internal->outputStreamBasicDescription.mChannelsPerFrame = format->channels;
+		internal->outputStreamBasicDescription.mBytesPerFrame =
+			internal->outputStreamBasicDescription.mChannelsPerFrame * sizeof (float);
+		internal->outputStreamBasicDescription.mBytesPerPacket =
+			internal->outputStreamBasicDescription.mBytesPerFrame *
+			internal->outputStreamBasicDescription.mFramesPerPacket;
+		status = AudioDeviceSetProperty(internal->outputDeviceID, 0, 0, 0,
+			kAudioDevicePropertyStreamFormat,
+			sizeof (internal->outputStreamBasicDescription),
+			&internal->outputStreamBasicDescription);
+		if (status != noErr)
+		{
+			fprintf(stderr, "ao_macosx_open: AudioDeviceSetProperty returned %.*s when setting kAudioDevicePropertyStreamFormat\n",
+				(int) sizeof (status), (char *) &status);
+			return 0;
+		}
+	}
+
     fprintf(stderr, "hardware format...\n");
     fprintf(stderr, "%f mSampleRate\n", internal->outputStreamBasicDescription.mSampleRate);
     fprintf(stderr, "%c%c%c%c mFormatID\n", (int)(internal->outputStreamBasicDescription.mFormatID & 0xff000000) >> 24,