Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
popt
pkgsrc-ng/audio/xwave/patches/patch-ad
Lionel Sambuc 785076ae39 Import of pkgsrc-2013Q2
2013-09-26 17:14:40 +02:00

190 lines
7.0 KiB
Plaintext
Raw Permalink Blame History

$NetBSD: patch-ad,v 1.3 2005/10/03 13:30:20 joerg Exp $
--- orig/xwave/src/audio.c Tue Nov 26 11:13:44 1996
+++ src/audio.c Fri Feb 20 23:46:06 1998
@@ -37,9 +37,12 @@
#ifdef linux
#include <linux/soundcard.h>
-#elif defined(FreeBSD)
+#elif defined(FreeBSD) || defined(__DragonFly__)
#include <machine/soundcard.h>
+#elif defined(__NetBSD__)
+#include <soundcard.h>
+
#elif defined(sgi)
#include <dmedia/audio.h>
@@ -55,7 +58,7 @@
#include "sample_settings.h"
#include "audio.h"
-#if defined(linux) || defined (FreeBSD) || defined(sun)
+#if defined(linux) || defined (FreeBSD) || defined(sun) || defined(__NetBSD__) || defined(__DragonFly__)
static int set_dsp(int o_mode,int res,int channels,int freq,int *buf_size);
#endif
@@ -67,7 +70,7 @@ extern AppResources app_resources;
static Audio_File af;
static int stop_record;
-#if defined (linux) || defined (FreeBSD)
+#if defined (linux) || defined (FreeBSD) || defined(__NetBSD__) || defined(__DragonFly__)
int set_dsp(int o_mode,int res, int channels, int freq, int *buf_size)
{
int check;
@@ -274,7 +277,7 @@ int get_samples(byte* audio_buffer,int m
}
#endif
-#ifdef sun
+#if defined(sun)
void check_audio(Main_Bool *mb)
/* test if there is a play device, and how fast we can play */
{
@@ -307,7 +310,7 @@ void check_audio(Main_Bool *mb)
case AUDIO_ENCODING_LINEAR:
printf("ULAW\n");break;
default:
- printf("unknown encoding\n");
+ printf("unknown encoding: %d\n",au_info.play.encoding);
}
close(audio);
} else {
@@ -370,7 +373,7 @@ int get_samples(byte* audio_buffer,int m
void play_file(char *fname,Main_Bool *mb)
{
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
int audio;
#elif defined(sgi)
ALport port;
@@ -384,7 +387,7 @@ void play_file(char *fname,Main_Bool *mb
return;
}
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__)
if ((audio=set_dsp(O_WRONLY,af.bps,af.channels,af.freq,&buf_size))==-1) {
fprintf(stderr,"XWave: Error ! Cannot set dsp !\n");
close(af.fd);
@@ -404,7 +407,7 @@ void play_file(char *fname,Main_Bool *mb
if ((buffer=malloc(buf_size))==NULL) {
fprintf(stderr,"XWave: Error ! Cannot alloc mem !\n");
close(af.fd);
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
close(audio);
#elif defined(sgi)
ALcloseport(port);
@@ -413,7 +416,7 @@ void play_file(char *fname,Main_Bool *mb
return;
}
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
while ((length=af_read(af,buffer,buf_size))>0) {
if (write(audio, buffer, length)==-1) break;
}
@@ -440,7 +443,7 @@ void play_buffer(Main_Data *md)
int offset=0,playlength,length;
#ifdef sgi
ALport port;
-#elif defined(linux) || defined (FreeBSD) || defined (sun)
+#elif defined(linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
int audio;
if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
@@ -473,7 +476,7 @@ void play_buffer(Main_Data *md)
buffer=wd->buffer+offset;
while (playlength>0) {
if (playlength<buf_size) buf_size=playlength;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
if (write(audio, buffer, buf_size)==-1) {
close(audio);
kill((pid_t) getppid(),SIGUSR1);
@@ -497,7 +500,7 @@ void play_buffer(Main_Data *md)
wd2af(wd,&af);
af_rewind(af);
if (af_seek(af,offset,SEEK_CUR)==AF_ERROR) {
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
close(audio);
#elif defined(sgi)
ALcloseport(port);
@@ -510,7 +513,7 @@ void play_buffer(Main_Data *md)
while (playlength>0) {
if (playlength<buf_size) buf_size=playlength;
if ((length=af_read(af,(char*) md->mg->fbuf,buf_size))==-1) {
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
close(audio);
#elif defined(sgi)
ALcloseport(port);
@@ -518,7 +521,7 @@ void play_buffer(Main_Data *md)
kill((pid_t) getppid(),SIGUSR1);
return;
}
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
if (write(audio,(char*) md->mg->fbuf,length)==-1) {
close(audio);
kill((pid_t) getppid(),SIGUSR1);
@@ -536,7 +539,7 @@ void play_buffer(Main_Data *md)
}
}
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
close(audio);
#elif defined(sgi)
while (ALgetfilled(port)) sginap(2);
@@ -556,7 +559,7 @@ void rec_file(byte res,byte mode,int fre
void write_length();
byte *data=NULL;
int abuf_size,count;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
int audio;
if ((audio=set_dsp(O_RDONLY,res,mode,freq,&abuf_size))==-1) {
@@ -577,7 +580,7 @@ void rec_file(byte res,byte mode,int fre
if ((data = (byte *) malloc(abuf_size)) == NULL) {
fprintf(stderr,"XWave: Error while alloc mem for audio_buffer !\n");
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
close(audio);
#elif defined(sgi)
ALcloseport(port);
@@ -595,7 +598,7 @@ void rec_file(byte res,byte mode,int fre
if (af_open(fname,&af,AF_NEW)==AF_ERROR) {
free(data);
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
close(audio);
#elif defined(sgi)
ALcloseport(port);
@@ -608,7 +611,7 @@ void rec_file(byte res,byte mode,int fre
signal(SIGUSR1,write_length);
while(1) {
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
if ((count=read(audio, data, abuf_size))==-1) {
close(audio);
af_close(af);
@@ -632,7 +635,7 @@ void rec_file(byte res,byte mode,int fre
return;
}
if ((count=af_write(af,(char*)data,count))==AF_ERROR) {
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (FreeBSD) || defined (sun) || defined(__NetBSD__) || defined(__DragonFly__)
close(audio);
#elif defined(sgi)
ALcloseport(port);
Reference in New Issue View Git Blame Copy Permalink