From e667c0fa3b4f5c0d0eb8ef35821e728ac548fe18 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@pkgsrc.org>
Date: Mon, 3 Dec 2001 04:22:40 +0000
Subject: Use 44100, 22050, 11025 and 5512Hz, not rounded variants.

---
 graphics/libflash/distinfo         |  4 ++--
 graphics/libflash/patches/patch-ac | 48 +++++++++++++++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/graphics/libflash/distinfo b/graphics/libflash/distinfo
index f5cf44a7696..31953f79e1e 100644
--- a/graphics/libflash/distinfo
+++ b/graphics/libflash/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.4 2001/12/02 21:25:30 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2001/12/03 04:22:40 mycroft Exp $
 
 SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420
 Size (flash-0.4.10.tgz) = 358995 bytes
 SHA1 (patch-aa) = 084064cfd3d4e650f98b93dd07404a1c52828848
 SHA1 (patch-ab) = e67474d893793b58cdf544722046d91e6cb2044b
-SHA1 (patch-ac) = d2157455ce48225a8fc796262bc0a0585da854c5
+SHA1 (patch-ac) = f1b440e84ea721cf2f32075927a60336f301c29a
 SHA1 (patch-ad) = 177bb07d1377c1923f8548cdece23292c2b897b8
 SHA1 (patch-ae) = 301e3359b28320822373c54a2c97e6ef528e55c7
 SHA1 (patch-af) = 918bfd3f9f021dded65f8379bec3b42deb30cf65
diff --git a/graphics/libflash/patches/patch-ac b/graphics/libflash/patches/patch-ac
index 4f941a4d553..4bdc38415ee 100644
--- a/graphics/libflash/patches/patch-ac
+++ b/graphics/libflash/patches/patch-ac
@@ -1,8 +1,9 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
+$NetBSD: patch-ac,v 1.2 2001/12/03 04:22:41 mycroft Exp $
 
---- Lib/sound.cc.orig	Fri Aug 25 17:03:22 2000
-+++ Lib/sound.cc	Fri Aug 25 17:05:29 2000
-@@ -27,6 +27,10 @@
+--- Lib/sound.cc.orig	Wed Sep  1 15:10:03 1999
++++ Lib/sound.cc	Mon Dec  3 04:12:21 2001
+@@ -26,8 +26,12 @@
+ #include <fcntl.h>
  #include <sys/ioctl.h>
  #ifndef NOSOUND
 +#ifdef __NetBSD__
@@ -13,17 +14,52 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/08/28 17:33:50 rh Exp $
 +#endif
  
  #ifdef RCSID
-@@ -163,5 +167,5 @@
+ static char *rcsid = "$Id: patch-ac,v 1.2 2001/12/03 04:22:41 mycroft Exp $";
+@@ -56,16 +60,16 @@
+ Sound::setSoundFlags(long f) {
+ 	switch (GET_SOUND_RATE_CODE(f)) {
+ 		case 0:
+-			soundRate = 5500;
++			soundRate = 5512;
+ 			break;
+ 		case 1:
+-			soundRate = 11000;
++			soundRate = 11025;
+ 			break;
+ 		case 2:
+-			soundRate = 22000;
++			soundRate = 22050;
+ 			break;
+ 		case 3:
+-			soundRate = 44000;
++			soundRate = 44100;
+ 			break;
+ 	}
+ 	if (f & soundIs16bit) {
+@@ -162,7 +166,7 @@
+ 	}
  
  	// Reset device
 -	status = ioctl(dsp, SNDCTL_DSP_RESET);
 +	status = ioctl(dsp, SNDCTL_DSP_RESET, NULL);
  	if (status < 0) perror("ioctl SNDCTL_DSP_RESET");
  
-@@ -325,5 +329,5 @@
+ 	// Set sample size
+@@ -187,7 +191,7 @@
+ 	}
+ 
+ 	// Set sound rate in Hertz
+-	soundRate = 11000;
++	soundRate = 11025;
+ 	status = ioctl(dsp, SNDCTL_DSP_SPEED, &soundRate);
+ 	if (status < 0) perror("ioctl SNDCTL_DSP_SPEED");
+ 
+@@ -324,7 +328,7 @@
+ 	if (nbBytes) {
  		// At last ! Play It !
  		write(dsp,buffer,nbBytes);
 -		status = ioctl(dsp, SNDCTL_DSP_POST);
 +		status = ioctl(dsp, SNDCTL_DSP_POST, NULL);
  	}
  
+ 	return nbBytes;
-- 
cgit v1.2.3