summaryrefslogtreecommitdiff
path: root/audio/xwave/files/patch-ad
blob: 38e4f310a2de782668e18949f42ee80ce725d813 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
--- src/audio.c.orig	Sun Nov  8 15:22:55 1998
+++ src/audio.c	Sun Sep  8 03:35:52 2002
@@ -37,8 +37,8 @@
 #ifdef linux
 #include <linux/soundcard.h>
 
-#elif defined(FreeBSD)
-#include <machine/soundcard.h>
+#elif defined(__FreeBSD__)
+#include <sys/soundcard.h>
 
 #elif defined(sgi)
 #include <dmedia/audio.h>
@@ -55,7 +55,7 @@
 #include "sample_settings.h"
 #include "audio.h"
 
-#if defined(linux) || defined (FreeBSD) || defined(sun) 
+#if defined(linux) || defined (__FreeBSD__) || defined(sun) 
 static int set_dsp(int o_mode,int res,int channels,int freq,int *buf_size);
 #endif
 
@@ -67,7 +67,7 @@
 static Audio_File af;
 static int stop_record;
 
-#if defined (linux) || defined (FreeBSD)
+#if defined (linux) || defined (__FreeBSD__)
 int set_dsp(int o_mode,int res, int channels, int freq, int *buf_size)
 {
     int check;
@@ -369,7 +369,7 @@
 
 void play_file(char *fname,Main_Bool *mb)
 {
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
     int audio;
 #elif defined(sgi)
     ALport port;
@@ -383,7 +383,7 @@
 	return;
     }
     
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
     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);
@@ -403,7 +403,7 @@
     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)
 	close(audio);
 #elif defined(sgi)
 	ALcloseport(port);
@@ -412,7 +412,7 @@
 	return;
     }
     
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
     while ((length=af_read(af,buffer,buf_size))>0) {
 	if (write(audio, buffer, length)==-1) break;
     }
@@ -439,7 +439,7 @@
     int offset=0,playlength,length;
 #ifdef sgi
     ALport port;
-#elif defined(linux) || defined (FreeBSD) || defined (sun)
+#elif defined(linux) || defined (__FreeBSD__) || defined (sun)
     int audio;
     
     if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
@@ -472,7 +472,7 @@
         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)
             if (write(audio, buffer, buf_size)==-1) {
                 close(audio);
                 kill((pid_t) getppid(),SIGUSR1);
@@ -497,7 +497,7 @@
         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)
             close(audio);
 #elif defined(sgi)
             ALcloseport(port);
@@ -510,7 +510,7 @@
         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)
                 close(audio);
 #elif defined(sgi)
                 ALcloseport(port);
@@ -518,7 +518,7 @@
                 kill((pid_t) getppid(),SIGUSR1);
                 return;
             }
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
             if (write(audio,(char*) md->mg->fbuf,length)==-1) {
                 close(audio);
                 kill((pid_t) getppid(),SIGUSR1);
@@ -537,7 +537,7 @@
         }
     }
     
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
     close(audio);
 #elif defined(sgi)
     while (ALgetfilled(port)) sginap(2);
@@ -558,7 +558,7 @@
     int offset=0,playlength,length;
 #ifdef sgi
     ALport port;
-#elif defined(linux) || defined (FreeBSD) || defined (sun)
+#elif defined(linux) || defined (__FreeBSD__) || defined (sun)
     int audio;
     
     if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
@@ -593,7 +593,7 @@
 	((int *)shared_playpos)[0] = wd->playbeg*wd->bpspl;
 	while (playlength>0) {
 	    if (playlength<buf_size) buf_size=playlength;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
 	    if (write(audio, buffer, buf_size)==-1) {
 		((int *)shared_playpos)[0] = -1;
 		close(audio);
@@ -621,7 +621,7 @@
 	af_rewind(af);
 	if (af_seek(af,offset,SEEK_CUR)==AF_ERROR) {
 	    ((int *)shared_playpos)[0] = -1;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
 	    close(audio);
 #elif defined(sgi)
 	    ALcloseport(port);
@@ -636,7 +636,7 @@
 	    if (playlength<buf_size) buf_size=playlength;
 	    if ((length=af_read(af,(char*) md->mg->fbuf,buf_size))==-1) {
 		((int *)shared_playpos)[0] = -1;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
 		close(audio);
 #elif defined(sgi)
 		ALcloseport(port);
@@ -644,7 +644,7 @@
 		kill((pid_t) getppid(),SIGUSR1);
 		return;
 	    }
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
 	    if (write(audio,(char*) md->mg->fbuf,length)==-1) {
 		((int *)shared_playpos)[0] = -1;
 		close(audio);
@@ -666,7 +666,7 @@
     }
     
     ((int *)shared_playpos)[0] = -1;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
     close(audio);
 #elif defined(sgi)
     while (ALgetfilled(port)) sginap(2);
@@ -686,7 +686,7 @@
     void write_length();
     byte *data=NULL;
     int abuf_size,count;
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
     int audio;
     
     if ((audio=set_dsp(O_RDONLY,res,mode,freq,&abuf_size))==-1) {
@@ -707,7 +707,7 @@
     
     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)
 	close(audio);
 #elif defined(sgi)
 	ALcloseport(port);
@@ -725,7 +725,7 @@
     
     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)
 	close(audio);
 #elif defined(sgi)
 	ALcloseport(port);
@@ -738,7 +738,7 @@
     signal(SIGUSR1,write_length);
     
     while(1) {
-#if defined (linux) || defined (FreeBSD) || defined (sun)
+#if defined (linux) || defined (__FreeBSD__) || defined (sun)
 	if ((count=read(audio, data, abuf_size))==-1) {
 	    close(audio);
 	    af_close(af);
@@ -762,7 +762,7 @@
 	    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)
 	    close(audio);
 #elif defined(sgi)
 	    ALcloseport(port);