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