[xiph-commits] r16796 - in trunk/ao: doc include/ao src

xiphmont at svn.xiph.org xiphmont at svn.xiph.org
Sun Jan 24 01:21:27 PST 2010


Author: xiphmont
Date: 2010-01-24 01:21:27 -0800 (Sun, 24 Jan 2010)
New Revision: 16796

Modified:
   trunk/ao/doc/ao_append_option.html
   trunk/ao/doc/ao_close.html
   trunk/ao/doc/ao_default_driver_id.html
   trunk/ao/doc/ao_device.html
   trunk/ao/doc/ao_driver_id.html
   trunk/ao/doc/ao_driver_info.html
   trunk/ao/doc/ao_driver_info_list.html
   trunk/ao/doc/ao_file_extension.html
   trunk/ao/doc/ao_free_options.html
   trunk/ao/doc/ao_info.html
   trunk/ao/doc/ao_initialize.html
   trunk/ao/doc/ao_is_big_endian.html
   trunk/ao/doc/ao_open_file.html
   trunk/ao/doc/ao_open_live.html
   trunk/ao/doc/ao_option.html
   trunk/ao/doc/ao_play.html
   trunk/ao/doc/ao_plugin_close.html
   trunk/ao/doc/ao_plugin_device_clear.html
   trunk/ao/doc/ao_plugin_device_init.html
   trunk/ao/doc/ao_plugin_driver_info.html
   trunk/ao/doc/ao_plugin_file_extension.html
   trunk/ao/doc/ao_plugin_open.html
   trunk/ao/doc/ao_plugin_play.html
   trunk/ao/doc/ao_plugin_set_option.html
   trunk/ao/doc/ao_plugin_test.html
   trunk/ao/doc/ao_sample_format.html
   trunk/ao/doc/ao_shutdown.html
   trunk/ao/doc/config.html
   trunk/ao/doc/drivers.html
   trunk/ao/doc/index.html
   trunk/ao/doc/libao-api.html
   trunk/ao/doc/overview.html
   trunk/ao/doc/plugin-api.html
   trunk/ao/doc/plugin-overview.html
   trunk/ao/include/ao/ao.h
   trunk/ao/src/audio_out.c
Log:
Revise the proposed matrixing extenstion to both somewhat simplify the 
interface (passing a bit more buck to the app) as well as freeing the 
app from only being able to use predefined matrices.



Modified: trunk/ao/doc/ao_append_option.html
===================================================================
--- trunk/ao/doc/ao_append_option.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_append_option.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -55,11 +55,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_close.html
===================================================================
--- trunk/ao/doc/ao_close.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_close.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -50,11 +50,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_default_driver_id.html
===================================================================
--- trunk/ao/doc/ao_default_driver_id.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_default_driver_id.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -49,11 +49,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_device.html
===================================================================
--- trunk/ao/doc/ao_device.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_device.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -75,11 +75,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_driver_id.html
===================================================================
--- trunk/ao/doc/ao_driver_id.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_driver_id.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -50,11 +50,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_driver_info.html
===================================================================
--- trunk/ao/doc/ao_driver_info.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_driver_info.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -53,11 +53,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_driver_info_list.html
===================================================================
--- trunk/ao/doc/ao_driver_info_list.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_driver_info_list.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -49,11 +49,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_file_extension.html
===================================================================
--- trunk/ao/doc/ao_file_extension.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_file_extension.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -54,11 +54,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_free_options.html
===================================================================
--- trunk/ao/doc/ao_free_options.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_free_options.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -42,11 +42,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_info.html
===================================================================
--- trunk/ao/doc/ao_info.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_info.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -80,11 +80,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_initialize.html
===================================================================
--- trunk/ao/doc/ao_initialize.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_initialize.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -45,11 +45,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_is_big_endian.html
===================================================================
--- trunk/ao/doc/ao_is_big_endian.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_is_big_endian.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -43,11 +43,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_open_file.html
===================================================================
--- trunk/ao/doc/ao_open_file.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_open_file.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -86,11 +86,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_open_live.html
===================================================================
--- trunk/ao/doc/ao_open_live.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_open_live.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -72,11 +72,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_option.html
===================================================================
--- trunk/ao/doc/ao_option.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_option.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -46,11 +46,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_play.html
===================================================================
--- trunk/ao/doc/ao_play.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_play.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -54,11 +54,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_plugin_close.html
===================================================================
--- trunk/ao/doc/ao_plugin_close.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_plugin_close.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -48,11 +48,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_plugin_device_clear.html
===================================================================
--- trunk/ao/doc/ao_plugin_device_clear.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_plugin_device_clear.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -40,11 +40,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_plugin_device_init.html
===================================================================
--- trunk/ao/doc/ao_plugin_device_init.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_plugin_device_init.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -54,11 +54,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_plugin_driver_info.html
===================================================================
--- trunk/ao/doc/ao_plugin_driver_info.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_plugin_driver_info.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -41,11 +41,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_plugin_file_extension.html
===================================================================
--- trunk/ao/doc/ao_plugin_file_extension.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_plugin_file_extension.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -46,11 +46,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_plugin_open.html
===================================================================
--- trunk/ao/doc/ao_plugin_open.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_plugin_open.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -58,11 +58,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_plugin_play.html
===================================================================
--- trunk/ao/doc/ao_plugin_play.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_plugin_play.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -57,11 +57,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_plugin_set_option.html
===================================================================
--- trunk/ao/doc/ao_plugin_set_option.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_plugin_set_option.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -60,11 +60,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_plugin_test.html
===================================================================
--- trunk/ao/doc/ao_plugin_test.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_plugin_test.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -46,11 +46,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_sample_format.html
===================================================================
--- trunk/ao/doc/ao_sample_format.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_sample_format.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -24,12 +24,13 @@
 <tr bgcolor=#cccccc>
         <td>
 <pre><b>typedef struct {
-  int bits; /* bits per sample */
-  int rate; /* samples per second (in a single channel) */
-  int channels; /* number of audio channels */
-  int byte_format; /* Byte ordering in sample, see constants below */
+  int  bits; /* bits per sample */
+  int  rate; /* samples per second (in a single channel) */
+  int  channels; /* number of audio channels */
+  int  byte_format; /* Byte ordering in sample, see constants below */
+  char *matrix; /* channel input matrix */
 } ao_sample_format;</b></pre>
-        </td>
+</td>
 </tr>
 </table>
 
@@ -43,17 +44,65 @@
 <li>AO_FMT_NATIVE - Samples are in the native ordering of the computer.</li>
 </ul>
 </dd>
+<dt><i>matrix</i></dt> <dd>Specifies the mapping of input channels to
+intended speaker/ouput location.  The matrix is specified as a comma
+seperated list of channel locations equal to the number and in the
+order of the input channels.  The channel mnemonics are as follows:
+<ul>
+<li>L - Left speaker, located forward and the the left of the listener.</li>
+<li>R - Right speaker, located forward and the the right of the listener.</li>
+<li>C - Center speaker, located directly forward of the listener between the Left and Right speakers.</li>
+<li>M - Monophonic, a virtual speaker for single-channel output.</li>
+<li>CL - Left of Center speaker (used in some Widescreen formats), located forward of the listener between the Center and Left speakers.  Alternatively referred to as 'Left Center'.</li>
+<li>CR - Right of Center speaker (used in some Widescreen formats), located forward of the listener between the Center and Right speakers.  Alternatively referred to as 'Right Center'.</li>
+<li>BL - Back Left speaker, located behind and to the left of the listener.  Alternatively called 'Left Surround' (primarily by Apple) or 'Surround Rear Left' (primarily by Dolby).
+<li>BR - Back Right speaker, located behind and to the right of the listener.  Alternatively called 'Right Surround' (primarily by Apple) or 'Surround Rear Right' (primarily by Dolby).
+<li>BC - Back Center speaker, located directly behind the listener.  Alternatively called 'Center Surround' (primarily by Apple) or 'Surround Rear Center' (primarily by Dolby).
+<li>SL - Side Left speaker, located directly to the listener's left side.  The Side Left speaker is also referred to as 'Left Surround Direct' (primarily by Apple) or 'Surround Left' (primarily by Dolby) </li>
+<li>SR - Side Right speaker, located directly to the listener's right side.  The Side Right speaker is also referred to as 'Right Surround Direct' (primarily by Apple) or 'Surround Right' (primarily by Dolby) </li>
+<li>LFE - Low Frequency Effect (subwoofer) channel.  This is channel is usually lowpassed and meant only for bass, though in some recent formats it is a discrete, full-range channel.  Microsoft calls this the 'Low Frequency' channel.
+<li>A1, A2, A3, A4 - 'auxiliary' channels, not mapped to a location.  Intended to be unmatrixed channels directly passed through to the driver for driver-specific use.</li>
+<li>U - Unused channel, to be dropped in the driver and not output to any speaker.</li>
+</ul>
+
+<p><i>Note that the 'surround' speakers referred to in other systems
+can be either the side or rear speakers depending on vendor.  For
+example, Apple calls the rear speakers 'surround' and the side
+speakers 'direct surround'.  Dolby calls the rear speakers 'surround
+rear' and the side speakers 'surround', resulting in a direct naming
+conflict.  For this reason, libao explicitly refers to speakers as
+'rear' and 'side' rather than 'surround'.</i>
+
+<p> Common examples of channel orderings:
+<ul>
+<li> "L,R" - Stereo ordering in virtually all file formats</li>
+<li> "L,R,BL,BR" - Quadraphonic ordering for most file formats</li>
+<li> "L,R,C,LFE,BR,BL" - channel order of a 5.1 WAV or FLAC file </li>
+<li> "L,R,C,LFE,BR,BL,SL,SR" - channel order of a 7.1 WAV or FLAC file </li>
+<li> "L,C,R,BR,BL,LFE" - channel order of a six channel (5.1) Vorbis I file </li>
+<li> "L,C,R,BR,BL,SL,SR,LFE" - channel order of an eight channel (7.1) Vorbis file </li>
+<li> "L,CL,C,R,RC,BC" - channel order of a six channel AIFF[-C] file</li>
+</ul>
+
+<p>Channel mappings for most formats are usually not tied to a single
+channel matrix (there are a few exceptions like Vorbis I, where the
+number of channels always maps to a specific order); the above
+examples cannot be blindly applied to a given file type and number of
+channels.  The mapping must usually be read from the input.
+
+</dd>
 </dl>
 
+<p>
 <br><br>
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/ao_shutdown.html
===================================================================
--- trunk/ao/doc/ao_shutdown.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/ao_shutdown.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -42,11 +42,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/config.html
===================================================================
--- trunk/ao/doc/config.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/config.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -43,11 +43,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/drivers.html
===================================================================
--- trunk/ao/doc/drivers.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/drivers.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -234,11 +234,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/index.html
===================================================================
--- trunk/ao/doc/index.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/index.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -39,11 +39,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/libao-api.html
===================================================================
--- trunk/ao/doc/libao-api.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/libao-api.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -48,11 +48,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/overview.html
===================================================================
--- trunk/ao/doc/overview.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/overview.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -96,11 +96,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/plugin-api.html
===================================================================
--- trunk/ao/doc/plugin-api.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/plugin-api.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -30,11 +30,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/doc/plugin-overview.html
===================================================================
--- trunk/ao/doc/plugin-overview.html	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/doc/plugin-overview.html	2010-01-24 09:21:27 UTC (rev 16796)
@@ -9,7 +9,7 @@
 <table border=0 width=100%>
 <tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 
@@ -155,11 +155,11 @@
 <hr noshade>
 <table border=0 width=100%>
 <tr valign=top>
-<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert</p></td>
-<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:volsung at xiph.org">volsung at xiph.org</a></p></td>
+<td><p class=tiny>copyright &copy; 2001-2003 Stan Seibert, 2010 Monty</p></td>
+<td align=right><p class=tiny><a href="http://www.xiph.org/">xiph.org</a><br><a href="mailto:monty at xiph.org">monty at xiph.org</a></p></td>
 </tr><tr>
 <td><p class=tiny>libao documentation</p></td>
-<td align=right><p class=tiny>libao version 0.8.5 - 20040312</p></td>
+<td align=right><p class=tiny>libao version 0.9.0 - 20100124</p></td>
 </tr>
 </table>
 

Modified: trunk/ao/include/ao/ao.h
===================================================================
--- trunk/ao/include/ao/ao.h	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/include/ao/ao.h	2010-01-24 09:21:27 UTC (rev 16796)
@@ -58,124 +58,6 @@
 #define AO_FMT_BIG    2
 #define AO_FMT_NATIVE 4
 
-/* Specify the ordering channels will appear in the stream; not
-   functionally necessary, but saves the application having to
-   byte-twiddle streams into a single supported input order when AO
-   will likelyhave to re-twiddle for specific hardware interfaces */
-
-/* the native channel ordering used by OSS/ALSA/PULSE [L R BL BR C LFE SL SR] */
-#define AO_CHANORDER_LINUX            0x00000100U
-/* FLAC, WAV and WMA use Windows ordering [L R C LFE BL BR SL SR] */
-#define AO_CHANORDER_WIN              0x00000200U
-/* AC3, Vorbis use the classic 8-track theater order [L C R BL BR SL SR LFE] */
-#define AO_CHANORDER_THEATER          0x00000300U
-/* AAC and DTS use variant theater order [C LC RC L R BL BR LFE] */
-#define AO_CHANORDER_AAC              0x00000400U
-/* AIFF[-C] is yet different [L BL C R BR LFE [SL SR?]] */
-#define AO_CHANORDER_AIF              0x00000500U
-
-/* input channel masks; mark which channels are present */
-
-/* not an exhaustive list, but what we will support for now */
-#define AO_CHAN_LEFT                    0x00001000U
-#define AO_CHAN_RIGHT                   0x00002000U
-#define AO_CHAN_CENTER                  0x00004000U
-
-#define AO_CHAN_REAR_SURROUND_LEFT      0x00008000U
-#define AO_CHAN_REAR_SURROUND_RIGHT     0x00010000U
-#define AO_CHAN_REAR_SURROUND_CENTER    0x00020000U
-
-#define AO_CHAN_SIDE_SURROUND_LEFT      0x00040000U
-#define AO_CHAN_SIDE_SURROUND_RIGHT     0x00080000U
-
-#define AO_CHAN_LEFT_OF_CENTER          0x00100000U
-#define AO_CHAN_RIGHT_OF_CENTER         0x00200000U
-
-#define AO_CHAN_LFE                     0x40000000U
-
-
-/* shortcuts */
-
-#define AO_CHANMAP_2_1_STEREO         (AO_CHAN_LEFT |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_LFE)
-
-#define AO_CHANMAP_3_0_WIDESTEREO     (AO_CHAN_LEFT |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_CENTER)
-
-#define AO_CHANMAP_3_0_SURROUND_DOLBY (AO_CHAN_LEFT |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_REAR_SURROUND_CENTER)
-
-#define AO_CHANMAP_4_0_QUAD           (AO_CHAN_LEFT |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_REAR_SURROUND_LEFT |\
-                                       AO_CHAN_REAR_SURROUND_RIGHT)
-
-#define AO_CHANMAP_4_0_SURROUND_DOLBY (AO_CHAN_LEFT |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_CENTER |\
-                                       AO_CHAN_REAR_SURROUND_CENTER)
-
-#define AO_CHANMAP_4_1_QUAD           (AO_CHAN_LEFT |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_REAR_SURROUND_LEFT |\
-                                       AO_CHAN_REAR_SURROUND_RIGHT |\
-                                       AO_CHAN_LFE)
-
-#define AO_CHANMAP_4_1_SURROUND_DOLBY (AO_CHAN_LEFT |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_CENTER |\
-                                       AO_CHAN_REAR_SURROUND_CENTER |\
-                                       AO_CHAN_LFE)
-
-#define AO_CHANMAP_5_0_SURROUND       (AO_CHAN_LEFT |\
-                                       AO_CHAN_CENTER |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_REAR_SURROUND_LEFT |\
-                                       AO_CHAN_REAR_SURROUND_RIGHT)
-
-#define AO_CHANMAP_5_1_SURROUND       (AO_CHAN_LEFT |\
-                                       AO_CHAN_CENTER |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_REAR_SURROUND_LEFT |\
-                                       AO_CHAN_REAR_SURROUND_RIGHT |\
-                                       AO_CHAN_LFE)
-
-#define AO_CHANMAP_6_0_SURROUND_HEX   (AO_CHAN_LEFT |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_SIDE_SURROUND_LEFT |\
-                                       AO_CHAN_SIDE_SURROUND_RIGHT |\
-                                       AO_CHAN_REAR_SURROUND_LEFT |\
-                                       AO_CHAN_REAR_SURROUND_RIGHT)
-
-#define AO_CHANMAP_6_1_SURROUND       (AO_CHAN_LEFT |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_CENTER |\
-                                       AO_CHAN_SIDE_SURROUND_LEFT |\
-                                       AO_CHAN_SIDE_SURROUND_RIGHT |\
-                                       AO_CHAN_REAR_SURROUND_CENTER |\
-                                       AO_CHAN_LFE)
-
-#define AO_CHANMAP_7_1_SURROUND       (AO_CHAN_LEFT |\
-                                       AO_CHAN_CENTER |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_REAR_SURROUND_LEFT |\
-                                       AO_CHAN_REAR_SURROUND_RIGHT |\
-                                       AO_CHAN_SIDE_SURROUND_LEFT |\
-                                       AO_CHAN_SIDE_SURROUND_RIGHT |\
-                                       AO_CHAN_LFE)
-
-#define AO_CHANMAP_7_1_WIDEDTS        (AO_CHAN_LEFT |\
-                                       AO_CHAN_CENTER |\
-                                       AO_CHAN_RIGHT |\
-                                       AO_CHAN_LEFT_OF_CENTER |\
-                                       AO_CHAN_RIGHT_OF_CENTER |\
-                                       AO_CHAN_REAR_SURROUND_LEFT |\
-                                       AO_CHAN_REAR_SURROUND_RIGHT |\
-                                       AO_CHAN_LFE)
-
 /* --- Structures --- */
 
 typedef struct ao_info {
@@ -194,10 +76,11 @@
 typedef struct ao_device ao_device;
 
 typedef struct ao_sample_format {
-	int bits; /* bits per sample */
-	int rate; /* samples per second (in a single channel) */
-	int channels; /* number of audio channels */
-	int byte_format; /* Byte ordering in sample, see constants below */
+	int  bits; /* bits per sample */
+	int  rate; /* samples per second (in a single channel) */
+	int  channels; /* number of audio channels */
+	int  byte_format; /* Byte ordering in sample, see constants below */
+        char *matrix; /* input channel location/ordering */
 } ao_sample_format;
 
 typedef struct ao_option {

Modified: trunk/ao/src/audio_out.c
===================================================================
--- trunk/ao/src/audio_out.c	2010-01-23 07:24:12 UTC (rev 16795)
+++ trunk/ao/src/audio_out.c	2010-01-24 09:21:27 UTC (rev 16796)
@@ -126,7 +126,7 @@
 		if (!dt) return NULL;
 
 		dt->handle = handle;
-		
+
 		dt->functions = (ao_functions *)malloc(sizeof(ao_functions));
 		if (!(dt->functions)) {
 			free(dt);
@@ -136,15 +136,15 @@
 		dt->functions->test = dlsym(dt->handle, "ao_plugin_test");
 		if (!(dt->functions->test)) goto failed;
 
-		dt->functions->driver_info = 
+		dt->functions->driver_info =
 		  dlsym(dt->handle, "ao_plugin_driver_info");
 		if (!(dt->functions->driver_info)) goto failed;
 
-		dt->functions->device_init = 
+		dt->functions->device_init =
 		  dlsym(dt->handle, "ao_plugin_device_init");
 		if (!(dt->functions->device_init )) goto failed;
 
-		dt->functions->set_option = 
+		dt->functions->set_option =
 		  dlsym(dt->handle, "ao_plugin_set_option");
 		if (!(dt->functions->set_option)) goto failed;
 
@@ -157,7 +157,7 @@
 		dt->functions->close = dlsym(dt->handle, "ao_plugin_close");
 		if (!(dt->functions->close)) goto failed;
 
-		dt->functions->device_clear = 
+		dt->functions->device_clear =
 		  dlsym(dt->handle, "ao_plugin_device_clear");
 		if (!(dt->functions->device_clear)) goto failed;
 
@@ -187,13 +187,13 @@
 	if ( name == NULL || (def_id = ao_driver_id(name)) < 0 ) {
 		/* No default specified. Find one among available drivers. */
 		def_id = -1;
-		
+
 		id = 0;
 		while (driver != NULL) {
 
 			info = driver->functions->driver_info();
 
-			if ( info->type == AO_TYPE_LIVE && 
+			if ( info->type == AO_TYPE_LIVE &&
 			     info->priority > 0 && /* Skip static drivers */
 			     driver->functions->test() ) {
 				def_id = id; /* Found a usable driver */
@@ -209,13 +209,13 @@
 }
 
 
-/* Convert the static drivers table into a linked list of drivers. */ 
+/* Convert the static drivers table into a linked list of drivers. */
 static driver_list* _load_static_drivers(driver_list **end)
 {
 	driver_list *head;
 	driver_list *driver;
 	int i;
-       
+
 	/* insert first driver */
 	head = driver = malloc(sizeof(driver_list));
 	if (driver != NULL) {
@@ -232,7 +232,7 @@
 			driver->next->functions = static_drivers[i];
 			driver->next->handle = NULL;
 			driver->next->next = NULL;
-			
+
 			driver = driver->next;
 			i++;
 		}
@@ -262,10 +262,10 @@
 	plugindir = opendir(AO_PLUGIN_PATH);
 	if (plugindir != NULL) {
 		while ((plugin_dirent = readdir(plugindir)) != NULL) {
-			snprintf(fullpath, PATH_MAX, "%s/%s", 
+			snprintf(fullpath, PATH_MAX, "%s/%s",
 				 AO_PLUGIN_PATH, plugin_dirent->d_name);
-			if (!stat(fullpath, &statbuf) && 
-			    S_ISREG(statbuf.st_mode) && 
+			if (!stat(fullpath, &statbuf) &&
+			    S_ISREG(statbuf.st_mode) &&
 			 (ext = strrchr(plugin_dirent->d_name, '.')) != NULL) {
 				if (strcmp(ext, SHARED_LIB_EXT) == 0) {
 					plugin = _get_plugin(fullpath);
@@ -277,16 +277,16 @@
 				}
 			}
 		}
-		
+
 		closedir(plugindir);
 	}
 #endif
 }
 
 
-/* Compare two drivers based on priority 
+/* Compare two drivers based on priority
    Used as compar function for qsort() in _make_info_table() */
-static int _compar_driver_priority (const driver_list **a, 
+static int _compar_driver_priority (const driver_list **a,
 				    const driver_list **b)
 {
 	return memcmp(&((*b)->functions->driver_info()->priority),
@@ -313,7 +313,7 @@
 		list = list->next;
 	}
 
-	
+
 	/* Sort driver_list */
 	drivers_table = (driver_list **) calloc(i, sizeof(driver_list *));
 	if (drivers_table == NULL)
@@ -322,7 +322,7 @@
 	*driver_count = i;
 	for (i = 0; i < *driver_count; i++, list = list->next)
 		drivers_table[i] = list;
-	qsort(drivers_table, i, sizeof(driver_list *), 
+	qsort(drivers_table, i, sizeof(driver_list *),
 			(int(*)(const void *, const void *))
 			_compar_driver_priority);
 	*head = drivers_table[0];
@@ -357,7 +357,7 @@
 		driver = driver->next;
 	}
 
-	if (i == driver_id) 
+	if (i == driver_id)
 		return driver;
 
 	return NULL;
@@ -376,12 +376,12 @@
 		driver = driver->next;
 		i++;
 	}
-	
+
 	if (i == (driver_id + 1))
 		return 1;
 
 	return 0;
-}	
+}
 
 
 /* helper function to convert a byte_format of AO_FMT_NATIVE to the
@@ -404,15 +404,15 @@
 				 ao_sample_format *format, FILE *file)
 {
 	ao_device *device;
-	
+
 	device = malloc(sizeof(ao_device));
-	
-	if (device != NULL) {		
+
+	if (device != NULL) {
 		device->type = driver->functions->driver_info()->type;
 		device->driver_id = driver_id;
 		device->funcs = driver->functions;
 		device->file = file;
-		device->machine_byte_format = 
+		device->machine_byte_format =
 		  ao_is_big_endian() ? AO_FMT_BIG : AO_FMT_LITTLE;
 		device->client_byte_format =
 		  _real_byte_format(format->byte_format);
@@ -456,17 +456,17 @@
 		target_buffer[i+1] = source_buffer[i];
 	}
 }
-		
 
+
 /* Open a device.  If this is a live device, file == NULL. */
-static ao_device* _open_device(int driver_id, ao_sample_format *format, 
+static ao_device* _open_device(int driver_id, ao_sample_format *format,
 			       ao_option *options, FILE *file)
 {
 	ao_functions *funcs;
 	driver_list *driver;
 	ao_device *device;
 	int result;
-	
+
 	/* Get driver id */
 	if ( (driver = _get_driver(driver_id)) == NULL ) {
 		errno = AO_ENODRIVER;
@@ -476,32 +476,32 @@
 	funcs = driver->functions;
 
 	/* Check the driver type */
-	if (file == NULL && 
+	if (file == NULL &&
 	    funcs->driver_info()->type != AO_TYPE_LIVE) {
 
 		errno = AO_ENOTLIVE;
 		return NULL;
-	} else if (file != NULL && 
+	} else if (file != NULL &&
 		   funcs->driver_info()->type != AO_TYPE_FILE) {
 
 		errno = AO_ENOTFILE;
 		return NULL;
 	}
-	
+
 	/* Make a new device structure */
-	if ( (device = _create_device(driver_id, driver, 
+	if ( (device = _create_device(driver_id, driver,
 				      format, file)) == NULL ) {
 		errno = AO_EFAIL;
 		return NULL; /* Couldn't alloc device */
 	}
-		
+
 	/* Initialize the device memory */
 	if (!funcs->device_init(device)) {
 		free(device);
 		errno = AO_EFAIL;
 		return NULL; /* Couldn't init internal memory */
 	}
-	
+
 	/* Load options */
 	while (options != NULL) {
 		if (!funcs->set_option(device, options->key, options->value)) {
@@ -510,7 +510,7 @@
 			errno = AO_EOPENDEVICE;
 			return NULL;
 		}
-			
+
 		options = options->next;
 	}
 
@@ -522,11 +522,11 @@
 		errno = AO_EOPENDEVICE;
 		return NULL; /* Couldn't open device */
 	}
-		
+
 	/* Resolve actual driver byte format */
-	device->driver_byte_format = 
+	device->driver_byte_format =
 		_real_byte_format(device->driver_byte_format);
-	
+
 	/* Only create swap buffer for 16 bit samples if needed */
 	if (format->bits == 16 &&
 	    device->client_byte_format != device->driver_byte_format) {
@@ -538,11 +538,11 @@
 		  "device->driver_byte_format:%d\n"
 		  "--------------------------\n",
 		  ao_is_big_endian(),device->client_byte_format,device->driver_byte_format);
-		
+
 		result = _realloc_swap_buffer(device, DEF_SWAP_BUF_SIZE);
-		
+
 		if (!result) {
-			
+
 			device->funcs->close(device);
 			device->funcs->device_clear(device);
 			free(device);
@@ -550,9 +550,9 @@
 			return NULL; /* Couldn't alloc swap buffer */
 		}
 	}
-	
+
 	/* If we made it this far, everything is OK. */
-	return device; 
+	return device;
 }
 
 
@@ -642,14 +642,14 @@
 }
 
 
-ao_device *ao_open_live (int driver_id, ao_sample_format *format, 
+ao_device *ao_open_live (int driver_id, ao_sample_format *format,
 			ao_option *options)
 {
-	return _open_device(driver_id, format, options, NULL);		
+	return _open_device(driver_id, format, options, NULL);
 }
 
 
-ao_device *ao_open_file (int driver_id, const char *filename, int overwrite, 
+ao_device *ao_open_file (int driver_id, const char *filename, int overwrite,
 			 ao_sample_format *format, ao_option *options)
 {
 	FILE *file;
@@ -678,9 +678,9 @@
 		errno = AO_EOPENFILE;
 		return NULL;
 	}
-		
+
 	device = _open_device(driver_id, format, options, file);
-	
+
 	if (device == NULL) {
 		fclose(file);
 		/* errno already set by _open_device() */
@@ -701,7 +701,7 @@
 #if 1
 	if (device->swap_buffer != NULL) {
 		if (_realloc_swap_buffer(device, num_bytes)) {
-			_swap_samples(device->swap_buffer, 
+			_swap_samples(device->swap_buffer,
 				      output_samples, num_bytes);
 			playback_buffer = device->swap_buffer;
 		} else
@@ -748,13 +748,13 @@
 
 	i = 0;
 	while (driver) {
-		if (strcmp(short_name, 
+		if (strcmp(short_name,
 			   driver->functions->driver_info()->short_name) == 0)
 			return i;
 		driver = driver->next;
 		i++;
 	}
-	
+
 	return -1; /* No driver by that name */
 }
 
@@ -762,7 +762,7 @@
 int ao_default_driver_id (void)
 {
 	/* Find the default driver in the list of loaded drivers */
-  
+
 	return _find_default_driver_id(config.default_driver);
 }
 
@@ -788,7 +788,7 @@
 /* -- Miscellaneous -- */
 
 /* Stolen from Vorbis' lib/vorbisfile.c */
-int ao_is_big_endian(void) 
+int ao_is_big_endian(void)
 {
 	static uint_16 pattern = 0xbabe;
 	return 0[(volatile unsigned char *)&pattern] == 0xba;



More information about the commits mailing list