From 1e45c6bafc8419930958103cc1651ff86cf5d84d Mon Sep 17 00:00:00 2001
From: Miller Puckette <millerpuckette@users.sourceforge.net>
Date: Fri, 20 Jul 2007 03:25:21 +0000
Subject: various bug fixes.

svn path=/trunk/; revision=8186
---
 pd/src/d_soundfile.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'pd/src/d_soundfile.c')

diff --git a/pd/src/d_soundfile.c b/pd/src/d_soundfile.c
index 56c89e07..93578e65 100644
--- a/pd/src/d_soundfile.c
+++ b/pd/src/d_soundfile.c
@@ -30,6 +30,10 @@ objects use Posix-like threads.  */
 #ifdef _LARGEFILE64_SOURCE
 # define open open64
 # define lseek lseek64
+#define off_t __off64_t
+#endif
+#ifdef MSW
+#define off_t long
 #endif
 
 /***************** soundfile header structures ************************/
@@ -369,7 +373,8 @@ int open_soundfile_via_fd(int fd, int headersize,
         }
     }
         /* seek past header and any sample frames to skip */
-    sysrtn = lseek(fd, nchannels * bytespersamp * skipframes + headersize, 0);
+    sysrtn = lseek(fd,
+        ((off_t)nchannels) * bytespersamp * skipframes + headersize, 0);
     if (sysrtn != nchannels * bytespersamp * skipframes + headersize)
         return (-1);
      bytelimit -= nchannels * bytespersamp * skipframes;
@@ -958,7 +963,6 @@ static t_soundfiler *soundfiler_new(void)
     usage: read [flags] filename table ...
     flags:
         -skip <frames> ... frames to skip in file
-        -nframes <frames>
         -onset <frames> ... onset in table to read into (NOT DONE YET)
         -raw <headersize channels bytes endian>
         -resize
@@ -970,7 +974,7 @@ static void soundfiler_read(t_soundfiler *x, t_symbol *s,
 {
     int headersize = -1, channels = 0, bytespersamp = 0, bigendian = 0,
         resize = 0, i, j;
-    long skipframes = 0, nframes = 0, finalsize = 0, itemsleft,
+    long skipframes = 0, finalsize = 0, itemsleft,
         maxsize = DEFMAXSIZE, itemsread = 0, bytelimit  = 0x7fffffff;
     int fd = -1;
     char endianness, *filename;
@@ -990,13 +994,6 @@ static void soundfiler_read(t_soundfiler *x, t_symbol *s,
                     goto usage;
             argc -= 2; argv += 2;
         }
-        else if (!strcmp(flag, "nframes"))
-        {
-            if (argc < 2 || argv[1].a_type != A_FLOAT ||
-                ((nframes = argv[1].a_w.w_float) < 0))
-                    goto usage;
-            argc -= 2; argv += 2;
-        }
         else if (!strcmp(flag, "raw"))
         {
             if (argc < 5 ||
-- 
cgit v1.2.1