From dfd5fc74e723818d0dd1f7c0ccbc260e7e84afb9 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sat, 9 Oct 2004 22:11:45 +0000 Subject: [PATCH] Date: Sat, 9 Oct 2004 02:46:18 +0300 (EEST) From: Hannu Savolainen Subject: SDL uses obsolete OSS features I was trying to compile SDL against the latest OSS version. It appeared that SDL 1.2.7 is using a very old SOUND_PCM_WRITE_RATE ioctl that is obsolete and has been removed from OSS. The right ioctl to call is SNDCTL_DSP_SPEED. Attached is a patch (works with all OSS versions). --- src/audio/dma/SDL_dmaaudio.c | 2 +- src/audio/dsp/SDL_dspaudio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/dma/SDL_dmaaudio.c b/src/audio/dma/SDL_dmaaudio.c index 56379bf4c..115399c81 100644 --- a/src/audio/dma/SDL_dmaaudio.c +++ b/src/audio/dma/SDL_dmaaudio.c @@ -301,7 +301,7 @@ static int DMA_ReopenAudio(_THIS, const char *audiodev, int format, int stereo, /* Set the DSP frequency */ value = spec->freq; - if ( ioctl(audio_fd, SOUND_PCM_WRITE_RATE, &value) < 0 ) { + if ( ioctl(audio_fd, SNDCTL_DSP_SPEED, &value) < 0 ) { SDL_SetError("Couldn't set audio frequency"); return(-1); } diff --git a/src/audio/dsp/SDL_dspaudio.c b/src/audio/dsp/SDL_dspaudio.c index 04cc3afb8..45afbb90d 100644 --- a/src/audio/dsp/SDL_dspaudio.c +++ b/src/audio/dsp/SDL_dspaudio.c @@ -309,7 +309,7 @@ static int DSP_ReopenAudio(_THIS, const char *audiodev, int format, /* Set the DSP frequency */ value = spec->freq; - if ( ioctl(audio_fd, SOUND_PCM_WRITE_RATE, &value) < 0 ) { + if ( ioctl(audio_fd, SNDCTL_DSP_SPEED, &value) < 0 ) { SDL_SetError("Couldn't set audio frequency"); return(-1); }