aboutsummaryrefslogtreecommitdiff
path: root/pd/extra
diff options
context:
space:
mode:
authorMiller Puckette <millerpuckette@users.sourceforge.net>2006-10-22 21:46:11 +0000
committerMiller Puckette <millerpuckette@users.sourceforge.net>2006-10-22 21:46:11 +0000
commit982d9823a3f4978b211841adff80c9bc6166c4e9 (patch)
tree85e51f843f5994f62f2b42fb7c30466c4fc5fdca /pd/extra
parentbb23964c64578b5921e3adddabf033b4b7c4c548 (diff)
test release for 0.41 (bug fixes for IA64).
svn path=/trunk/; revision=6154
Diffstat (limited to 'pd/extra')
-rw-r--r--pd/extra/expr~/makefile4
-rw-r--r--pd/extra/makefile6
-rw-r--r--pd/extra/sigmund~/sigmund~.c12
3 files changed, 12 insertions, 10 deletions
diff --git a/pd/extra/expr~/makefile b/pd/extra/expr~/makefile
index 7d033b7c..2b4cdc58 100644
--- a/pd/extra/expr~/makefile
+++ b/pd/extra/expr~/makefile
@@ -77,7 +77,7 @@ SGIINCLUDE = -I/usr/people/msp/pd/pd/src
LINUXOBJ = vexp.pd_linux_o vexp_fun.pd_linux_o vexp_if.pd_linux_o
.SUFFIXES: .pd_linux_o
-LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC -m32 \
+LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \
-Wall -W -Wshadow -Wstrict-prototypes \
-Wno-unused -Wno-parentheses -Wno-switch
@@ -87,7 +87,7 @@ LINUXINCLUDE = -I../../src
$(CC) -g $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.pd_linux_o -c $*.c
expr.pd_linux: $(LINUXOBJ)
- $(CC) -m32 -export_dynamic -shared -o expr.pd_linux $(LINUXOBJ) -lc -lm
+ $(CC) -export_dynamic -shared -o expr.pd_linux $(LINUXOBJ) -lc -lm
strip --strip-unneeded expr.pd_linux
expr~.pd_linux: expr.pd_linux
diff --git a/pd/extra/makefile b/pd/extra/makefile
index a328d919..bc913aca 100644
--- a/pd/extra/makefile
+++ b/pd/extra/makefile
@@ -19,7 +19,7 @@ PDNTLIB = $(PDNTLDIR)\libc.lib \
.c.dll:
cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
- link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB)
+ link /nologo /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB)
# ----------------------- IRIX 5.x -----------------------
@@ -57,7 +57,7 @@ pd_linux: $(NAME).pd_linux
.SUFFIXES: .pd_linux
-LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC -m32 \
+LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \
-Wall -W -Wshadow -Wstrict-prototypes \
-Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS)
@@ -65,7 +65,7 @@ LINUXINCLUDE = -I../../src
.c.pd_linux:
$(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
- $(CC) -m32 -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm
+ $(CC) -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm
strip --strip-unneeded $*.pd_linux
rm -f $*.o
diff --git a/pd/extra/sigmund~/sigmund~.c b/pd/extra/sigmund~/sigmund~.c
index 96d15a2c..09d004cb 100644
--- a/pd/extra/sigmund~/sigmund~.c
+++ b/pd/extra/sigmund~/sigmund~.c
@@ -770,7 +770,7 @@ static t_class *sigmund_class;
#define NHIST 100
#define MODE_STREAM 1
-#define MODE_BLOCK 2 /* uninplemented */
+#define MODE_BLOCK 2 /* unimplemented */
#define MODE_TABLE 3
#define NPOINTS_DEF 1024
@@ -1098,7 +1098,7 @@ static void sigmund_list(t_sigmund *x, t_symbol *s, int argc, t_atom *argv)
int arraysize, totstorage, nfound, i;
t_garray *a;
float *arraypoints, pit;
-
+ t_word *wordarray = 0;
if (argc < 5)
{
post(
@@ -1115,9 +1115,9 @@ static void sigmund_list(t_sigmund *x, t_symbol *s, int argc, t_atom *argv)
error("sigmund: negative onset");
return;
}
-
+ arraypoints = alloca(sizeof(float)*npts);
if (!(a = (t_garray *)pd_findbyclass(syminput, garray_class)) ||
- !garray_getfloatarray(a, &arraysize, &arraypoints) ||
+ !garray_getfloatwords(a, &arraysize, &wordarray) ||
arraysize < onset + npts)
{
error("%s: array missing or too small", syminput->s_name);
@@ -1128,7 +1128,9 @@ static void sigmund_list(t_sigmund *x, t_symbol *s, int argc, t_atom *argv)
error("sigmund~: too few points in array");
return;
}
- sigmund_doit(x, npts, arraypoints+onset, loud, srate);
+ for (i = 0; i < npts; i++)
+ arraypoints[i] = wordarray[i+onset].w_float;
+ sigmund_doit(x, npts, arraypoints, loud, srate);
}
static void sigmund_clear(t_sigmund *x)