aboutsummaryrefslogtreecommitdiff
path: root/pd/extra/sigmund~
diff options
context:
space:
mode:
authorMiller Puckette <millerpuckette@users.sourceforge.net>2009-09-01 18:22:23 +0000
committerMiller Puckette <millerpuckette@users.sourceforge.net>2009-09-01 18:22:23 +0000
commit22a829cb1907c79bfe68ad91314a1dddbf1beeb3 (patch)
tree510dcb1af070f5eac5b1192d9fffad2f3e431958 /pd/extra/sigmund~
parent1cc6aed4bfdd84b06d418bc5198a0380479e639a (diff)
merge in HC's new tcl code and start taking patches
svn path=/trunk/; revision=12166
Diffstat (limited to 'pd/extra/sigmund~')
-rw-r--r--pd/extra/sigmund~/sigmund~.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/pd/extra/sigmund~/sigmund~.c b/pd/extra/sigmund~/sigmund~.c
index d5211ac6..92604b7e 100644
--- a/pd/extra/sigmund~/sigmund~.c
+++ b/pd/extra/sigmund~/sigmund~.c
@@ -26,13 +26,13 @@ for example, defines this in the file d_fft_mayer.c or d_fft_fftsg.c. */
#include <math.h>
#include <stdio.h>
#include <string.h>
-#ifdef NT
+#ifdef _WIN32
#include <malloc.h>
#else
#include <alloca.h>
#endif
#include <stdlib.h>
-#ifdef NT
+#ifdef _MSC_VER
#pragma warning( disable : 4244 )
#pragma warning( disable : 4305 )
#endif
@@ -1395,7 +1395,7 @@ void sigmund_tilde_setup(void)
gensym("print"), 0);
class_addmethod(sigmund_class, (t_method)sigmund_printnext,
gensym("printnext"), A_FLOAT, 0);
- post("sigmund~ version 0.06");
+ post("sigmund~ version 0.07");
}
#endif /* PD */
@@ -1429,6 +1429,10 @@ static t_int *sigmund_perform(t_int *w)
int n = (int)(w[3]), j;
int infill = x->x_infill;
float *fp = x->x_inbuf2 + infill;
+
+ if (x->x_obj.z_disabled) /* return if in muted MSP subpatch -Rd */
+ return (w+4);
+
if (infill < 0 || infill >= x->x_npts)
infill = 0;
/* for some reason this sometimes happens: */
@@ -1642,7 +1646,7 @@ int main()
class_register(CLASS_BOX, c);
sigmund_class = c;
- post("sigmund~ v0.06");
+ post("sigmund~ version 0.07");
return (0);
}