head 1.16; access; symbols pkgsrc-2026Q1:1.16.0.106 pkgsrc-2026Q1-base:1.16 pkgsrc-2025Q4:1.16.0.104 pkgsrc-2025Q4-base:1.16 pkgsrc-2025Q3:1.16.0.102 pkgsrc-2025Q3-base:1.16 pkgsrc-2025Q2:1.16.0.100 pkgsrc-2025Q2-base:1.16 pkgsrc-2025Q1:1.16.0.98 pkgsrc-2025Q1-base:1.16 pkgsrc-2024Q4:1.16.0.96 pkgsrc-2024Q4-base:1.16 pkgsrc-2024Q3:1.16.0.94 pkgsrc-2024Q3-base:1.16 pkgsrc-2024Q2:1.16.0.92 pkgsrc-2024Q2-base:1.16 pkgsrc-2024Q1:1.16.0.90 pkgsrc-2024Q1-base:1.16 pkgsrc-2023Q4:1.16.0.88 pkgsrc-2023Q4-base:1.16 pkgsrc-2023Q3:1.16.0.86 pkgsrc-2023Q3-base:1.16 pkgsrc-2023Q2:1.16.0.84 pkgsrc-2023Q2-base:1.16 pkgsrc-2023Q1:1.16.0.82 pkgsrc-2023Q1-base:1.16 pkgsrc-2022Q4:1.16.0.80 pkgsrc-2022Q4-base:1.16 pkgsrc-2022Q3:1.16.0.78 pkgsrc-2022Q3-base:1.16 pkgsrc-2022Q2:1.16.0.76 pkgsrc-2022Q2-base:1.16 pkgsrc-2022Q1:1.16.0.74 pkgsrc-2022Q1-base:1.16 pkgsrc-2021Q4:1.16.0.72 pkgsrc-2021Q4-base:1.16 pkgsrc-2021Q3:1.16.0.70 pkgsrc-2021Q3-base:1.16 pkgsrc-2021Q2:1.16.0.68 pkgsrc-2021Q2-base:1.16 pkgsrc-2021Q1:1.16.0.66 pkgsrc-2021Q1-base:1.16 pkgsrc-2020Q4:1.16.0.64 pkgsrc-2020Q4-base:1.16 pkgsrc-2020Q3:1.16.0.62 pkgsrc-2020Q3-base:1.16 pkgsrc-2020Q2:1.16.0.58 pkgsrc-2020Q2-base:1.16 pkgsrc-2020Q1:1.16.0.38 pkgsrc-2020Q1-base:1.16 pkgsrc-2019Q4:1.16.0.60 pkgsrc-2019Q4-base:1.16 pkgsrc-2019Q3:1.16.0.56 pkgsrc-2019Q3-base:1.16 pkgsrc-2019Q2:1.16.0.54 pkgsrc-2019Q2-base:1.16 pkgsrc-2019Q1:1.16.0.52 pkgsrc-2019Q1-base:1.16 pkgsrc-2018Q4:1.16.0.50 pkgsrc-2018Q4-base:1.16 pkgsrc-2018Q3:1.16.0.48 pkgsrc-2018Q3-base:1.16 pkgsrc-2018Q2:1.16.0.46 pkgsrc-2018Q2-base:1.16 pkgsrc-2018Q1:1.16.0.44 pkgsrc-2018Q1-base:1.16 pkgsrc-2017Q4:1.16.0.42 pkgsrc-2017Q4-base:1.16 pkgsrc-2017Q3:1.16.0.40 pkgsrc-2017Q3-base:1.16 pkgsrc-2017Q2:1.16.0.36 pkgsrc-2017Q2-base:1.16 pkgsrc-2017Q1:1.16.0.34 pkgsrc-2017Q1-base:1.16 pkgsrc-2016Q4:1.16.0.32 pkgsrc-2016Q4-base:1.16 pkgsrc-2016Q3:1.16.0.30 pkgsrc-2016Q3-base:1.16 pkgsrc-2016Q2:1.16.0.28 pkgsrc-2016Q2-base:1.16 pkgsrc-2016Q1:1.16.0.26 pkgsrc-2016Q1-base:1.16 pkgsrc-2015Q4:1.16.0.24 pkgsrc-2015Q4-base:1.16 pkgsrc-2015Q3:1.16.0.22 pkgsrc-2015Q3-base:1.16 pkgsrc-2015Q2:1.16.0.20 pkgsrc-2015Q2-base:1.16 pkgsrc-2015Q1:1.16.0.18 pkgsrc-2015Q1-base:1.16 pkgsrc-2014Q4:1.16.0.16 pkgsrc-2014Q4-base:1.16 pkgsrc-2014Q3:1.16.0.14 pkgsrc-2014Q3-base:1.16 pkgsrc-2014Q2:1.16.0.12 pkgsrc-2014Q2-base:1.16 pkgsrc-2014Q1:1.16.0.10 pkgsrc-2014Q1-base:1.16 pkgsrc-2013Q4:1.16.0.8 pkgsrc-2013Q4-base:1.16 pkgsrc-2013Q3:1.16.0.6 pkgsrc-2013Q3-base:1.16 pkgsrc-2013Q2:1.16.0.4 pkgsrc-2013Q2-base:1.16 pkgsrc-2013Q1:1.16.0.2 pkgsrc-2013Q1-base:1.16 pkgsrc-2012Q4:1.14.0.8 pkgsrc-2012Q4-base:1.14 pkgsrc-2012Q3:1.14.0.6 pkgsrc-2012Q3-base:1.14 pkgsrc-2012Q2:1.14.0.4 pkgsrc-2012Q2-base:1.14 pkgsrc-2012Q1:1.14.0.2 pkgsrc-2012Q1-base:1.14 pkgsrc-2011Q4:1.13.0.42 pkgsrc-2011Q4-base:1.13 pkgsrc-2011Q3:1.13.0.40 pkgsrc-2011Q3-base:1.13 pkgsrc-2011Q2:1.13.0.38 pkgsrc-2011Q2-base:1.13 pkgsrc-2011Q1:1.13.0.36 pkgsrc-2011Q1-base:1.13 pkgsrc-2010Q4:1.13.0.34 pkgsrc-2010Q4-base:1.13 pkgsrc-2010Q3:1.13.0.32 pkgsrc-2010Q3-base:1.13 pkgsrc-2010Q2:1.13.0.30 pkgsrc-2010Q2-base:1.13 pkgsrc-2010Q1:1.13.0.28 pkgsrc-2010Q1-base:1.13 pkgsrc-2009Q4:1.13.0.26 pkgsrc-2009Q4-base:1.13 pkgsrc-2009Q3:1.13.0.24 pkgsrc-2009Q3-base:1.13 pkgsrc-2009Q2:1.13.0.22 pkgsrc-2009Q2-base:1.13 pkgsrc-2009Q1:1.13.0.20 pkgsrc-2009Q1-base:1.13 pkgsrc-2008Q4:1.13.0.18 pkgsrc-2008Q4-base:1.13 pkgsrc-2008Q3:1.13.0.16 pkgsrc-2008Q3-base:1.13 cube-native-xorg:1.13.0.14 cube-native-xorg-base:1.13 pkgsrc-2008Q2:1.13.0.12 pkgsrc-2008Q2-base:1.13 cwrapper:1.13.0.10 pkgsrc-2008Q1:1.13.0.8 pkgsrc-2008Q1-base:1.13 pkgsrc-2007Q4:1.13.0.6 pkgsrc-2007Q4-base:1.13 pkgsrc-2007Q3:1.13.0.4 pkgsrc-2007Q3-base:1.13 pkgsrc-2007Q2:1.13.0.2 pkgsrc-2007Q2-base:1.13 pkgsrc-2007Q1:1.12.0.10 pkgsrc-2007Q1-base:1.12 pkgsrc-2006Q4:1.12.0.8 pkgsrc-2006Q4-base:1.12 pkgsrc-2006Q3:1.12.0.6 pkgsrc-2006Q3-base:1.12 pkgsrc-2006Q2:1.12.0.4 pkgsrc-2006Q2-base:1.12 pkgsrc-2006Q1:1.12.0.2 pkgsrc-2006Q1-base:1.12 pkgsrc-2005Q4:1.11.0.6 pkgsrc-2005Q4-base:1.11 pkgsrc-2005Q3:1.11.0.4 pkgsrc-2005Q3-base:1.11 pkgsrc-2005Q2:1.11.0.2 pkgsrc-2005Q2-base:1.11 pkgsrc-2005Q1:1.10.0.14 pkgsrc-2005Q1-base:1.10 pkgsrc-2004Q4:1.10.0.12 pkgsrc-2004Q4-base:1.10 pkgsrc-2004Q3:1.10.0.10 pkgsrc-2004Q3-base:1.10 pkgsrc-2004Q2:1.10.0.8 pkgsrc-2004Q2-base:1.10 pkgsrc-2004Q1:1.10.0.6 pkgsrc-2004Q1-base:1.10 pkgsrc-2003Q4:1.10.0.4 pkgsrc-2003Q4-base:1.10 netbsd-1-6-1:1.10.0.2 netbsd-1-6-1-base:1.10 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.5 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.4 netbsd-1-4-PATCH001:1.4 netbsd-1-4-RELEASE:1.4 netbsd-1-3-PATCH003:1.4 FreeBSD-97-10-25:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.16 date 2013.01.06.03.21.47; author ryoon; state Exp; branches; next 1.15; 1.15 date 2013.01.05.12.57.22; author mef; state Exp; branches; next 1.14; 1.14 date 2012.01.30.01.34.38; author sbd; state Exp; branches; next 1.13; 1.13 date 2007.05.05.21.31.10; author markd; state Exp; branches; next 1.12; 1.12 date 2006.01.11.11.32.38; author markd; state Exp; branches; next 1.11; 1.11 date 2005.06.04.23.43.51; author markd; state Exp; branches; next 1.10; 1.10 date 2002.12.03.09.13.39; author jlam; state Exp; branches; next 1.9; 1.9 date 2002.12.03.09.03.08; author jlam; state Exp; branches; next 1.8; 1.8 date 2002.11.28.11.40.46; author markd; state Exp; branches; next 1.7; 1.7 date 2002.10.18.14.02.12; author jlam; state Exp; branches; next 1.6; 1.6 date 2001.07.14.13.35.13; author jlam; state Exp; branches; next 1.5; 1.5 date 2000.08.04.01.31.56; author jlam; state Exp; branches; next 1.4; 1.4 date 98.08.07.10.36.05; author agc; state Exp; branches; next 1.3; 1.3 date 98.05.18.11.09.00; author agc; state Exp; branches; next 1.2; 1.2 date 98.02.09.19.56.13; author augustss; state dead; branches; next 1.1; 1.1 date 97.10.28.23.18.44; author augustss; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 97.10.28.23.18.44; author augustss; state Exp; branches; next ; desc @@ 1.16 log @Fix build on OpenBSD/amd64 5.2. * Add OpenBSD conditionals * Add workaround for library link @ text @$NetBSD: patch-ab,v 1.15 2013/01/05 12:57:22 mef Exp $ (1.9) Convert -lossaudio to portable $(LIBOSSAUDIO) Make this work with audio/oss again. (1.13) Add NetBSDArchitecture (1.14) In server/Imakefile add a target for $(VOXWARELIBS) that call make for the targets directory. This should fix the occasional problem were make complains with "don't know how to make dda/voxware/libvoxware.a" (1.5) Taking care nasd.conf (etc) --- server/Imakefile.orig Thu Feb 26 01:16:01 2009 +++ server/Imakefile @@@@ -60,8 +60,8 @@@@ XCOMM $NCDId: @@(#)Imakefile,v 1.17 1995/12/06 01:33:07 SYSLIBS = #endif -#ifdef NetBSDArchitecture - SYSLIBS = -lossaudio +#if defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) + SYSLIBS = $(LIBOSSAUDIO) #endif CBRT = @@@@ -96,7 +96,7 @@@@ ALL1 = nasd #endif -#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) +#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) || defined(OpenBSDArchitecture) # define CanBuildAuServer YES #if !defined(GNUMachArchitecture) @@@@ -206,23 +206,34 @@@@ dirs: FRC @@@@\ $(MAKE) $(MFLAGS) PassCDebugFlags all @@@@\ @@@@\ FRC: + #endif /* ForceSubdirs */ #endif /* Project X < 5 */ ForceSubdirs($(DEPDIRS) $(SUBDIRS)) +$(VOXWARELIBS): + @@echo "making all in $(CURRENT_DIR)/${@@D}..." + @@(cd ${@@D} && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@@@\ + PassCDebugFlags all) || exit $$? + clean:: $(RM) $(ALL) ETCDIR = NasConfigSearchPath + EGDIR = ${PREFIX}/share/examples/nas InstallManPage(nasd,$(MANDIR)) #ifdef InstallGenManPage InstallGenManPage(nasd.conf,$(FILEMANDIR),$(FILEMANSUFFIX)) #else +#ifdef InstallNamedTarget +InstallNamedTarget(install.man,nasd.conf.man,$(INSTMANFLAGS),$(FILEMANDIR),nasd.conf.$(FILEMANSUFFIX)) +#else InstallManPage(nasd.conf,$(FILEMANDIR)) #endif -InstallNonExecFile(nasd.conf.eg,$(ETCDIR)) +#endif +InstallNonExecFile(nasd.conf.eg,$(EGDIR)) #else /* CanBuildAuServer */ @ 1.15 log @(1) Bump version 1.9.1 to 1.9.3 based on PR pkg/45449 ChangeLog attached at the bottom of this Log. (2) patches/patch-ag Delete the first chunk, upstream included the first one. Comments added from cvs log (1.4) (3) patches/patch-ah # fix for "libpthread: Unlocking unlocked mutex" seen on NetBSD-4 removed (upstream included). (4) Comments added for patches/patch-aa -- Add NetBSDArchitecture and DragonFlyArchitecture patches/patch-ab -- (1.9) Convert -lossaudio to portable $(LIBOSSAUDIO) Make this work with audio/oss again. -- (1.13) Add NetBSDArchitecture -- (1.14) In server/Imakefile add a target for $(VOXWARELIBS) that call make for the targets directory. This should fix the occasional problem were make complains with "don't know how to make dda/voxware/libvoxware.a" -- (1.5) Taking care nasd.conf (etc) patches/patch-ae -- Honor ${PKG_SYSCONFDIR}, see SUBST in Makefile. patches/patch-af -- Don't build/install auscope. (5) PLIST.client PLIST.server Convert IMAKE_MANNEWSUFFIX to IMAKE_MAN_SUFFIX which pkglint flagged and by reading the thread starting with http://mail-index.netbsd.org/tech-pkg/2005/12/06/0034.html (Please correct this part if some OS'en get problems.) ----- Version 1.9.3 (stable) 05/13/2011 - overdue 1.9.3 maint release - Older X11 systems used to define SharedLibX and friends if the installed X11 system was built with shared lib support. Newer X11's use SharedLibX11 instead. Same for {Normal|Debug|Profile}LibX. So check for these and set appropriately in NetAudio.tmpl. Shared lib installations should deal with libXau dependancies correctly now. - auerswald: Added MacOS X aka Darwin to list of systems that need to explicitely link libaudio.so against libXau. This enables building of the shared library libaudio.so on MacOS X. There is currently no NAS server for MacOS X. Version 1.9.2 (stable) 03/07/2009 - overdue 1.9.2 release. - patch from Aleksey Cheusov: "fix for "libpthread: Unlocking unlocked mutex" seen on NetBSD-4" libaudio: OpenSvr.c: The server mutex was being unlocked, even though it was never locked in the first place. - Hugo Vanwoerkom reported thousands of diagnostics in his syslog: "doSetup: elementRate == 0! Forcing to 5000". Fix doSetup to only warn about this when the debug level is above 10. - auerswald: document syslog usage use syslog if running as a daemon, stderr otherwise add syslog-usage-change to HISTORY file - steve_mcintyre: Minor man page fix ported from the Debian packages. Multiple minor portability changes ported over from the Debian packages. Cope with Hurd and GNU/KFreeBSD and other systems using glibc - apply patch from sourceforge user moinakg: Libaudio is built with missing linker flags on OpenSolaris like missing lXt, so it results in symbol not found errors at runtime. I am including an Imakefile patch below that fixed this. ----- @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.14 2012/01/30 01:34:38 sbd Exp $ d16 1 a16 1 --- server/Imakefile.orig 2007-06-16 19:03:22.000000000 +0000 d18 2 a19 1 @@@@ -61,7 +61,7 @@@@ d22 1 a22 1 #ifdef NetBSDArchitecture d24 1 d29 1 a29 1 @@@@ -96,7 +96,7 @@@@ d34 1 a34 1 +#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) d38 1 a38 1 @@@@ -206,23 +206,34 @@@@ @ 1.14 log @In server/Imakefile add a target for $(VOXWARELIBS) that call make for the targets directory. This should fix the occasional problem were make complains with "don't know how to make dda/voxware/libvoxware.a" @ text @d1 14 a14 1 $NetBSD: patch-ab,v 1.13 2007/05/05 21:31:10 markd Exp $ d18 1 a18 1 @@@@ -61,7 +61,7 @@@@ XCOMM $NCDId: @@(#)Imakefile,v 1.17 1995/ d27 1 a27 1 @@@@ -96,7 +96,7 @@@@ ALL1 = nasd d35 2 a36 2 # if defined(cygwinArchitecture) @@@@ -204,23 +204,34 @@@@ dirs: FRC @@@@\ @ 1.13 log @Update nas to 1.9 Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.12 2006/01/11 11:32:38 markd Exp $ d3 1 a3 1 --- server/Imakefile.orig 2006-08-14 13:04:17.000000000 +1200 d23 16 a38 1 @@@@ -213,14 +213,19 @@@@ clean:: @ 1.12 log @Some makedepend's object if a referenced header file is a dangling symlink, so create the actual release.h file at the includes stage as the depends stage is too late (server/os is before lib/audio). Fixes PR pkg/32098 from Gilles Dauphin. Also fix installation of nasd.conf manual page on systems where imake doesn't have an InstallGenManPage rule (ie. solaris with openwin) @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.11 2005/06/04 23:43:51 markd Exp $ d3 1 a3 1 --- server/Imakefile.orig 2005-06-04 16:40:58.000000000 +1200 d18 2 a19 2 -#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) +#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__) @ 1.11 log @Update to version 1.7b 6/3/2005 1.7b (devel) - applied patch from 'Inma', correcting a connection hang in Solaris 9. This reworks some of the very old and primitive fd_set stuff in Aulibint.c . - updated config/config.sub and config.guess to properly detect DragonFly systems. - Applied patch from Mark Davies and Joerg Sonnenberger correcting some BSD issues and adding DragonFly support. Then nasd.conf man page is always installed in $FILEMANDIR for all systems. 4/10/2005 1.7a (devel) - applied patch from Mark Davies correcting audio/Imakefile to properly define BSD44SOCKETS on NetBSD systems. - Applied patch from Steve McIntyre correcting CYWIN -> CYGWIN typo in server/dda/voxware/auvoxware.c - applied patch from Steve McIntyre Correcting some Gcc 4.0 and AMD64 issues. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.10 2002/12/03 09:13:39 jlam Exp $ d23 1 a23 1 @@@@ -213,6 +213,7 @@@@ clean:: d31 1 a31 1 @@@@ -220,7 +221,7 @@@@ InstallGenManPage(nasd.conf,$(FILEMANDIR d33 3 d39 1 @ 1.10 log @Ensure that the voxware (OSS) audio server is built on NetBSD/sparc. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- server/Imakefile.orig Tue Jul 23 18:49:33 2002 d14 1 a14 1 @@@@ -99,7 +99,7 @@@@ RCMANDIR = $(MANDIR) d18 2 a19 2 -#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) +#if defined(i386SVR4Architecture) || defined(NetBSDArchitecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) d22 2 a23 2 # if defined(LinuxArchitecture) @@@@ -224,6 +224,7 @@@@ clean:: d31 1 a31 1 @@@@ -231,7 +232,7 @@@@ InstallGenManPage(nasd.conf,$(RCMANDIR), d33 1 a33 1 InstallManPage(nasd.conf,$(RCMANDIR)) @ 1.9 log @Make this work with audio/oss again. @ text @d14 9 @ 1.8 log @Update of nas to 1.6. pkgsrc changes: PKG_SYSCONFised. changes: bug fixes and ... 1.5h 10/12/2002 - Added SoundFileGetProc() to get access to the toSound and fromSound Procs in _SoundFileInfo[]. Needed for xemacs. - Added AudioLibraryVersionMajor, AudioLibraryVersionMinor, and AudioLibraryVersionTeeny to audiolib.h. Somewhat more informative than just the old AudioLibraryVersion which was set a '2'. The older AudioLibraryVersion define is still there however. 1.5g 10/7/2002 - changed inputsection defaults in nasd.conf.eg to 44.1Khz, 2 channel 16b sound. outputsection also defaults to 44.1Khz now, instead of 33Khz. - began some CC ANSI'fication of libaudio. 1.5f 8/26/2002 7/20/2002 - added cygwinArchitecture to the server Imakefile so auvoxware will be built on cygwin systems. - Removed the SoundFileInfo[] array in sound.h so cygwin would be happy. Apps should not have been accessing that array directly anyways. Added the following new functions to sound.c (that used to be macros in sound.h): SoundFileFormatString, SoundValidDataFormat, SoundFileFormatToString, SoundFileFormatToAbbrev, SoundFileFormatToSuffixes Assuming your code did not attempt to directly access SoundFileInfo[], no changes should be required. libaudio.so revision bumped to 2.3 - re-added back the Xtutils stuff, as some of the demos did in fact require it. cygwin has a problem with implicitly defined functions anyway. 7/9/2002 - rename dia/nasconfig.* to dia/nasconf.* to avoid name collision with NasConfig.h on windows systems. 1.5e 7/7/2002 - added patch from Nicolas Escuder that adds support for Windows operating systems using Cygwin. Even the NAS server is now supported. There are still issues with building regarding Imake, but once I can get more information, I'll fix those up. Read the README.CYGWIN file in the nas/ directory for instructions. I will provide a link on the nas-links page to precompiled windows binaries for libaudio.dll, nasd, and some clients - provided by Nicolas. - based on idea from Nicolas, added background (-b) mode to nasd, to force it to run in the background. Actually, he supplied a patch, but I just redid it to work properly with unix systems. - added NAS_AUDIOMSGFILE in config/NasConfig.h to specify where audio messages are stored (ADMPATH in os/osinit.c). 1.5d 6/1/2002 - added .ps -> .pdf conversions in doc/pdf/ - added html versions of man pages in doc/html/ 1.5c 3/27/2002 - removed Xtutil[hc] from libaudio and removed references to Xtutil.h in the clients. Suggestion by Paul Fox. 1.5b 3/16/2002 - added patch from Marco Molteni to add a '-local' option to nasd. Specifying this option allows only local clients to connect. - moved allow_any_host into the NasConfig struct. Along with the new '-local' option. 1.5a 2/23/2002 - more STARTSERVER fixes - there was still one case where when STARTSERVER was defined, nasd could be called with the wrong display number due to a bug in _AuConnectServer. - changed LEX/YACC DEBUG token to CDEBUG to avoid conflicts when building nas with '-DDEBUG' - DEFAULT_AUSERVER is now ":0" rather than "tcp/localhost:8000". A local socket connection will startup faster than a tcp connection. - mutex.h - corrected unixware 7.x build problem (XMUTEX_INITIALIZER) in mutex.h - added same check for sun/solaris boxes - got rid of XUSE_MTSAFE_API - now controlled by NAS_USEMTSAFEAPI defined in config/NasConfig.h If you think you are having mutex problems, you can edit config/NasConfig.h and '#undef' NAS_USEMTSAFEAPI, then rebuild everthing. This will turn off threadsafety in libaudio. - added new option, 'gain', to config file in the input/output sections. This sets the default gains when nasd starts up (if MixerInit is enabled). Only in voxware for now. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 2002/10/18 14:02:12 jlam Exp $ d3 1 a3 1 --- server/Imakefile.orig Wed Jul 24 13:49:33 2002 d5 10 a14 10 @@@@ -38,7 +38,7 @@@@ EXTENSIONS = XAULIB = XDMCPLIB = - OS = os/libos.a $(XAULIB) $(XDMCPLIB) + OS = os/libos.a $(XAULIB) $(XDMCPLIB) $(LIBOSSAUDIO) BSDEMUL = $(LIBSRC)/Berk/Berklib.o MFB = CFB = @@@@ -224,6 +224,7 @@@@ d22 1 a22 1 @@@@ -231,7 +232,7 @@@@ @ 1.7 log @Make this packages OSS-aware. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- server/Imakefile.orig Tue Dec 12 20:45:48 2000 d5 1 a5 1 @@@@ -38,7 +38,7 @@@@ XCOMM $NCDId: @@(#)Imakefile,v 1.17 1995/ d14 1 a14 1 @@@@ -217,10 +217,11 @@@@ clean:: d18 1 a18 1 + EGDIR = ${PREFIX}/share/examples/nas d21 3 d25 1 @ 1.6 log @Update nas to the latest stable release 1.4.2. Changes from 1.4 include major bugfixes in the clients and bumping the major version of the library. @ text @d3 1 a3 1 --- server/Imakefile.orig Tue Dec 12 23:45:48 2000 d5 10 a14 1 @@@@ -217,10 +217,11 @@@@ @ 1.5 log @Update nas from 1.2.5 to 1.4. Relevant changes from version 1.2.5: - corrected a problem in the voxware server where when ReleaseDevice was enabled, the device would be held open when nasd was first started until the first connection was made. - changed documentation regarding the new location of the web site (http://radscan.com/nas.html) - integrated config handling in all servers, based on a lex/yacc parser from Stephen Hocking that was in the voxware server. - config file is /etc/nas/nasd.conf an example config file is installed. - parser errors are a bit more informative ;-) - each server now has a config.c and config.h file that provides the ddaSetConfig() functionality required of each server by dia/. In the SGI case, it's just a stub. ddaSetConfig() ignores options it doesn't understand (required behavior). - server cmdline options '-v' (verbose) and '-d ' (debug messages) added. These override nasd.conf settings. - hooks added to all servers in config.c - ddaProcessArg() and ddaUseMsg() for integrated arg handling. - voxware server: - release device functionality now controlled by nasd.conf - mixer init policy now controlled by nasd.conf - sun server: - added integrated sun (ausuni) module (now built by default) into the distribution. - release device functionality now controlled by nasd.conf - hpux server: - added device release (ReleaseDevice) capability to hpux server. All servers except for sgi now support this functionality. - fixed sample rate change problem in hpux server - separated hardware init code for ReleaseDevice functionality - added new option in nasd.conf to select either the EXT (external - headphones/speakers) or INT (internal speaker) output device by default - renamed generated server binary from au* to nasd for all servers - man pages updated (auserver.man and AUVoxConfig.man respectively). - Added patches from Mark Davies for NetBSD. @ text @d3 3 a5 3 --- server/Imakefile.orig Sat Feb 12 15:22:43 2000 +++ server/Imakefile Thu Aug 3 21:03:54 2000 @@@@ -207,10 +207,11 @@@@ d12 1 a12 1 InstallManPage(nasd.conf,$(MANDIR)) @ 1.4 log @Add NetBSD RCS Ids. @ text @d3 12 a14 4 --- lib/audio/8svx.c 1998/05/18 10:17:50 1.1 +++ lib/audio/8svx.c 1998/05/18 10:22:13 @@@@ -43,7 +43,7 @@@@ char n; d16 1 a16 493 if ((status = fread(c, sizeof(SvxChunk), 1, fp))) - if (LITTLE_ENDIAN) + if (NAS_LITTLE_ENDIAN) swapl(&c->ckSize, n); return status; @@@@ -87,17 +87,17 @@@@ { AuUint8 c; - si->numSamples = FileReadL(si->fp, LITTLE_ENDIAN); - FileReadL(si->fp, LITTLE_ENDIAN); - FileReadL(si->fp, LITTLE_ENDIAN); - si->sampleRate = FileReadS(si->fp, LITTLE_ENDIAN); + si->numSamples = FileReadL(si->fp, NAS_LITTLE_ENDIAN); + FileReadL(si->fp, NAS_LITTLE_ENDIAN); + FileReadL(si->fp, NAS_LITTLE_ENDIAN); + si->sampleRate = FileReadS(si->fp, NAS_LITTLE_ENDIAN); readByte(&c); readByte(&c); if (c) Err(); - FileReadL(si->fp, LITTLE_ENDIAN); + FileReadL(si->fp, NAS_LITTLE_ENDIAN); } /* sound data chunk */ else if (!cmpID(&ck.ckID, SVX_BodyID)) @@@@ -149,7 +149,7 @@@@ si->sizeOffset = ftell(si->fp); - if (!FileWriteL(0, si->fp, LITTLE_ENDIAN) || + if (!FileWriteL(0, si->fp, NAS_LITTLE_ENDIAN) || !fwrite(SVX_8svxID, sizeof(SVX_ID), 1, si->fp)) Err(); @@@@ -158,7 +158,7 @@@@ if ((n = strlen(si->comment))) { if (!fwrite(SVX_NameID, sizeof(SVX_ID), 1, si->fp) || - !FileWriteL(n, si->fp, LITTLE_ENDIAN) || + !FileWriteL(n, si->fp, NAS_LITTLE_ENDIAN) || !fwrite(si->comment, n, 1, si->fp)) Err(); @@@@ -166,13 +166,13 @@@@ } if (!fwrite(SVX_VhdrID, sizeof(SVX_ID), 1, si->fp) || - !FileWriteL(SVX_SizeofVhdrChunk, si->fp, LITTLE_ENDIAN) || - !FileWriteL(si->numSamples, si->fp, LITTLE_ENDIAN) || - !FileWriteL(0, si->fp, LITTLE_ENDIAN) || - !FileWriteL(0, si->fp, LITTLE_ENDIAN) || - !FileWriteS(si->sampleRate, si->fp, LITTLE_ENDIAN) || - !FileWriteS(0, si->fp, LITTLE_ENDIAN) || - !FileWriteL(SVX_MaxVolume, si->fp, LITTLE_ENDIAN)) + !FileWriteL(SVX_SizeofVhdrChunk, si->fp, NAS_LITTLE_ENDIAN) || + !FileWriteL(si->numSamples, si->fp, NAS_LITTLE_ENDIAN) || + !FileWriteL(0, si->fp, NAS_LITTLE_ENDIAN) || + !FileWriteL(0, si->fp, NAS_LITTLE_ENDIAN) || + !FileWriteS(si->sampleRate, si->fp, NAS_LITTLE_ENDIAN) || + !FileWriteS(0, si->fp, NAS_LITTLE_ENDIAN) || + !FileWriteL(SVX_MaxVolume, si->fp, NAS_LITTLE_ENDIAN)) Err(); si->fileSize += sizeof(SvxChunk) + SVX_SizeofVhdrChunk; @@@@ -182,7 +182,7 @@@@ si->dataOffset = ftell(si->fp); - if (!FileWriteL(0, si->fp, LITTLE_ENDIAN)) + if (!FileWriteL(0, si->fp, NAS_LITTLE_ENDIAN)) Err(); si->fileSize += sizeof(SvxChunk); @@@@ -202,9 +202,9 @@@@ if (si->writing) { fseek(si->fp, si->sizeOffset, 0); - FileWriteL(si->fileSize + si->dataSize, si->fp, LITTLE_ENDIAN); + FileWriteL(si->fileSize + si->dataSize, si->fp, NAS_LITTLE_ENDIAN); fseek(si->fp, si->dataOffset, 0); - FileWriteL(si->dataSize, si->fp, LITTLE_ENDIAN); + FileWriteL(si->dataSize, si->fp, NAS_LITTLE_ENDIAN); } status = fclose(si->fp); --- lib/audio/aiff.c 1998/05/18 10:20:15 1.1 +++ lib/audio/aiff.c 1998/05/18 10:23:52 @@@@ -218,7 +218,7 @@@@ char n; if ((status = fread(c, sizeof(AiffChunk), 1, fp))) - if (LITTLE_ENDIAN) + if (NAS_LITTLE_ENDIAN) swapl(&c->ckSize, n); return status; @@@@ -262,9 +262,9 @@@@ { char rate[AIFF_SizeofExtended]; - ai->channels = FileReadS(ai->fp, LITTLE_ENDIAN); - ai->numSamples = FileReadL(ai->fp, LITTLE_ENDIAN); - ai->bitsPerSample = FileReadS(ai->fp, LITTLE_ENDIAN); + ai->channels = FileReadS(ai->fp, NAS_LITTLE_ENDIAN); + ai->numSamples = FileReadL(ai->fp, NAS_LITTLE_ENDIAN); + ai->bitsPerSample = FileReadS(ai->fp, NAS_LITTLE_ENDIAN); if (!fread(rate, AIFF_SizeofExtended, 1, ai->fp)) Err(); @@@@ -277,8 +277,8 @@@@ AuInt32 blockSize, offset; - offset = FileReadL(ai->fp, LITTLE_ENDIAN); - blockSize = FileReadL(ai->fp, LITTLE_ENDIAN); + offset = FileReadL(ai->fp, NAS_LITTLE_ENDIAN); + blockSize = FileReadL(ai->fp, NAS_LITTLE_ENDIAN); ai->dataOffset = ftell(ai->fp) - sizeof(long) * 3 + offset; ai->dataSize = ck.ckSize - 8; @@@@ -290,7 +290,7 @@@@ { unsigned short numComments; - numComments = FileReadS(ai->fp, LITTLE_ENDIAN); + numComments = FileReadS(ai->fp, NAS_LITTLE_ENDIAN); if (numComments) { @@@@ -298,9 +298,9 @@@@ AIFF_MARKER_ID marker; unsigned short count; - timeStamp = FileReadL(ai->fp, LITTLE_ENDIAN); - marker = FileReadS(ai->fp, LITTLE_ENDIAN); - count = FileReadS(ai->fp, LITTLE_ENDIAN); + timeStamp = FileReadL(ai->fp, NAS_LITTLE_ENDIAN); + marker = FileReadS(ai->fp, NAS_LITTLE_ENDIAN); + count = FileReadS(ai->fp, NAS_LITTLE_ENDIAN); if (count) { @@@@ -353,7 +353,7 @@@@ ai->sizeOffset = ftell(ai->fp); - if (!FileWriteL(0, ai->fp, LITTLE_ENDIAN) || + if (!FileWriteL(0, ai->fp, NAS_LITTLE_ENDIAN) || !fwrite(AIFF_AiffID, sizeof(AIFF_ID), 1, ai->fp)) Err(); @@@@ -367,15 +367,15 @@@@ size = AIFF_SizeofCommentChunk + PAD2(n); if (!fwrite(AIFF_CommentID, sizeof(AIFF_ID), 1, ai->fp) || - !FileWriteL(size, ai->fp, LITTLE_ENDIAN) || + !FileWriteL(size, ai->fp, NAS_LITTLE_ENDIAN) || /* one comment */ - !FileWriteS(1, ai->fp, LITTLE_ENDIAN) || + !FileWriteS(1, ai->fp, NAS_LITTLE_ENDIAN) || /* XXX: maybe we should use the real time */ - !FileWriteL(0, ai->fp, LITTLE_ENDIAN) || + !FileWriteL(0, ai->fp, NAS_LITTLE_ENDIAN) || /* no marker */ - !FileWriteS(0, ai->fp, LITTLE_ENDIAN) || + !FileWriteS(0, ai->fp, NAS_LITTLE_ENDIAN) || /* comment length */ - !FileWriteS(n, ai->fp, LITTLE_ENDIAN) || + !FileWriteS(n, ai->fp, NAS_LITTLE_ENDIAN) || !fwrite(ai->comment, n, 1, ai->fp)) Err(); @@@@ -388,10 +388,10 @@@@ ConvertToIeeeExtended((double) ai->sampleRate, rate); if (!fwrite(AIFF_CommonID, sizeof(AIFF_ID), 1, ai->fp) || - !FileWriteL(AIFF_SizeofCommonChunk, ai->fp, LITTLE_ENDIAN) || - !FileWriteS(ai->channels, ai->fp, LITTLE_ENDIAN) || - !FileWriteL(ai->numSamples, ai->fp, LITTLE_ENDIAN) || - !FileWriteS(ai->bitsPerSample, ai->fp, LITTLE_ENDIAN) || + !FileWriteL(AIFF_SizeofCommonChunk, ai->fp, NAS_LITTLE_ENDIAN) || + !FileWriteS(ai->channels, ai->fp, NAS_LITTLE_ENDIAN) || + !FileWriteL(ai->numSamples, ai->fp, NAS_LITTLE_ENDIAN) || + !FileWriteS(ai->bitsPerSample, ai->fp, NAS_LITTLE_ENDIAN) || !fwrite(rate, AIFF_SizeofExtended, 1, ai->fp)) Err(); @@@@ -402,11 +402,11 @@@@ ai->dataOffset = ftell(ai->fp); - if (!FileWriteL(0, ai->fp, LITTLE_ENDIAN) || + if (!FileWriteL(0, ai->fp, NAS_LITTLE_ENDIAN) || /* offset */ - !FileWriteL(0, ai->fp, LITTLE_ENDIAN) || + !FileWriteL(0, ai->fp, NAS_LITTLE_ENDIAN) || /* block size */ - !FileWriteL(0, ai->fp, LITTLE_ENDIAN)) + !FileWriteL(0, ai->fp, NAS_LITTLE_ENDIAN)) Err(); ai->fileSize += sizeof(AiffChunk) + AIFF_SizeofSoundDataChunk; @@@@ -430,9 +430,9 @@@@ fseek(ai->fp, ai->sizeOffset, 0); FileWriteL(ai->fileSize + PAD2(ai->dataSize), ai->fp, - LITTLE_ENDIAN); + NAS_LITTLE_ENDIAN); fseek(ai->fp, ai->dataOffset, 0); - FileWriteL(ai->dataSize, ai->fp, LITTLE_ENDIAN); + FileWriteL(ai->dataSize, ai->fp, NAS_LITTLE_ENDIAN); } status = fclose(ai->fp); --- lib/audio/convutil.c 1998/05/18 10:20:15 1.1 +++ lib/audio/convutil.c 1998/05/18 10:24:44 @@@@ -107,7 +107,7 @@@@ convert(char, x << 8); break; case AuFormatLinearSigned16MSB: - if (LITTLE_ENDIAN) + if (NAS_LITTLE_ENDIAN) convert(short, ((((unsigned short) x) >> 8) | (x << 8))); #if 0 else @@@@ -115,14 +115,14 @@@@ #endif break; case AuFormatLinearUnsigned16MSB: - if (LITTLE_ENDIAN) + if (NAS_LITTLE_ENDIAN) convert(short, (((((unsigned short) x) >> 8) | (x << 8)) ^ 0x8000)); else convert(short, x ^ 0x8000); break; case AuFormatLinearSigned16LSB: - if (BIG_ENDIAN) + if (NAS_BIG_ENDIAN) convert(short, ((((unsigned short) x) >> 8) | (x << 8))); #if 0 else @@@@ -130,7 +130,7 @@@@ #endif break; case AuFormatLinearUnsigned16LSB: - if (BIG_ENDIAN) + if (NAS_BIG_ENDIAN) convert(short, (((((unsigned short) x) >> 8) | (x << 8)) ^ 0x8000)); else @@@@ -266,7 +266,7 @@@@ convert(char, x >> 8); break; case AuFormatLinearSigned16MSB: - if (LITTLE_ENDIAN) + if (NAS_LITTLE_ENDIAN) convert(short, ((((unsigned short) x) >> 8) | (x << 8))); #if 0 else @@@@ -276,7 +276,7 @@@@ #endif break; case AuFormatLinearUnsigned16MSB: - if (LITTLE_ENDIAN) + if (NAS_LITTLE_ENDIAN) { convert(short, (((((unsigned short) x) >> 8) | (x << 8)) ^ 0x8000)); @@@@ -287,7 +287,7 @@@@ } break; case AuFormatLinearSigned16LSB: - if (BIG_ENDIAN) + if (NAS_BIG_ENDIAN) convert(short, ((((unsigned short) x) >> 8) | (x << 8))); #if 0 else @@@@ -297,7 +297,7 @@@@ #endif break; case AuFormatLinearUnsigned16LSB: - if (BIG_ENDIAN) + if (NAS_BIG_ENDIAN) { convert(short, (((((unsigned short) x) >> 8) | (x << 8)) ^ 0x8000)); --- lib/audio/fileutil.h 1998/05/18 10:18:30 1.1 +++ lib/audio/fileutil.h 1998/05/18 10:25:31 @@@@ -58,8 +58,8 @@@@ #endif #endif /* _FUNCPROTOBEGIN */ -#define LITTLE_ENDIAN (*(char *) &endian) -#define BIG_ENDIAN (!LITTLE_ENDIAN) +#define NAS_LITTLE_ENDIAN (*(char *) &endian) +#define NAS_BIG_ENDIAN (!NAS_LITTLE_ENDIAN) static int endian = 1; /* byte swap a AuInt32 */ --- lib/audio/snd.c 1998/05/18 10:20:15 1.1 +++ lib/audio/snd.c 1998/05/18 10:25:57 @@@@ -62,7 +62,7 @@@@ { if (si->writing) { - if (LITTLE_ENDIAN) + if (NAS_LITTLE_ENDIAN) { char n; @@@@ -136,7 +136,7 @@@@ Err(); /* do byte swapping if necessary */ - if (LITTLE_ENDIAN) + if (NAS_LITTLE_ENDIAN) { char n; @@@@ -201,7 +201,7 @@@@ { h = si->h; - if (LITTLE_ENDIAN) + if (NAS_LITTLE_ENDIAN) { /* header is big-endian */ char n; --- lib/audio/voc.c 1998/05/18 10:20:15 1.1 +++ lib/audio/voc.c 1998/05/18 10:26:31 @@@@ -66,9 +66,9 @@@@ if (!fread(buf, VOC_ID_SIZE, 1, vi->fp) || strncmp(buf, VOC_ID, VOC_ID_SIZE) || - FileReadS(vi->fp, BIG_ENDIAN) != VOC_DATA_OFFSET || - FileReadS(vi->fp, BIG_ENDIAN) != VOC_VERSION || - FileReadS(vi->fp, BIG_ENDIAN) != VOC_VERSION_CHK) + FileReadS(vi->fp, NAS_BIG_ENDIAN) != VOC_DATA_OFFSET || + FileReadS(vi->fp, NAS_BIG_ENDIAN) != VOC_VERSION || + FileReadS(vi->fp, NAS_BIG_ENDIAN) != VOC_VERSION_CHK) Err(); do @@@@ -153,9 +153,9 @@@@ if (!(vi->fp = fopen(name, AU_WRITE_BINARY)) || !fwrite(VOC_ID, VOC_ID_SIZE, 1, vi->fp) || - !FileWriteS(VOC_DATA_OFFSET, vi->fp, BIG_ENDIAN) || - !FileWriteS(VOC_VERSION, vi->fp, BIG_ENDIAN) || - !FileWriteS(VOC_VERSION_CHK, vi->fp, BIG_ENDIAN)) + !FileWriteS(VOC_DATA_OFFSET, vi->fp, NAS_BIG_ENDIAN) || + !FileWriteS(VOC_VERSION, vi->fp, NAS_BIG_ENDIAN) || + !FileWriteS(VOC_VERSION_CHK, vi->fp, NAS_BIG_ENDIAN)) Err(); if ((n = strlen(vi->comment))) --- lib/audio/wave.c 1998/05/18 10:20:15 1.1 +++ lib/audio/wave.c 1998/05/18 10:27:46 @@@@ -47,7 +47,7 @@@@ char n; if ((status = fread(c, sizeof(RiffChunk), 1, fp))) - if (BIG_ENDIAN) + if (NAS_BIG_ENDIAN) swapl(&c->ckSize, n); return status; @@@@ -130,18 +130,18 @@@@ { AuInt32 dummy; - wi->format = FileReadS(wi->fp, BIG_ENDIAN); - wi->channels = FileReadS(wi->fp, BIG_ENDIAN); - wi->sampleRate = FileReadL(wi->fp, BIG_ENDIAN); + wi->format = FileReadS(wi->fp, NAS_BIG_ENDIAN); + wi->channels = FileReadS(wi->fp, NAS_BIG_ENDIAN); + wi->sampleRate = FileReadL(wi->fp, NAS_BIG_ENDIAN); /* we don't care about the next two fields */ - dummy = FileReadL(wi->fp, BIG_ENDIAN); - dummy = FileReadS(wi->fp, BIG_ENDIAN); + dummy = FileReadL(wi->fp, NAS_BIG_ENDIAN); + dummy = FileReadS(wi->fp, NAS_BIG_ENDIAN); if (wi->format != RIFF_WAVE_FORMAT_PCM) Err(); - wi->bitsPerSample = FileReadS(wi->fp, BIG_ENDIAN); + wi->bitsPerSample = FileReadS(wi->fp, NAS_BIG_ENDIAN); /* skip any other format specific fields */ fseek(wi->fp, PAD2(ck.ckSize - 16), 1); @@@@ -199,7 +199,7 @@@@ wi->sizeOffset = ftell(wi->fp); - if (!FileWriteL(0, wi->fp, BIG_ENDIAN) || + if (!FileWriteL(0, wi->fp, NAS_BIG_ENDIAN) || !fwrite(RIFF_WaveID, sizeof(RIFF_FOURCC), 1, wi->fp)) Err(); @@@@ -213,10 +213,10 @@@@ size = sizeof(RiffChunk) + sizeof(RIFF_FOURCC) + PAD2(n); if (!fwrite(RIFF_ListID, sizeof(RIFF_FOURCC), 1, wi->fp) || - !FileWriteL(size, wi->fp, BIG_ENDIAN) || + !FileWriteL(size, wi->fp, NAS_BIG_ENDIAN) || !fwrite(RIFF_ListInfoID, sizeof(RIFF_FOURCC), 1, wi->fp) || !fwrite(RIFF_InfoIcmtID, sizeof(RIFF_FOURCC), 1, wi->fp) || - !FileWriteL(n, wi->fp, BIG_ENDIAN) || + !FileWriteL(n, wi->fp, NAS_BIG_ENDIAN) || !fwrite(wi->comment, n, 1, wi->fp)) Err(); @@@@ -227,15 +227,15 @@@@ } if (!fwrite(RIFF_WaveFmtID, sizeof(RIFF_FOURCC), 1, wi->fp) || - !FileWriteL(RIFF_WaveFmtSize, wi->fp, BIG_ENDIAN) || - !FileWriteS(RIFF_WAVE_FORMAT_PCM, wi->fp, BIG_ENDIAN) || - !FileWriteS(wi->channels, wi->fp, BIG_ENDIAN) || - !FileWriteL(wi->sampleRate, wi->fp, BIG_ENDIAN) || + !FileWriteL(RIFF_WaveFmtSize, wi->fp, NAS_BIG_ENDIAN) || + !FileWriteS(RIFF_WAVE_FORMAT_PCM, wi->fp, NAS_BIG_ENDIAN) || + !FileWriteS(wi->channels, wi->fp, NAS_BIG_ENDIAN) || + !FileWriteL(wi->sampleRate, wi->fp, NAS_BIG_ENDIAN) || !FileWriteL(wi->channels * wi->sampleRate * (wi->bitsPerSample >> 3), - wi->fp, BIG_ENDIAN) || + wi->fp, NAS_BIG_ENDIAN) || !FileWriteS(wi->channels * (wi->bitsPerSample >> 3), wi->fp, - BIG_ENDIAN) || - !FileWriteS(wi->bitsPerSample, wi->fp, BIG_ENDIAN)) + NAS_BIG_ENDIAN) || + !FileWriteS(wi->bitsPerSample, wi->fp, NAS_BIG_ENDIAN)) Err(); wi->fileSize += sizeof(RiffChunk) + RIFF_WaveFmtSize; @@@@ -245,7 +245,7 @@@@ wi->dataOffset = ftell(wi->fp); - if (!FileWriteL(0, wi->fp, BIG_ENDIAN)) + if (!FileWriteL(0, wi->fp, NAS_BIG_ENDIAN)) Err(); wi->fileSize += sizeof(RiffChunk); @@@@ -268,9 +268,9 @@@@ fputc(0, wi->fp); /* pad the data */ fseek(wi->fp, wi->sizeOffset, 0); - FileWriteL(wi->fileSize + PAD2(wi->dataSize), wi->fp, BIG_ENDIAN); + FileWriteL(wi->fileSize + PAD2(wi->dataSize), wi->fp, NAS_BIG_ENDIAN); fseek(wi->fp, wi->dataOffset, 0); - FileWriteL(wi->dataSize, wi->fp, BIG_ENDIAN); + FileWriteL(wi->dataSize, wi->fp, NAS_BIG_ENDIAN); } status = fclose(wi->fp); --- clients/audio/auedit/auedit.c 1998/05/18 10:16:02 1.1 +++ clients/audio/auedit/auedit.c 1998/05/18 10:11:17 @@@@ -77,8 +77,8 @@@@ #include "pause.xbm" #define APP_CLASS "Auedit" -#define LITTLE_ENDIAN (*(char *) &g->endian == 1) -#define BIG_ENDIAN (!LITTLE_ENDIAN) +#define NAS_LITTLE_ENDIAN (*(char *) &g->endian == 1) +#define NAS_BIG_ENDIAN (!NAS_LITTLE_ENDIAN) #define SELECTION_HEADER_SIZE 4 #define DEFAULT_FREQUENCY 8000 #define ZOOM_SCALE 2 @@@@ -508,7 +508,7 @@@@ XtVaSetValues(g->frequency, XtNstring, buf, NULL); s = SoundCreate(SoundFileFormatNone, - LITTLE_ENDIAN ? AuFormatLinearSigned16LSB : + NAS_LITTLE_ENDIAN ? AuFormatLinearSigned16LSB : AuFormatLinearSigned16MSB, g->numTracks, freq, g->numSamples, NULL); @@@@ -693,7 +693,7 @@@@ setTime(g, g->positionTime, start); s = SoundCreate(SoundFileFormatNone, - LITTLE_ENDIAN ? AuFormatLinearSigned16LSB : + NAS_LITTLE_ENDIAN ? AuFormatLinearSigned16LSB : AuFormatLinearSigned16MSB, g->numTracks, g->sampleRate, end - start, NULL); @ 1.3 log @Move all occurrences of LITTLE_ENDIAN to NAS_LITTLE_ENDIAN, and BIG_ENDIAN to NAS_BIG_ENDIAN, to avoid conflicts with the definitions in @ text @d1 2 @ 1.2 log @Remove nas package until someone has ported it. @ text @d1 499 a499 16 *** server/dda/voxware/auvoxware.c.orig Thu Nov 3 11:24:11 1994 --- server/dda/voxware/auvoxware.c Thu Nov 3 11:24:50 1994 *************** *** 755,760 **** --- 755,765 ---- /* * Setup soundcard at maximum audio quality. */ + + #ifdef __FreeBSD__ + #define NO_16_BIT_SAMPLING + #endif + static void setupSoundcard(sndStatPtr) SndStat* sndStatPtr; { @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @Initial import of FreeBSD audio packages. @ text @@