make sample playing via /dev/audio work

3 files changed, 124 insertions, 3 deletions

diff --git a/sysutils/xcdroast/files/patch-sum b/sysutils/xcdroast/files/patch-sum
index 4b3f982ce64..28b34bc0308 100644
--- a/sysutils/xcdroast/files/patch-sum
+++ b/sysutils/xcdroast/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.1.1.1 2001/02/10 23:23:35 frueauf Exp $
+$NetBSD: patch-sum,v 1.2 2001/03/10 10:31:33 drochner Exp $
 
-MD5 (patch-aa) = 285934d8bfe854fc89cfd2a08f5991cf
-MD5 (patch-ab) = a81c559662ce460da8610871d2bfd6ba
+SHA1 (patch-aa) = 96207a9ae670099258507894854a351fca321050
+SHA1 (patch-ab) = bb019f49215db561d29f52971d186600f1db710e
+SHA1 (patch-ac) = 0ed9ee21a221800b8c7d1c6d3e17a734c81f3eca
+SHA1 (patch-ad) = 0a9ec2f5f20a39211669fdb0b613955295a41720
diff --git a/sysutils/xcdroast/patches/patch-ac b/sysutils/xcdroast/patches/patch-ac
new file mode 100644
index 00000000000..2ffd8d4ca4f
--- /dev/null
+++ b/sysutils/xcdroast/patches/patch-ac
@@ -0,0 +1,77 @@
+$NetBSD: patch-ac,v 1.1 2001/03/10 10:31:33 drochner Exp $
+
+--- io.c~	Sun Nov 26 13:55:57 2000
++++ io.c	Fri Mar  9 21:43:07 2001
+@@ -20,7 +20,8 @@
+ #include <sys/soundcard.h>
+ #include <sys/ioctl.h>
+ #endif
+-#ifdef sun 
++#if defined(sun) || defined(__NetBSD__)
++#include <sys/ioctl.h>
+ #include <sys/audioio.h>
+ #endif
+ #ifdef hpux 
+@@ -782,7 +783,7 @@
+ GList *dsp;
+ GList *loop;
+ struct stat buf;
+-#ifdef sun
++#if defined(sun) || defined(__NetBSD__)
+ gchar *audiodev;
+ #endif
+ 	dsp = NULL;
+@@ -797,7 +798,7 @@
+ 		dsp = g_list_append(dsp,"/dev/dsp1");
+ 	}
+ #endif
+-#ifdef sun
++#if defined(sun) || defined(__NetBSD__)
+ 	/* check if the user has any special audio-hardware running,
+ 	   which set the AUDIODEV-environment-variable */
+ 	audiodev = getenv("AUDIODEV");
+@@ -863,7 +864,7 @@
+ 		}	
+ 	}	
+ #endif
+-#ifdef sun
++#if defined(sun) || defined(__NetBSD__)
+ 
+ 	g_snprintf(tmp,MAXLINE,"%s%s",dsp,"ctl");
+ 
+@@ -2130,7 +2131,7 @@
+ #if defined(linux) || defined(__FreeBSD__)
+ gint val;
+ #endif
+-#ifdef sun
++#if defined(sun) || defined(__NetBSD__)
+ audio_info_t ainfo;
+ #endif
+ #ifdef hpux
+@@ -2163,7 +2164,7 @@
+ 	return ((val & 0x7f) + ((val >> 8) & 0x7f))/2;
+ 
+ #endif
+-#ifdef sun
++#if defined(sun) || defined(__NetBSD__)
+ 
+ 	dodebug(10,"quering mixer %s\n", setupdata.mix_device);
+ 	mix = open(setupdata.mix_device, O_RDONLY);
+@@ -2211,7 +2212,7 @@
+ 
+ gint set_mixer(gint val) {
+ gint mix;
+-#ifdef sun
++#if defined(sun) || defined(__NetBSD__)
+ audio_info_t ainfo;
+ #endif
+ #ifdef hpux
+@@ -2241,7 +2242,7 @@
+ 	close(mix);
+ 
+ #endif 
+-#ifdef sun
++#if defined(sun) || defined(__NetBSD__)
+ 
+ 	dodebug(10,"setting mixer %s to %d\n", setupdata.mix_device, val);
+ 	mix = open(setupdata.mix_device, O_WRONLY);
diff --git a/sysutils/xcdroast/patches/patch-ad b/sysutils/xcdroast/patches/patch-ad
new file mode 100644
index 00000000000..db6e4123bdb
--- /dev/null
+++ b/sysutils/xcdroast/patches/patch-ad
@@ -0,0 +1,42 @@
+$NetBSD: patch-ad,v 1.1 2001/03/10 10:31:34 drochner Exp $
+
+--- wavplay.c~	Sat Jul 15 16:47:44 2000
++++ wavplay.c	Fri Mar  9 21:11:28 2001
+@@ -22,7 +22,8 @@
+ #include <sys/soundcard.h>
+ #include <sys/ioctl.h>
+ #endif
+-#ifdef sun 
++#if defined(sun) || defined(__NetBSD__)
++#include <sys/ioctl.h>
+ #include <sys/audioio.h>
+ #endif
+ #ifdef hpux
+@@ -100,7 +101,7 @@
+ 
+ #endif
+ 
+-#ifdef sun
++#if defined(sun) || defined(__NetBSD__)
+ 
+ /* open the sound-device of solaris and set cd-quality */
+ 
+@@ -127,7 +128,9 @@
+ 	info.play.precision = 16;
+ 	info.play.encoding = AUDIO_ENCODING_LINEAR;
+ 	info.play.buffer_size = abuf_size;
++#ifndef __NetBSD__
+ 	info.output_muted = 0;
++#endif
+ 
+ 	if (ioctl(audio, AUDIO_SETINFO, &info) == -1) {
+ 		g_warning("Unable to set audio parameters\n");
+@@ -251,7 +254,7 @@
+ #if defined(linux) || defined(__FreeBSD__)
+ 	audio = open_linux_audio(audio_dev);
+ #endif
+-#ifdef sun
++#if defined(sun) || defined(__NetBSD__)
+ 	audio = open_solaris_audio(audio_dev);
+ #endif
+ #ifdef hpux