head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.192 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.190 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.188 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.186 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.184 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.182 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.180 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.178 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.176 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.174 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.172 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.170 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.168 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.166 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.164 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.162 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.160 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.158 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.156 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.154 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.152 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.150 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.148 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.144 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.124 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.146 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.142 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.140 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.138 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.136 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.134 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.132 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.130 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.128 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.126 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.122 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.120 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.118 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.116 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.114 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.112 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.110 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.108 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.106 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.104 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.102 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.100 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.98 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.96 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.94 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.92 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.90 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.88 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.86 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.84 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.82 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.80 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.78 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.76 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.74 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.72 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.70 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.68 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.66 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.64 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.62 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.60 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.58 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.56 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.54 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.52 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.50 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.48 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.46 pkgsrc-2008Q1:1.3.0.44 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.42 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.40 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.38 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.36 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.34 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.32 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.30 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.28 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.26 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.24 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.22 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.20 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.2 netbsd-1-4-PATCH003:1.2 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1; locks; strict; comment @# @; 1.3 date 2001.11.18.15.03.39; author itohy; state Exp; branches; next 1.2; 1.2 date 98.08.07.10.36.24; author agc; state Exp; branches; next 1.1; 1.1 date 98.02.21.22.46.48; author hubertf; state Exp; branches; next ; desc @@ 1.3 log @- Fix file I/O on alpha. Only RIFF(PCM) is tested. - Fix offset on copy & paste when current format has header (not raw format). @ text @$NetBSD: patch-aj,v 1.2 1998/08/07 10:36:24 agc Exp $ --- src/riff.c.orig Thu Aug 13 08:27:10 1998 +++ src/riff.c Sun Nov 18 22:19:23 2001 @@@@ -33,7 +33,7 @@@@ #ifdef linux #include -#elif defined (FreeBSD) +#elif defined (FreeBSD) || defined(__NetBSD__) #include #elif defined (sgi) #include @@@@ -45,12 +45,12 @@@@ #include "types.h" #include "audio_file.h" +#include "endian.h" #include "riff.h" #include "xwave.h" #include "ccitt/g711.h" #include "ccitt/g72x.h" #include "adpcm2pcm/adpcm.h" -#include "endian.h" extern Main_Data *MD; @@@@ -79,9 +79,10 @@@@ { RiffHeader rh; FmtHeader fh; - long chunk; + int32_t chunk; int headoffs,i; - ulong length,slength; + u_int32_t length; + off_t slength; if (mode==AF_NEW) return(riff_new(af)); @@@@ -112,7 +113,7 @@@@ if ((i=read (af->fd,&chunk,sizeof(chunk)))!=sizeof(chunk)) return(AF_ERROR); headoffs+=i; - if ((i=read (af->fd,&length,sizeof(ulong)))!=sizeof(ulong)) + if ((i=read (af->fd,&length,sizeof(length)))!=sizeof(length)) return(AF_ERROR); headoffs+=i; @@@@ -172,8 +173,9 @@@@ { RiffHeader rh; FmtHeader fh; - long chunk; - ulong length,count; + int32_t chunk; + u_int32_t length; + int count; length=af->length; @@@@ -344,19 +346,26 @@@@ { switch (af.comp) { case AF_PCM: + break; return(lseek(af.fd,pos,mode)); case AF_ALAW: case AF_MULAW: + pos /= 2; + break; return(lseek(af.fd,pos/2,mode)); case AF_ADPCM: + pos /= 4; + break; return(lseek(af.fd,pos/4,mode)); + default: + return(AF_ERROR); } - return(AF_ERROR); + return(lseek(af.fd, mode == SEEK_SET ? pos + af.headoffs : pos, mode)); } int riff_close(Audio_File af) { - if (riff_seek(af,0,SEEK_SET)==AF_ERROR) return(AF_ERROR); + if (lseek(af.fd,0,SEEK_SET)) return(AF_ERROR); if (riff_new (&af)==AF_ERROR) return(AF_ERROR); return(close(af.fd)); @ 1.2 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- orig/xwave/src/riff.c Mon Nov 25 13:35:17 1996 +++ src/riff.c Sat Sep 13 04:29:02 1997 d14 77 @ 1.1 log @Audio player/recorder/editor for the X Window System. @ text @d1 2 @