a28a1142b4
- Convert to new options framework - alsa-plugins: - Add option: ARIFF_OSS for FreeBSD-specific patch - Revert ports/165247 per regression in ports/169767 - Unbreak arcam-av and usb_stream plugins - While I'm here, pet portlint by removing ABI version number from LIB_DEPENDS Changes: http://www.alsa-project.org/main/index.php/Changes_v1.0.24_v1.0.25 http://www.alsa-project.org/main/index.php/Changes_v1.0.23_v1.0.24 PR: ports/169841 Submitted by: Jan Beich <jbeich@tormail.org> (maintainer)
30 lines
787 B
C
30 lines
787 B
C
--- oss/pcm_oss.c.orig 2008-10-29 08:42:13.000000000 -0400
|
|
+++ oss/pcm_oss.c
|
|
@@ -22,4 +22,8 @@
|
|
#include <sys/ioctl.h>
|
|
#include <alsa/asoundlib.h>
|
|
#include <alsa/pcm_external.h>
|
|
+#ifdef __linux__
|
|
#include <linux/soundcard.h>
|
|
+#else
|
|
+#include <sys/soundcard.h>
|
|
+#endif
|
|
@@ -116,7 +120,7 @@ static int oss_drain(snd_pcm_ioplug_t *i
|
|
snd_pcm_oss_t *oss = io->private_data;
|
|
|
|
if (io->stream == SND_PCM_STREAM_PLAYBACK)
|
|
- ioctl(oss->fd, SNDCTL_DSP_SYNC);
|
|
+ ioctl(oss->fd, SNDCTL_DSP_SYNC, NULL);
|
|
return 0;
|
|
}
|
|
|
|
@@ -125,7 +129,7 @@ static int oss_prepare(snd_pcm_ioplug_t
|
|
snd_pcm_oss_t *oss = io->private_data;
|
|
int tmp;
|
|
|
|
- ioctl(oss->fd, SNDCTL_DSP_RESET);
|
|
+ ioctl(oss->fd, SNDCTL_DSP_RESET, NULL);
|
|
|
|
tmp = io->channels;
|
|
if (ioctl(oss->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0) {
|