head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.54 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.52 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.50 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.48 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-4-PATCH002:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2000.02.29.16.57.45; author scw; state dead; branches; next 1.1; 1.1 date 99.12.04.12.56.32; author scw; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.12.04.12.56.32; author scw; state Exp; branches; next ; desc @@ 1.2 log @Update to version 2.1.1. The author has incorporated the stdio changes which were originally in the patch files being deleted. @ text @$NetBSD: patch-ac,v 1.1 1999/12/04 12:56:32 scw Exp $ --- sound/DPSample.cc.orig Fri Dec 3 21:37:53 1999 +++ sound/DPSample.cc Tue Nov 30 21:12:28 1999 @@@@ -532,7 +532,7 @@@@ int rawSignedData, int rawEndian) { - int irixFile; + fhandle irixFile; AFfilesetup fileSetup; AFfilehandle file; long bits; @@@@ -559,8 +559,13 @@@@ clear (); // Open requested irix file +#ifndef USE_STDIO irixFile = open (newFilename,O_RDONLY); if (irixFile == -1) return "Cannot open specified file"; +#else + irixFile = fopen (newFilename,"rb"); + if (irixFile == NULL) return "Cannot open specified file"; +#endif // Check irix file format if (sampleFormat == AF_FORMAT_AIFF) @@@@ -572,16 +577,28 @@@@ case AF_FILE_AIFFC : break; case AF_FILE_UNSUPPORTED : +#ifndef USE_STDIO close (irixFile); +#else + fclose (irixFile); +#endif return "Unsupported file format"; case AF_FILE_UNKNOWN : default: +#ifndef USE_STDIO close (irixFile); +#else + fclose (irixFile); +#endif return "Unknown file format"; } } +#ifndef USE_STDIO close (irixFile); +#else + fclose (irixFile); +#endif // Disable void handling AFseterrorhandler (DPSampleAudiofileError); @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Digital audio recording and processing package. @ text @@