- Allow multiple apps to access sound device in parallel

- Bump PORTREVISION

PR:		ports/122584
Submitted by:	Steve Ames <steve at energistic.com> (maintainer)
This commit is contained in:
Rong-En Fan 2008-04-13 12:43:55 +00:00
parent 2c5ce7d989
commit 6ece12cda9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=211160
2 changed files with 20 additions and 4 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= pwlib
PORTVERSION= 1.12.0
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}

View file

@ -1,6 +1,22 @@
--- plugins/sound_oss/sound_oss.cxx.orig 2007-10-19 02:22:33.000000000 -0400
+++ plugins/sound_oss/sound_oss.cxx 2007-12-30 20:46:38.000000000 -0500
@@ -643,6 +643,7 @@
--- plugins/sound_oss/sound_oss.orig 2008-04-08 13:54:44.000000000 -0400
+++ plugins/sound_oss/sound_oss.cxx 2008-04-08 13:57:40.000000000 -0400
@@ -399,6 +399,15 @@
PINDEX cardnum = numbers.AsInteger(); //dspN.M is truncated to dspN.
// If we have not yet inserted something for this cardnum, insert it
if (dsp.GetAt(cardnum+1) == NULL) {
+#if defined P_FREEBSD
+ // in FreeBSD the file name should be used via the devfs(5) and
+ // is just "/dev/dsp0" and devfs(5) takes care of virtual channels,
+ // like /dev/dsp0.0 /dev/dsp0.1 ...
+ // everything else would conflict with other KDE apps using the
+ // audio
+ devname = devdir + "dsp0";
+ PTRACE(1, "OSS\tCollectSoundDevices FreeBSD devname set to devfs(5) name:" << devname );
+ #endif
dsp.SetAt(cardnum+1, devname);
}
}
@@ -643,6 +652,7 @@
arg = val = (entry.numChannels == 2) ? 1 : 0;
if (ConvertOSError(::ioctl(os_handle, SNDCTL_DSP_STEREO, &arg)) || (arg != val)) {