diff options
-rw-r--r-- | ENV.c | 1 | ||||
-rw-r--r-- | bfilt.c (renamed from bangfilt.c) | 0 | ||||
-rw-r--r-- | bfilt2.c (renamed from bangfilt2.c) | 0 | ||||
-rw-r--r-- | delta~.c (renamed from sigdelta.c) | 1 | ||||
-rw-r--r-- | makefile | 2 | ||||
-rw-r--r-- | makefile.in | 2 | ||||
-rw-r--r-- | mean~.c (renamed from mean.c) | 0 | ||||
-rw-r--r-- | proc.c | 1 | ||||
-rw-r--r-- | reference/ENV-help.pd (renamed from reference/ENV.pd) | 0 | ||||
-rw-r--r-- | reference/ascseq-help.pd (renamed from reference/ascseq.pd) | 0 | ||||
-rw-r--r-- | reference/ascwave-help.pd (renamed from reference/ascwave.pd) | 0 | ||||
-rw-r--r-- | reference/bfilt-help.pd (renamed from reference/bfilt.pd) | 0 | ||||
-rw-r--r-- | reference/bfilt2-help.pd | 23 | ||||
-rw-r--r-- | reference/delta~-help.pd (renamed from reference/delta.pd) | 0 | ||||
-rw-r--r-- | reference/proc-help.pd (renamed from reference/proc.pd) | 0 | ||||
-rw-r--r-- | reference/randomix-help.pd (renamed from reference/randomix.pd) | 0 | ||||
-rw-r--r-- | reference/reson~-help.pd (renamed from reference/reson~.pd) | 0 | ||||
-rw-r--r-- | reference/serialize-help.pd (renamed from reference/serialize.pd) | 0 | ||||
-rw-r--r-- | reference/utime-help.pd (renamed from reference/utime.pd) | 0 | ||||
-rw-r--r-- | reson~.c (renamed from reson.c) | 2 | ||||
-rw-r--r-- | utime.c (renamed from microtime.c) | 45 |
21 files changed, 48 insertions, 29 deletions
@@ -84,6 +84,5 @@ void ENV_setup(void) class_addmethod(ENV_class, (t_method)ENV_getenv, gensym("getenv"), A_SYMBOL); class_addmethod(ENV_class, (t_method)ENV_setenv, gensym("setenv"), A_SYMBOL, A_SYMBOL); class_addfloat(ENV_class, ENV_float); - class_sethelpsymbol(ENV_class, gensym("ENV.pd")); } @@ -52,5 +52,4 @@ void delta_tilde_setup(void) sizeof(t_delta), 0, A_DEFFLOAT, 0); class_addmethod(delta_class, nullfn, gensym("signal"), 0); class_addmethod(delta_class, (t_method)delta_dsp, gensym("dsp"), 0); - class_sethelpsymbol(delta_class, gensym("delta.pd")); } @@ -22,7 +22,7 @@ CXXFLAGS = $(CFLAGS) LIBS = -lc -lm #LIBS = -lpthread -lm -lc -SOURCES = ENV.c ascseq.c ascwave.c bangfilt.c bangfilt2.c binshift.c cx.c ixprint.c mean.c microtime.c proc.c randomix.c reson.c sigdelta.c split.c +SOURCES = ENV.c ascseq.c ascwave.c bangfilt.c bangfilt2.c binshift.c cx.c ixprint.c mean.c utime.c proc.c randomix.c reson~.c sigdelta.c split.c TARGETS = $(SOURCES:.c=.$(EXT)) # all: $(TARGETS) diff --git a/makefile.in b/makefile.in index 3d0fec8..163b6e1 100644 --- a/makefile.in +++ b/makefile.in @@ -22,7 +22,7 @@ CXXFLAGS = $(CFLAGS) LIBS = -lc -lm #LIBS = -lpthread -lm -lc -SOURCES = ENV.c ascseq.c ascwave.c bangfilt.c bangfilt2.c binshift.c counter.c cx.c ixprint.c mean.c microtime.c prepend.c proc.c randomix.c reson.c sigdelta.c split.c +SOURCES = ENV.c ascseq.c ascwave.c bangfilt.c bangfilt2.c binshift.c counter.c cx.c ixprint.c mean.c utime.c prepend.c proc.c randomix.c reson~.c sigdelta.c split.c TARGETS = $(SOURCES:.c=.$(EXT)) # all: $(TARGETS) @@ -218,6 +218,5 @@ void proc_setup(void) //class_addmethod(proc_class, (t_method)proc_getenv, gensym("getenv"), A_SYMBOL); //class_addmethod(proc_class, (t_method)proc_setenv, gensym("setenv"), A_SYMBOL, A_SYMBOL); class_addfloat(proc_class, proc_float); - class_sethelpsymbol(proc_class, gensym("proc.pd")); } diff --git a/reference/ENV.pd b/reference/ENV-help.pd index 7582c67..7582c67 100644 --- a/reference/ENV.pd +++ b/reference/ENV-help.pd diff --git a/reference/ascseq.pd b/reference/ascseq-help.pd index 5038a84..5038a84 100644 --- a/reference/ascseq.pd +++ b/reference/ascseq-help.pd diff --git a/reference/ascwave.pd b/reference/ascwave-help.pd index bb36502..bb36502 100644 --- a/reference/ascwave.pd +++ b/reference/ascwave-help.pd diff --git a/reference/bfilt.pd b/reference/bfilt-help.pd index 4be9d45..4be9d45 100644 --- a/reference/bfilt.pd +++ b/reference/bfilt-help.pd diff --git a/reference/bfilt2-help.pd b/reference/bfilt2-help.pd new file mode 100644 index 0000000..4be9d45 --- /dev/null +++ b/reference/bfilt2-help.pd @@ -0,0 +1,23 @@ +#N canvas 203 207 404 226 10; +#X floatatom 85 119; +#X obj 57 175 print; +#X floatatom 45 120; +#X obj 58 146 bfilt 5; +#X text 43 16 bfilt (at the moment) is: modulo something + select 0; +#X floatatom 167 120; +#X obj 139 176 print; +#X floatatom 127 121; +#X obj 140 147 bfilt2 5; +#X obj 145 87 metro 100; +#X msg 145 68 1; +#X text 42 29 bfilt2: real bangfilter: bangs on first inlet \, internal counter \, only outputs every arg2th bang ...; +#X msg 169 67 0; +#X connect 0 0 3 1; +#X connect 2 0 3 0; +#X connect 3 0 1 0; +#X connect 5 0 8 1; +#X connect 7 0 8 0; +#X connect 8 0 6 0; +#X connect 9 0 8 0; +#X connect 10 0 9 0; +#X connect 12 0 9 0; diff --git a/reference/delta.pd b/reference/delta~-help.pd index 7f0bf8b..7f0bf8b 100644 --- a/reference/delta.pd +++ b/reference/delta~-help.pd diff --git a/reference/proc.pd b/reference/proc-help.pd index 65411ae..65411ae 100644 --- a/reference/proc.pd +++ b/reference/proc-help.pd diff --git a/reference/randomix.pd b/reference/randomix-help.pd index d913f39..d913f39 100644 --- a/reference/randomix.pd +++ b/reference/randomix-help.pd diff --git a/reference/reson~.pd b/reference/reson~-help.pd index d90c159..d90c159 100644 --- a/reference/reson~.pd +++ b/reference/reson~-help.pd diff --git a/reference/serialize.pd b/reference/serialize-help.pd index b9d8469..b9d8469 100644 --- a/reference/serialize.pd +++ b/reference/serialize-help.pd diff --git a/reference/utime.pd b/reference/utime-help.pd index aa5af83..aa5af83 100644 --- a/reference/utime.pd +++ b/reference/utime-help.pd @@ -143,7 +143,7 @@ void *sigreson_new(t_floatarg f, t_floatarg g) return (x); } -void reson_setup() +void reson_tilde_setup() { sigreson_class = class_new(gensym("reson~"), (t_newmethod)sigreson_new, (t_method)sigreson_ff, sizeof(t_sigreson), 0, @@ -4,11 +4,11 @@ */ #include <m_pd.h> -#ifdef NT
-#include <windows.h>
-#else
+#ifdef NT +#include <windows.h> +#else #include <sys/time.h> -#endif
+#endif #include <time.h> /* ----------------------- utime --------------------- */ @@ -28,7 +28,7 @@ static void *utime_new(t_symbol *s, int argc, t_atom *argv) { x->x_outlet2 = outlet_new(&x->x_obj, &s_float); return (x); } -
+ #ifndef NT static void utime_bang(t_utime *x) { @@ -39,23 +39,23 @@ static void utime_bang(t_utime *x) outlet_float(x->x_outlet2, (t_float)myutime.tv_usec); outlet_float(x->x_outlet1, (t_float)myutime.tv_sec); } -#else
-static void utime_bang(t_utime *x)
-{
- FILETIME myfiletime;
- ULARGE_INTEGER ulfiletime, ulSec, uluSec;
-
- GetSystemTimeAsFileTime(&myfiletime);
- ulfiletime.LowPart = myfiletime.dwLowDateTime;
- ulfiletime.HighPart = myfiletime.dwHighDateTime;
- ulfiletime.QuadPart -= 116444736000000000; // number of 100ns ticks from 1601-01-01 to 1970-01-01
- ulSec.QuadPart = ulfiletime.QuadPart / (10 * 1000 * 1000); // FILETIME uses 100ns ticks
- uluSec.QuadPart = (ulfiletime.QuadPart - ulSec.QuadPart * 10 * 1000 * 1000) / 10; // FILETIME uses 100ns ticks
-
- outlet_float(x->x_outlet2, (t_float)(__int64)ulSec.QuadPart );
- outlet_float(x->x_outlet1, (t_float)(__int64)uluSec.QuadPart);
-}
-#endif
+#else +static void utime_bang(t_utime *x) +{ + FILETIME myfiletime; + ULARGE_INTEGER ulfiletime, ulSec, uluSec; + + GetSystemTimeAsFileTime(&myfiletime); + ulfiletime.LowPart = myfiletime.dwLowDateTime; + ulfiletime.HighPart = myfiletime.dwHighDateTime; + ulfiletime.QuadPart -= 116444736000000000; // number of 100ns ticks from 1601-01-01 to 1970-01-01 + ulSec.QuadPart = ulfiletime.QuadPart / (10 * 1000 * 1000); // FILETIME uses 100ns ticks + uluSec.QuadPart = (ulfiletime.QuadPart - ulSec.QuadPart * 10 * 1000 * 1000) / 10; // FILETIME uses 100ns ticks + + outlet_float(x->x_outlet2, (t_float)(__int64)ulSec.QuadPart ); + outlet_float(x->x_outlet1, (t_float)(__int64)uluSec.QuadPart); +} +#endif static void help_utime(t_utime *x) { @@ -72,5 +72,4 @@ void utime_setup(void) class_addbang(utime_class, utime_bang); class_addmethod(utime_class, (t_method)help_utime, gensym("help"), 0); - class_sethelpsymbol(utime_class, gensym("utime.pd")); } |