head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.4 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 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.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.4 date 2010.03.14.14.19.19; author martin; state dead; branches; next 1.3; 1.3 date 99.10.12.04.43.13; author simonb; state Exp; branches; next 1.2; 1.2 date 99.07.10.10.39.04; author tron; state dead; branches; next 1.1; 1.1 date 99.05.01.09.55.32; author tron; state Exp; branches; next ; desc @@ 1.4 log @Update mpg123 to version 1.10.1. Thanks to for answering lots of stupid questions and general guidance. @ text @$NetBSD: patch-ag,v 1.3 1999/10/12 04:43:13 simonb Exp $ --- decode.c.orig Tue Jan 26 23:47:05 1999 +++ decode.c Tue Oct 12 01:19:18 1999 @@@@ -13,9 +13,9 @@@@ #include "mpg123.h" #define WRITE_SAMPLE(samples,sum,clip) \ - if( (sum) > 32767.0) { *(samples) = 0x7fff; (clip)++; } \ - else if( (sum) < -32768.0) { *(samples) = -0x8000; (clip)++; } \ - else { *(samples) = sum; } + if( (sum) > REAL_PLUS_32767) { *(samples) = 0x7fff; (clip)++; } \ + else if( (sum) < REAL_MINUS_32768) { *(samples) = -0x8000; (clip)++; } \ + else { *(samples) = REAL_TO_SHORT(sum); } int synth_1to1_8bit(real *bandPtr,int channel,unsigned char *samples,int *pnt) { @@@@ -156,36 +156,36 @@@@ for (j=16;j;j--,window+=0x10,samples+=step) { real sum; - sum = *window++ * *b0++; - sum -= *window++ * *b0++; - sum += *window++ * *b0++; - sum -= *window++ * *b0++; - sum += *window++ * *b0++; - sum -= *window++ * *b0++; - sum += *window++ * *b0++; - sum -= *window++ * *b0++; - sum += *window++ * *b0++; - sum -= *window++ * *b0++; - sum += *window++ * *b0++; - sum -= *window++ * *b0++; - sum += *window++ * *b0++; - sum -= *window++ * *b0++; - sum += *window++ * *b0++; - sum -= *window++ * *b0++; + sum = REAL_MUL(*window++, *b0++); + sum -= REAL_MUL(*window++, *b0++); + sum += REAL_MUL(*window++, *b0++); + sum -= REAL_MUL(*window++, *b0++); + sum += REAL_MUL(*window++, *b0++); + sum -= REAL_MUL(*window++, *b0++); + sum += REAL_MUL(*window++, *b0++); + sum -= REAL_MUL(*window++, *b0++); + sum += REAL_MUL(*window++, *b0++); + sum -= REAL_MUL(*window++, *b0++); + sum += REAL_MUL(*window++, *b0++); + sum -= REAL_MUL(*window++, *b0++); + sum += REAL_MUL(*window++, *b0++); + sum -= REAL_MUL(*window++, *b0++); + sum += REAL_MUL(*window++, *b0++); + sum -= REAL_MUL(*window++, *b0++); WRITE_SAMPLE(samples,sum,clip); } { real sum; - sum = window[0x0] * b0[0x0]; - sum += window[0x2] * b0[0x2]; - sum += window[0x4] * b0[0x4]; - sum += window[0x6] * b0[0x6]; - sum += window[0x8] * b0[0x8]; - sum += window[0xA] * b0[0xA]; - sum += window[0xC] * b0[0xC]; - sum += window[0xE] * b0[0xE]; + sum = REAL_MUL(window[0x0], b0[0x0]); + sum += REAL_MUL(window[0x2], b0[0x2]); + sum += REAL_MUL(window[0x4], b0[0x4]); + sum += REAL_MUL(window[0x6], b0[0x6]); + sum += REAL_MUL(window[0x8], b0[0x8]); + sum += REAL_MUL(window[0xA], b0[0xA]); + sum += REAL_MUL(window[0xC], b0[0xC]); + sum += REAL_MUL(window[0xE], b0[0xE]); WRITE_SAMPLE(samples,sum,clip); b0-=0x10,window-=0x20,samples+=step; } @@@@ -194,22 +194,22 @@@@ for (j=15;j;j--,b0-=0x20,window-=0x10,samples+=step) { real sum; - sum = -*(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; - sum -= *(--window) * *b0++; + sum = -REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); + sum -= REAL_MUL(*(--window), *b0++); WRITE_SAMPLE(samples,sum,clip); } @@@@ -219,5 +219,3 @@@@ return clip; } - - @ 1.3 log @Add fixed-point support used by the arm32. XXX: Uses strongarm C-compiler options to use 32x32=64 int multiply. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update "mpg123" package version 0.59r. Changes since version 0.59q: - applied audio_alib changes from Ralf Hildebrandt - some 'paetsches' from DK - minor optimizations in layer3 (dequantize/huffman) - BSDOS 4.0 with gcc added to Makefile () - Solaris-ESD patch from Ryan Prosser - Added Frontend changes from Bertrand Petit - more DK 'paetsches' (final dk7-clubhaus edition), includes extended term control - SGI audio fix for non RAD machines from Erik Mouw - fixed ugly bug in layer3 dequant for bt==2 (may cause high frequency clitchs) - AMD-3DNow optimizations in decode and dct64 - OS/2 reworked from Samuel Audet (see audio_os2.c for more) - added freebsd-esd make-entry from Daniel O'Connor (darius@@guppy.dons.net.au) - added enhanced head_check from D. Skarda <0rfelyus@@atrey.karlin.mff.cuni.cz> - applied 'xterm-title-patch' from "Wilson, Jeff D" - more esd changes from Robert Bihlmeyer - applied Hannu Napari's SGI audio patches - minor changes in httpget.c and mpg123.c - added native AIX support from Juergen.Schoew@@unix-ag.uni-siegen.de - applied playlist patch from - more SGI audio patches from Gilles Zunino - applied esdserver patch from Matthew Parslow - added some fixes for control_generic @ text @d1 1 a1 39 $NetBSD: patch-ag,v 1.1 1999/05/01 09:55:32 tron Exp $ --- httpget.c Mon Nov 23 08:17:46 1998 +++ httpget.c Thu Apr 29 15:08:05 1999 @@@@ -154,6 +154,7 @@@@ if (!(proxyurl = getenv("http_proxy"))) proxyurl = getenv("HTTP_PROXY"); if (proxyurl && proxyurl[0] && strcmp(proxyurl, "none")) { + host = NULL; if (!(url2hostport(proxyurl, &host, &proxyip, &proxyport))) { fprintf (stderr, "Unknown proxy host \"%s\".\n", host ? host : ""); @@@@ -184,18 +185,22 @@@@ myip = proxyip; } else { + host = NULL; if (!(sptr = url2hostport(purl, &host, &myip, &myport))) { fprintf (stderr, "Unknown host \"%s\".\n", host ? host : ""); exit (1); } - if (host) - free (host); strcat (request, sptr); } sprintf (request + strlen(request), " HTTP/1.0\r\nUser-Agent: %s/%s\r\n", prgName, prgVersion); + if (host) { + sprintf(request + strlen(request), + "Host: %s:%u\r\n", host, myport); + free (host); + } strcat (request, ACCEPT_HEAD); strcat (request, "\r\n"); server.sin_family = AF_INET; >Audit-Trail: >Unformatted: d3 121 @ 1.1 log @Add support for fetching files from name based virtual WWW servers. Patch supplied by Michael Graff in PR pkg/7500. @ text @d1 1 a1 1 $NetBSD$ @