summaryrefslogtreecommitdiff
path: root/audio/dap/patches/patch-ac
blob: e676066726e3cb1794ab8bb6c15fa3633df55e7e (plain)
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
$NetBSD: patch-ac,v 1.1.1.1 1999/12/04 12:56:32 scw Exp $

--- sound/DPSample.cc.orig	Fri Dec  3 21:37:53 1999
+++ sound/DPSample.cc	Tue Nov 30 21:12:28 1999
@@ -532,7 +532,7 @@
   int  rawSignedData,
   int  rawEndian)
 {
-  int           irixFile;
+  fhandle       irixFile;
   AFfilesetup   fileSetup;
   AFfilehandle  file;
   long          bits;
@@ -559,8 +559,13 @@
   clear ();
 
   // Open requested irix file
+#ifndef USE_STDIO
   irixFile = open (newFilename,O_RDONLY);
   if (irixFile == -1) return "Cannot open specified file";
+#else
+  irixFile = fopen (newFilename,"rb");
+  if (irixFile == NULL) return "Cannot open specified file";
+#endif
     
   // Check irix file format
   if (sampleFormat == AF_FORMAT_AIFF)
@@ -572,16 +577,28 @@
       case AF_FILE_AIFFC :
         break;
       case AF_FILE_UNSUPPORTED :
+#ifndef USE_STDIO
         close (irixFile);
+#else
+        fclose (irixFile);
+#endif
         return "Unsupported file format";
       case AF_FILE_UNKNOWN :
       default:
+#ifndef USE_STDIO
         close (irixFile);
+#else
+        fclose (irixFile);
+#endif
         return "Unknown file format";
     }
   }
 
+#ifndef USE_STDIO
   close (irixFile);
+#else
+  fclose (irixFile);
+#endif
   
   // Disable void handling
   AFseterrorhandler (DPSampleAudiofileError);