head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.44 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.42 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.40 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.38 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.36 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.34 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.32 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.30 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.28 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.26 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.24 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.22 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.20 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.18 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.16 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.14 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.12 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.10 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.0.4 pkgsrc-2004Q4-base:1.1 pkgsrc-2004Q3:1.1.0.2 pkgsrc-2004Q3-base:1.1; locks; strict; comment @# @; 1.2 date 2005.01.05.12.05.19; author adam; state dead; branches; next 1.1; 1.1 date 2004.07.19.10.48.46; author wiz; state Exp; branches; next ; desc @@ 1.2 log @Changes 1.2.8: * Fixed compiling under newer versions of gcc * Fixed floating point exception with Linux 2.6 joysticks * Added 4/6 channel surround sound support on ALSA (not 3D audio) * Fixed mouse coordinate inversion on MacOS X * Added a CoreAudio sound driver for MacOS X * Added MacOS X Xcode build environment support * Updated QNX support for QNX6 * Improved Atari port, including OSMesa support * Numerous other bug fixes and platform support improvements @ text @$NetBSD: patch-aw,v 1.1 2004/07/19 10:48:46 wiz Exp $ --- src/audio/dmedia/SDL_irixaudio.c.orig 2003-08-30 21:13:02.000000000 +0200 +++ src/audio/dmedia/SDL_irixaudio.c @@@@ -28,6 +28,7 @@@@ static char rcsid = #endif /* Allow access to a raw mixing buffer (For IRIX 6.5 and higher) */ +/* patch for IRIX 5 by Georg Schwarz 18/07/2004 */ #include @@@@ -39,6 +40,21 @@@@ static char rcsid = #include "SDL_irixaudio.h" +#ifdef AL_RESOURCE /* as a test whether we use the "new" IRIX + audio libraries */ +#define NEW_IRIX_AUDIO +#else +#define alClosePort(x) ALcloseport(x) +#define alFreeConfig(x) ALfreeconfig(x) +#define alGetFillable(x) ALgetfillable(x) +#define alNewConfig() ALnewconfig() +#define alOpenPort(x,y,z) ALopenport(x,y,z) +#define alSetChannels(x,y) ALsetchannels(x,y) +#define alSetQueueSize(x,y) ALsetqueuesize(x,y) +#define alSetSampFmt(x,y) ALsetsampfmt(x,y) +#define alSetWidth(x,y) ALsetwidth(x,y) +#endif + /* Audio driver functions */ static int AL_OpenAudio(_THIS, SDL_AudioSpec *spec); static void AL_WaitAudio(_THIS); @@@@ -137,7 +153,11 @@@@ static void AL_CloseAudio(_THIS) static int AL_OpenAudio(_THIS, SDL_AudioSpec *spec) { ALconfig audio_config; +#ifdef NEW_IRIX_AUDIO ALpv audio_param; +#else + long audio_param[2]; +#endif int width; /* Determine the audio parameters from the AudioSpec */ @@@@ -165,9 +185,16 @@@@ static int AL_OpenAudio(_THIS, SDL_Audio SDL_CalculateAudioSpec(spec); /* Set output frequency */ +#ifdef NEW_IRIX_AUDIO audio_param.param = AL_RATE; audio_param.value.i = spec->freq; - if( alSetParams(AL_DEFAULT_OUTPUT, &audio_param, 1) < 0 ) { + if( alSetParams(AL_DEFAULT_OUTPUT, &audio_param, 1) < 0 ) +#else + audio_param[0] = AL_OUTPUT_RATE; + audio_param[1] = spec->freq; + if( ALsetparams(AL_DEFAULT_DEVICE, audio_param, 2) < 0 ) +#endif + { SDL_SetError("alSetParams failed"); return(-1); } @ 1.1 log @Patch to make audio work on IRIX 5, from Georg Schwarz. @ text @d1 1 a1 1 $NetBSD$ @