# HG changeset patch # User Sam Lantinga # Date 1348631258 25200 # Node ID 0a1bab6898928d5f1d413957914a53f32547fa0a # Parent f71e3fdba072a49b254e0aba0faaf0a3c65ebad9 NetBSD patch to use AUDIO_GETBUFINFO when available (contributed by jmcneill) diff -r f71e3fdba072 -r 0a1bab689892 src/audio/sun/SDL_sunaudio.c --- a/src/audio/sun/SDL_sunaudio.c Sun Sep 23 17:15:05 2012 -0700 +++ b/src/audio/sun/SDL_sunaudio.c Tue Sep 25 20:47:38 2012 -0700 @@ -53,6 +53,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); @@ -129,11 +133,11 @@ 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"); @@ -145,12 +149,12 @@ 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;