head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.54 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.52 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.50 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.48 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.46 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.44 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.42 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.40 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.38 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.36 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.34 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.32 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.30 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 buildlink2-base:1.7 netbsd-1-3-PATCH003:1.6 netbsd-1-3-PATCH002:1.5; locks; strict; comment @# @; 1.7 date 99.03.19.08.43.56; author rh; state dead; branches; next 1.6; 1.6 date 98.08.07.10.40.54; author agc; state Exp; branches; next 1.5; 1.5 date 98.04.26.16.21.28; author mycroft; state Exp; branches; next 1.4; 1.4 date 98.03.07.13.01.43; author mycroft; state Exp; branches; next 1.3; 1.3 date 98.02.16.12.45.09; author frueauf; state Exp; branches; next 1.2; 1.2 date 98.02.16.10.50.04; author frueauf; state Exp; branches; next 1.1; 1.1 date 98.02.15.22.02.40; author tron; state Exp; branches; next ; desc @@ 1.7 log @update to version 2.80.0 @ text @$NetBSD: patch-ac,v 1.6 1998/08/07 10:40:54 agc Exp $ --- xa_audio.c.orig Mon Mar 23 18:54:59 1998 +++ xa_audio.c Sun Apr 26 12:04:40 1998 @@@@ -4508,31 +4508,53 @@@@ a_info.blocksize = 1024; ioctl(devAudio, AUDIO_SETINFO, &a_info); AUDIO_INITINFO(&a_info); - -#ifndef AUDIO_ENCODING_SLINEAR - a_info.play.encoding = AUDIO_ENCODING_PCM16; -#else - /* NetBSD-1.3 */ - a_info.play.encoding = AUDIO_ENCODING_SLINEAR; /* Signed, nativeorder */ -#endif - ioctl(devAudio, AUDIO_SETINFO, &a_info); - AUDIO_INITINFO(&a_info); a_info.mode = AUMODE_PLAY | AUMODE_PLAY_ALL; ioctl(devAudio, AUDIO_SETINFO, &a_info); +#ifdef AUDIO_ENCODING_SLINEAR + /* Use new encoding names */ AUDIO_INITINFO(&a_info); + a_info.play.encoding = AUDIO_ENCODING_SLINEAR; a_info.play.precision = 16; + if (ioctl(devAudio, AUDIO_SETINFO, &a_info) < 0) { + AUDIO_INITINFO(&a_info); + a_info.play.encoding = AUDIO_ENCODING_ULINEAR; + a_info.play.precision = 8; + ioctl(devAudio, AUDIO_SETINFO, &a_info); + } +#else + AUDIO_INITINFO(&a_info); + a_info.play.encoding = AUDIO_ENCODING_PCM16; + a_info.play.precision = 16; + if (ioctl(devAudio, AUDIO_SETINFO, &a_info) < 0) { + AUDIO_INITINFO(&a_info); + a_info.play.encoding = AUDIO_ENCODING_PCM; + a_info.play.precision = 8; + ioctl(devAudio, AUDIO_SETINFO, &a_info); + } +#endif + AUDIO_INITINFO(&a_info); + a_info.play.channels = /*2*/1; ioctl(devAudio, AUDIO_SETINFO, &a_info); AUDIO_INITINFO(&a_info); - a_info.play.sample_rate = 11025; + a_info.play.sample_rate = 22050; ioctl(devAudio, AUDIO_SETINFO, &a_info); ioctl(devAudio, AUDIO_GETINFO, &a_info); - xa_audio_hard_type = (a_info.play.precision==8)?XA_AUDIO_LINEAR_1M - :XA_AUDIO_SIGNED_2ML; + if (a_info.play.channels == 2) + if (a_info.play.precision == 8) + xa_audio_hard_type = XA_AUDIO_LINEAR_1S; + else + xa_audio_hard_type = XA_AUDIO_SIGNED_2SL; + else + if (a_info.play.precision == 8) + xa_audio_hard_type = XA_AUDIO_LINEAR_1M; + else + xa_audio_hard_type = XA_AUDIO_SIGNED_2ML; xa_audio_hard_freq = a_info.play.sample_rate; xa_audio_hard_buff = a_info.blocksize; - xa_audio_hard_bps = (a_info.play.precision==8)?1:2; - xa_audio_hard_chans = 1; + xa_audio_hard_bps = a_info.play.precision / 8; + xa_audio_hard_chans = a_info.play.channels; + Gen_Ulaw_2_Signed(); Gen_Signed_2_Ulaw(); @ 1.6 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update to 2.70.7.0. @ text @d1 2 @ 1.4 log @Clean up the audio setup a bit. @ text @d1 3 a3 4 --- xa_audio.c.orig Sun Jan 26 11:22:03 1997 +++ xa_audio.c Sat Mar 7 07:56:29 1998 @@@@ -4479,26 +4479,57 @@@@ AUDIO_INITINFO(&a_info); a5 2 +#ifdef AUDIO_ENCODING_SLINEAR + /* Use new encoding names */ d7 2 d10 7 a16 1 + a_info.mode = AUMODE_PLAY | AUMODE_PLAY_ALL; d18 2 d22 1 a22 1 + a_info.play.precision = 16; a30 3 a_info.mode = AUMODE_PLAY | AUMODE_PLAY_ALL; ioctl(devAudio, AUDIO_SETINFO, &a_info); AUDIO_INITINFO(&a_info); d32 1 a32 1 a_info.play.precision = 16; @ 1.3 log @back out previous change, AUDIO_ENCODING_SLINEAR is right. See pr 5000 why I was confused. Thanx to Matthias Scheler for forcing me test this again :) @ text @d1 4 a4 3 --- xa_audio.c-orig Mon May 26 12:57:15 1997 +++ xa_audio.c Mon May 26 15:55:13 1997 @@@@ -4480,6 +4480,22 @@@@ a6 1 AUDIO_INITINFO(&a_info); d9 5 a14 5 + ioctl(devAudio, AUDIO_SETINFO, &a_info); + AUDIO_INITINFO(&a_info); + a_info.mode = AUMODE_PLAY | AUMODE_PLAY_ALL; + ioctl(devAudio, AUDIO_SETINFO, &a_info); + AUDIO_INITINFO(&a_info); d23 2 a24 1 a_info.play.encoding = AUDIO_ENCODING_PCM16; d27 1 a27 2 @@@@ -4488,6 +4504,7 @@@@ AUDIO_INITINFO(&a_info); d29 9 a38 1 +#endif d40 2 a41 1 a_info.play.sample_rate = 11025; d43 24 @ 1.2 log @Use AUDIO_ENCODING_LINEAR_LE instead of AUDIO_ENCODING_SLINEAR. @ text @d7 1 a7 1 +#ifdef AUDIO_ENCODING_LINEAR_LE d9 1 a9 1 + a_info.play.encoding = AUDIO_ENCODING_LINEAR_LE; @ 1.1 log @Patch by Roland C. Dowdeswell to fix audio playback for NetBSD >=1.3. @ text @d1 2 a2 2 --- xa_audio.c.orig Sun Jan 26 17:22:03 1997 +++ xa_audio.c Sun Feb 15 21:34:01 1998 d7 1 a7 1 +#ifdef AUDIO_ENCODING_SLINEAR d9 1 a9 1 + a_info.play.encoding = AUDIO_ENCODING_SLINEAR; @