Pd-cvs June 2008

pd-cvs@lists.iem.at

14 participants
221 discussions

SF.net SVN: pure-data: [9982] trunk/externals/zexy/src/matchbox.c
by zmoelnig＠users.sourceforge.net 12 Jun '08

12 Jun '08

Revision: 9982 http://pure-data.svn.sourceforge.net/pure-data/?rev=9982&view=rev Author: zmoelnig Date: 2008-06-12 01:17:27 -0700 (Thu, 12 Jun 2008) Log Message: ----------- changed verbose message to refer to the originating object Modified Paths: -------------- trunk/externals/zexy/src/matchbox.c Modified: trunk/externals/zexy/src/matchbox.c =================================================================== --- trunk/externals/zexy/src/matchbox.c 2008-06-11 13:57:53 UTC (rev 9981) +++ trunk/externals/zexy/src/matchbox.c 2008-06-12 08:17:27 UTC (rev 9982) @@ -194,7 +194,7 @@ } case ']' : case '}' : - z_verbose(1, "Spurious %c in pattern \".../%s/...\"",pattern[0], theWholePattern); + z_verbose(1, "[matchbox]: spurious %c in OSC-pattern \".../%s/...\"",pattern[0], theWholePattern); return FALSE; case '[' : return OSC_MatchBrackets (pattern,test, theWholePattern); @@ -225,7 +225,7 @@ const char *p = pattern; if (pattern[1] == 0) { - z_verbose(1, "Unterminated [ in pattern \".../%s/...\"", theWholePattern); + z_verbose(1, "[matchbox]: unterminated [ in OSC-pattern \".../%s/...\"", theWholePattern); return FALSE; } @@ -236,7 +236,7 @@ while (*p != ']') { if (*p == 0) { - z_verbose(1, "Unterminated [ in pattern \".../%s/...\"", theWholePattern); + z_verbose(1, "[matchbox]: unterminated [ in OSC-pattern \".../%s/...\"", theWholePattern); return FALSE; } if (p[1] == '-' && p[2] != 0) { @@ -261,7 +261,7 @@ while (*p != ']') { if (*p == 0) { - z_verbose(1, "Unterminated [ in pattern \".../%s/...\"", theWholePattern); + z_verbose(1, "[matchbox]: unterminated [ in OSC-pattern \".../%s/...\"", theWholePattern); return FALSE; } p++; @@ -276,7 +276,7 @@ for(restOfPattern = pattern; *restOfPattern != '}'; restOfPattern++) { if (*restOfPattern == 0) { - z_verbose(1, "Unterminated { in pattern \".../%s/...\"", theWholePattern); + z_verbose(1, "[matchbox]: unterminated { in OSC-pattern \".../%s/...\"", theWholePattern); return FALSE; } } @@ -551,7 +551,7 @@ /* 1st match, whether we already have this entry */ if(matchlistlist(0, x->x_lists, argc, argv, MATCHBOX_EXACT, FALSE)) { /* already there, skip the rest */ - z_verbose(1, "this list is already in the buffer!, skipping..."); + z_verbose(1, "[matchbox]: refusing to add already existing list to buffer..."); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9981] trunk/externals/iem/iemmatrix/src
by zmoelnig＠users.sourceforge.net 11 Jun '08

11 Jun '08

Revision: 9981 http://pure-data.svn.sourceforge.net/pure-data/?rev=9981&view=rev Author: zmoelnig Date: 2008-06-11 06:57:53 -0700 (Wed, 11 Jun 2008) Log Message: ----------- removed spurious addcreator()s Modified Paths: -------------- trunk/externals/iem/iemmatrix/src/mtx_binop_generic.h trunk/externals/iem/iemmatrix/src/mtx_mul.c Modified: trunk/externals/iem/iemmatrix/src/mtx_binop_generic.h =================================================================== --- trunk/externals/iem/iemmatrix/src/mtx_binop_generic.h 2008-06-11 12:02:11 UTC (rev 9980) +++ trunk/externals/iem/iemmatrix/src/mtx_binop_generic.h 2008-06-11 13:57:53 UTC (rev 9981) @@ -260,8 +260,6 @@ (t_method)mtx_binmtx_free, sizeof(t_mtx_binmtx), 0, A_GIMME, 0); - class_addcreator((t_newmethod)mtxbin_new, gensym(MTXBIN_SHORTNAME), A_GIMME,0); - class_addmethod(MTXBIN_APPEND(_class), (t_method)mtxbin_matrix, gensym("matrix"), A_GIMME, 0); class_addmethod(MTXBIN_APPEND(_class), (t_method)mtx_bin_matrix2, gensym(""), A_GIMME, 0); class_addfloat (MTXBIN_APPEND(_class), mtxbin_float); @@ -269,7 +267,6 @@ MTXBIN_APPEND(_scalarclass) = class_new(gensym(MTXBIN_LONGNAME), 0, (t_method)mtx_binscalar_free, sizeof(t_mtx_binscalar), 0, 0); - class_addcreator(0, gensym(MTXBIN_SHORTNAME), 0, 0); class_addmethod(MTXBIN_APPEND(_scalarclass), (t_method)mtxbin_scalar_matrix, gensym("matrix"), A_GIMME, 0); class_addlist (MTXBIN_APPEND(_scalarclass), mtxbin_scalar_list); @@ -277,6 +274,8 @@ class_sethelpsymbol(MTXBIN_APPEND(_class), gensym(MTXBIN_REALHELPNAME)); class_sethelpsymbol(MTXBIN_APPEND(_scalarclass), gensym(MTXBIN_REALHELPNAME)); + + class_addcreator((t_newmethod)mtxbin_new, gensym(MTXBIN_SHORTNAME), A_GIMME,0); } void MTXBIN_IEMSETUP(MTXBIN_GENERIC__NAME) (void) Modified: trunk/externals/iem/iemmatrix/src/mtx_mul.c =================================================================== --- trunk/externals/iem/iemmatrix/src/mtx_mul.c 2008-06-11 12:02:11 UTC (rev 9980) +++ trunk/externals/iem/iemmatrix/src/mtx_mul.c 2008-06-11 13:57:53 UTC (rev 9981) @@ -197,8 +197,7 @@ mtx_mulscalar_class = class_new(gensym("mtx_mul"), 0, (t_method)mtx_binscalar_free, sizeof(t_mtx_binscalar), 0, 0); - class_addcreator(0, gensym("mtx_*"), 0, 0); - class_addcreator(0, gensym("mtx_.*"), 0, 0); + class_addmethod(mtx_mulscalar_class, (t_method)mtx_mulscalar_matrix, gensym("matrix"), A_GIMME, 0); class_addlist (mtx_mulscalar_class, mtx_mulscalar_list); class_addbang (mtx_mulscalar_class, mtx_binscalar_bang); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9980] branches/pd-extended/v0-40/pd/src/m_class.c
by zmoelnig＠users.sourceforge.net 11 Jun '08

11 Jun '08

Revision: 9980 http://pure-data.svn.sourceforge.net/pure-data/?rev=9980&view=rev Author: zmoelnig Date: 2008-06-11 05:02:11 -0700 (Wed, 11 Jun 2008) Log Message: ----------- a bit less restrictive recursion check (patch #1990599) - this should allow hexloader to work Modified Paths: -------------- branches/pd-extended/v0-40/pd/src/m_class.c Modified: branches/pd-extended/v0-40/pd/src/m_class.c =================================================================== --- branches/pd-extended/v0-40/pd/src/m_class.c 2008-06-10 08:59:57 UTC (rev 9979) +++ branches/pd-extended/v0-40/pd/src/m_class.c 2008-06-11 12:02:11 UTC (rev 9980) @@ -528,6 +528,7 @@ return (gensym(namebuf)); } +#define MAXOBJDEPTH 1000 static int tryingalready; void canvas_popabstraction(t_canvas *x); @@ -545,14 +546,17 @@ t_pd *current; int fd; char dirbuf[FILENAME_MAX], *nameptr; - if (tryingalready) return; + if (tryingalready>MAXOBJDEPTH){ + error("maximum object loading depth %d reached", MAXOBJDEPTH); + return; + } newest = 0; class_loadsym = s; if (sys_load_lib(canvas_getcurrent(), s->s_name)) { - tryingalready = 1; + tryingalready++; typedmess(dummy, s, argc, argv); - tryingalready = 0; + tryingalready--; return; } class_loadsym = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

autobuild: pd-extended macosx104-powerpc 2008-06-11 03.15.03
by pd＠macosx104-powerpc.idmi.poly.edu 11 Jun '08

11 Jun '08

install -d /Users/pd/auto-build/pd-extended/packages/darwin_app/build/Pd-extended.app/Contents/Resources/doc/manuals/pdp install -p /Users/pd/auto-build/pd-extended/externals/pdp/doc/reference.txt /Users/pd/auto-build/pd-extended/packages/darwin_app/build/Pd-extended.app/Contents/Resources/doc/manuals/pdp install -p /Users/pd/auto-build/pd-extended/externals/pdp/doc/introduction/*.* \ /Users/pd/auto-build/pd-extended/packages/darwin_app/build/Pd-extended.app/Contents/Resources/doc/manuals/pdp install -d /Users/pd/auto-build/pd-extended/packages/darwin_app/build/Pd-extended.app/Contents/Resources/doc/examples/pdp install -p /Users/pd/auto-build/pd-extended/externals/pdp/doc/examples/*.* \ /Users/pd/auto-build/pd-extended/packages/darwin_app/build/Pd-extended.app/Contents/Resources/doc/examples/pdp install -d /Users/pd/auto-build/pd-extended/packages/darwin_app/build/Pd-extended.app/Contents/Resources/extra install -p /Users/pd/auto-build/pd-extended/externals/pidip/*.pd_darwin /Users/pd/auto-build/pd-extended/packages/darwin_app/build/Pd-extended.app/Contents/Resources/extra install: /Users/pd/auto-build/pd-extended/externals/pidip/*.pd_darwin: No such file or directory make[2]: *** [pidip_install] Error 71 make[1]: *** [externals_install] Error 2 make: *** [extended_install] Error 2 ls: /Users/pd/auto-build/pd-extended/packages/darwin_app/./Pd*.dmg: No such file or directory upload specs darwin_app . dmg Uploading ERROR: module is write only rsync error: syntax or usage error (code 1) at main.c(641) [sender=2.6.9] rsync: connection unexpectedly closed (4 bytes received so far) [receiver] rsync error: error in rsync protocol data stream (code 12) at /SourceCache/rsync/rsync-24.1/rsync/io.c(359)

1 0

SF.net SVN: pure-data: [9979] trunk/externals/nusmuk
by nusmuk＠users.sourceforge.net 10 Jun '08

10 Jun '08

Revision: 9979 http://pure-data.svn.sourceforge.net/pure-data/?rev=9979&view=rev Author: nusmuk Date: 2008-06-10 01:59:57 -0700 (Tue, 10 Jun 2008) Log Message: ----------- replacement for tabread4~ and tabosc4~ with a better cubic interpolation Added Paths: ----------- trunk/externals/nusmuk/tab/ trunk/externals/nusmuk/tab/makefile trunk/externals/nusmuk/tab/tabosc4cloop~-help.pd trunk/externals/nusmuk/tab/tabosc4cloop~.c trunk/externals/nusmuk/tab/tabosc4c~-help.pd trunk/externals/nusmuk/tab/tabosc4c~.c trunk/externals/nusmuk/tab/tabread4c~-help.pd trunk/externals/nusmuk/tab/tabread4c~.c Added: trunk/externals/nusmuk/tab/makefile =================================================================== --- trunk/externals/nusmuk/tab/makefile (rev 0) +++ trunk/externals/nusmuk/tab/makefile 2008-06-10 08:59:57 UTC (rev 9979) @@ -0,0 +1,97 @@ +current: + echo make pd_linux, pd_nt, pd_irix5, or pd_irix6 + +clean: ; rm -f *.pd_linux *.o + +# ----------------------- NT ----------------------- + +pd_nt: tabosc4c~.dll tabread4c~.dll + +.SUFFIXES: .dll + +PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo +VC="C:\Program Files\Microsoft Visual Studio\Vc98" + +PDNTINCLUDE = /I. /I$(VC)\include /I..\..\..\pd\src\ + +PDNTLDIR = $(VC)\lib +PDNTLIB = $(PDNTLDIR)\libc.lib \ + $(PDNTLDIR)\oldnames.lib \ + $(PDNTLDIR)\kernel32.lib \ + \pds\win32\pd36\bin\pd.lib + +.c.dll: + cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c + link /dll /export:$*_setup $*.obj $(PDNTLIB) + +# ----------------------- IRIX 5.x ----------------------- + +pd_irix5: tabosc4c~.pd_irix5 tabread4c~.pd_irix5 + +.SUFFIXES: .pd_irix5 + +SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2 + + +SGIINCLUDE = -I../../../pd/src/ + +.c.pd_irix5: + cc $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c + ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o + rm $*.o + +# ----------------------- IRIX 6.x ----------------------- + +pd_irix6: tabosc4c~.pd_irix6 tabread4c~.pd_irix6 + +.SUFFIXES: .pd_irix6 + +SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \ + -OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \ + -Ofast=ip32 + +.c.pd_irix6: + cc $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c + ld -IPA -n32 -shared -rdata_shared -o $*.pd_irix6 $*.o + rm $*.o + +# ----------------------- LINUX i386 ----------------------- + +pd_linux: tabosc4c~.pd_linux tabread4c~.pd_linux tabosc4cloop~.pd_linux + +.SUFFIXES: .pd_linux + +LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer \ + -Wall -W -Wshadow -Wstrict-prototypes -Werror \ + -Wno-unused -Wno-parentheses -Wno-switch + +LINUXINCLUDE = -I../../../pd/src/ + +.c.pd_linux: + cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c + ld -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm + strip --strip-unneeded $*.pd_linux + rm $*.o + +# ----------------------- Mac OS X (Darwin) ----------------------- + + +pd_darwin: tabosc4c~.pd_darwin tabread4c~.pd_darwin + +.SUFFIXES: .pd_darwin + +DARWINCFLAGS = -DPD -DUNIX -DMACOSX -O2 \ + -Wall -W -Wshadow -Wstrict-prototypes \ + -Wno-unused -Wno-parentheses -Wno-switch + +# where is your m_pd.h ??? +DARWININCLUDE = -I/. -I../../../pd/src -I../../../pd/obj + +.c.pd_darwin: + cc $(DARWINCFLAGS) $(DARWININCLUDE) -o $*.o -c $*.c + cc -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o + rm -f $*.o ../$*.pd_darwin + ln -s $*/$*.pd_darwin .. + + + Property changes on: trunk/externals/nusmuk/tab/makefile ___________________________________________________________________ Name: svn:executable + * Added: trunk/externals/nusmuk/tab/tabosc4cloop~-help.pd =================================================================== --- trunk/externals/nusmuk/tab/tabosc4cloop~-help.pd (rev 0) +++ trunk/externals/nusmuk/tab/tabosc4cloop~-help.pd 2008-06-10 08:59:57 UTC (rev 9979) @@ -0,0 +1,78 @@ +#N canvas 366 99 606 399 12; +#X floatatom 40 42 9 0 0 0 - - -; +#X obj 40 63 sig~ 100; +#N canvas 0 0 450 300 (subpatch) 0; +#X array array99 8 float 0; +#X coords 0 1 7 -1 250 200 1; +#X restore 250 120 graph; +#X obj 251 14 loadbang; +#X floatatom 40 -1 5 0 0 0 - - -; +#X obj 40 19 mtof; +#X floatatom 74 124 0 0 0 0 - - -; +#N canvas 159 26 706 447 output 0; +#X obj 414 196 t b; +#X obj 414 134 f; +#X obj 414 73 inlet; +#X text 421 36 mute; +#X obj 414 227 f; +#X msg 521 218 0; +#X msg 414 104 bang; +#X obj 414 166 moses 1; +#X obj 521 187 t b f; +#X obj 486 143 moses 1; +#X obj 102 181 dbtorms; +#X obj 486 113 r master-lvl; +#X obj 102 52 r master-lvl; +#X obj 414 257 s master-lvl; +#X obj 26 222 inlet~; +#X obj 244 50 inlet; +#X text 244 22 level; +#X obj 244 122 s master-lvl; +#X msg 118 80 set \$1; +#X obj 118 109 outlet; +#X msg 262 78 \; pd dsp 1; +#X obj 102 238 line~; +#X obj 26 259 *~; +#X obj 26 295 dac~; +#X obj 102 210 pack 0 50; +#X text 24 195 audio; +#X text 114 135 show level; +#X connect 0 0 4 0; +#X connect 1 0 7 0; +#X connect 2 0 6 0; +#X connect 4 0 13 0; +#X connect 5 0 13 0; +#X connect 6 0 1 0; +#X connect 7 0 0 0; +#X connect 7 1 8 0; +#X connect 8 0 5 0; +#X connect 9 1 4 1; +#X connect 10 0 24 0; +#X connect 11 0 1 1; +#X connect 11 0 9 0; +#X connect 12 0 10 0; +#X connect 12 0 18 0; +#X connect 14 0 22 0; +#X connect 15 0 17 0; +#X connect 15 0 20 0; +#X connect 18 0 19 0; +#X connect 21 0 22 1; +#X connect 22 0 23 0; +#X connect 22 0 23 1; +#X connect 24 0 21 0; +#X restore 40 150 pd output; +#X msg 110 124 MUTE; +#X obj 41 92 tabosc4cloop~ array99; +#X msg 251 39 \; array99 resize 8 \; array99 0 0 0 -0.5 -0.5 1 -1 0.5 +0.5 \; pd dsp 1 \;; +#X text 42 346 just like tabosc4c~ \, but does not need to copy the +last 3 point in the beggining. So \, table must be a power of 2; +#X connect 0 0 1 0; +#X connect 1 0 9 0; +#X connect 3 0 10 0; +#X connect 4 0 5 0; +#X connect 5 0 0 0; +#X connect 6 0 7 1; +#X connect 7 0 6 0; +#X connect 8 0 7 2; +#X connect 9 0 7 0; Added: trunk/externals/nusmuk/tab/tabosc4cloop~.c =================================================================== --- trunk/externals/nusmuk/tab/tabosc4cloop~.c (rev 0) +++ trunk/externals/nusmuk/tab/tabosc4cloop~.c 2008-06-10 08:59:57 UTC (rev 9979) @@ -0,0 +1,205 @@ +// GPL +// most of this code comes from pd. just the interpolation shematic is diferent. +// and the modulo for the position is made for all sample, so you do'nt need to copy the last 3 point in the beggining + + +#include "m_pd.h" + +/******************** tabosc4cloop~ ***********************/ + +/* this is all copied from d_osc.c... what include file could this go in? */ +#define UNITBIT32 1572864. /* 3*2^19; bit 32 has place value 1 */ + + /* machine-dependent definitions. These ifdefs really + should have been by CPU type and not by operating system! */ +#ifdef IRIX + /* big-endian. Most significant byte is at low address in memory */ +#define HIOFFSET 0 /* word offset to find MSB */ +#define LOWOFFSET 1 /* word offset to find LSB */ +#define int32 long /* a data type that has 32 bits */ +#endif /* IRIX */ + +#ifdef MSW + /* little-endian; most significant byte is at highest address */ +#define HIOFFSET 1 +#define LOWOFFSET 0 +#define int32 long +#endif + +#if defined(__FreeBSD__) || defined(__APPLE__) +#include <machine/endian.h> +#endif + +#ifdef __linux__ +#include <endian.h> +#endif + +#if defined(__unix__) || defined(__APPLE__) +#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) +#error No byte order defined +#endif + +#if BYTE_ORDER == LITTLE_ENDIAN +#define HIOFFSET 1 +#define LOWOFFSET 0 +#else +#define HIOFFSET 0 /* word offset to find MSB */ +#define LOWOFFSET 1 /* word offset to find LSB */ +#endif /* __BYTE_ORDER */ +#include <sys/types.h> +#define int32 int32_t +#endif /* __unix__ or __APPLE__*/ + +union tabfudge +{ + double tf_d; + int32 tf_i[2]; +}; + +static t_class *tabosc4cloop_tilde_class; + +typedef struct _tabosc4cloop_tilde +{ + t_object x_obj; + t_float x_fnpoints; + t_float x_finvnpoints; + t_word *x_vec; + t_symbol *x_arrayname; + t_float x_f; + double x_phase; + t_float x_conv; +} t_tabosc4cloop_tilde; + +static void *tabosc4cloop_tilde_new(t_symbol *s) +{ + t_tabosc4cloop_tilde *x = (t_tabosc4cloop_tilde *)pd_new(tabosc4cloop_tilde_class); + x->x_arrayname = s; + x->x_vec = 0; + x->x_fnpoints = 512.; + x->x_finvnpoints = (1./512.); + outlet_new(&x->x_obj, gensym("signal")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("ft1")); + x->x_f = 0; + return (x); +} + +static t_int *tabosc4cloop_tilde_perform(t_int *w) +{ + t_tabosc4cloop_tilde *x = (t_tabosc4cloop_tilde *)(w[1]); + t_sample *in = (t_sample *)(w[2]); + t_sample *out = (t_sample *)(w[3]); + int n = (int)(w[4]); + int normhipart; + union tabfudge tf; + double a0,a1,a2,a3; // CH + t_float fnpoints = x->x_fnpoints; + int mask = fnpoints -1; + t_float conv = fnpoints * x->x_conv; + int maxindex; + t_word *tab = x->x_vec, *addr; + int i; + double dphase = fnpoints * x->x_phase + UNITBIT32; + + if (!tab) goto zero; + tf.tf_d = UNITBIT32; + normhipart = tf.tf_i[HIOFFSET]; + +#if 1 + while (n--) + { + t_sample frac, a, b, c, d, cminusb; + tf.tf_d = dphase; + dphase += *in++ * conv; + addr = tab + (tf.tf_i[HIOFFSET] & mask); +// thx to dh + a = addr[0].w_float; + addr = tab + ((1+tf.tf_i[HIOFFSET]) & mask); + b = addr[0].w_float; + addr = tab + ((2+tf.tf_i[HIOFFSET]) & mask); + c = addr[0].w_float; + addr = tab + ((3+tf.tf_i[HIOFFSET]) & mask); + d = addr[0].w_float; + tf.tf_i[HIOFFSET] = normhipart; + frac = tf.tf_d - UNITBIT32; +// CH + a0 = d - c - a + b; + a1 = a - b - a0; + a2 = c - a; + a3 = b; + *out++ = ((a0*frac+a1)*frac+a2)*frac+a3; + + } +#endif + + tf.tf_d = UNITBIT32 * fnpoints; + normhipart = tf.tf_i[HIOFFSET]; + tf.tf_d = dphase + (UNITBIT32 * fnpoints - UNITBIT32); + tf.tf_i[HIOFFSET] = normhipart; + x->x_phase = (tf.tf_d - UNITBIT32 * fnpoints) * x->x_finvnpoints; + return (w+5); + zero: + while (n--) *out++ = 0; + + return (w+5); +} + +void tabosc4cloop_tilde_set(t_tabosc4cloop_tilde *x, t_symbol *s) +{ + t_garray *a; + int npoints, pointsinarray; + + x->x_arrayname = s; + if (!(a = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class))) + { + if (*s->s_name) + pd_error(x, "tabosc4cloop~: %s: no such array", x->x_arrayname->s_name); + x->x_vec = 0; + } + else if (!garray_getfloatwords(a, &pointsinarray, &x->x_vec)) + { + pd_error(x, "%s: bad template for tabosc4cloop~", x->x_arrayname->s_name); + x->x_vec = 0; + } + else if (pointsinarray != (1 << ilog2(pointsinarray))) + { + pd_error(x, "%s: number of points (%d) not a power of 2", + x->x_arrayname->s_name, pointsinarray); + x->x_vec = 0; + garray_usedindsp(a); + } + else + { + x->x_fnpoints = pointsinarray; + x->x_finvnpoints = 1./pointsinarray; + garray_usedindsp(a); + } +} + +static void tabosc4cloop_tilde_ft1(t_tabosc4cloop_tilde *x, t_float f) +{ + x->x_phase = f; +} + +static void tabosc4cloop_tilde_dsp(t_tabosc4cloop_tilde *x, t_signal **sp) +{ + x->x_conv = 1. / sp[0]->s_sr; + tabosc4cloop_tilde_set(x, x->x_arrayname); + + dsp_add(tabosc4cloop_tilde_perform, 4, x, + sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n); +} + +void tabosc4cloop_tilde_setup(void) +{ + tabosc4cloop_tilde_class = class_new(gensym("tabosc4cloop~"), + (t_newmethod)tabosc4cloop_tilde_new, 0, + sizeof(t_tabosc4cloop_tilde), 0, A_DEFSYM, 0); + CLASS_MAINSIGNALIN(tabosc4cloop_tilde_class, t_tabosc4cloop_tilde, x_f); + class_addmethod(tabosc4cloop_tilde_class, (t_method)tabosc4cloop_tilde_dsp, + gensym("dsp"), 0); + class_addmethod(tabosc4cloop_tilde_class, (t_method)tabosc4cloop_tilde_set, + gensym("set"), A_SYMBOL, 0); + class_addmethod(tabosc4cloop_tilde_class, (t_method)tabosc4cloop_tilde_ft1, + gensym("ft1"), A_FLOAT, 0); +} + Added: trunk/externals/nusmuk/tab/tabosc4c~-help.pd =================================================================== --- trunk/externals/nusmuk/tab/tabosc4c~-help.pd (rev 0) +++ trunk/externals/nusmuk/tab/tabosc4c~-help.pd 2008-06-10 08:59:57 UTC (rev 9979) @@ -0,0 +1,103 @@ +#N canvas 79 60 755 582 12; +#X floatatom 41 42 9 0 0 0 - - -; +#X obj 41 63 sig~ 100; +#N canvas 0 0 450 300 (subpatch) 0; +#X array array99 11 float 0; +#X coords 0 1 10 -1 250 200 1; +#X restore 436 180 graph; +#X obj 437 48 loadbang; +#X floatatom 41 -1 5 0 0 0 - - -; +#X obj 41 19 mtof; +#X floatatom 77 307 0 0 0 0 - - -; +#N canvas 159 26 706 447 output 0; +#X obj 414 196 t b; +#X obj 414 134 f; +#X obj 414 73 inlet; +#X text 421 36 mute; +#X obj 414 227 f; +#X msg 521 218 0; +#X msg 414 104 bang; +#X obj 414 166 moses 1; +#X obj 521 187 t b f; +#X obj 486 143 moses 1; +#X obj 102 181 dbtorms; +#X obj 486 113 r master-lvl; +#X obj 102 52 r master-lvl; +#X obj 414 257 s master-lvl; +#X obj 26 222 inlet~; +#X obj 244 50 inlet; +#X text 244 22 level; +#X obj 244 122 s master-lvl; +#X msg 118 80 set \$1; +#X obj 118 109 outlet; +#X msg 262 78 \; pd dsp 1; +#X obj 102 238 line~; +#X obj 26 259 *~; +#X obj 26 295 dac~; +#X obj 102 210 pack 0 50; +#X text 24 195 audio; +#X text 114 135 show level; +#X connect 0 0 4 0; +#X connect 1 0 7 0; +#X connect 2 0 6 0; +#X connect 4 0 13 0; +#X connect 5 0 13 0; +#X connect 6 0 1 0; +#X connect 7 0 0 0; +#X connect 7 1 8 0; +#X connect 8 0 5 0; +#X connect 9 1 4 1; +#X connect 10 0 24 0; +#X connect 11 0 1 1; +#X connect 11 0 9 0; +#X connect 12 0 10 0; +#X connect 12 0 18 0; +#X connect 14 0 22 0; +#X connect 15 0 17 0; +#X connect 15 0 20 0; +#X connect 18 0 19 0; +#X connect 21 0 22 1; +#X connect 22 0 23 0; +#X connect 22 0 23 1; +#X connect 24 0 21 0; +#X restore 43 333 pd output; +#X msg 113 307 MUTE; +#X obj 42 123 tabosc4~ array99; +#X obj 179 230 *~; +#X msg 356 42 \$1 30; +#X obj 359 19 hsl 128 15 0 1 0 0 empty empty empty -2 -8 0 10 -262144 +-1 -1 0 1; +#X obj 357 89 -~ 1; +#X obj 356 113 *~ -1; +#X obj 356 66 line~; +#X obj 43 231 *~; +#X text 498 18 tabosc4~; +#X text 279 17 tabosc4c~; +#X msg 294 67 0; +#X obj 178 123 tabosc4c~ array99; +#X msg 437 75 \; array99 resize 11 \; array99 0 0 0 -0.5 -0.5 1 -1 +0.5 -1 0 0 0 \; pd dsp 1 \;; +#X text 52 419 tabosc4c~ is a drop in remplacement for tabosc4~ \, +but offer a true 4 points cubic interpolation. So \, quality is better +than the standart interpolation; +#X connect 0 0 1 0; +#X connect 1 0 9 0; +#X connect 1 0 20 0; +#X connect 3 0 21 0; +#X connect 4 0 5 0; +#X connect 5 0 0 0; +#X connect 6 0 7 1; +#X connect 7 0 6 0; +#X connect 8 0 7 2; +#X connect 9 0 16 0; +#X connect 10 0 7 0; +#X connect 11 0 15 0; +#X connect 12 0 11 0; +#X connect 13 0 14 0; +#X connect 14 0 10 1; +#X connect 15 0 13 0; +#X connect 15 0 16 1; +#X connect 16 0 7 0; +#X connect 19 0 9 1; +#X connect 19 0 20 1; +#X connect 20 0 10 0; Added: trunk/externals/nusmuk/tab/tabosc4c~.c =================================================================== --- trunk/externals/nusmuk/tab/tabosc4c~.c (rev 0) +++ trunk/externals/nusmuk/tab/tabosc4c~.c 2008-06-10 08:59:57 UTC (rev 9979) @@ -0,0 +1,202 @@ +// GPL +// most of this code comes from pd. just the interpolation shematic is diferent. + + +#include "m_pd.h" + +/******************** tabosc4c~ ***********************/ + +/* this is all copied from d_osc.c... what include file could this go in? */ +#define UNITBIT32 1572864. /* 3*2^19; bit 32 has place value 1 */ + + /* machine-dependent definitions. These ifdefs really + should have been by CPU type and not by operating system! */ +#ifdef IRIX + /* big-endian. Most significant byte is at low address in memory */ +#define HIOFFSET 0 /* word offset to find MSB */ +#define LOWOFFSET 1 /* word offset to find LSB */ +#define int32 long /* a data type that has 32 bits */ +#endif /* IRIX */ + +#ifdef MSW + /* little-endian; most significant byte is at highest address */ +#define HIOFFSET 1 +#define LOWOFFSET 0 +#define int32 long +#endif + +#if defined(__FreeBSD__) || defined(__APPLE__) +#include <machine/endian.h> +#endif + +#ifdef __linux__ +#include <endian.h> +#endif + +#if defined(__unix__) || defined(__APPLE__) +#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) +#error No byte order defined +#endif + +#if BYTE_ORDER == LITTLE_ENDIAN +#define HIOFFSET 1 +#define LOWOFFSET 0 +#else +#define HIOFFSET 0 /* word offset to find MSB */ +#define LOWOFFSET 1 /* word offset to find LSB */ +#endif /* __BYTE_ORDER */ +#include <sys/types.h> +#define int32 int32_t +#endif /* __unix__ or __APPLE__*/ + +union tabfudge +{ + double tf_d; + int32 tf_i[2]; +}; + +static t_class *tabosc4c_tilde_class; + +typedef struct _tabosc4c_tilde +{ + t_object x_obj; + t_float x_fnpoints; + t_float x_finvnpoints; + t_word *x_vec; + t_symbol *x_arrayname; + t_float x_f; + double x_phase; + t_float x_conv; +} t_tabosc4c_tilde; + +static void *tabosc4c_tilde_new(t_symbol *s) +{ + t_tabosc4c_tilde *x = (t_tabosc4c_tilde *)pd_new(tabosc4c_tilde_class); + x->x_arrayname = s; + x->x_vec = 0; + x->x_fnpoints = 512.; + x->x_finvnpoints = (1./512.); + outlet_new(&x->x_obj, gensym("signal")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("ft1")); + x->x_f = 0; + return (x); +} + +static t_int *tabosc4c_tilde_perform(t_int *w) +{ + t_tabosc4c_tilde *x = (t_tabosc4c_tilde *)(w[1]); + t_sample *in = (t_sample *)(w[2]); + t_sample *out = (t_sample *)(w[3]); + int n = (int)(w[4]); + int normhipart; + union tabfudge tf; + double a0,a1,a2; // CH + t_float fnpoints = x->x_fnpoints; + int mask = fnpoints - 1; + t_float conv = fnpoints * x->x_conv; + int maxindex; + t_word *tab = x->x_vec, *addr; + int i; + double dphase = fnpoints * x->x_phase + UNITBIT32; + + if (!tab) goto zero; + tf.tf_d = UNITBIT32; + normhipart = tf.tf_i[HIOFFSET]; + +#if 1 + while (n--) + { + t_sample frac, a, b, c, d, cminusb; + tf.tf_d = dphase; + dphase += *in++ * conv; + addr = tab + (tf.tf_i[HIOFFSET] & mask); + tf.tf_i[HIOFFSET] = normhipart; + frac = tf.tf_d - UNITBIT32; + a = addr[0].w_float; + b = addr[1].w_float; + c = addr[2].w_float; + d = addr[3].w_float; +// cminusb = c-b; +// *out++ = b + frac * ( +// cminusb - 0.1666667f * (1.-frac) * ( +// (d - a - 3.0f * cminusb) * frac + (d + 2.0f*a - 3.0f*b) ) ); +// CH + a0 = d - c - a + b; + a1 = a - b - a0; + a2 = c - a; + *out++ = ((a0*frac+a1)*frac+a2)*frac+b; + } +#endif + + tf.tf_d = UNITBIT32 * fnpoints; + normhipart = tf.tf_i[HIOFFSET]; + tf.tf_d = dphase + (UNITBIT32 * fnpoints - UNITBIT32); + tf.tf_i[HIOFFSET] = normhipart; + x->x_phase = (tf.tf_d - UNITBIT32 * fnpoints) * x->x_finvnpoints; + return (w+5); + zero: + while (n--) *out++ = 0; + + return (w+5); +} + +void tabosc4c_tilde_set(t_tabosc4c_tilde *x, t_symbol *s) +{ + t_garray *a; + int npoints, pointsinarray; + + x->x_arrayname = s; + if (!(a = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class))) + { + if (*s->s_name) + pd_error(x, "tabosc4c~: %s: no such array", x->x_arrayname->s_name); + x->x_vec = 0; + } + else if (!garray_getfloatwords(a, &pointsinarray, &x->x_vec)) + { + pd_error(x, "%s: bad template for tabosc4c~", x->x_arrayname->s_name); + x->x_vec = 0; + } + else if ((npoints = pointsinarray - 3) != (1 << ilog2(pointsinarray - 3))) + { + pd_error(x, "%s: number of points (%d) not a power of 2 plus three", + x->x_arrayname->s_name, pointsinarray); + x->x_vec = 0; + garray_usedindsp(a); + } + else + { + x->x_fnpoints = npoints; + x->x_finvnpoints = 1./npoints; + garray_usedindsp(a); + } +} + +static void tabosc4c_tilde_ft1(t_tabosc4c_tilde *x, t_float f) +{ + x->x_phase = f; +} + +static void tabosc4c_tilde_dsp(t_tabosc4c_tilde *x, t_signal **sp) +{ + x->x_conv = 1. / sp[0]->s_sr; + tabosc4c_tilde_set(x, x->x_arrayname); + + dsp_add(tabosc4c_tilde_perform, 4, x, + sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n); +} + +void tabosc4c_tilde_setup(void) +{ + tabosc4c_tilde_class = class_new(gensym("tabosc4c~"), + (t_newmethod)tabosc4c_tilde_new, 0, + sizeof(t_tabosc4c_tilde), 0, A_DEFSYM, 0); + CLASS_MAINSIGNALIN(tabosc4c_tilde_class, t_tabosc4c_tilde, x_f); + class_addmethod(tabosc4c_tilde_class, (t_method)tabosc4c_tilde_dsp, + gensym("dsp"), 0); + class_addmethod(tabosc4c_tilde_class, (t_method)tabosc4c_tilde_set, + gensym("set"), A_SYMBOL, 0); + class_addmethod(tabosc4c_tilde_class, (t_method)tabosc4c_tilde_ft1, + gensym("ft1"), A_FLOAT, 0); +} + Added: trunk/externals/nusmuk/tab/tabread4c~-help.pd =================================================================== --- trunk/externals/nusmuk/tab/tabread4c~-help.pd (rev 0) +++ trunk/externals/nusmuk/tab/tabread4c~-help.pd 2008-06-10 08:59:57 UTC (rev 9979) @@ -0,0 +1,43 @@ +#N canvas 106 72 743 605 10; +#N canvas 0 0 450 300 (subpatch) 0; +#X array array99 10 float 0; +#X coords 0 1 9 -1 250 200 1; +#X restore 461 80 graph; +#X obj 69 195 line~; +#X obj 36 139 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1 +-1; +#X msg 69 172 0 \, 10 1000; +#X obj 70 219 tabread4c~ array99; +#X obj 36 32 loadbang; +#X obj 296 195 line~; +#X msg 296 172 0 \, 10 1000; +#X obj 297 219 tabread4~ array99; +#X obj 298 241 tabwrite~ test_miller; +#X obj 70 241 tabwrite~ test_cubic; +#X obj 36 55 t b b; +#N canvas 0 0 450 300 (subpatch) 0; +#X array test_miller 44100 float 0; +#X coords 0 1 44099 -1 250 200 1; +#X restore 295 312 graph; +#N canvas 0 0 450 300 (subpatch) 0; +#X array test_cubic 44100 float 0; +#X coords 0 1 44099 -1 250 200 1; +#X restore 34 312 graph; +#X text 49 530 tabread4c~ is a drop in remplacement for tabrad4~ \, +but offer a true 4 points cubic interpolation. So \, quality is better +than the standart interpolation; +#X msg 63 77 \; array99 resize 10 \; array99 0 -0.5 -0.5 -0.5 0.5 0.5 +0.5 -0.5 0 0 \; pd dsp 1 \;; +#X connect 1 0 4 0; +#X connect 2 0 3 0; +#X connect 2 0 7 0; +#X connect 2 0 9 0; +#X connect 2 0 10 0; +#X connect 3 0 1 0; +#X connect 4 0 10 0; +#X connect 5 0 11 0; +#X connect 6 0 8 0; +#X connect 7 0 6 0; +#X connect 8 0 9 0; +#X connect 11 0 2 0; +#X connect 11 1 15 0; Added: trunk/externals/nusmuk/tab/tabread4c~.c =================================================================== --- trunk/externals/nusmuk/tab/tabread4c~.c (rev 0) +++ trunk/externals/nusmuk/tab/tabread4c~.c 2008-06-10 08:59:57 UTC (rev 9979) @@ -0,0 +1,137 @@ +// GPL +// most of this code comes from pd. just the interpolation shematic is diferent. + +#include "m_pd.h" + +/******************** tabread4c~ ***********************/ + +static t_class *tabread4c_tilde_class; + +typedef struct _tabread4c_tilde +{ + t_object x_obj; + int x_npoints; + t_word *x_vec; + t_symbol *x_arrayname; + t_float x_f; +} t_tabread4c_tilde; + +static void *tabread4c_tilde_new(t_symbol *s) +{ + t_tabread4c_tilde *x = (t_tabread4c_tilde *)pd_new(tabread4c_tilde_class); + x->x_arrayname = s; + x->x_vec = 0; + outlet_new(&x->x_obj, gensym("signal")); + x->x_f = 0; + return (x); +} + +static t_int *tabread4c_tilde_perform(t_int *w) +{ + t_tabread4c_tilde *x = (t_tabread4c_tilde *)(w[1]); + t_sample *in = (t_sample *)(w[2]); + t_sample *out = (t_sample *)(w[3]); + int n = (int)(w[4]); + int maxindex; + t_word *buf = x->x_vec, *wp; + int i; + double a0,a1,a2; // CH + + maxindex = x->x_npoints - 3; + + if (!buf) goto zero; + +#if 0 /* test for spam -- I'm not ready to deal with this */ + for (i = 0, xmax = 0, xmin = maxindex, fp = in1; i < n; i++, fp++) + { + t_sample f = *in1; + if (f < xmin) xmin = f; + else if (f > xmax) xmax = f; + } + if (xmax < xmin + x->c_maxextent) xmax = xmin + x->c_maxextent; + for (i = 0, splitlo = xmin+ x->c_maxextent, splithi = xmax - x->c_maxextent, + fp = in1; i < n; i++, fp++) + { + t_sample f = *in1; + if (f > splitlo && f < splithi) goto zero; + } +#endif + + for (i = 0; i < n; i++) + { + t_sample findex = *in++; + int index = findex; + t_sample frac, a, b, c, d, cminusb; + static int count; + if (index < 1) + index = 1, frac = 0; + else if (index > maxindex) + index = maxindex, frac = 1; + else frac = findex - index; + wp = buf + index; + a = wp[-1].w_float; + b = wp[0].w_float; + c = wp[1].w_float; + d = wp[2].w_float; + /* if (!i && !(count++ & 1023)) + post("fp = %lx, shit = %lx, b = %f", fp, buf->b_shit, b); */ +// cminusb = c-b; +// *out++ = b + frac * ( +// cminusb - 0.1666667f * (1.-frac) * ( +// (d - a - 3.0f * cminusb) * frac + (d + 2.0f*a - 3.0f*b) +// CH + a0 = d - c - a + b; + a1 = a - b - a0; + a2 = c - a; + *out++ = ((a0*frac+a1)*frac+a2)*frac+b; + } + return (w+5); + zero: + while (n--) *out++ = 0; + + return (w+5); +} + +void tabread4c_tilde_set(t_tabread4c_tilde *x, t_symbol *s) +{ + t_garray *a; + + x->x_arrayname = s; + if (!(a = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class))) + { + if (*s->s_name) + pd_error(x, "tabread4c~: %s: no such array", x->x_arrayname->s_name); + x->x_vec = 0; + } + else if (!garray_getfloatwords(a, &x->x_npoints, &x->x_vec)) + { + pd_error(x, "%s: bad template for tabread4c~", x->x_arrayname->s_name); + x->x_vec = 0; + } + else garray_usedindsp(a); +} + +static void tabread4c_tilde_dsp(t_tabread4c_tilde *x, t_signal **sp) +{ + tabread4c_tilde_set(x, x->x_arrayname); + + dsp_add(tabread4c_tilde_perform, 4, x, + sp[0]->s_vec, sp[1]->s_vec, sp[0]->s_n); + +} + +static void tabread4c_tilde_free(t_tabread4c_tilde *x) +{ +} + +void tabread4c_tilde_setup(void) +{ + tabread4c_tilde_class = class_new(gensym("tabread4c~"), + (t_newmethod)tabread4c_tilde_new, (t_method)tabread4c_tilde_free, + sizeof(t_tabread4c_tilde), 0, A_DEFSYM, 0); + CLASS_MAINSIGNALIN(tabread4c_tilde_class, t_tabread4c_tilde, x_f); + class_addmethod(tabread4c_tilde_class, (t_method)tabread4c_tilde_dsp, + gensym("dsp"), 0); + class_addmethod(tabread4c_tilde_class, (t_method)tabread4c_tilde_set, + gensym("set"), A_SYMBOL, 0); +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

autobuild: pd-extended macosx104-powerpc 2008-06-10 03.15.03
by pd＠macosx104-powerpc.idmi.poly.edu 10 Jun '08

10 Jun '08

1 0

SF.net SVN: pure-data: [9978] trunk/externals/zexy/src
by zmoelnig＠users.sourceforge.net 09 Jun '08

09 Jun '08

Revision: 9978 http://pure-data.svn.sourceforge.net/pure-data/?rev=9978&view=rev Author: zmoelnig Date: 2008-06-09 09:53:50 -0700 (Mon, 09 Jun 2008) Log Message: ----------- fixed help-message for scalar-versions of objects Modified Paths: -------------- trunk/externals/zexy/src/0x3c0x7e.c trunk/externals/zexy/src/0x3d0x3d0x7e.c trunk/externals/zexy/src/0x3e0x7e.c trunk/externals/zexy/src/0x7c0x7c0x7e.c Modified: trunk/externals/zexy/src/0x3c0x7e.c =================================================================== --- trunk/externals/zexy/src/0x3c0x7e.c 2008-06-09 16:17:40 UTC (rev 9977) +++ trunk/externals/zexy/src/0x3c0x7e.c 2008-06-09 16:53:50 UTC (rev 9978) @@ -247,7 +247,7 @@ CLASS_MAINSIGNALIN(scalarlt_tilde_class, t_scalarlt_tilde, x_f); class_addmethod(scalarlt_tilde_class, (t_method)scalarlt_tilde_dsp, gensym("dsp"), 0); - class_addmethod (lt_tilde_class, (t_method)lt_tilde_help, gensym("help"), A_NULL); + class_addmethod (scalarlt_tilde_class, (t_method)lt_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(scalarlt_tilde_class, gensym("zigbinops")); zexy_register("<~"); } Modified: trunk/externals/zexy/src/0x3d0x3d0x7e.c =================================================================== --- trunk/externals/zexy/src/0x3d0x3d0x7e.c 2008-06-09 16:17:40 UTC (rev 9977) +++ trunk/externals/zexy/src/0x3d0x3d0x7e.c 2008-06-09 16:53:50 UTC (rev 9978) @@ -247,7 +247,7 @@ CLASS_MAINSIGNALIN(scalareq_tilde_class, t_scalareq_tilde, x_f); class_addmethod(scalareq_tilde_class, (t_method)scalareq_tilde_dsp, gensym("dsp"), 0); - class_addmethod (eq_tilde_class, (t_method)eq_tilde_help, gensym("help"), A_NULL); + class_addmethod (scalareq_tilde_class, (t_method)eq_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(scalareq_tilde_class, gensym("zigbinops")); zexy_register("==~"); Modified: trunk/externals/zexy/src/0x3e0x7e.c =================================================================== --- trunk/externals/zexy/src/0x3e0x7e.c 2008-06-09 16:17:40 UTC (rev 9977) +++ trunk/externals/zexy/src/0x3e0x7e.c 2008-06-09 16:53:50 UTC (rev 9978) @@ -250,7 +250,7 @@ CLASS_MAINSIGNALIN(scalargt_tilde_class, t_scalargt_tilde, x_f); class_addmethod(scalargt_tilde_class, (t_method)scalargt_tilde_dsp, gensym("dsp"), 0); - class_addmethod (gt_tilde_class, (t_method)gt_tilde_help, gensym("help"), A_NULL); + class_addmethod (scalargt_tilde_class, (t_method)gt_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(scalargt_tilde_class, gensym("zigbinops")); zexy_register(">~"); Modified: trunk/externals/zexy/src/0x7c0x7c0x7e.c =================================================================== --- trunk/externals/zexy/src/0x7c0x7c0x7e.c 2008-06-09 16:17:40 UTC (rev 9977) +++ trunk/externals/zexy/src/0x7c0x7c0x7e.c 2008-06-09 16:53:50 UTC (rev 9978) @@ -264,7 +264,7 @@ CLASS_MAINSIGNALIN(scalaroror_tilde_class, t_scalaroror_tilde, x_f); class_addmethod(scalaroror_tilde_class, (t_method)scalaroror_tilde_dsp, gensym("dsp"), 0); - class_addmethod (oror_tilde_class, (t_method)oror_tilde_help, gensym("help"), A_NULL); + class_addmethod (scalaroror_tilde_class, (t_method)oror_tilde_help, gensym("help"), A_NULL); class_sethelpsymbol(scalaroror_tilde_class, gensym("zigbinops")); zexy_register("||~"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: pure-data: [9977] trunk/externals/iemlib/Make.include
by zmoelnig＠users.sourceforge.net 09 Jun '08

09 Jun '08

Revision: 9977 http://pure-data.svn.sourceforge.net/pure-data/?rev=9977&view=rev Author: zmoelnig Date: 2008-06-09 09:17:40 -0700 (Mon, 09 Jun 2008) Log Message: ----------- make the path optional to be able to set it from outside (i wonder how often i have already done that...) Modified Paths: -------------- trunk/externals/iemlib/Make.include Modified: trunk/externals/iemlib/Make.include =================================================================== --- trunk/externals/iemlib/Make.include 2008-06-08 11:55:43 UTC (rev 9976) +++ trunk/externals/iemlib/Make.include 2008-06-09 16:17:40 UTC (rev 9977) @@ -1,6 +1,6 @@ current: all -PDSOURCE = /usr/local/src/pd/src +PDSOURCE ?= /usr/local/src/pd/src .SUFFIXES: .pd_linux This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

autobuild: pd-extended macosx104-powerpc 2008-06-09 03.15.03
by pd＠macosx104-powerpc.idmi.poly.edu 09 Jun '08

09 Jun '08

1 0

SF.net SVN: pure-data: [9976] branches/pd-extended/v0-40/externals/pdp
by sevyves＠users.sourceforge.net 08 Jun '08

08 Jun '08

Revision: 9976 http://pure-data.svn.sourceforge.net/pure-data/?rev=9976&view=rev Author: sevyves Date: 2008-06-08 04:55:43 -0700 (Sun, 08 Jun 2008) Log Message: ----------- Patch to support more conversion Modified Paths: -------------- branches/pd-extended/v0-40/externals/pdp/include/pdp_llconv.h branches/pd-extended/v0-40/externals/pdp/system/image/pdp_llconv.c Modified: branches/pd-extended/v0-40/externals/pdp/include/pdp_llconv.h =================================================================== --- branches/pd-extended/v0-40/externals/pdp/include/pdp_llconv.h 2008-06-08 11:49:52 UTC (rev 9975) +++ branches/pd-extended/v0-40/externals/pdp/include/pdp_llconv.h 2008-06-08 11:55:43 UTC (rev 9976) @@ -53,6 +53,7 @@ RIF_YUV__P411_U8, RIF_YVU__P411_S16, RIF_YVU__P444_S16, + RIF_UYVY_P____U8, RIF_YUYV_P____U8, RIF_RGB__P____U8, RIF_RGBA_P____U8, Modified: branches/pd-extended/v0-40/externals/pdp/system/image/pdp_llconv.c =================================================================== --- branches/pd-extended/v0-40/externals/pdp/system/image/pdp_llconv.c 2008-06-08 11:49:52 UTC (rev 9975) +++ branches/pd-extended/v0-40/externals/pdp/system/image/pdp_llconv.c 2008-06-08 11:55:43 UTC (rev 9976) @@ -509,6 +509,66 @@ } + + +/* convert yuvu packed 8 bit unsigned to yv12 planar 16bit signed */ +/* search for bithacks */ +static void llconv_uyvy_packed_u8s16(unsigned char* ucsource, short int *sidest, unsigned int w, unsigned int h) +{ + unsigned int i, j; + unsigned int *source = (unsigned int *)ucsource; + + unsigned int *dest = (unsigned int *)sidest; + unsigned int uoffset = (w*h)>>1; + unsigned int voffset = (w*h + ((w*h) >> 2)) >> 1; + + for(j=0; j < (h*w)>>1; j +=(w)){ + for(i=0; i< (w>>1); i+=2){ + unsigned int y,u,v; + unsigned int v00, v01, v10, v11; + v00 = source[i+j]; + v01 = source[i+j+1]; + v10 = source[i+j+(w>>1)]; + v11 = source[i+j+(w>>1)+1]; + + // save luma + dest[i+j] = ((v00 & 0xff00ff00)>>1); + v11 = source[i+j+(w>>1)+1]; + + // save luma + dest[i+j] = ((v00 & 0xff00ff00)>>1); + dest[i+j+1] = ((v01 & 0xff00ff00)>>1); + dest[i+j+(w>>1)] = ((v10 & 0xff00ff00)>>1); + dest[i+j+(w>>1)+1] = ((v11 & 0xff00ff00)>>1); + + // compute chroma + + + v00 = (v00 & 0x00ff00ff) << 7; + v01 = (v01 & 0x00ff00ff) << 7; + v10 = (v10 & 0x00ff00ff) << 7; + v11 = (v11 & 0x00ff00ff) << 7; + + // average 2 scan lines + v00 += v10; + v01 += v11; + + // combine TWO VALUES IN ONE WORD (32bits) + v = (v01 << 16) | (v00 & 0x0000ffff); + u = (v01 & 0xffff0000) | (v00 >> 16); + + // flip sign bits for u,v FOR PDP FORMAT + u ^= 0x80008000; + v ^= 0x80008000; + + // save chroma + dest[uoffset + (i>>1) + (j>>2)] = u; + dest[voffset + (i>>1) + (j>>2)] = v; + } + } + +} + #define CONVERT(x,y) ((x) + ((y)<<16)) void pdp_llconv(void *src, int stype, void *dst, int dtype, int w, int h) @@ -530,6 +590,10 @@ llconv_yuyv_packed_u8s16((unsigned char*)src, (short int *)dst, w, h); break; + case CONVERT( RIF_UYVY_P____U8, RIF_YVU__P411_S16 ): + llconv_uyvy_packed_u8s16((unsigned char*)src, (short int *)dst, w, h); + break; + case CONVERT( RIF_RGB__P____U8, RIF_YVU__P411_U8 ): llconv_rgb2yvu_planar8sub((unsigned char*) src, (unsigned char*) dst, w, h); break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs June 2008