Pd-cvs December 2006

pd-cvs@lists.iem.at

19 participants
825 discussions

autobuild: pd-main macosx104-powerpc 2006-12-31 03.15.03
by pd＠macosx104-powerpc.idmi.poly.edu 31 Dec '06

31 Dec '06

cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/m_sched.o m_sched.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/s_main.o s_main.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/s_inter.o s_inter.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/s_file.o s_file.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/s_print.o s_print.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/s_loader.o s_loader.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/s_path.o s_path.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/s_entry.o s_entry.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/s_audio.o s_audio.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/s_midi.o s_midi.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/d_ugen.o d_ugen.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/d_ctl.o d_ctl.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/d_arithmetic.o d_arithmetic.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Wno-error -O2 -DUSEAPI_JACK -DINSTALL_PREFIX=\"\" -c -o ../obj/d_osc.o d_osc.c d_osc.c:39:2: error: #error No byte order defined d_osc.c:39:2: error: #error No byte order defined lipo: can't figure out the architecture type of: /var/tmp//cctr6uaJ.out make[2]: *** [d_osc.o] Error 1 make[1]: *** [pd_install] Error 2 make: *** [darwin_app_core] Error 2

1 0

pd/src desire.c, 1.1.2.217.2.97, 1.1.2.217.2.98 kernel.c, 1.1.2.16, 1.1.2.17
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8546 Modified Files: Tag: desiredata desire.c kernel.c Log Message: binbuf_addv "s" replaced by binbuf_addv "t" to avoid gensym Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -C2 -d -r1.1.2.16 -r1.1.2.17 *** kernel.c 31 Dec 2006 07:54:20 -0000 1.1.2.16 --- kernel.c 31 Dec 2006 08:05:57 -0000 1.1.2.17 *************** *** 1917,1920 **** --- 1917,1921 ---- case 'f': SETFLOAT(at, va_arg(ap, double)); break; case 's': SETSYMBOL(at, va_arg(ap, t_symbol *)); break; + case 't': SETSYMBOL(at, gensym(va_arg(ap, char *))); break; case ';': SETSEMI(at); break; case ',': SETCOMMA(at); break; *************** *** 1952,1956 **** break; default: ! bug("binbuf_addbinbuf"); } } --- 1953,1957 ---- break; default: ! bug("binbuf_addbinbuf: stray atom of type %d",ap->a_type); } } Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.97 retrieving revision 1.1.2.217.2.98 diff -C2 -d -r1.1.2.217.2.97 -r1.1.2.217.2.98 *** desire.c 31 Dec 2006 07:27:18 -0000 1.1.2.217.2.97 --- desire.c 31 Dec 2006 08:05:55 -0000 1.1.2.217.2.98 *************** *** 117,121 **** hashvalue v; int i=0; ! binbuf_addv(b, "s", gensym("#V")); hash_foreach(k,v,h) { t_arglist *al = (t_arglist *)v; --- 117,121 ---- hashvalue v; int i=0; ! binbuf_addv(b,"t","#V"); hash_foreach(k,v,h) { t_arglist *al = (t_arglist *)v; *************** *** 123,127 **** binbuf_add(b,al->c,al->v); if (i+1==hash_size(h)) binbuf_addv(b, ";"); ! else binbuf_addv(b, "s", gensym(",")); i++; } --- 123,127 ---- binbuf_add(b,al->c,al->v); if (i+1==hash_size(h)) binbuf_addv(b, ";"); ! else binbuf_addv(b,"t",","); i++; } *************** *** 649,653 **** x->goprect = 0; x->binbuf = binbuf_new(); ! binbuf_addv(x->binbuf, "s", gensym("graph")); if (!menu) pd_pushsym(x); canvas_add(g,x); --- 649,653 ---- x->goprect = 0; x->binbuf = binbuf_new(); ! binbuf_addv(x->binbuf,"t","graph"); if (!menu) pd_pushsym(x); canvas_add(g,x); *************** *** 1312,1316 **** canvas_wires_each(oc,t,x) { if ((o==t.from) != (o==t.to)) ! binbuf_addv(buf, "ssiiii;", gensym("#X"), gensym("connect"), canvas_getindex(x, t.from), t.outlet, canvas_getindex(x, t.to), t.inlet); --- 1312,1316 ---- canvas_wires_each(oc,t,x) { if ((o==t.from) != (o==t.to)) ! binbuf_addv(buf,"ttiiii;","#X","connect", canvas_getindex(x, t.from), t.outlet, canvas_getindex(x, t.to), t.inlet); *************** *** 1949,1959 **** style = (int)template_getfloat(scalartemplate, gensym("style"), x->scalar->v, 0); filestyle = (style == PLOTSTYLE_POINTS ? 1 : (style == PLOTSTYLE_POLY ? 0 : style)); ! binbuf_addv(b, "sssisi;", gensym("#X"), gensym("array"), ! x->realname, array->n, &s_float, x->saveit + 2 * filestyle + 8*x->hidename); if (x->saveit) { int n = array->n, n2 = 0; while (n2 < n) { int chunk = imin(n-n2,1000); ! binbuf_addv(b, "si", gensym("#A"), n2); for (int i=0; i<chunk; i++) binbuf_addv(b, "f", ((float *)array->vec)[n2+i]); binbuf_addv(b, ";"); --- 1949,1958 ---- style = (int)template_getfloat(scalartemplate, gensym("style"), x->scalar->v, 0); filestyle = (style == PLOTSTYLE_POINTS ? 1 : (style == PLOTSTYLE_POLY ? 0 : style)); ! binbuf_addv(b, "ttsisi;","#X","array", x->realname, array->n, &s_float, x->saveit+2*filestyle+8*x->hidename); if (x->saveit) { int n = array->n, n2 = 0; while (n2 < n) { int chunk = imin(n-n2,1000); ! binbuf_addv(b,"ti","#A",n2); for (int i=0; i<chunk; i++) binbuf_addv(b, "f", ((float *)array->vec)[n2+i]); binbuf_addv(b, ";"); *************** *** 2938,2947 **** canvas_addtemplatesforscalar(s->t, s->v, &ntemplates, &templatevec); } ! binbuf_addv(b, "s;", gensym("data")); for (int i=0; i<ntemplates; i++) { t_template *t = template_findbyname(templatevec[i]); int m = t->n; /* drop "pd-" prefix from template symbol to print it: */ ! binbuf_addv(b, "ss;", gensym("template"), gensym(templatevec[i]->s_name + 3)); for (int j=0; j<m; j++) { t_symbol *type; --- 2937,2946 ---- canvas_addtemplatesforscalar(s->t, s->v, &ntemplates, &templatevec); } ! binbuf_addv(b,"t;","data"); for (int i=0; i<ntemplates; i++) { t_template *t = template_findbyname(templatevec[i]); int m = t->n; /* drop "pd-" prefix from template symbol to print it: */ ! binbuf_addv(b,"tt;","template",templatevec[i]->s_name + 3); for (int j=0; j<m; j++) { t_symbol *type; *************** *** 2954,2959 **** } if (t->vec[j].type == DT_ARRAY) ! binbuf_addv(b, "sss;", type, t->vec[j].name, gensym(t->vec[j].arraytemplate->s_name + 3)); ! else binbuf_addv(b, "ss;", type, t->vec[j].name); } binbuf_addsemi(b); --- 2953,2958 ---- } if (t->vec[j].type == DT_ARRAY) ! binbuf_addv(b,"sst;", type, t->vec[j].name, t->vec[j].arraytemplate->s_name + 3); ! else binbuf_addv(b,"ss;", type, t->vec[j].name); } binbuf_addsemi(b); *************** *** 2997,3001 **** int x1=x->screenx1, xs=x->screenx2-x1; int y1=x->screeny1, ys=x->screeny2-y1; ! binbuf_addv(b, "ssiiii", gensym("#N"), gensym("canvas"), x1, y1, xs, ys); if (x->owner && !x->env) { /* subpatch */ binbuf_addv(b, "si;", (patchsym != &s_ ? patchsym: gensym("(subpatch)")), x->mapped); --- 2996,3000 ---- int x1=x->screenx1, xs=x->screenx2-x1; int y1=x->screeny1, ys=x->screeny2-y1; ! binbuf_addv(b,"ttiiii","#N","canvas",x1,y1,xs,ys); if (x->owner && !x->env) { /* subpatch */ binbuf_addv(b, "si;", (patchsym != &s_ ? patchsym: gensym("(subpatch)")), x->mapped); *************** *** 3014,3018 **** that old versions of Pd can at least do something with it. otherwise write in 0.38-compatible form. */ ! binbuf_addv(b, "ssffffffi", gensym("#X"), gensym("coords"), x->x1, x->y1, x->x2, x->y2, (float)x->pixwidth, (float)x->pixheight, x->isgraph?x->hidetext?2:1:0); --- 3013,3017 ---- that old versions of Pd can at least do something with it. otherwise write in 0.38-compatible form. */ ! binbuf_addv(b,"ttffffffi","#X","coords", x->x1, x->y1, x->x2, x->y2, (float)x->pixwidth, (float)x->pixheight, x->isgraph?x->hidetext?2:1:0); *************** *** 3027,3031 **** int from = canvas_getindex(x,t.from); int to = canvas_getindex(x,t.to); ! binbuf_addv(b, "ssiiii;", gensym("#X"), gensym("connect"), from, t.outlet, to, t.inlet); appendix_save(oc,b); } --- 3026,3030 ---- int from = canvas_getindex(x,t.from); int to = canvas_getindex(x,t.to); ! binbuf_addv(b, "ttiiii;","#X","connect", from, t.outlet, to, t.inlet); appendix_save(oc,b); } *************** *** 3059,3063 **** } /* drop "pd-" prefix from template symbol to print */ ! binbuf_addv(b, "sss", &s__N, gensym("struct"), gensym(templatevec[i]->s_name + 3)); for (j = 0; j < m; j++) { t_symbol *type; --- 3058,3062 ---- } /* drop "pd-" prefix from template symbol to print */ ! binbuf_addv(b,"ttt","#N","struct",templatevec[i]->s_name+3); for (j = 0; j < m; j++) { t_symbol *type; *************** *** 3069,3074 **** default: type = &s_float; bug("canvas_write"); } ! binbuf_addv(b, "ss", type, t->vec[j].name); ! if (t->vec[j].type == DT_ARRAY) binbuf_addv(b, "s", gensym(t->vec[j].arraytemplate->s_name + 3)); } binbuf_addsemi(b); --- 3068,3073 ---- default: type = &s_float; bug("canvas_write"); } ! binbuf_addv(b,"ss",type,t->vec[j].name); ! if (t->vec[j].type == DT_ARRAY) binbuf_addv(b, "t", t->vec[j].arraytemplate->s_name + 3); } binbuf_addsemi(b); *************** *** 3746,3750 **** t_binbuf *b2 = binbuf_new(); canvas_writescalar(x->t, x->v, b2, 0); ! binbuf_addv(b, "ss", &s__X, gensym("scalar")); binbuf_addbinbuf(b, b2); binbuf_addsemi(b); --- 3745,3749 ---- t_binbuf *b2 = binbuf_new(); canvas_writescalar(x->t, x->v, b2, 0); ! binbuf_addv(b,"tt","#X","scalar"); binbuf_addbinbuf(b, b2); binbuf_addsemi(b); *************** *** 6092,6105 **** t_canvas *c = (t_canvas *)z; /* in case it is */ if (x->_class == message_class) { ! binbuf_addv(b, "ssii", gensym("#X"), gensym("msg"), (t_int)x->x, (t_int)x->y); binbuf_addbinbuf(b, x->binbuf); } else if (x->_class == gatom_class) { t_gatom *g = (t_gatom *)x; t_symbol *sel = g->atom.a_type==A_SYMBOL? gensym("symbolatom") : gensym("floatatom"); ! binbuf_addv(b, "ssii", gensym("#X"), sel, (t_int)x->x, (t_int)x->y); ! binbuf_addv(b, "iffi", (t_int)g->width, g->min, g->max, (t_int)g->wherelabel); ! binbuf_addv(b, "sss", gatom_escapit(g->label), gatom_escapit(g->rcv), gatom_escapit(g->snd)); } else if (x->_class == text_class) { ! binbuf_addv(b, "ssii", gensym("#X"), gensym("text"), (t_int)x->x, (t_int)x->y); binbuf_addbinbuf(b, x->binbuf); } else { --- 6091,6104 ---- t_canvas *c = (t_canvas *)z; /* in case it is */ if (x->_class == message_class) { ! binbuf_addv(b,"ttii","#X","msg", (t_int)x->x, (t_int)x->y); binbuf_addbinbuf(b, x->binbuf); } else if (x->_class == gatom_class) { t_gatom *g = (t_gatom *)x; t_symbol *sel = g->atom.a_type==A_SYMBOL? gensym("symbolatom") : gensym("floatatom"); ! binbuf_addv(b,"tsii","#X", sel, (t_int)x->x, (t_int)x->y); ! binbuf_addv(b,"iffi", (t_int)g->width, g->min, g->max, (t_int)g->wherelabel); ! binbuf_addv(b,"sss", gatom_escapit(g->label), gatom_escapit(g->rcv), gatom_escapit(g->snd)); } else if (x->_class == text_class) { ! binbuf_addv(b, "ttii","#X","text", (t_int)x->x, (t_int)x->y); binbuf_addbinbuf(b, x->binbuf); } else { *************** *** 6107,6113 **** !(x->_class==canvas_class && (canvas_isabstraction(c) || canvas_istable(c)))) { mess1(x,gensym("saveto"),b); ! binbuf_addv(b, "ssii", gensym("#X"), gensym("restore"), (t_int)x->x, (t_int)x->y); } else { ! binbuf_addv(b, "ssii", gensym("#X"), gensym("obj"), (t_int)x->x, (t_int)x->y); } if (x->binbuf) { --- 6106,6112 ---- !(x->_class==canvas_class && (canvas_isabstraction(c) || canvas_istable(c)))) { mess1(x,gensym("saveto"),b); ! binbuf_addv(b,"ttii","#X","restore", (t_int)x->x, (t_int)x->y); } else { ! binbuf_addv(b,"ttii","#X","obj", (t_int)x->x, (t_int)x->y); } if (x->binbuf) { *************** *** 6461,6465 **** static int pd_savehead(t_binbuf *b, t_iemgui *x, char *name) { ! binbuf_addv(b, "ssiis", gensym("#X"), gensym("obj"), (t_int)x->x, (t_int)x->y, gensym(name)); return 1; } --- 6460,6464 ---- static int pd_savehead(t_binbuf *b, t_iemgui *x, char *name) { ! binbuf_addv(b, "ttiit","#X","obj", (t_int)x->x, (t_int)x->y, name); return 1; } *************** *** 6475,6479 **** canvas_savecontainerto((t_canvas *)self,b); canvas_savecoordsto((t_canvas *)self,b); /* this may be too early */ ! binbuf_addv(b, "ssii", gensym("#X"), gensym("restore"), (t_int)x->x, (t_int)x->y); if (x->binbuf) { binbuf_addbinbuf(b, x->binbuf); --- 6474,6478 ---- canvas_savecontainerto((t_canvas *)self,b); canvas_savecoordsto((t_canvas *)self,b); /* this may be too early */ ! binbuf_addv(b, "ttii", "#X","restore", (t_int)x->x, (t_int)x->y); if (x->binbuf) { binbuf_addbinbuf(b, x->binbuf); *************** *** 7283,7287 **** if (pd_class(y) == declare_class) { ! binbuf_addv(b, "s", gensym("#X")); binbuf_addbinbuf(b, ((t_declare *)y)->x_obj.te_binbuf); binbuf_addv(b, ";"); --- 7282,7286 ---- if (pd_class(y) == declare_class) { ! binbuf_addv(b,"t","#X"); binbuf_addbinbuf(b, ((t_declare *)y)->x_obj.te_binbuf); binbuf_addv(b, ";");

1 0

pd/src kernel.c,1.1.2.15,1.1.2.16
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4167 Modified Files: Tag: desiredata kernel.c Log Message: shrunk code for loading and saving .pat files Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** kernel.c 31 Dec 2006 07:27:21 -0000 1.1.2.15 --- kernel.c 31 Dec 2006 07:54:20 -0000 1.1.2.16 *************** *** 1646,1652 **** t_gotfn getfn(t_pd *x, t_symbol *s) { t_class *c = *x; ! t_methodentry *m; ! int i; ! for (i = c->nmethod, m = c->methods; i--; m++) if (m->me_name == s) return m->me_fun; pd_error(x, "%s: no method for message '%s'", c->name->s_name, s->s_name); return (t_gotfn)nullfn; --- 1646,1651 ---- t_gotfn getfn(t_pd *x, t_symbol *s) { t_class *c = *x; ! t_methodentry *m = c->methods; ! for (int i=c->nmethod; i--; m++) if (m->me_name == s) return m->me_fun; pd_error(x, "%s: no method for message '%s'", c->name->s_name, s->s_name); return (t_gotfn)nullfn; *************** *** 1655,1661 **** t_gotfn zgetfn(t_pd *x, t_symbol *s) { t_class *c = *x; ! t_methodentry *m; ! int i; ! for (i = c->nmethod, m = c->methods; i--; m++) if (m->me_name == s) return m->me_fun; return 0; } --- 1654,1659 ---- t_gotfn zgetfn(t_pd *x, t_symbol *s) { t_class *c = *x; ! t_methodentry *m = c->methods; ! for (int i=c->nmethod; i--; m++) if (m->me_name == s) return m->me_fun; return 0; } *************** *** 1679,1684 **** int class_getfieldindex(t_class *x, const char *s) { t_symbol *sy = gensym((char *)s); ! int i; ! for (i=0; i<x->nfields; i++) if (x->fields[i]==sy) return i; return -1; } --- 1677,1681 ---- int class_getfieldindex(t_class *x, const char *s) { t_symbol *sy = gensym((char *)s); ! for (int i=0; i<x->nfields; i++) if (x->fields[i]==sy) return i; return -1; } *************** *** 1709,1713 **** if (c-> listmethod != pd_defaultlist) sys_vgui("<list> "); if (c-> anymethod != pd_defaultanything) sys_vgui("<any> "); ! {int i; for (i=0; i<c->nmethod; i++) sys_vgui("%s ",c->methods[i].me_name->s_name);} sys_vgui("}]; %s %s %s\n",cb_recv->s_name, cb_sel->s_name, s->s_name); } --- 1706,1710 ---- if (c-> listmethod != pd_defaultlist) sys_vgui("<list> "); if (c-> anymethod != pd_defaultanything) sys_vgui("<any> "); ! for (int i=0; i<c->nmethod; i++) sys_vgui("%s ",c->methods[i].me_name->s_name); sys_vgui("}]; %s %s %s\n",cb_recv->s_name, cb_sel->s_name, s->s_name); } *************** *** 1939,1946 **** void binbuf_addbinbuf(t_binbuf *x, t_binbuf *y) { t_binbuf *z = binbuf_new(); ! int i; ! t_atom *ap; binbuf_add(z, y->n, y->vec); ! for (i = 0, ap = z->vec; i < z->n; i++, ap++) { char tbuf[MAXPDSTRING]; switch (ap->a_type) { --- 1936,1942 ---- void binbuf_addbinbuf(t_binbuf *x, t_binbuf *y) { t_binbuf *z = binbuf_new(); ! t_atom *ap = z->vec; binbuf_add(z, y->n, y->vec); ! for (int i=0; i < z->n; i++, ap++) { char tbuf[MAXPDSTRING]; switch (ap->a_type) { *************** *** 2135,2144 **** } else s = argv[at->a_w.w_index-1].a_w.w_symbol; } else if (at->a_type == A_DOLLSYM) { ! if (!(s = binbuf_realizedollsym(at->a_w.w_symbol, argc, argv, 0))) { error("$%s: not enough arguments supplied", at->a_w.w_symbol->s_name); goto cleanup; } ! } ! else s = atom_getsymbol(at); target = s->s_thing; /* IMPD: allows messages to unbound objects, via pointers */ --- 2131,2140 ---- } else s = argv[at->a_w.w_index-1].a_w.w_symbol; } else if (at->a_type == A_DOLLSYM) { ! s = binbuf_realizedollsym(at->a_w.w_symbol, argc, argv, 0); ! if (!s) { error("$%s: not enough arguments supplied", at->a_w.w_symbol->s_name); goto cleanup; } ! } else s = atom_getsymbol(at); target = s->s_thing; /* IMPD: allows messages to unbound objects, via pointers */ *************** *** 2387,2390 **** --- 2383,2387 ---- !strcmp((a)->a_w.w_symbol->s_name, (b))) + #define GETF(i) atom_getfloatarg(i,natom,nextmess) static t_binbuf *binbuf_convert(t_binbuf *oldb, int maxtopd) { t_binbuf *newb = binbuf_new(); *************** *** 2430,2439 **** stackdepth++; nobj = 0; ! binbuf_addv(newb, "ssfffff;", ! gensym("#N"), gensym("canvas"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), ! atom_getfloatarg(4, natom, nextmess) - atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(5, natom, nextmess) - atom_getfloatarg(3, natom, nextmess), 10.); } } --- 2427,2432 ---- stackdepth++; nobj = 0; ! binbuf_addv(newb, "ssfffff;", gensym("#N"), gensym("canvas"), GETF(2), GETF(3), ! GETF(4)-GETF(2), GETF(5)-GETF(3), 10.); } } *************** *** 2447,2453 **** if (natom >= 7 && !strcmp(second, "newobj") && (ISSYMBOL(&nextmess[6], "patcher") || ISSYMBOL(&nextmess[6], "p"))) { ! binbuf_addv(newb, "ssffss;", gensym("#X"), gensym("restore"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), gensym("pd"), atom_getsymbolarg(7, natom, nextmess)); if (stackdepth) stackdepth--; --- 2440,2444 ---- if (natom >= 7 && !strcmp(second, "newobj") && (ISSYMBOL(&nextmess[6], "patcher") || ISSYMBOL(&nextmess[6], "p"))) { ! binbuf_addv(newb, "ssffss;", gensym("#X"), gensym("restore"), GETF(2), GETF(3), gensym("pd"), atom_getsymbolarg(7, natom, nextmess)); if (stackdepth) stackdepth--; *************** *** 2482,2539 **** nobj++; } else if (!strcmp(second, "button")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), ! gensym("bng")); nobj++; } else if (!strcmp(second, "number") || !strcmp(second, "flonum")) { ! binbuf_addv(newb, "ssff;", gensym("#X"), gensym("floatatom"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess)); nobj++; } else if (!strcmp(second, "slider")) { ! float inc = atom_getfloatarg(7, natom, nextmess); if (inc <= 0) inc = 1; binbuf_addv(newb, "ssffsffffffsssfffffffff;", gensym("#X"), gensym("obj"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), gensym("vsl"), ! atom_getfloatarg(4, natom, nextmess), ! atom_getfloatarg(5, natom, nextmess), ! atom_getfloatarg(6, natom, nextmess), ! atom_getfloatarg(6, natom, nextmess) ! + (atom_getfloatarg(5, natom, nextmess) - 1) * inc, ! 0., 0., ! gensym("empty"), gensym("empty"), gensym("empty"), 0., -8., 0., 8., -262144., -1., -1., 0., 1.); nobj++; } else if (!strcmp(second, "toggle")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), gensym("tgl")); nobj++; } else if (!strcmp(second, "inlet")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), ! gensym((char *)(natom > 5 ? "inlet~" : "inlet"))); nobj++; } else if (!strcmp(second, "outlet")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), gensym((char *)(natom > 5 ? "outlet~" : "outlet"))); nobj++; } else if (!strcmp(second, "user")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), ! atom_getfloatarg(3, natom, nextmess), ! atom_getfloatarg(4, natom, nextmess), atom_getsymbolarg(2, natom, nextmess)); nobj++; } else if (!strcmp(second, "connect") || !strcmp(second, "fasten")) { binbuf_addv(newb, "ssffff;", gensym("#X"), gensym("connect"), ! nobj - atom_getfloatarg(2, natom, nextmess) - 1, ! atom_getfloatarg(3, natom, nextmess), ! nobj - atom_getfloatarg(4, natom, nextmess) - 1, ! atom_getfloatarg(5, natom, nextmess)); } } --- 2473,2507 ---- nobj++; } else if (!strcmp(second, "button")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), GETF(2), GETF(3), gensym("bng")); nobj++; } else if (!strcmp(second, "number") || !strcmp(second, "flonum")) { ! binbuf_addv(newb, "ssff;", gensym("#X"), gensym("floatatom"), GETF(2), GETF(3)); nobj++; } else if (!strcmp(second, "slider")) { ! float inc = GETF(7); if (inc <= 0) inc = 1; binbuf_addv(newb, "ssffsffffffsssfffffffff;", gensym("#X"), gensym("obj"), ! GETF(2), GETF(3), gensym("vsl"), GETF(4), GETF(5), GETF(6), GETF(6)+(GETF(5)-1)*inc, ! 0., 0., gensym("empty"), gensym("empty"), gensym("empty"), 0., -8., 0., 8., -262144., -1., -1., 0., 1.); nobj++; } else if (!strcmp(second, "toggle")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), GETF(2), GETF(3), gensym("tgl")); nobj++; } else if (!strcmp(second, "inlet")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), GETF(2), GETF(3), ! gensym((char *)(natom > 5 ? "inlet~" : "inlet"))); nobj++; } else if (!strcmp(second, "outlet")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), GETF(2), GETF(3), gensym((char *)(natom > 5 ? "outlet~" : "outlet"))); nobj++; } else if (!strcmp(second, "user")) { ! binbuf_addv(newb, "ssffs;", gensym("#X"), gensym("obj"), GETF(3), GETF(4), atom_getsymbolarg(2, natom, nextmess)); nobj++; } else if (!strcmp(second, "connect") || !strcmp(second, "fasten")) { binbuf_addv(newb, "ssffff;", gensym("#X"), gensym("connect"), ! nobj-GETF(2)-1, GETF(3), nobj-GETF(4)-1, GETF(5)); } } *************** *** 2549,2556 **** nobj = 0; binbuf_addv(newb, "ssffff;", gensym("#N"), gensym("vpatcher"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), ! atom_getfloatarg(4, natom, nextmess), ! atom_getfloatarg(5, natom, nextmess)); } } --- 2517,2521 ---- nobj = 0; binbuf_addv(newb, "ssffff;", gensym("#N"), gensym("vpatcher"), ! GETF(2), GETF(3), GETF(4), GETF(5)); } } *************** *** 2558,2564 **** if (natom >= 5 && !strcmp(second, "restore") && (ISSYMBOL (&nextmess[4], "pd"))) { binbuf_addv(newb, "ss;", gensym("#P"), gensym("pop")); ! binbuf_addv(newb, "ssffffss;", gensym("#P"), gensym("newobj"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), 50., 1., gensym("patcher"), atom_getsymbolarg(5, natom, nextmess)); if (stackdepth) stackdepth--; --- 2523,2527 ---- if (natom >= 5 && !strcmp(second, "restore") && (ISSYMBOL (&nextmess[4], "pd"))) { binbuf_addv(newb, "ss;", gensym("#P"), gensym("pop")); ! binbuf_addv(newb, "ssffffss;", gensym("#P"), gensym("newobj"), GETF(2), GETF(3), 50., 1., gensym("patcher"), atom_getsymbolarg(5, natom, nextmess)); if (stackdepth) stackdepth--; *************** *** 2568,2607 **** t_symbol *classname = atom_getsymbolarg(4, natom, nextmess); if (classname == gensym("inlet")) ! binbuf_addv(newb, "ssfff;", gensym("#P"), gensym("inlet"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), 15.); else if (classname == gensym("inlet~")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("inlet"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), 15., 1.); else if (classname == gensym("outlet")) ! binbuf_addv(newb, "ssfff;", gensym("#P"), gensym("outlet"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), 15.); else if (classname == gensym("outlet~")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("outlet"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), 15., 1.); else if (classname == gensym("bng")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("button"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), ! atom_getfloatarg(5, natom, nextmess), 0.); else if (classname == gensym("tgl")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("toggle"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), ! atom_getfloatarg(5, natom, nextmess), 0.); else if (classname == gensym("vsl")) binbuf_addv(newb, "ssffffff;", gensym("#P"), gensym("slider"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), ! atom_getfloatarg(5, natom, nextmess), ! atom_getfloatarg(6, natom, nextmess), ! (atom_getfloatarg(8, natom, nextmess) - ! atom_getfloatarg(7, natom, nextmess)) / ! (atom_getfloatarg(6, natom, nextmess) == 1? 1 : ! atom_getfloatarg(6, natom, nextmess) - 1), ! atom_getfloatarg(7, natom, nextmess)); else { SETSYMBOL(outmess, gensym("#P")); --- 2531,2550 ---- t_symbol *classname = atom_getsymbolarg(4, natom, nextmess); if (classname == gensym("inlet")) ! binbuf_addv(newb, "ssfff;", gensym("#P"), gensym("inlet"), GETF(2), GETF(3), 15.); else if (classname == gensym("inlet~")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("inlet"), GETF(2), GETF(3), 15., 1.); else if (classname == gensym("outlet")) ! binbuf_addv(newb, "ssfff;", gensym("#P"), gensym("outlet"), GETF(2), GETF(3), 15.); else if (classname == gensym("outlet~")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("outlet"), GETF(2), GETF(3), 15., 1.); else if (classname == gensym("bng")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("button"), GETF(2), GETF(3), GETF(5), 0.); else if (classname == gensym("tgl")) ! binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("toggle"), GETF(2), GETF(3), GETF(5), 0.); else if (classname == gensym("vsl")) binbuf_addv(newb, "ssffffff;", gensym("#P"), gensym("slider"), ! GETF(2), GETF(3), GETF(5), GETF(6), ! (GETF(8)-GETF(7)) / (GETF(6)==1?1:GETF(6)-1), ! GETF(7)); else { SETSYMBOL(outmess, gensym("#P")); *************** *** 2629,2640 **** nobj++; } else if (!strcmp(second, "floatatom")) { ! binbuf_addv(newb, "ssfff;", gensym("#P"), gensym("flonum"), ! atom_getfloatarg(2, natom, nextmess), ! atom_getfloatarg(3, natom, nextmess), 35); nobj++; } else if (!strcmp(second, "connect")) { binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("connect"), ! nobj - atom_getfloatarg(2, natom, nextmess) - 1, atom_getfloatarg(3, natom, nextmess), ! nobj - atom_getfloatarg(4, natom, nextmess) - 1, atom_getfloatarg(5, natom, nextmess)); } } --- 2572,2580 ---- nobj++; } else if (!strcmp(second, "floatatom")) { ! binbuf_addv(newb, "ssfff;", gensym("#P"), gensym("flonum"), GETF(2), GETF(3), 35); nobj++; } else if (!strcmp(second, "connect")) { binbuf_addv(newb, "ssffff;", gensym("#P"), gensym("connect"), ! nobj-GETF(2)-1, GETF(3), nobj-GETF(4)-1, GETF(5)); } }

1 0

pd/src u_pdsend.c,1.2.8.1,1.2.8.1.2.1
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27290 Modified Files: Tag: desiredata u_pdsend.c Log Message: removed the code for retries Index: u_pdsend.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/u_pdsend.c,v retrieving revision 1.2.8.1 retrieving revision 1.2.8.1.2.1 diff -C2 -d -r1.2.8.1 -r1.2.8.1.2.1 *** u_pdsend.c 12 Jul 2005 15:11:13 -0000 1.2.8.1 --- u_pdsend.c 31 Dec 2006 07:28:42 -0000 1.2.8.1.2.1 *************** *** 33,37 **** struct hostent *hp; char *hostname; - int nretry = 10; #ifdef MSW short version = MAKEWORD(2, 0); --- 33,36 ---- *************** *** 73,98 **** memcpy((char *)&server.sin_addr, (char *)hp->h_addr, hp->h_length); ! /* assign client port number */ server.sin_port = htons((unsigned short)portno); - #if 0 /* try this again for 4.0; this crashed my RH 6.2 machine!) */ - - /* try to connect. */ - for (nretry = 0; nretry < (protocol == SOCK_STREAM ? 10 : 1); nretry++) - - { - if (nretry > 0) - { - sleep (nretry < 5 ? 1 : 5); - fprintf(stderr, "retrying..."); - } - if (connect(sockfd, (struct sockaddr *) &server, sizeof (server)) >= 0) - goto connected; - sockerror("connect"); - } - x_closesocket(sockfd); - exit(1); - connected: ; - #else /* try to connect. */ if (connect(sockfd, (struct sockaddr *) &server, sizeof (server)) < 0) --- 72,78 ---- memcpy((char *)&server.sin_addr, (char *)hp->h_addr, hp->h_length); ! /* assign client port number */ server.sin_port = htons((unsigned short)portno); /* try to connect. */ if (connect(sockfd, (struct sockaddr *) &server, sizeof (server)) < 0) *************** *** 102,107 **** exit(1); } ! #endif ! /* now loop reading stdin and sending it to socket */ while (1) { --- 82,87 ---- exit(1); } ! ! /* now loop reading stdin and sending it to socket */ while (1) {

1 0

pd/src makefile.in,1.4.4.2.2.21.2.17,1.4.4.2.2.21.2.18
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26923 Modified Files: Tag: desiredata makefile.in Log Message: kernel.c goes C++ Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.21.2.17 retrieving revision 1.4.4.2.2.21.2.18 diff -C2 -d -r1.4.4.2.2.21.2.17 -r1.4.4.2.2.21.2.18 *** makefile.in 28 Dec 2006 00:46:45 -0000 1.4.4.2.2.21.2.17 --- makefile.in 31 Dec 2006 07:27:54 -0000 1.4.4.2.2.21.2.18 *************** *** 22,27 **** # from DesireData (matju & chun) ! SRCXX = desire.c ! SRC = kernel.c # from devel_0_39 (thomas & tim) --- 22,27 ---- # from DesireData (matju & chun) ! SRCXX = desire.c kernel.c ! SRC = # from devel_0_39 (thomas & tim)

1 0

pd/src desire.c, 1.1.2.217.2.96, 1.1.2.217.2.97 kernel.c, 1.1.2.14, 1.1.2.15
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26872 Modified Files: Tag: desiredata desire.c kernel.c Log Message: kernel.c goes C++ Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -C2 -d -r1.1.2.14 -r1.1.2.15 *** kernel.c 28 Dec 2006 20:39:01 -0000 1.1.2.14 --- kernel.c 31 Dec 2006 07:27:21 -0000 1.1.2.15 *************** *** 368,381 **** t_bindelem *e; bind_each(e,x) pd_typedmess(e->who, s, argc, argv);} - void m_pd_setup(void) { - bindlist_class = class_new(gensym("bindlist"), 0, 0, sizeof(t_bindlist), CLASS_PD, 0); - class_addbang(bindlist_class, bindlist_bang); - class_addfloat(bindlist_class, (t_method)bindlist_float); - class_addsymbol(bindlist_class, bindlist_symbol); - class_addpointer(bindlist_class, bindlist_pointer); - class_addlist(bindlist_class, bindlist_list); - class_addanything(bindlist_class, bindlist_anything); - } - static t_bindelem *bindelem_new(t_pd *who, t_bindelem *next) { t_bindelem *self = (t_bindelem *)getbytes(sizeof(t_bindelem)); --- 368,371 ---- *************** *** 520,525 **** }; - int sys_tooltips = 1; - struct _inlet { t_pd i_pd; --- 510,513 ---- *************** *** 556,564 **** x->i_next = 0; x->i_tip = gensym("?"); ! if (y = owner->ob_inlet) { while ((y2=y->i_next)) y = y2; y->i_next = x; ! } ! else owner->ob_inlet = x; return x; } --- 544,552 ---- x->i_next = 0; x->i_tip = gensym("?"); ! y = owner->ob_inlet; ! if (y) { while ((y2=y->i_next)) y = y2; y->i_next = x; ! } else owner->ob_inlet = x; return x; } *************** *** 575,579 **** void inlet_settip(t_inlet* i,t_symbol* s) {i->i_tip = s;} - void glob_tooltips(t_pd *dummy, t_float f) {sys_tooltips = f;} char* inlet_tip(t_inlet* i,int num) { --- 563,566 ---- *************** *** 651,656 **** x->i_dest = 0; \ x->i_next = 0; \ ! if (y = owner->ob_inlet) { \ ! while (y2 = y->i_next) y = y2; \ y->i_next = x; \ } else owner->ob_inlet = x; \ --- 638,644 ---- x->i_dest = 0; \ x->i_next = 0; \ ! y = owner->ob_inlet; \ ! if (y) { \ ! while ((y2 = y->i_next)) y = y2; \ y->i_next = x; \ } else owner->ob_inlet = x; \ *************** *** 750,765 **** } - void m_obj_setup(void) { - wire_class = class_new(gensym("__wire"), (t_newmethod)wire_new, - (t_method)wire_free, sizeof(t_wire), CLASS_GOBJ, A_GIMME, 0); - class_setsavefn(wire_class,(t_savefn)wire_save); - } - t_outlet *outlet_new(t_object *owner, t_symbol *s) { t_outlet *x = (t_outlet *)getbytes(sizeof(*x)), *y, *y2; x->o_owner = owner; x->o_next = 0; ! if (y = owner->ob_outlet) { ! while (y2 = y->o_next) y = y2; y->o_next = x; } else owner->ob_outlet = x; --- 738,748 ---- } t_outlet *outlet_new(t_object *owner, t_symbol *s) { t_outlet *x = (t_outlet *)getbytes(sizeof(*x)), *y, *y2; x->o_owner = owner; x->o_next = 0; ! y = owner->ob_outlet; ! if (y) { ! while ((y2 = y->o_next)) y = y2; y->o_next = x; } else owner->ob_outlet = x; *************** *** 861,865 **** goto done; } ! while (oc2 = oc->next) { if (oc2->oc_to == i) { oc->next = oc2->next; --- 844,848 ---- goto done; } ! while ((oc2 = oc->next)) { if (oc2->oc_to == i) { oc->next = oc2->next; *************** *** 1097,1105 **** how this is handled. */ - extern void text_save(t_gobj *z, t_binbuf *b); - t_class *class_new(t_symbol *s, t_newmethod newmethod, t_method freemethod, ! size_t size, int flags, t_atomtype type1, ...) ! { va_list ap; t_atomtype vec[MAXPDARG+1], *vp = vec; --- 1080,1085 ---- how this is handled. */ t_class *class_new(t_symbol *s, t_newmethod newmethod, t_method freemethod, ! size_t size, int flags, t_atomtypearg type1, ...) { va_list ap; t_atomtype vec[MAXPDARG+1], *vp = vec; *************** *** 1111,1115 **** int typeflag = flags & CLASS_TYPEMASK; if (!typeflag) typeflag = CLASS_PATCHABLE; ! *vp = type1; va_start(ap, type1); --- 1091,1095 ---- int typeflag = flags & CLASS_TYPEMASK; if (!typeflag) typeflag = CLASS_PATCHABLE; ! *vp = (t_atomtype)type1; va_start(ap, type1); *************** *** 1121,1125 **** vp++; count++; ! *vp = va_arg(ap, t_atomtype); } va_end(ap); --- 1101,1105 ---- vp++; count++; ! *vp = (t_atomtype)va_arg(ap,int); } va_end(ap); *************** *** 1183,1191 **** can belong to, but this won't be used until the newmethod is actually called back (and the new method explicitly takes care of this.) */ ! void class_addcreator(t_newmethod newmethod, t_symbol *s, t_atomtype type1, ...) { va_list ap; t_atomtype vec[MAXPDARG+1], *vp = vec; int count = 0; ! *vp = type1; va_start(ap, type1); while (*vp) { --- 1163,1171 ---- can belong to, but this won't be used until the newmethod is actually called back (and the new method explicitly takes care of this.) */ ! void class_addcreator(t_newmethod newmethod, t_symbol *s, t_atomtypearg type1, ...) { va_list ap; t_atomtype vec[MAXPDARG+1], *vp = vec; int count = 0; ! *vp = (t_atomtype)type1; va_start(ap, type1); while (*vp) { *************** *** 1196,1200 **** vp++; count++; ! *vp = va_arg(ap, t_atomtype); } va_end(ap); --- 1176,1180 ---- vp++; count++; ! *vp = (t_atomtype)va_arg(ap,int); } va_end(ap); *************** *** 1266,1271 **** } ! void class_addmethod(t_class *c, t_method fn, t_symbol *sel, t_atomtype arg1, ...) ! { char fmt[42],*f=fmt; int t; --- 1246,1250 ---- } ! void class_addmethod(t_class *c, t_method fn, t_symbol *sel, t_atomtypearg arg1, ...) { char fmt[42],*f=fmt; int t; *************** *** 1277,1281 **** if (t>A_CANT) {error("class_addmethod: ARRGH! t=%d",t); return;} *f++ = " fsp;,FS$@*!"[t]; ! t=va_arg(ap, t_atomtype); } *f = 0; --- 1256,1260 ---- if (t>A_CANT) {error("class_addmethod: ARRGH! t=%d",t); return;} *f++ = " fsp;,FS$@*!"[t]; ! t=(t_atomtype)va_arg(ap,int); } *f = 0; *************** *** 1378,1382 **** sym1 = symhash + (hash2 & (HASHSIZE-1)); #endif ! while (sym2 = *sym1) { if (!strcmp(sym2->s_name, s)) return sym2; sym1 = &sym2->s_next; --- 1357,1361 ---- sym1 = symhash + (hash2 & (HASHSIZE-1)); #endif ! while ((sym2 = *sym1)) { if (!strcmp(sym2->s_name, s)) return sym2; sym1 = &sym2->s_next; *************** *** 1418,1422 **** static int tryingalready; ! void canvas_popabstraction(t_canvas *x); extern t_pd *newest; --- 1397,1401 ---- static int tryingalready; ! extern "C" void canvas_popabstraction(t_canvas *x); extern t_pd *newest; *************** *** 1501,1516 **** &s_list, &s_anything, &s_signal, &s__N, &s__X, &s_x, &s_y, &s_}; - void mess_init(void) { - t_symbol **sp; - int i; - if (pd_objectmaker) return; - for (i = sizeof(symlist)/sizeof(*symlist), sp = symlist; i--; sp++) - (void) dogensym((*sp)->s_name, strlen((*sp)->s_name), *sp); - pd_objectmaker = class_new(gensym("objectmaker"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL); - pd_canvasmaker = class_new(gensym("canvasmaker"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL); - pd_bind(&pd_canvasmaker, &s__N); - class_addanything(pd_objectmaker, (t_method)new_anything); - } - t_pd *newest; --- 1480,1483 ---- *************** *** 1567,1571 **** if (argc > MAXPDARG) argc = MAXPDARG; if (x != &pd_objectmaker) *(ap++) = (t_int)x, narg++; ! while (wanttype = *wp++) { switch (wanttype) { case A_POINTER: --- 1534,1538 ---- if (argc > MAXPDARG) argc = MAXPDARG; if (x != &pd_objectmaker) *(ap++) = (t_int)x, narg++; ! while ((wanttype = *wp++)) { switch (wanttype) { case A_POINTER: *************** *** 1611,1614 **** --- 1578,1582 ---- narg++; ap++; + default: {} } } *************** *** 1719,1723 **** /* only looks for already loaded classes though. */ ! t_class *class_find (t_symbol *s) {return hash_get(class_table,s);} void glob_update_class_info (t_pd *bogus, t_symbol *s, t_symbol *cb_recv, t_symbol *cb_sel) { --- 1687,1691 ---- /* only looks for already loaded classes though. */ ! t_class *class_find (t_symbol *s) {return (t_class *)hash_get(class_table,s);} void glob_update_class_info (t_pd *bogus, t_symbol *s, t_symbol *cb_recv, t_symbol *cb_sel) { *************** *** 1916,1920 **** } if (length && buf[length-1] == ' ') { ! if (newbuf = (char *)t_resizebytes(buf, length, length-1)) { buf = newbuf; length--; --- 1884,1889 ---- } if (length && buf[length-1] == ' ') { ! newbuf = (char *)t_resizebytes(buf, length, length-1); ! if (newbuf) { buf = newbuf; length--; *************** *** 2005,2014 **** int newsize = x->n + argc, i; t_atom *ap; ! if (ap = (t_atom *)t_resizebytes(x->vec, x->n * sizeof(*x->vec), newsize * sizeof(*x->vec))) { ! x->vec = ap; ! } else { error("binbuf_addmessage: out of space"); return; } for (ap = x->vec + x->n, i = argc; i--; ap++) { if (argv->a_type == A_SYMBOL) { --- 1974,1983 ---- int newsize = x->n + argc, i; t_atom *ap; ! ap = (t_atom *)t_resizebytes(x->vec, x->n * sizeof(*x->vec), newsize * sizeof(*x->vec)); ! if (!ap) { error("binbuf_addmessage: out of space"); return; } + x->vec = ap; for (ap = x->vec + x->n, i = argc; i--; ap++) { if (argv->a_type == A_SYMBOL) { *************** *** 2016,2023 **** if (!strcmp(str, ";")) SETSEMI(ap); else if (!strcmp(str, ",")) SETCOMMA(ap); ! else if ((str2 = strchr(str, '$')) && str2[1] >= '0' && str2[1] <= '9') { int dollsym = 0; if (*str != '$') dollsym = 1; ! else for (str2 = str + 1; *str2; str2++) if (*str2 < '0' || *str2 > '9') { dollsym = 1; break; --- 1985,1992 ---- if (!strcmp(str, ";")) SETSEMI(ap); else if (!strcmp(str, ",")) SETCOMMA(ap); ! else if ((str2 = strchr(str, '$')) && isdigit(str2[1])) { int dollsym = 0; if (*str != '$') dollsym = 1; ! else for (str2 = str + 1; *str2; str2++) if (!isdigit(*str2)) { dollsym = 1; break; *************** *** 2080,2084 **** char c=*cs; *buf=0; ! while(c&&(c>='0')&&(c<='9')) { c=*cs++; arglen++; --- 2049,2053 ---- char c=*cs; *buf=0; ! while (c && isdigit(c)) { c=*cs++; arglen++; *************** *** 2255,2258 **** --- 2224,2228 ---- else pd_list(target, 0, nargs, stackwas); break; + default: {} } } *************** *** 2290,2296 **** char *buf; char namebuf[MAXPDSTRING]; ! namebuf[0] = 0; ! if (*dirname) strcat(namebuf, dirname), strcat(namebuf, "/"); ! strcat(namebuf, filename); if ((fd = binbuf_doopen(namebuf, 0)) < 0) { error("open: %s: %s",namebuf,strerror(errno)); --- 2260,2265 ---- char *buf; char namebuf[MAXPDSTRING]; ! if (*dirname) sprintf(namebuf,"%s/%s",dirname,filename); ! else sprintf(namebuf, "%s", filename); if ((fd = binbuf_doopen(namebuf, 0)) < 0) { error("open: %s: %s",namebuf,strerror(errno)); *************** *** 2740,2750 **** } ! void mess_init(void); ! void conf_init(void); ! void glob_init(void); ! void garray_init(void); ! void pd_init(void) { object_table = hash_new(127); ! mess_init(); obj_init(); conf_init(); --- 2709,2737 ---- } ! extern "C" { ! void conf_init(); ! void glob_init(); ! void garray_init(); ! void pd_init() { object_table = hash_new(127); ! bindlist_class = class_new(gensym("bindlist"), 0, 0, sizeof(t_bindlist), CLASS_PD, 0); ! class_addbang(bindlist_class, (t_method)bindlist_bang); ! class_addfloat(bindlist_class, (t_method)bindlist_float); ! class_addsymbol(bindlist_class, (t_method)bindlist_symbol); ! class_addpointer(bindlist_class, (t_method)bindlist_pointer); ! class_addlist(bindlist_class, (t_method)bindlist_list); ! class_addanything(bindlist_class, (t_method)bindlist_anything); ! wire_class = class_new(gensym("__wire"), (t_newmethod)wire_new, ! (t_method)wire_free, sizeof(t_wire), CLASS_GOBJ, A_GIMME, 0); ! class_setsavefn(wire_class,(t_savefn)wire_save); ! t_symbol **sp; ! int i; ! if (pd_objectmaker) bug("ARGH"); ! for (i = sizeof(symlist)/sizeof(*symlist), sp = symlist; i--; sp++) ! (void) dogensym((*sp)->s_name, strlen((*sp)->s_name), *sp); ! pd_objectmaker = class_new(gensym("objectmaker"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL); ! pd_canvasmaker = class_new(gensym("canvasmaker"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL); ! pd_bind(&pd_canvasmaker, &s__N); ! class_addanything(pd_objectmaker, (t_method)new_anything); obj_init(); conf_init(); *************** *** 2752,2754 **** garray_init(); } ! --- 2739,2741 ---- garray_init(); } ! }; Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.96 retrieving revision 1.1.2.217.2.97 diff -C2 -d -r1.1.2.217.2.96 -r1.1.2.217.2.97 *** desire.c 28 Dec 2006 05:24:05 -0000 1.1.2.217.2.96 --- desire.c 31 Dec 2006 07:27:18 -0000 1.1.2.217.2.97 *************** *** 1208,1212 **** static int canvas_find_index1, canvas_find_index2; static t_binbuf *canvas_findbuf; ! extern "C" int binbuf_match(t_binbuf *inbuf, t_binbuf *searchbuf); /* find an atom or string of atoms */ --- 1208,1212 ---- static int canvas_find_index1, canvas_find_index2; static t_binbuf *canvas_findbuf; ! int binbuf_match(t_binbuf *inbuf, t_binbuf *searchbuf); /* find an atom or string of atoms */ *************** *** 2355,2360 **** extern "C" t_inlet *vinlet_getit(t_pd *x); extern "C" t_outlet *voutlet_getit(t_pd *x); - extern "C" void obj_moveinletfirst( t_object *x, t_inlet *i); - extern "C" void obj_moveoutletfirst(t_object *x, t_outlet *i); static void canvas_resortinlets(t_canvas *x) { --- 2355,2358 ---- *************** *** 6198,6202 **** } - extern "C" char *class_gethelpdir(t_class *c); extern "C" void open_via_helppath(const char *name, const char *dir); static void canvas_object_help(t_canvas *x, t_symbol *name) { --- 6196,6199 ---- *************** *** 6205,6209 **** t_class *c = o->_class; strcpy(namebuf, class_gethelpname(c)); ! dir = class_gethelpdir(c); if (strcmp(namebuf + strlen(namebuf) - 3, ".pd")) strcat(namebuf, ".pd"); open_via_helppath(namebuf, dir); --- 6202,6206 ---- t_class *c = o->_class; strcpy(namebuf, class_gethelpname(c)); ! dir = c->externdir->s_name; if (strcmp(namebuf + strlen(namebuf) - 3, ".pd")) strcat(namebuf, ".pd"); open_via_helppath(namebuf, dir); *************** *** 7514,7518 **** } - extern "C" void glob_update_class_info (t_pd *bogus, t_symbol *s, t_symbol *cb_recv, t_symbol *cb_sel); extern "C" void glob_update_path (void); --- 7511,7514 ---- *************** *** 7531,7535 **** } strcpy(namebuf, class_gethelpname(c)); ! dir = class_gethelpdir(c); if (strcmp(namebuf + strlen(namebuf) - 3, ".pd")) strcat(namebuf, ".pd"); open_via_helppath(namebuf, dir); --- 7527,7531 ---- } strcpy(namebuf, class_gethelpname(c)); ! dir = c->externdir->s_name; if (strcmp(namebuf + strlen(namebuf) - 3, ".pd")) strcat(namebuf, ".pd"); open_via_helppath(namebuf, dir); *************** *** 7537,7541 **** EXTERN t_hash *class_table; ! void glob_update_class_list (t_pd *self, t_symbol *cb_recv, t_symbol *cb_sel) { hashkey k; hashvalue v; sys_gui("global class_list; set class_list {"); --- 7533,7537 ---- EXTERN t_hash *class_table; ! extern "C" void glob_update_class_list (t_pd *self, t_symbol *cb_recv, t_symbol *cb_sel) { hashkey k; hashvalue v; sys_gui("global class_list; set class_list {"); *************** *** 7812,7816 **** void glob_startup_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv); void glob_ping(t_pd *dummy); - void glob_tooltips(t_pd *dummy, t_float f); /* tb: message-based audio configuration { */ void glob_audio_testaudiosetting(t_pd * dummy, t_symbol *s, int ac, t_atom *av); --- 7808,7811 ---- *************** *** 7870,7874 **** class_addmethod3(c,glob_midi_dialog, "midi-dialog", "*"); class_addmethod3(c,glob_ping, "ping",""); - class_addmethod3(c,glob_tooltips, "tooltips", "F"); /* tb: message-based audio configuration { */ // class_addmethod3(c,glob_audio_samplerate, "audio-samplerate", "F"); --- 7865,7868 ---- *************** *** 8057,8061 **** extern "C" { void conf_init(void) { ! S(hash) S(m_obj) S(m_pd) S(x_acoustics) S(x_connective) S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac) --- 8051,8055 ---- extern "C" { void conf_init(void) { ! S(x_acoustics) S(x_connective) S(x_time) S(x_arithmetic) S(x_midi) S(x_misc) S(x_net) S(x_qlist) S(x_gui) S(x_list) S(d_arithmetic) S(d_array) S(d_ctl) S(d_dac)

1 0

pd/src desire.h,1.1.2.49.2.18,1.1.2.49.2.19
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26130 Modified Files: Tag: desiredata desire.h Log Message: removed t_string reference and added some decls needed to make kernel.c compile as C++ Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.18 retrieving revision 1.1.2.49.2.19 diff -C2 -d -r1.1.2.49.2.18 -r1.1.2.49.2.19 *** desire.h 27 Dec 2006 23:30:34 -0000 1.1.2.49.2.18 --- desire.h 31 Dec 2006 07:26:33 -0000 1.1.2.49.2.19 *************** *** 63,67 **** typedef void (*t_floatmethod) (t_pd *x, t_float f); typedef void (*t_symbolmethod) (t_pd *x, t_symbol *s); ! typedef void (*t_stringmethod) (t_pd *x, t_string *s); typedef void (*t_listmethod) (t_pd *x, t_symbol *s, int argc, t_atom *argv); typedef void (*t_anymethod) (t_pd *x, t_symbol *s, int argc, t_atom *argv); --- 63,67 ---- typedef void (*t_floatmethod) (t_pd *x, t_float f); typedef void (*t_symbolmethod) (t_pd *x, t_symbol *s); ! typedef void (*t_stringmethod) (t_pd *x, const char *s); typedef void (*t_listmethod) (t_pd *x, t_symbol *s, int argc, t_atom *argv); typedef void (*t_anymethod) (t_pd *x, t_symbol *s, int argc, t_atom *argv); *************** *** 81,85 **** t_pointermethod pointermethod; t_floatmethod floatmethod; ! t_symbolmethod symbolmethod; /* or t_stringmethod, but C doesn't have anonymous unions */ t_listmethod listmethod; t_anymethod anymethod; --- 81,85 ---- t_pointermethod pointermethod; t_floatmethod floatmethod; ! t_symbolmethod symbolmethod; /* or t_stringmethod, but only C++ has anonymous unions, so... */ t_listmethod listmethod; t_anymethod anymethod; *************** *** 103,106 **** --- 103,109 ---- //#define c_name name /* for Cyclone,Creb,Pidip */ //#define c_size size /* for Cyclone,Flext */ + //#define me_name name /* for Cyclone */ + //#define me_fun fun /* for Cyclone */ + //#define me_arg arg /* for Cyclone */ /* m_obj.c */ *************** *** 308,311 **** --- 311,324 ---- EXTERN t_hash *object_table; + /* some kernel.c stuff that wasn't in any header, when shifting to C++. */ + void obj_moveinletfirst(t_object *x, t_inlet *i); + void obj_moveoutletfirst(t_object *x, t_outlet *o); + int inlet_getsignalindex(t_inlet *x); + int outlet_getsignalindex(t_outlet *x); + void text_save(t_gobj *z, t_binbuf *b); + t_sample *obj_findsignalscalar(t_object *x, int m); + void class_set_extern_dir(t_symbol *s); + void glob_update_class_info (t_pd *bogus, t_symbol *s, t_symbol *cb_recv, t_symbol *cb_sel); + #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) }

1 0

pd/src m_pd.h,1.4.4.11.2.33.2.19,1.4.4.11.2.33.2.20
by Mathieu Bouchard 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19327 Modified Files: Tag: desiredata m_pd.h Log Message: another shot at the string API. Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.19 retrieving revision 1.4.4.11.2.33.2.20 diff -C2 -d -r1.4.4.11.2.33.2.19 -r1.4.4.11.2.33.2.20 *** m_pd.h 20 Dec 2006 10:10:34 -0000 1.4.4.11.2.33.2.19 --- m_pd.h 31 Dec 2006 05:37:54 -0000 1.4.4.11.2.33.2.20 *************** *** 1,6 **** ! /* Copyright (c) 1997-1999 Miller Puckette. ! * For information on usage and redistribution, and for a DISCLAIMER OF ALL ! * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ ! #ifndef __m_pd_h_ --- 1,6 ---- ! /* Copyright (c) 2006-2007 Mathieu Bouchard. ! Copyright (c) 1997-1999 Miller Puckette. ! For information on usage and redistribution, and for a DISCLAIMER OF ALL ! WARRANTIES, see the file, "LICENSE.txt", in this distribution. */ #ifndef __m_pd_h_ *************** *** 74,89 **** typedef struct _symbol { char *s_name; /* the const string that represents this symbol */ ! t_pd *s_thing; /* pointer to the target of a receive-symbol, ! or to the bindlist of several targets */ ! struct _symbol *s_next; /* brochette of all symbols */ ! size_t s_size; /* size of symbol (DesireData support for NUL) */ } t_symbol; ! typedef struct _string { ! char *s_name; /* the const string that represents this symbol */ ! size_t refcount; ! struct _symbol *s_next; /* brochette of all strings */ ! size_t s_size; /* size of string (DesireData support for NUL) */ ! } t_string; typedef struct _array t_array; /* g_canvas.h */ --- 74,90 ---- typedef struct _symbol { char *s_name; /* the const string that represents this symbol */ ! t_pd *s_thing; /* pointer to the target of a receive-symbol or to the bindlist of several targets */ ! struct _symbol *s_next; /* brochette of all symbols (only for permanent symbols) */ ! size_t refcount; /* refcount<0 means that the symbol is permanent */ ! size_t s_size; /* size of s_name (support for NUL characters) */ } t_symbol; ! typedef struct _list { ! struct _atom *at; ! t_pd *s_thing; /* dummy (unused) */ ! struct _symbol *s_next; /* brochette of all symbols (only for permanent symbols) */ ! size_t refcount; /* refcount<0 means that the symbol is permanent */ ! size_t s_size; /* size of s_name (support for NUL characters) */ ! } t_list; typedef struct _array t_array; /* g_canvas.h */ *************** *** 119,123 **** t_float w_float; /* A_FLOAT */ t_symbol *w_symbol; /* A_SYMBOL */ - t_string *w_string; /* A_STRING */ t_gpointer *w_gpointer; /* A_POINTER */ t_array *w_array; /* DS nested array? */ --- 120,123 ---- *************** *** 313,327 **** #define SETSTRING(atom, s) ((atom)->a_type = A_SYMBOL, (atom)->a_w.w_symbol = gensym(s)) ! EXTERN t_float atom_getfloat( t_atom *a); ! EXTERN t_int atom_getint( t_atom *a); ! EXTERN t_symbol *atom_getsymbol(t_atom *a); ! EXTERN t_string *atom_getstring(t_atom *a); /* for future use */ ! EXTERN t_symbol *atom_gensym( t_atom *a); ! EXTERN t_float atom_getfloatarg( int which, int argc, t_atom *argv); ! EXTERN t_int atom_getintarg( int which, int argc, t_atom *argv); ! EXTERN t_symbol *atom_getsymbolarg(int which, int argc, t_atom *argv); ! EXTERN t_string *atom_getstringarg(int which, int argc, t_atom *argv); /* for future use */ ! EXTERN void atom_string(t_atom *a, char *buf, unsigned int bufsize); /* has nothing to do with A_STRING */ /* ------------------ binbufs --------------- */ --- 313,328 ---- #define SETSTRING(atom, s) ((atom)->a_type = A_SYMBOL, (atom)->a_w.w_symbol = gensym(s)) ! EXTERN t_float atom_getfloat( t_atom *a); ! EXTERN t_int atom_getint( t_atom *a); ! EXTERN t_symbol *atom_getsymbol(t_atom *a); /* t_symbol guaranteed to live forever */ ! EXTERN const char *atom_getstring(t_atom *a); /* the return value should be used only immediately */ ! EXTERN t_symbol *atom_gensym( t_atom *a); ! EXTERN t_float atom_getfloatarg( int which, int argc, t_atom *argv); ! EXTERN t_int atom_getintarg( int which, int argc, t_atom *argv); ! EXTERN t_symbol *atom_getsymbolarg(int which, int argc, t_atom *argv); ! EXTERN const char *atom_getstringarg(int which, int argc, t_atom *argv); ! /* this function should produce a literal, whereas getstring gives the exact string */ ! EXTERN void atom_string(t_atom *a, char *buf, unsigned int bufsize); /* ------------------ binbufs --------------- */ *************** *** 376,380 **** EXTERN void pd_float( t_pd *x, t_float f); EXTERN void pd_symbol( t_pd *x, t_symbol *s); ! EXTERN void pd_string( t_pd *x, t_string *s); /* for future use */ EXTERN void pd_list( t_pd *x, t_symbol *s, int argc, t_atom *argv); EXTERN void pd_anything(t_pd *x, t_symbol *s, int argc, t_atom *argv); --- 377,381 ---- EXTERN void pd_float( t_pd *x, t_float f); EXTERN void pd_symbol( t_pd *x, t_symbol *s); ! EXTERN void pd_string( t_pd *x, const char *s); /* makes a refcounted symbol (copying s) */ EXTERN void pd_list( t_pd *x, t_symbol *s, int argc, t_atom *argv); EXTERN void pd_anything(t_pd *x, t_symbol *s, int argc, t_atom *argv); *************** *** 418,422 **** EXTERN void outlet_float( t_outlet *x, t_float f); EXTERN void outlet_symbol( t_outlet *x, t_symbol *s); ! EXTERN void outlet_string( t_outlet *x, t_string *s); /* for future use */ EXTERN void outlet_list( t_outlet *x, t_symbol *s, int argc, t_atom *argv); EXTERN void outlet_anything(t_outlet *x, t_symbol *s, int argc, t_atom *argv); --- 419,423 ---- EXTERN void outlet_float( t_outlet *x, t_float f); EXTERN void outlet_symbol( t_outlet *x, t_symbol *s); ! EXTERN void outlet_string( t_outlet *x, const char *s); /* makes a refcounted symbol (copying s) */ EXTERN void outlet_list( t_outlet *x, t_symbol *s, int argc, t_atom *argv); EXTERN void outlet_anything(t_outlet *x, t_symbol *s, int argc, t_atom *argv); *************** *** 425,429 **** EXTERN t_object *pd_checkobject(t_pd *x); - /* -------------------- canvases -------------- */ --- 426,429 ---- *************** *** 446,450 **** #define CLASS_PATCHABLE 3 #define CLASS_NOINLET 8 ! #define CLASS_TYPEMASK 3 --- 446,450 ---- #define CLASS_PATCHABLE 3 #define CLASS_NOINLET 8 ! #define CLASS_NEWATOM 16 #define CLASS_TYPEMASK 3 *************** *** 786,793 **** #endif /* __m_pd_h_ */ ! /* removed features: sys_fontwidth, sys_fontheight, t_widgetbehavior, class_setproperties, class_setwidget, class_setparentwidget, class_parentwidget, pd_getparentwidget, sys_pretendguibytes, sys_queuegui, sys_unqueuegui, getzbytes, gfxstub_new, gfxstub_deleteforkey */ --- 786,794 ---- #endif /* __m_pd_h_ */ ! /* removed functions: sys_fontwidth, sys_fontheight, t_widgetbehavior, class_setproperties, class_setwidget, class_setparentwidget, class_parentwidget, pd_getparentwidget, sys_pretendguibytes, sys_queuegui, sys_unqueuegui, getzbytes, gfxstub_new, gfxstub_deleteforkey + removed fields: te_width, te_type. */

1 0

pd/src desire.tk,1.1.2.600.2.145,1.1.2.600.2.146
by chunlee 31 Dec '06

31 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5012 Modified Files: Tag: desiredata desire.tk Log Message: simple subpatcherize Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.145 retrieving revision 1.1.2.600.2.146 diff -C2 -d -r1.1.2.600.2.145 -r1.1.2.600.2.146 *** desire.tk 28 Dec 2006 15:46:24 -0000 1.1.2.600.2.145 --- desire.tk 31 Dec 2006 00:35:26 -0000 1.1.2.600.2.146 *************** *** 295,306 **** #-----------------------------------------------------------------------------------# #used during subpatcherize ! set subpatcherize(cut) 0 ! set subpatcherize(insert) 0 set subpatcherize(paste) 0 - set subpatcherize(parent) 0 - set subpatcherize(sub) 0 - set subpatcherize(count) 0 - set subpatcherize(x) 0 - set subpatcherize(y) 0 #-----------------------------------------------------------------------------------# # adapted from matju's MetaRuby (UndoQueue.rb) --- 295,300 ---- #-----------------------------------------------------------------------------------# #used during subpatcherize ! set subpatcherize(edit) 0 set subpatcherize(paste) 0 #-----------------------------------------------------------------------------------# # adapted from matju's MetaRuby (UndoQueue.rb) *************** *** 389,393 **** set rbackup @redo_q; set @redo_q {} set err [catch {uplevel 2 $code}] ! if {$err} {set err $errorInfo} set atom $@undo_q set @undo_q $ubackup --- 383,387 ---- set rbackup @redo_q; set @redo_q {} set err [catch {uplevel 2 $code}] ! if {$err} {set err $errorInfo; puts "errorinfo :::: $errorInfo"} set atom $@undo_q set @undo_q $ubackup *************** *** 1297,1301 **** class_new Canvas {Menuable ObjectBox} ! def Canvas close {} { if {$@subpatch} { --- 1291,1295 ---- class_new Canvas {Menuable ObjectBox} ! def Canvas close {} { if {$@subpatch} { *************** *** 2394,2401 **** def Canvas havewindow= {flag} { set was [winfo exists .$self] if {$flag && $was && [$self gop]} {$self redraw} if {$flag && $was} {$self raise} ! if {$flag && !$was} {$self init_window} ;#??? if {!$flag && $was} {$self delete_window} ;#??? } --- 2388,2404 ---- def Canvas havewindow= {flag} { + global subpatcherize set was [winfo exists .$self] if {$flag && $was && [$self gop]} {$self redraw} if {$flag && $was} {$self raise} ! if {$flag && !$was} { ! if {!$subpatcherize(paste) && !$subpatcherize(edit)} { ! $self init_window ! } else { ! if {$subpatcherize(paste)} {set subpatherize(paste) 0} ! if {$subpatcherize(edit)} {set subpatherize(edit) 0} ! } ! ! } ;#??? if {!$flag && $was} {$self delete_window} ;#??? } *************** *** 2484,2499 **** def Canvas delete_selection {} { if {![llength $@selection] && ![llength $@selection_wire]} {return} foreach obj $@selection { ! foreach wire $_($obj:wires2) { ! set find [lsearch $@wires $wire] ! if {$find != -1} {$self disconnect [$wire connects]} ! $wire delete ! } ! $self del [$self index $obj] } foreach x $@selection_wire { ! set find [lsearch $@wires $x] ! if {$find != -1} {$self disconnect [$x connects]} ! $x delete } # don't use $self selection= here, otherwise it might call changed on deleted stuff.. --- 2487,2510 ---- def Canvas delete_selection {} { if {![llength $@selection] && ![llength $@selection_wire]} {return} + set del_wire {} foreach obj $@selection { ! foreach wire $_($obj:wires2) { ! set find [lsearch $@wires $wire] ! set find2 [lsearch $del_wire $wire] ! if {$find != -1 && $find2 < 0} { ! $self disconnect [$wire connects] ! lappend del_wire $wire ! $wire delete ! } ! } ! $self del [$self index $obj] } foreach x $@selection_wire { ! set find [lsearch $@wires $x] ! set find2 [lsearch $del_wire $x] ! if {$find != -1 && $find2 < 0} { ! $self disconnect [$x connects] ! $x delete ! } } # don't use $self selection= here, otherwise it might call changed on deleted stuff.. *************** *** 2991,2995 **** def Canvas visible_rect {} { - global subpatcherize set c [$self widget] set height [winfo height $c] --- 3002,3005 ---- *************** *** 3069,3077 **** def Canvas do_paste {offset} { - global paste subpatcherize set in 0 $self deselect_all netsend [list .$self "push"] - set paste(state) $self foreach mess [pd_mess_split [$::clipboard value]] { set type [lindex $mess 1] --- 3079,3085 ---- *************** *** 3278,3284 **** } def Canvas subpatcherize {} { - global subpatcherize - set subpatcherize(sub) 0 if {![llength $@selection]} {return} set x 0; set y 0 --- 3286,3291 ---- } + def Canvas new_object_subpatcherize {subpatch} {$subpatch subpatcherize_paste} def Canvas subpatcherize {} { if {![llength $@selection]} {return} set x 0; set y 0 *************** *** 3288,3297 **** set y [expr $y + $y1] } ! set subpatcherize(x) [expr $x / [llength $@selection]] ! set subpatcherize(y) [expr $y / [llength $@selection]] ! set subpatcherize(cut) 1 ! set subpatcherize(parent) $self ! incr subpatcherize(count) $self cut } --- 3295,3316 ---- set y [expr $y + $y1] } ! set x [expr $x / [llength $@selection]] ! set y [expr $y / [llength $@selection]] $self cut + netsend [list .$self "push"] + netsend [list #N canvas 0 0 450 300 sub 0] [list $self new_object_subpatcherize] + netsend [list #X restore $x $y pd sub] + netsend [list .$self "pop"] + } + def Canvas subpatcherize_paste {} { + global subpatcherize + set subpatcherize(paste) 1 + set in 0 + $self deselect_all + netsend [list .$self "push"] + foreach mess [pd_mess_split [$::clipboard value]] {netsend $mess} + netsend [list #X pop 1] + set subpatcherize(edit) 1 + $self edit } *************** *** 4537,4545 **** #A 0 0; - #state is 0 when not pasting, its the canvas id if it is - set paste(state) 0 - #set paste(count) 0 - #set paste(count2) 0 - proc change {self canvas e {ninlets 0} {noutlets 0}} { foreach mess [pd_mess_split $e] {change_2 $self $mess} --- 4556,4559 ----

1 0

externals/miXed/doc/help/cyclone overdrive~-help.pd, NONE, 1.1
by Hans-Christoph Steiner 30 Dec '06

30 Dec '06

Update of /cvsroot/pure-data/externals/miXed/doc/help/cyclone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv576 Added Files: overdrive~-help.pd Log Message: added help file for new(ish) overdrive~ --- NEW FILE: overdrive~-help.pd --- #N canvas 217 290 604 408 10; #X obj 147 205 overdrive~; #N canvas 0 22 450 300 graph3 0; #X array overdrive 200 float 0; #X coords 0 1 199 -1 200 140 1; #X restore 358 239 graph; #X obj 53 236 tgl 15 1 empty empty empty 0 -6 0 8 -24198 -1 -1 1 1 ; #X obj 147 292 tabwrite~ overdrive; #X floatatom 176 175 5 0 0 0 - - -; #X obj 179 146 hsl 128 15 1 12 0 1 empty empty drive 45 9 1 12 -262131 -1 -1 0 1; #N canvas 0 22 454 304 graph4 0; #X array osc 200 float 0; #X coords 0 1 199 -1 200 140 1; #X restore 357 82 graph; #X obj 7 2 cnv 15 600 20 empty empty overdrive~ 20 12 1 14 -233017 -66577 0; #X obj 532 3 pddp/dsp; #X obj 26 80 comment 300 11 helvetica ? 0 0 0 0 If the "drive" is 1 \, the signal is unchanged. Increasing the "drive" increases the amount of distortion. If the "drive" is less than 1 \, then it causes a different kind of distortion. If the "drive" is less than 0 \, VERY LOUD distortion can result \, so be careful!; #X obj 21 324 comment 300 11 helvetica ? 0 0 0 0 overdrive~ simulates the distortion caused when an analog amplifier is fed a signal that is too high for the inputs. This is generally known as "overdriving" the amplifier \, and it causes a characteristic distortion that is often used to generate a "fat" sound.; #X text 11 27 Simulate an analog amplifier being overdriven by applying a non-linear transfer function to the incoming signal.; #X obj 28 292 tabwrite~ osc; #X obj 28 143 osc~ 400; #X obj 53 254 metro 442; #X connect 0 0 3 0; #X connect 2 0 14 0; #X connect 4 0 0 0; #X connect 5 0 4 0; #X connect 13 0 0 0; #X connect 13 0 12 0; #X connect 14 0 3 0; #X connect 14 0 12 0;

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 December 2006