diff options
| author | Sam Lantinga <slouken@libsdl.org> | 2012-09-25 20:45:31 -0700 |
|---|---|---|
| committer | Sam Lantinga <slouken@libsdl.org> | 2012-09-25 20:45:31 -0700 |
| commit | 1fe4f35c63d6a6854cafe1dcc1aced4c92a4a6bf (patch) | |
| tree | 97a38de8d8237dcfa5c2d91a35985d0a2175e288 | |
| parent | cf7797e91758b5b2a950d9da5c7d5f0d0265d676 (diff) | |
| download | sdl-1fe4f35c63d6a6854cafe1dcc1aced4c92a4a6bf.tar.gz | |
NetBSD patch to use AUDIO_GETBUFINFO when available (contributed by jmcneill)
| -rw-r--r-- | src/audio/sun/SDL_sunaudio.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/audio/sun/SDL_sunaudio.c b/src/audio/sun/SDL_sunaudio.c index 7a39e71d1..25f02de92 100644 --- a/src/audio/sun/SDL_sunaudio.c +++ b/src/audio/sun/SDL_sunaudio.c @@ -47,6 +47,10 @@ /* Open the audio device for playback, and don't block if busy */ #define OPEN_FLAGS (O_WRONLY|O_NONBLOCK) +#if defined(AUDIO_GETINFO) && !defined(AUDIO_GETBUFINFO) +#define AUDIO_GETBUFINFO AUDIO_GETINFO +#endif + /* Audio driver functions */ static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec); static void DSP_WaitAudio(_THIS); @@ -119,11 +123,11 @@ AudioBootStrap SUNAUDIO_bootstrap = { #ifdef DEBUG_AUDIO void CheckUnderflow(_THIS) { -#ifdef AUDIO_GETINFO +#ifdef AUDIO_GETBUFINFO audio_info_t info; int left; - ioctl(audio_fd, AUDIO_GETINFO, &info); + ioctl(audio_fd, AUDIO_GETBUFINFO, &info); left = (written - info.play.samples); if ( written && (left == 0) ) { fprintf(stderr, "audio underflow!\n"); @@ -134,12 +138,12 @@ void CheckUnderflow(_THIS) void DSP_WaitAudio(_THIS) { -#ifdef AUDIO_GETINFO +#ifdef AUDIO_GETBUFINFO #define SLEEP_FUDGE 10 /* 10 ms scheduling fudge factor */ audio_info_t info; Sint32 left; - ioctl(audio_fd, AUDIO_GETINFO, &info); + ioctl(audio_fd, AUDIO_GETBUFINFO, &info); left = (written - info.play.samples); if ( left > fragsize ) { Sint32 sleepy; |