Merged revisions 59605-59624 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59606 | georg.brandl | 2007-12-29 11:57:00 +0100 (Sat, 29 Dec 2007) | 2 lines
Some cleanup in the docs.
........
r59611 | martin.v.loewis | 2007-12-29 19:49:21 +0100 (Sat, 29 Dec 2007) | 2 lines
Bug #1699: Define _BSD_SOURCE only on OpenBSD.
........
r59612 | raymond.hettinger | 2007-12-29 23:09:34 +0100 (Sat, 29 Dec 2007) | 1 line
Simpler documentation for itertools.tee(). Should be backported.
........
r59613 | raymond.hettinger | 2007-12-29 23:16:24 +0100 (Sat, 29 Dec 2007) | 1 line
Improve docs for itertools.groupby(). The use of xrange(0) to create a unique object is less obvious than object().
........
r59620 | christian.heimes | 2007-12-31 15:47:07 +0100 (Mon, 31 Dec 2007) | 3 lines
Added wininst-9.0.exe executable for VS 2008
Integrated bdist_wininst into PCBuild9 directory
........
r59621 | christian.heimes | 2007-12-31 15:51:18 +0100 (Mon, 31 Dec 2007) | 1 line
Moved PCbuild directory to PC/VS7.1
........
r59622 | christian.heimes | 2007-12-31 15:59:26 +0100 (Mon, 31 Dec 2007) | 1 line
Fix paths for build bot
........
r59623 | christian.heimes | 2007-12-31 16:02:41 +0100 (Mon, 31 Dec 2007) | 1 line
Fix paths for build bot, part 2
........
r59624 | christian.heimes | 2007-12-31 16:18:55 +0100 (Mon, 31 Dec 2007) | 1 line
Renamed PCBuild9 directory to PCBuild
........
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
index 7be838b..e23b049 100644
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -11,33 +11,33 @@
OSS is available for a wide range of open-source and commercial Unices, and is
the standard audio interface for Linux and recent versions of FreeBSD.
-.. % Things will get more complicated for future Linux versions, since
-.. % ALSA is in the standard kernel as of 2.5.x. Presumably if you
-.. % use ALSA, you'll have to make sure its OSS compatibility layer
-.. % is active to use ossaudiodev, but you're gonna need it for the vast
-.. % majority of Linux audio apps anyways.
-.. %
-.. % Sounds like things are also complicated for other BSDs. In response
-.. % to my python-dev query, Thomas Wouters said:
-.. %
-.. % > Likewise, googling shows OpenBSD also uses OSS/Free -- the commercial
-.. % > OSS installation manual tells you to remove references to OSS/Free from the
-.. % > kernel :)
-.. %
-.. % but Aleksander Piotrowsk actually has an OpenBSD box, and he quotes
-.. % from its <soundcard.h>:
-.. % > * WARNING! WARNING!
-.. % > * This is an OSS (Linux) audio emulator.
-.. % > * Use the Native NetBSD API for developing new code, and this
-.. % > * only for compiling Linux programs.
-.. %
-.. % There's also an ossaudio manpage on OpenBSD that explains things
-.. % further. Presumably NetBSD and OpenBSD have a different standard
-.. % audio interface. That's the great thing about standards, there are so
-.. % many to choose from ... ;-)
-.. %
-.. % This probably all warrants a footnote or two, but I don't understand
-.. % things well enough right now to write it! --GPW
+.. Things will get more complicated for future Linux versions, since
+ ALSA is in the standard kernel as of 2.5.x. Presumably if you
+ use ALSA, you'll have to make sure its OSS compatibility layer
+ is active to use ossaudiodev, but you're gonna need it for the vast
+ majority of Linux audio apps anyways.
+
+ Sounds like things are also complicated for other BSDs. In response
+ to my python-dev query, Thomas Wouters said:
+
+ > Likewise, googling shows OpenBSD also uses OSS/Free -- the commercial
+ > OSS installation manual tells you to remove references to OSS/Free from the
+ > kernel :)
+
+ but Aleksander Piotrowsk actually has an OpenBSD box, and he quotes
+ from its <soundcard.h>:
+ > * WARNING! WARNING!
+ > * This is an OSS (Linux) audio emulator.
+ > * Use the Native NetBSD API for developing new code, and this
+ > * only for compiling Linux programs.
+
+ There's also an ossaudio manpage on OpenBSD that explains things
+ further. Presumably NetBSD and OpenBSD have a different standard
+ audio interface. That's the great thing about standards, there are so
+ many to choose from ... ;-)
+
+ This probably all warrants a footnote or two, but I don't understand
+ things well enough right now to write it! --GPW
.. seealso::
@@ -87,6 +87,10 @@
second is required. This is a historical artifact for compatibility with the
older :mod:`linuxaudiodev` module which :mod:`ossaudiodev` supersedes.
+ .. XXX it might also be motivated
+ by my unfounded-but-still-possibly-true belief that the default
+ audio device varies unpredictably across operating systems. -GW
+
.. function:: openmixer([device])