From 22a829cb1907c79bfe68ad91314a1dddbf1beeb3 Mon Sep 17 00:00:00 2001 From: Miller Puckette Date: Tue, 1 Sep 2009 18:22:23 +0000 Subject: merge in HC's new tcl code and start taking patches svn path=/trunk/; revision=12166 --- pd/extra/bonk~/bonk~.c | 3 ++- pd/extra/expr~/vexp.c | 2 +- pd/extra/expr~/vexp.h | 6 +++++- pd/extra/expr~/vexp_fun.c | 10 +++++----- pd/extra/fiddle~/fiddle~.c | 10 ++++++++-- pd/extra/pique/pique.c | 3 ++- pd/extra/sigmund~/sigmund~.c | 12 ++++++++---- 7 files changed, 31 insertions(+), 15 deletions(-) (limited to 'pd/extra') diff --git a/pd/extra/bonk~/bonk~.c b/pd/extra/bonk~/bonk~.c index 6776b2e2..d0f18de9 100644 --- a/pd/extra/bonk~/bonk~.c +++ b/pd/extra/bonk~/bonk~.c @@ -53,7 +53,8 @@ decay and other times in msec #include #include -#ifdef NT +/* These pragmas are only used for MSVC, not MinGW or Cygwin */ +#ifdef _MSC_VER #pragma warning (disable: 4305 4244) #endif diff --git a/pd/extra/expr~/vexp.c b/pd/extra/expr~/vexp.c index 7d4d7b52..732944de 100644 --- a/pd/extra/expr~/vexp.c +++ b/pd/extra/expr~/vexp.c @@ -2137,6 +2137,6 @@ ex_print(struct ex_ex *eptr) post("\n"); } -#ifdef NT +#ifdef _WIN32 void ABORT( void) {bug("expr");} #endif diff --git a/pd/extra/expr~/vexp.h b/pd/extra/expr~/vexp.h index 92dfb06e..d096842f 100644 --- a/pd/extra/expr~/vexp.h +++ b/pd/extra/expr~/vexp.h @@ -236,9 +236,13 @@ extern void ex_store(t_expr *expr, long int argc, struct ex_ex *argv, int value_getonly(t_symbol *s, t_float *f); -#ifdef NT + +/* These pragmas are only used for MSVC, not MinGW or Cygwin */ +#ifdef _MSC_VER #pragma warning (disable: 4305 4244) +#endif +#ifdef _WIN32 #define abort ABORT void ABORT(void); #endif diff --git a/pd/extra/expr~/vexp_fun.c b/pd/extra/expr~/vexp_fun.c index fba49b18..26b0b767 100644 --- a/pd/extra/expr~/vexp_fun.c +++ b/pd/extra/expr~/vexp_fun.c @@ -123,7 +123,7 @@ static void ex_if(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *opt static void ex_ldexp(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); static void ex_imodf(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); static void ex_modf(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); -#ifndef NT +#ifndef _WIN32 static void ex_cbrt(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); static void ex_erf(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); static void ex_erfc(t_expr *expr, long argc, struct ex_ex *argv, struct ex_ex *optr); @@ -176,7 +176,7 @@ t_ex_func ex_funcs[] = { {"ldexp ", ex_ldexp, 1}, {"imodf ", ex_imodf, 1}, {"modf", ex_modf, 1}, -#ifndef NT +#ifndef _WIN32 {"cbrt", ex_cbrt, 1}, {"erf", ex_erf, 1}, {"erfc", ex_erfc, 1}, @@ -542,7 +542,7 @@ ex_toint(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr) FUNC_EVAL_UNARY(left, toint, (int), optr, 0); } -#ifdef NT +#ifdef _WIN32 /* No rint in NT land ??? */ double rint(double x); @@ -874,7 +874,7 @@ ex_tanh(t_expr *e, long int argc, struct ex_ex *argv, struct ex_ex *optr) } -#ifndef NT +#ifndef _WIN32 static void ex_asinh(t_expr *e, long argc, struct ex_ex *argv, struct ex_ex *optr) { @@ -1239,7 +1239,7 @@ FUNC_DEF_UNARY(ex_modf, fracmodf, (double), 1); */ FUNC_DEF(ex_ldexp, ldexp, (double), (int), 1); -#ifndef NT +#ifndef _WIN32 /* * ex_cbrt - cube root */ diff --git a/pd/extra/fiddle~/fiddle~.c b/pd/extra/fiddle~/fiddle~.c index d959b00f..4633b3c0 100644 --- a/pd/extra/fiddle~/fiddle~.c +++ b/pd/extra/fiddle~/fiddle~.c @@ -28,11 +28,17 @@ * */ -#ifdef NT + +/* These pragmas are only used for MSVC, not MinGW or Cygwin */ +#ifdef _MSC_VER +#pragma warning (disable: 4305 4244) +#endif + +/* this #ifdef does nothing, but its there... */ +#ifdef _WIN32 #define flog log #define fexp exp #define fsqrt sqrt -#pragma warning (disable: 4305 4244) #else #define flog log #define fexp exp diff --git a/pd/extra/pique/pique.c b/pd/extra/pique/pique.c index f4cae5e1..a53ad765 100644 --- a/pd/extra/pique/pique.c +++ b/pd/extra/pique/pique.c @@ -7,7 +7,8 @@ combustible materiel, or as part of any life support system or weapon. */ #include "m_pd.h" #include #include -#ifdef NT +/* These pragmas are only used for MSVC, not MinGW or Cygwin */ +#ifdef _MSC_VER #pragma warning( disable : 4244 ) #pragma warning( disable : 4305 ) #endif 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 #include #include -#ifdef NT +#ifdef _WIN32 #include #else #include #endif #include -#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); } -- cgit v1.2.1