76 lines
1.8 KiB
C
76 lines
1.8 KiB
C
--- src/backends/alc_backend_bsd.c.orig 2006-01-05 15:11:20 UTC
|
|
+++ src/backends/alc_backend_bsd.c
|
|
@@ -9,7 +9,10 @@
|
|
*/
|
|
#include "al_siteconfig.h"
|
|
|
|
+#define __BSD_VISIBLE 1
|
|
+
|
|
#include <AL/al.h>
|
|
+#include <AL/alext.h>
|
|
#include <assert.h>
|
|
#include <fcntl.h>
|
|
#include <sys/soundcard.h>
|
|
@@ -113,7 +116,6 @@ static int AL2BSDFMT(int fmt)
|
|
*/
|
|
static void *grab_write_native(void) {
|
|
const char *dsppath = "/dev/dsp";
|
|
- int divisor = _alSpot(_AL_DEF_BUFSIZ) | (2<<16);
|
|
|
|
dsp_fd = open(dsppath, O_WRONLY | O_NONBLOCK);
|
|
|
|
@@ -126,10 +128,6 @@ static void *grab_write_native(void) {
|
|
perror("fcntl");
|
|
}
|
|
|
|
- if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) {
|
|
- perror("ioctl SETFRAGMENT");
|
|
- }
|
|
-
|
|
FD_ZERO(&dsp_fd_set);
|
|
FD_SET(dsp_fd, &dsp_fd_set);
|
|
|
|
@@ -318,10 +316,12 @@ ALsizei capture_nativedevice(UNUSED(void
|
|
}
|
|
|
|
static ALboolean set_write_native(UNUSED(void *handle),
|
|
- UNUSED(unsigned int *bufsiz),
|
|
+ unsigned int *bufsiz,
|
|
ALenum *fmt,
|
|
unsigned int *speed) {
|
|
ALuint channels = _alGetChannelsFromFormat(*fmt);
|
|
+ int divisor;
|
|
+ char *custom_bufsiz;
|
|
|
|
if(dsp_fd < 0) {
|
|
return AL_FALSE;
|
|
@@ -364,6 +364,28 @@ static ALboolean set_write_native(UNUSED
|
|
|
|
*fmt = BSD2ALFMT(*fmt, channels);
|
|
|
|
+ custom_bufsiz = getenv("OPENAL_BUFFER_SIZE");
|
|
+ if (custom_bufsiz != NULL)
|
|
+ *bufsiz = atoi(custom_bufsiz);
|
|
+ else {
|
|
+ if(ioctl(dsp_fd, SNDCTL_DSP_GETBLKSIZE, bufsiz) < 0) {
|
|
+#ifdef DEBUG_MAXIMUS
|
|
+ fprintf(stderr, "blksize %d\n", *bufsiz);
|
|
+ perror("get_devsp blksize ioctl");
|
|
+#endif
|
|
+ return AL_FALSE;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ divisor = _alSpot(*bufsiz) | (2<<16);
|
|
+ if(ioctl(dsp_fd, SNDCTL_DSP_SETFRAGMENT, &divisor) < 0) {
|
|
+#ifdef DEBUG_MAXIMUS
|
|
+ fprintf(stderr, "divisor %d\n", divisor);
|
|
+ perror("set_devsp fragment ioctl");
|
|
+#endif
|
|
+ return AL_FALSE;
|
|
+ }
|
|
+
|
|
return AL_TRUE;
|
|
}
|
|
|