Pd-cvs January 2007

pd-cvs@lists.iem.at

21 participants
539 discussions

pd/src desire.c, 1.1.2.217.2.106, 1.1.2.217.2.107 m_pd.h, 1.4.4.11.2.33.2.28, 1.4.4.11.2.33.2.29 kernel.c, 1.1.2.23, 1.1.2.24
by Mathieu Bouchard 03 Jan '07

03 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30479 Modified Files: Tag: desiredata desire.c m_pd.h kernel.c Log Message: t_gstub is gone. Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.28 retrieving revision 1.4.4.11.2.33.2.29 diff -C2 -d -r1.4.4.11.2.33.2.28 -r1.4.4.11.2.33.2.29 *** m_pd.h 3 Jan 2007 04:59:09 -0000 1.4.4.11.2.33.2.28 --- m_pd.h 3 Jan 2007 06:39:26 -0000 1.4.4.11.2.33.2.29 *************** *** 99,119 **** #define GP_GLIST 1 #define GP_ARRAY 2 /* ... or array */ - #ifdef PD_PLUSPLUS_FACE - typedef struct _gstub { - union { - struct _glist *canvas; - struct _array *array; - }; - } t_gstub; - #define gs_refcount canvas->refcount #else - typedef struct _gstub { - union { - struct _glist *canvas; - struct _array *array; - } un; - } t_gstub; - #define gs_refcount un.canvas->gl_obj.refcount #endif --- 99,104 ---- *************** *** 124,128 **** union word *w; /* raw data (if array) */ }; ! t_gstub *gp_stub; /* stub which points to glist/array */ } t_gpointer; #else --- 109,118 ---- union word *w; /* raw data (if array) */ }; ! union { ! struct _glist *canvas; ! struct _array *array; ! struct t_text *o; ! }; ! #define gs_refcount canvas->refcount } t_gpointer; #else *************** *** 132,136 **** union word *gp_w; /* raw data (if array) */ } gp_un; ! t_gstub *gp_stub; /* stub which points to glist/array */ } t_gpointer; #endif --- 122,131 ---- union word *gp_w; /* raw data (if array) */ } gp_un; ! union { ! struct _glist *canvas; ! struct _array *array; ! struct _text *o; ! } un; ! #define gs_refcount un.canvas->gl_obj.refcount } t_gpointer; #endif *************** *** 326,330 **** #define SETSEMI(atom) ((atom)->a_type = A_SEMI, (atom)->a_w.w_index = 0) #define SETCOMMA(atom) ((atom)->a_type = A_COMMA, (atom)->a_w.w_index = 0) ! #define SETPOINTER(atom, gp) ((atom)->a_type = A_POINTER, (atom)->a_w.w_gpointer = (gp)) #define SETFLOAT(atom, f) ((atom)->a_type = A_FLOAT, (atom)->a_w.w_float = (f)) #define SETSYMBOL(atom, s) ((atom)->a_type = A_SYMBOL, (atom)->a_w.w_symbol = (s)) --- 321,325 ---- #define SETSEMI(atom) ((atom)->a_type = A_SEMI, (atom)->a_w.w_index = 0) #define SETCOMMA(atom) ((atom)->a_type = A_COMMA, (atom)->a_w.w_index = 0) ! #define SETPOINTER(atom, gp) ((atom)->a_type = A_POINTER, (atom)->a_w.w_gpointer = (gp)) /* looks unsafe... */ #define SETFLOAT(atom, f) ((atom)->a_type = A_FLOAT, (atom)->a_w.w_float = (f)) #define SETSYMBOL(atom, s) ((atom)->a_type = A_SYMBOL, (atom)->a_w.w_symbol = (s)) Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.23 retrieving revision 1.1.2.24 diff -C2 -d -r1.1.2.23 -r1.1.2.24 *** kernel.c 3 Jan 2007 04:25:27 -0000 1.1.2.23 --- kernel.c 3 Jan 2007 06:39:26 -0000 1.1.2.24 *************** *** 620,624 **** gpointer_unset(x->u.pointerslot); *(x->u.pointerslot) = *gp; ! if (gp->gp_stub) gp->gp_stub->gs_refcount++; } --- 620,624 ---- gpointer_unset(x->u.pointerslot); *(x->u.pointerslot) = *gp; ! if (gp->o) gp->o->refcount++; } Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.106 retrieving revision 1.1.2.217.2.107 diff -C2 -d -r1.1.2.217.2.106 -r1.1.2.217.2.107 *** desire.c 3 Jan 2007 04:59:06 -0000 1.1.2.217.2.106 --- desire.c 3 Jan 2007 06:39:24 -0000 1.1.2.217.2.107 *************** *** 531,536 **** /* zero out everyone except "pd" and "g_adix" fields */ memset(((char *)x) + sizeof(t_gobj), 0, sizeof(*x) - sizeof(t_gobj)); - x->stub = gstub_new(x, 0); - x->valid = ++canvas_valid; x->xlabel = (t_symbol **)getbytes(0); x->ylabel = (t_symbol **)getbytes(0); --- 531,534 ---- *************** *** 755,759 **** freebytes(x->xlabel, x->nxlabels * sizeof(*(x->xlabel))); freebytes(x->ylabel, x->nylabels * sizeof(*(x->ylabel))); - gstub_cutoff(x->stub); if (!x->owner) canvas_takeofflist(x); } --- 753,756 ---- *************** *** 1391,1395 **** we'll be deleted before the thing pointed to gets deleted anyway; see array_free. */ x->gp = *parent; - x->stub = gstub_new(0, x); word_init((t_word *)x->vec, t, parent); return x; --- 1388,1391 ---- *************** *** 1397,1405 **** void array_resize(t_array *x, int n) { - int elemsize, oldn; t_template *t = template_findbyname(x->templatesym); if (n < 1) n = 1; ! oldn = x->n; ! elemsize = sizeof(t_word) * t->n; x->vec = (char *)resizealignedbytes(x->vec, oldn * elemsize, n * elemsize); x->n = n; --- 1393,1400 ---- void array_resize(t_array *x, int n) { t_template *t = template_findbyname(x->templatesym); if (n < 1) n = 1; ! int oldn = x->n; ! int elemsize = sizeof(t_word) * t->n; x->vec = (char *)resizealignedbytes(x->vec, oldn * elemsize, n * elemsize); x->n = n; *************** *** 1411,1424 **** } } - x->valid = ++canvas_valid; } - #define STUB(x) x->gp.gp_stub - - static int gstub_which(t_gstub *); - static void array_resize_and_redraw(t_array *array, int n) { ! t_array *a2 = array; ! while (gstub_which(STUB(a2)) == GP_ARRAY) a2 = STUB(a2)->array; array_resize(array,n); gobj_changed(array,0); --- 1406,1414 ---- } } } static void array_resize_and_redraw(t_array *array, int n) { ! /* what was that for??? */ ! /* t_array *a2 = array; while (gstub_which(STUB(a2)) == GP_ARRAY) a2 = STUB(a2)->array; */ array_resize(array,n); gobj_changed(array,0); *************** *** 1429,1433 **** static void array_free(t_array *x) { t_template *scalartemplate = template_findbyname(x->templatesym); - gstub_cutoff(x->stub); for (int i=0; i < x->n; i++) word_free((t_word *)(x->vec + x->elemsize*i), scalartemplate); freealignedbytes(x->vec, x->elemsize * x->n); --- 1419,1422 ---- *************** *** 1699,1703 **** static void array_redraw(t_array *a, t_canvas *canvas) { ! while (gstub_which(STUB(a)) == GP_ARRAY) a = STUB(a)->array; scalar_redraw(a->gp.scalar, canvas); } --- 1688,1693 ---- static void array_redraw(t_array *a, t_canvas *canvas) { ! /* what was that for? */ ! /* while (gstub_which(STUB(a)) == GP_ARRAY) a = STUB(a)->array; */ scalar_redraw(a->gp.scalar, canvas); } *************** *** 2252,2256 **** if (chkdsp) canvas_update_dsp(); if (drawcommand) canvas_redrawallfortemplate(template_findbyname(canvas_makebindsym(canvas_getcanvas(x)->name)), 1); - x->valid = ++canvas_valid; } --- 2242,2245 ---- *************** *** 3626,3629 **** --- 3615,3634 ---- static void gpointer_setcanvas(t_gpointer *gp, t_canvas *canvas, t_scalar *x); static void gpointer_setarray(t_gpointer *gp, t_array *array, t_word *w); + static t_word *gpointer_word(t_gpointer *gp) {return gp->o->_class == array_class ? gp->w : gp->scalar->v;} + static t_canvas *gpointer_getcanvas(t_gpointer *gp) { + if (gp->o->_class != array_class) return gp->canvas; + else {/* fuck: + t_array *owner_array = gp->array; + // find associated scalar: + while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->array; + return STUB(owner_array)->canvas; + */} + return 0; /* FIXME */ + } + static t_scalar *gpointer_getscalar(t_gpointer *gp) { + if (gp->o->_class != array_class) return gp->scalar; + /* t_array *o = gp->array; while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->array; return o->gp.scalar; */ + return 0; + } /* make a new scalar and add to the canvas. We create a "gp" here which *************** *** 5067,5084 **** } ! /* ------------- gstubs and gpointers - safe pointing --------------- */ ! /* create a gstub which is "owned" by a canvas (gl) or an array ("a"). */ ! t_gstub *gstub_new(t_canvas *gl, t_array *a) { ! t_gstub *gs = (t_gstub *)getbytes(sizeof(*gs)); ! if (gl) gs->canvas = gl; ! else gs->array = a; ! gs->gs_refcount = 0; ! return gs; ! } ! ! /* when a "gpointer" is set to point to this stub (so we can later chase ! down the owner) we increase a reference count. The following routine is called ! whenever a gpointer is unset from pointing here. If the owner is ! gone and the refcount goes to zero, we can free the gstub safely. */ static void gstub_dis(t_gstub *gs) { int refcount = --gs->gs_refcount; --- 5072,5077 ---- } ! /* ------------- gpointers - safe pointing --------------- */ ! /* static void gstub_dis(t_gstub *gs) { int refcount = --gs->gs_refcount; *************** *** 5086,5103 **** else if (refcount < 0) bug("gstub_dis"); } - - /* this routing is called by the owner to inform the gstub that it is - being deleted. If no gpointers are pointing here, we can free the gstub; - otherwise we wait for the last gstub_dis() to free it. */ - void gstub_cutoff(t_gstub *gs) { - gs->array = 0; - if (gs->gs_refcount < 0) bug("gstub_cutoff"); - if (!gs->gs_refcount) t_freebytes(gs, sizeof (*gs)); - } - static int gstub_which(t_gstub *gs) { if (gs->array) return 0; if (gs->array->_class == array_class) return GP_ARRAY; else return GP_CANVAS; } /* call this to verify that a pointer is fresh, i.e., that it either --- 5079,5087 ---- else if (refcount < 0) bug("gstub_dis"); } static int gstub_which(t_gstub *gs) { if (gs->array) return 0; if (gs->array->_class == array_class) return GP_ARRAY; else return GP_CANVAS; } + */ /* call this to verify that a pointer is fresh, i.e., that it either *************** *** 5106,5114 **** Unless "headok" is set, the routine also fails for the head of a list. */ int gpointer_check(const t_gpointer *gp, int headok) { ! t_gstub *gs = gp->gp_stub; ! if (!gs) return 0; ! if (gstub_which(gs) == GP_ARRAY) return 1; ! if (gstub_which(gs) == GP_CANVAS) return headok || gp->scalar; ! return 0; } --- 5090,5096 ---- Unless "headok" is set, the routine also fails for the head of a list. */ int gpointer_check(const t_gpointer *gp, int headok) { ! if (!gp->o) return 0; ! if (gp->o->_class == array_class) return 1; ! return headok || gp->scalar; } *************** *** 5116,5122 **** freshness. Returns 0 if head of list. */ static t_symbol *gpointer_gettemplatesym(const t_gpointer *gp) { ! t_gstub *gs = gp->gp_stub; ! if (gstub_which(gs) == GP_CANVAS) {t_scalar *sc = gp->scalar; return sc ? sc->t : 0;} ! else {t_array *a = gs->array; return a->templatesym;} } --- 5098,5104 ---- freshness. Returns 0 if head of list. */ static t_symbol *gpointer_gettemplatesym(const t_gpointer *gp) { ! if (gp->o->_class == array_class) return gp->array->templatesym; ! t_scalar *sc = gp->scalar; ! return sc ? sc->t : 0; } *************** *** 5126,5151 **** void gpointer_copy(const t_gpointer *gpfrom, t_gpointer *gpto) { *gpto = *gpfrom; ! if (gpto->gp_stub) gpto->gp_stub->gs_refcount++; ! else bug("gpointer_copy"); } ! /* clear a gpointer that was previously set, releasing the associted gstub if this was the last reference to it. */ void gpointer_unset(t_gpointer *gp) { ! t_gstub *gs = gp->gp_stub; ! if (gs) {gstub_dis(gs); gp->gp_stub = 0;} } ! static void gpointer_setcanvas(t_gpointer *gp, t_canvas *canvas, t_scalar *x) { ! t_gstub *gs = gp->gp_stub; if (gs) gstub_dis(gs); ! gp->gp_stub=gs=canvas->stub; gp->scalar = x; gs->gs_refcount++; } ! static void gpointer_setarray(t_gpointer *gp, t_array *array, t_word *w) { ! t_gstub *gs = gp->gp_stub; if (gs) gstub_dis(gs); ! gp->gp_stub=gs=array->stub; gp->w = w; gs->gs_refcount++; } void gpointer_init(t_gpointer *gp) { ! gp->gp_stub = 0; gp->scalar = 0; } --- 5108,5135 ---- void gpointer_copy(const t_gpointer *gpfrom, t_gpointer *gpto) { *gpto = *gpfrom; ! if (gpto && gpto->o) gpto->o->refcount++; else bug("gpointer_copy"); } ! /* clear a gpointer that was previously set, releasing the associated gstub if this was the last reference to it. */ void gpointer_unset(t_gpointer *gp) { ! if (gp->scalar) { ! if (!--gp->o->refcount) pd_free(gp->o); ! gp->o=0; ! gp->scalar=0; ! } } ! static void gpointer_setcanvas(t_gpointer *gp, t_canvas *o, t_scalar *x) { ! gpointer_unset(gp); ! gp->o=o; gp->scalar = x; gp->o->refcount++; } ! static void gpointer_setarray(t_gpointer *gp, t_array *o, t_word *w) { ! gpointer_unset(gp); ! gp->o=o; gp->w = w; gp->o->refcount++; } void gpointer_init(t_gpointer *gp) { ! gp->o = 0; gp->scalar = 0; } *************** *** 5190,5206 **** } - /* for future use */ - static int isstale(t_gpointer *x) {return 1;} - static void ptrobj_vnext(t_ptrobj *x, float f) { t_gobj *gobj; t_gpointer *gp = &x->gp; - t_gstub *gs = gp->gp_stub; - t_canvas *canvas; int wantselected = f!=0; ! if (!gs) {pd_error(x, "next: no current pointer"); return;} ! if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "next: lists only, not arrays"); return;} ! canvas = gs->canvas; ! if (isstale(gp)) {pd_error(x, "next: stale pointer"); return;} if (wantselected) {pd_error(x, "next: next-selected unsupported in desiredata"); return;} /* if (wantselected && !canvas_isvisible(canvas)) --- 5174,5184 ---- } static void ptrobj_vnext(t_ptrobj *x, float f) { t_gobj *gobj; t_gpointer *gp = &x->gp; int wantselected = f!=0; ! if (!gp->o) {pd_error(x, "next: no current pointer"); return;} ! if (gp->o->_class == array_class) {pd_error(x, "next: lists only, not arrays"); return;} ! t_canvas *canvas = gp->canvas; if (wantselected) {pd_error(x, "next: next-selected unsupported in desiredata"); return;} /* if (wantselected && !canvas_isvisible(canvas)) *************** *** 5226,5241 **** static void ptrobj_sendwindow(t_ptrobj *x, t_symbol *s, int argc, t_atom *argv) { - t_canvas *canvas; - t_gstub *gs; if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} ! gs = x->gp.gp_stub; ! if (gstub_which(gs) == GP_CANVAS) canvas = gs->canvas; ! else { ! t_array *owner_array = gs->array; ! while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->array; ! canvas = STUB(owner_array)->canvas; ! } ! if (argc && argv->a_type == A_SYMBOL) ! pd_typedmess(canvas_getcanvas(canvas), argv->a_symbol, argc-1, argv+1); else pd_error(x, "send-window: no message?"); } --- 5204,5210 ---- static void ptrobj_sendwindow(t_ptrobj *x, t_symbol *s, int argc, t_atom *argv) { if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} ! t_canvas *canvas = gpointer_getcanvas(&x->gp); ! if (argc && argv->a_type == A_SYMBOL) pd_typedmess(canvas_getcanvas(canvas), argv->a_symbol, argc-1, argv+1); else pd_error(x, "send-window: no message?"); } *************** *** 5245,5249 **** if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} t_symbol *templatesym = gpointer_gettemplatesym(&x->gp); ! for (int n = x->ntypedout; n--; to++) if (to->type == templatesym) {outlet_pointer(to->outlet, &x->gp); return;} outlet_pointer(x->otherout, &x->gp); --- 5214,5218 ---- if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} t_symbol *templatesym = gpointer_gettemplatesym(&x->gp); ! for (int n=x->ntypedout; n--; to++) if (to->type == templatesym) {outlet_pointer(to->outlet, &x->gp); return;} outlet_pointer(x->otherout, &x->gp); *************** *** 5257,5267 **** static void ptrobj_rewind(t_ptrobj *x) { - t_canvas *canvas; - t_gstub *gs; if (!gpointer_check(&x->gp, 1)) {pd_error(x, "rewind: empty pointer"); return;} ! gs = x->gp.gp_stub; ! if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "rewind: sorry, unavailable for arrays"); return;} ! canvas = gs->canvas; ! gpointer_setcanvas(&x->gp, canvas, 0); ptrobj_bang(x); } --- 5226,5232 ---- static void ptrobj_rewind(t_ptrobj *x) { if (!gpointer_check(&x->gp, 1)) {pd_error(x, "rewind: empty pointer"); return;} ! if (x->gp.o->_class == array_class) {pd_error(x, "rewind: sorry, unavailable for arrays"); return;} ! gpointer_setcanvas(&x->gp, x->gp.canvas, 0); ptrobj_bang(x); } *************** *** 5306,5314 **** int nitems = x->nout; t_template *t = template_findbyname(x->templatesym); - t_gstub *gs = gp->gp_stub; t_getvariable *vp; TEMPLATE_CHECK(x,x->templatesym,) if (!gpointer_check(gp, 0)) {pd_error(x, "stale or empty pointer"); return;} ! t_word *vec = gstub_which(gs)==GP_ARRAY ? gp->w : gp->scalar->v; vp = x->variables + nitems-1; for (int i=nitems-1; i>=0; i--, vp--) { --- 5271,5278 ---- int nitems = x->nout; t_template *t = template_findbyname(x->templatesym); t_getvariable *vp; TEMPLATE_CHECK(x,x->templatesym,) if (!gpointer_check(gp, 0)) {pd_error(x, "stale or empty pointer"); return;} ! t_word *vec = gpointer_word(gp); vp = x->variables + nitems-1; for (int i=nitems-1; i>=0; i--, vp--) { *************** *** 5376,5380 **** t_template *t = template_findbyname(x->templatesym); t_gpointer *gp = &x->gp; - t_gstub *gs = gp->gp_stub; TEMPLATE_CHECK(x,x->templatesym,) if (!gpointer_check(gp, 0)) {pd_error(x, "empty pointer"); return;} --- 5340,5343 ---- *************** *** 5384,5398 **** } if (!nitems) return; ! t_word *vec = gstub_which(gs) == GP_ARRAY ? gp->w : gp->scalar->v; t_setvariable *vp=x->variables; ! if (x->issymbol) ! for (int i=0; i<nitems; i++,vp++) template_setsymbol(t, vp->sym, vec, vp->w.w_symbol, 1); ! else for (int i=0; i<nitems; i++,vp++) template_setfloat(t, vp->sym, vec, vp->w.w_float, 1); ! if (gstub_which(gs) == GP_CANVAS) scalar_redraw(gp->scalar, gs->canvas); ! else { ! t_array *owner_array = gs->array; ! while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->array; ! scalar_redraw(owner_array->gp.scalar, STUB(owner_array)->canvas); ! } } --- 5347,5355 ---- } if (!nitems) return; ! t_word *vec = gpointer_word(gp); t_setvariable *vp=x->variables; ! if (x->issymbol) for (int i=0; i<nitems; i++,vp++) template_setsymbol(t, vp->sym, vec, vp->w.w_symbol, 1); ! else for (int i=0; i<nitems; i++,vp++) template_setfloat(t, vp->sym, vec, vp->w.w_float, 1); ! scalar_redraw(gp->scalar, gpointer_getcanvas(gp)); /* but ought to use owner_array->gp.scalar */ } *************** *** 5448,5452 **** return; } ! t_word *w = gstub_which(gparent->gp_stub)==GP_ARRAY ? gparent->w : gparent->scalar->v; TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(t, fieldsym, &onset, &type, &elemtemplatesym)) { --- 5405,5409 ---- return; } ! t_word *w = gpointer_word(gparent); TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(t, fieldsym, &onset, &type, &elemtemplatesym)) { *************** *** 5494,5498 **** t_symbol *fieldsym = x->fieldsym, *elemtemplatesym; t_template *t = template_findbyname(x->templatesym); - t_gstub *gs = gp->gp_stub; TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(t, fieldsym, &onset, &type, &elemtemplatesym)) { --- 5451,5454 ---- *************** *** 5507,5511 **** return; } ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->w : gp->scalar->v; t_array *array = *(t_array **)(((char *)w) + onset); outlet_float(x->ob_outlet, (float)(array->n)); --- 5463,5467 ---- return; } ! t_word *w = gpointer_word(gp); t_array *array = *(t_array **)(((char *)w) + onset); outlet_float(x->ob_outlet, (float)(array->n)); *************** *** 5536,5540 **** int newsize = (int)f; t_gpointer *gp = &x->gp; - t_gstub *gs = gp->gp_stub; if (!gpointer_check(&x->gp, 0)) {pd_error(x, "empty pointer"); return;} if (gpointer_gettemplatesym(&x->gp) != x->templatesym) { --- 5492,5495 ---- *************** *** 5542,5546 **** return; } ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->w : gp->scalar->v; TEMPLATE_CHECK(x,x->templatesym,) t_symbol *elemtemplatesym; --- 5497,5501 ---- return; } ! t_word *w = gpointer_word(gp); TEMPLATE_CHECK(x,x->templatesym,) t_symbol *elemtemplatesym; *************** *** 5562,5575 **** if (newsize == nitems) return; ! /* erase the array before resizing it. If we belong to a scalar it's easy, ! but if we belong to an element of another array we have to search back until we get to a ! scalar to erase. When graphics updates become queueable this may fall apart... */ ! if (gstub_which(gs) == GP_CANVAS) { ! if (canvas_isvisible(gs->canvas)) sys_mgui(gp->scalar,"delete",""); ! } else { ! t_array *o = gs->array; ! while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->array; ! if (canvas_isvisible(STUB(o)->canvas)) sys_mgui(o->gp.scalar, "delete",""); ! } /* now do the resizing and, if growing, initialize new scalars */ --- 5517,5521 ---- if (newsize == nitems) return; ! /* here there was something to erase the array before resizing it */ /* now do the resizing and, if growing, initialize new scalars */ *************** *** 5584,5594 **** } } ! if (gstub_which(gs) == GP_CANVAS) { ! gobj_changed(gp->scalar,0); ! } else {/*is there something missing here?*/ ! t_array *o = gs->array; ! while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->array; ! gobj_changed(o->gp.scalar,0); ! } } --- 5530,5534 ---- } } ! gobj_changed(gpointer_getscalar(gp),0); } *************** *** 5635,5644 **** t_template *t = template_findbyname(x->templatesym); t_gpointer *gp = &x->gp; - t_gstub *gs = gp->gp_stub; TEMPLATE_CHECK(x,x->templatesym,) ! if (!gs) {pd_error(x, "no current pointer"); return;} ! if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "lists only, not arrays"); return;} ! t_canvas *canvas = gs->canvas; ! if (isstale(gp)) {pd_error(x, "stale pointer"); return;} if (!nitems) return; x->variables[0].f = f; --- 5575,5582 ---- t_template *t = template_findbyname(x->templatesym); t_gpointer *gp = &x->gp; TEMPLATE_CHECK(x,x->templatesym,) ! if (!gp->o) {pd_error(x, "no current pointer"); return;} ! if (gp->o->_class == array_class) {pd_error(x, "lists only, not arrays"); return;} ! t_canvas *canvas = gp->canvas; if (!nitems) return; x->variables[0].f = f; *************** *** 5684,5688 **** t_symbol *dummy; t_template *t = template_findbyname(x->templatesym); - t_gstub *gs = gp->gp_stub; int onset, type; TEMPLATE_CHECK(x,x->templatesym,) --- 5622,5625 ---- *************** *** 5693,5697 **** } if (type != DT_LIST) {pd_error(x, "field %s not of type list", x->fieldsym->s_name); return;} ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->w : gp->scalar->v; gpointer_setcanvas(&x->gp, *(t_canvas **)(((char *)w) + onset), 0); outlet_pointer(x->ob_outlet, &x->gp); --- 5630,5634 ---- } if (type != DT_LIST) {pd_error(x, "field %s not of type list", x->fieldsym->s_name); return;} ! t_word *w = gpointer_word(gp); gpointer_setcanvas(&x->gp, *(t_canvas **)(((char *)w) + onset), 0); outlet_pointer(x->ob_outlet, &x->gp);

1 0

externals/io/hidio hidio.c, 1.18, 1.19 hidio.h, 1.18, 1.19 hidio_darwin.c, 1.9, 1.10 hidio_linux.c, 1.6, 1.7 hidio_windows.c, 1.6, 1.7
by Hans-Christoph Steiner 03 Jan '07

03 Jan '07

Update of /cvsroot/pure-data/externals/io/hidio In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28233 Modified Files: hidio.c hidio.h hidio_darwin.c hidio_linux.c hidio_windows.c Log Message: builds on all platforms now, but doesn't link on MinGW Index: hidio_darwin.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio_darwin.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** hidio_darwin.c 2 Jan 2007 20:40:49 -0000 1.9 --- hidio_darwin.c 3 Jan 2007 06:33:25 -0000 1.10 *************** *** 889,893 **** */ ! t_int hidio_ff_send_ff_command (t_hidio *x, UInt32 ff_command) { HRESULT result = 0; --- 889,893 ---- */ ! void hidio_ff_send_ff_command (t_hidio *x, UInt32 ff_command) { HRESULT result = 0; *************** *** 901,949 **** } ! t_int hidio_ff_continue( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_continue"); ! return( hidio_ff_send_ff_command( x, FFSFFC_CONTINUE ) ); } ! t_int hidio_ff_pause( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_pause"); ! return( hidio_ff_send_ff_command( x, FFSFFC_PAUSE ) ); } ! t_int hidio_ff_reset( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_reset"); ! return( hidio_ff_send_ff_command( x, FFSFFC_RESET ) ); } ! t_int hidio_ff_setactuatorsoff( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_setactuatorsoff"); ! return( hidio_ff_send_ff_command( x, FFSFFC_SETACTUATORSOFF ) ); } ! t_int hidio_ff_setactuatorson( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_setactuatorson"); ! return( hidio_ff_send_ff_command( x, FFSFFC_SETACTUATORSON ) ); } ! t_int hidio_ff_stopall( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_stopall"); ! return( hidio_ff_send_ff_command( x, FFSFFC_STOPALL ) ); } ! t_int hidio_ff_motors( t_hidio *x, t_float value ) { if ( value > 0 ) { ! return ( hidio_ff_setactuatorson( x ) ); } else { ! return ( hidio_ff_setactuatorsoff( x ) ); } } --- 901,949 ---- } ! void hidio_ff_continue( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_continue"); ! hidio_ff_send_ff_command( x, FFSFFC_CONTINUE ); } ! void hidio_ff_pause( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_pause"); ! hidio_ff_send_ff_command( x, FFSFFC_PAUSE ); } ! void hidio_ff_reset( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_reset"); ! hidio_ff_send_ff_command( x, FFSFFC_RESET ); } ! void hidio_ff_setactuatorsoff( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_setactuatorsoff"); ! hidio_ff_send_ff_command( x, FFSFFC_SETACTUATORSOFF ); } ! void hidio_ff_setactuatorson( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_setactuatorson"); ! hidio_ff_send_ff_command( x, FFSFFC_SETACTUATORSON ); } ! void hidio_ff_stopall( t_hidio *x ) { debug_post(LOG_DEBUG,"hidio_ff_stopall"); ! hidio_ff_send_ff_command( x, FFSFFC_STOPALL ); } ! void hidio_ff_motors( t_hidio *x, t_float value ) { if ( value > 0 ) { ! hidio_ff_setactuatorson( x ); } else { ! hidio_ff_setactuatorsoff( x ); } } *************** *** 954,962 **** */ ! t_int hidio_ff_fftest ( t_hidio *x, t_float value) { debug_post(LOG_DEBUG,"hidio_ff_fftest"); - return EXIT_SUCCESS; } --- 954,961 ---- */ ! void hidio_ff_fftest ( t_hidio *x, t_float value) { debug_post(LOG_DEBUG,"hidio_ff_fftest"); } Index: hidio.h =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** hidio.h 2 Jan 2007 22:00:00 -0000 1.18 --- hidio.h 3 Jan 2007 06:33:25 -0000 1.19 *************** *** 3,6 **** --- 3,8 ---- #include <stdio.h> + #include <stdlib.h> + #ifdef _WIN32 #define LOG_DEBUG 7 *************** *** 9,12 **** --- 11,15 ---- #define LOG_ERR 3 #define vsnprintf _vsnprintf + #include <windows.h> #else #include <sys/syslog.h> *************** *** 40,43 **** --- 43,47 ---- #endif /* PD */ + #define HIDIO_MAJOR_VERSION 0 #define HIDIO_MINOR_VERSION 0 *************** *** 72,80 **** ! /*------------------------------------------------------------------------------ ! * CLASS DEF ! */ ! typedef struct _hidio ! { t_object x_obj; --- 76,82 ---- ! /* ----------------------------------------------------------------------------- ! * CLASS DEF */ ! typedef struct _hidio { t_object x_obj; *************** *** 130,145 **** #endif /* _WIN32 */ #ifdef __APPLE__ ! void *pHIDElement; // pRecElement on Mac OS X #endif /* __APPLE__ */ ! t_symbol *type; // Linux "type"; HID "usagePage", but using the hidio scheme ! t_symbol *name; // Linux "code"; HID "usage", but using the hidio scheme ! unsigned char polled; // is it polled or queued? ! unsigned char relative; // relative data gets output everytime ! t_int min; // from device report ! t_int max; // from device report ! t_float instance; // usage page/usage instance # (e.g. [absolute x 2 163( ) ! t_atom output_message[3]; // pre-generated message for hidio_output_event() ! t_int value; // output the sum of events in a poll for relative axes ! t_int previous_value; //only output on change on abs and buttons } t_hid_element; --- 132,147 ---- #endif /* _WIN32 */ #ifdef __APPLE__ ! void *pHIDElement; /* pRecElement on Mac OS X */ #endif /* __APPLE__ */ ! t_symbol *type; /* Linux "type"; HID "usagePage", but using hidio scheme */ ! t_symbol *name; /* Linux "code"; HID "usage", but using hidio scheme */ ! unsigned char polled; /* is it polled or queued? */ ! unsigned char relative; /* relative data gets output everytime */ ! t_int min; /* from device report */ ! t_int max; /* from device report */ ! t_float instance; /* usage page/usage instance # (e.g. [absolute x 2 163( */ ! t_atom output_message[3]; /* pre-generated message for hidio_output_event */ ! t_int value; /* output the sum of events in a poll for relative axes */ ! t_int previous_value; /*only output on change on abs and buttons */ } t_hid_element; *************** *** 196,209 **** /* cross-platform force feedback functions */ ! extern t_int hidio_ff_autocenter(t_hidio *x, t_float value); ! extern t_int hidio_ff_gain(t_hidio *x, t_float value); ! extern t_int hidio_ff_motors(t_hidio *x, t_float value); ! extern t_int hidio_ff_continue(t_hidio *x); ! extern t_int hidio_ff_pause(t_hidio *x); ! extern t_int hidio_ff_reset(t_hidio *x); ! extern t_int hidio_ff_stopall(t_hidio *x); ! // these are just for testing... ! extern t_int hidio_ff_fftest (t_hidio *x, t_float value); extern void hidio_ff_print(t_hidio *x); --- 198,211 ---- /* cross-platform force feedback functions */ ! extern void hidio_ff_autocenter(t_hidio *x, t_float value); ! extern void hidio_ff_gain(t_hidio *x, t_float value); ! extern void hidio_ff_motors(t_hidio *x, t_float value); ! extern void hidio_ff_continue(t_hidio *x); ! extern void hidio_ff_pause(t_hidio *x); ! extern void hidio_ff_reset(t_hidio *x); ! extern void hidio_ff_stopall(t_hidio *x); ! /* these are just for testing... */ ! extern void hidio_ff_fftest (t_hidio *x, t_float value); extern void hidio_ff_print(t_hidio *x); Index: hidio_linux.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio_linux.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** hidio_linux.c 2 Jan 2007 05:37:07 -0000 1.6 --- hidio_linux.c 3 Jan 2007 06:33:25 -0000 1.7 *************** *** 595,637 **** /* cross-platform force feedback functions */ ! t_int hidio_ff_autocenter( t_hidio *x, t_float value ) { ! return EXIT_SUCCESS; } ! t_int hidio_ff_gain( t_hidio *x, t_float value ) { ! return EXIT_SUCCESS; } ! t_int hidio_ff_motors( t_hidio *x, t_float value ) { ! return EXIT_SUCCESS; } ! t_int hidio_ff_continue( t_hidio *x ) { ! return EXIT_SUCCESS; } ! t_int hidio_ff_pause( t_hidio *x ) { ! return EXIT_SUCCESS; } ! t_int hidio_ff_reset( t_hidio *x ) { ! return EXIT_SUCCESS; } ! t_int hidio_ff_stopall( t_hidio *x ) { ! return EXIT_SUCCESS; } --- 595,637 ---- /* cross-platform force feedback functions */ ! void hidio_ff_autocenter( t_hidio *x, t_float value ) { ! } ! void hidio_ff_gain( t_hidio *x, t_float value ) { ! } ! void hidio_ff_motors( t_hidio *x, t_float value ) { ! } ! void hidio_ff_continue( t_hidio *x ) { ! } ! void hidio_ff_pause( t_hidio *x ) { ! } ! void hidio_ff_reset( t_hidio *x ) { ! } ! void hidio_ff_stopall( t_hidio *x ) { ! } *************** *** 639,645 **** // these are just for testing... ! t_int hidio_ff_fftest ( t_hidio *x, t_float value) { ! return EXIT_SUCCESS; } --- 639,645 ---- // these are just for testing... ! void hidio_ff_fftest ( t_hidio *x, t_float value) { ! } Index: hidio.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** hidio.c 2 Jan 2007 22:00:00 -0000 1.18 --- hidio.c 3 Jan 2007 06:33:25 -0000 1.19 *************** *** 35,39 **** #endif /* _WIN32 */ #include <stdarg.h> - #include <stdlib.h> #include <string.h> --- 35,38 ---- Index: hidio_windows.c =================================================================== RCS file: /cvsroot/pure-data/externals/io/hidio/hidio_windows.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** hidio_windows.c 2 Jan 2007 22:00:00 -0000 1.6 --- hidio_windows.c 3 Jan 2007 06:33:25 -0000 1.7 *************** *** 25,34 **** #include <winbase.h> #include <stdio.h> ! #include <setupapi.h> ! ! /* ! * Please note that this file needs the Microsoft Driver Developent Kit (DDK) ! * to be installed in order to compile! ! */ #ifdef _MSC_VER [...1227 lines suppressed...] ! ! if (self) ! freebytes(self, sizeof(t_hid_device)); } ! void *hidio_platform_specific_new(t_hidio *x) ! { ! t_hid_device *self; ! ! debug_print(LOG_DEBUG,"hidio_platform_specific_new"); ! ! /* alloc memory for our instance */ ! self = (t_hid_device *)getbytes(sizeof(t_hid_device)); ! self->fh = INVALID_HANDLE_VALUE; ! ! return (void *)self; /* return void pointer to our data struct */ ! } #endif /* _WINDOWS */

1 0

pd/src desire.c, 1.1.2.217.2.105, 1.1.2.217.2.106 m_pd.h, 1.4.4.11.2.33.2.27, 1.4.4.11.2.33.2.28
by Mathieu Bouchard 03 Jan '07

03 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25269 Modified Files: Tag: desiredata desire.c m_pd.h Log Message: removed gs_un.gs_ Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.27 retrieving revision 1.4.4.11.2.33.2.28 diff -C2 -d -r1.4.4.11.2.33.2.27 -r1.4.4.11.2.33.2.28 *** m_pd.h 3 Jan 2007 04:42:12 -0000 1.4.4.11.2.33.2.27 --- m_pd.h 3 Jan 2007 04:59:09 -0000 1.4.4.11.2.33.2.28 *************** *** 111,121 **** typedef struct _gstub { union { ! struct _glist *gs_glist; /* should be renamed to gs_canvas */ ! struct _array *gs_array; ! } gs_un; } t_gstub; ! #define gs_refcount gs_un.gs_glist->gl_obj.refcount #endif typedef struct _gpointer { union { --- 111,130 ---- typedef struct _gstub { union { ! struct _glist *canvas; ! struct _array *array; ! } un; } t_gstub; ! #define gs_refcount un.canvas->gl_obj.refcount #endif + #ifdef PD_PLUSPLUS_FACE + typedef struct _gpointer { + union { + struct _scalar *scalar; /* scalar we're in (if glist) */ + union word *w; /* raw data (if array) */ + }; + t_gstub *gp_stub; /* stub which points to glist/array */ + } t_gpointer; + #else typedef struct _gpointer { union { *************** *** 123,129 **** union word *gp_w; /* raw data (if array) */ } gp_un; - int gp_useless; t_gstub *gp_stub; /* stub which points to glist/array */ } t_gpointer; typedef union word { --- 132,138 ---- union word *gp_w; /* raw data (if array) */ } gp_un; t_gstub *gp_stub; /* stub which points to glist/array */ } t_gpointer; + #endif typedef union word { Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.105 retrieving revision 1.1.2.217.2.106 diff -C2 -d -r1.1.2.217.2.105 -r1.1.2.217.2.106 *** desire.c 3 Jan 2007 04:42:10 -0000 1.1.2.217.2.105 --- desire.c 3 Jan 2007 04:59:06 -0000 1.1.2.217.2.106 *************** *** 1700,1704 **** static void array_redraw(t_array *a, t_canvas *canvas) { while (gstub_which(STUB(a)) == GP_ARRAY) a = STUB(a)->array; ! scalar_redraw(a->gp.gp_un.gp_scalar, canvas); } --- 1700,1704 ---- static void array_redraw(t_array *a, t_canvas *canvas) { while (gstub_which(STUB(a)) == GP_ARRAY) a = STUB(a)->array; ! scalar_redraw(a->gp.scalar, canvas); } *************** *** 5109,5113 **** if (!gs) return 0; if (gstub_which(gs) == GP_ARRAY) return 1; ! if (gstub_which(gs) == GP_CANVAS) return headok || gp->gp_un.gp_scalar; return 0; } --- 5109,5113 ---- if (!gs) return 0; if (gstub_which(gs) == GP_ARRAY) return 1; ! if (gstub_which(gs) == GP_CANVAS) return headok || gp->scalar; return 0; } *************** *** 5117,5121 **** static t_symbol *gpointer_gettemplatesym(const t_gpointer *gp) { t_gstub *gs = gp->gp_stub; ! if (gstub_which(gs) == GP_CANVAS) {t_scalar *sc = gp->gp_un.gp_scalar; return sc ? sc->t : 0;} else {t_array *a = gs->array; return a->templatesym;} } --- 5117,5121 ---- static t_symbol *gpointer_gettemplatesym(const t_gpointer *gp) { t_gstub *gs = gp->gp_stub; ! if (gstub_which(gs) == GP_CANVAS) {t_scalar *sc = gp->scalar; return sc ? sc->t : 0;} else {t_array *a = gs->array; return a->templatesym;} } *************** *** 5139,5152 **** static void gpointer_setcanvas(t_gpointer *gp, t_canvas *canvas, t_scalar *x) { t_gstub *gs = gp->gp_stub; if (gs) gstub_dis(gs); ! gp->gp_stub=gs=canvas->stub; gp->gp_un.gp_scalar = x; gs->gs_refcount++; } static void gpointer_setarray(t_gpointer *gp, t_array *array, t_word *w) { t_gstub *gs = gp->gp_stub; if (gs) gstub_dis(gs); ! gp->gp_stub=gs=array->stub; gp->gp_un.gp_w = w; gs->gs_refcount++; } void gpointer_init(t_gpointer *gp) { gp->gp_stub = 0; ! gp->gp_un.gp_scalar = 0; } --- 5139,5152 ---- static void gpointer_setcanvas(t_gpointer *gp, t_canvas *canvas, t_scalar *x) { t_gstub *gs = gp->gp_stub; if (gs) gstub_dis(gs); ! gp->gp_stub=gs=canvas->stub; gp->scalar = x; gs->gs_refcount++; } static void gpointer_setarray(t_gpointer *gp, t_array *array, t_word *w) { t_gstub *gs = gp->gp_stub; if (gs) gstub_dis(gs); ! gp->gp_stub=gs=array->stub; gp->w = w; gs->gs_refcount++; } void gpointer_init(t_gpointer *gp) { gp->gp_stub = 0; ! gp->scalar = 0; } *************** *** 5206,5210 **** /* if (wantselected && !canvas_isvisible(canvas)) {pd_error(x, "next: next-selected only works for a visible window"); return;} */ ! gobj = gp->gp_un.gp_scalar; if (!gobj) gobj = canvas->list; else gobj = gobj->g_next; --- 5206,5210 ---- /* if (wantselected && !canvas_isvisible(canvas)) {pd_error(x, "next: next-selected only works for a visible window"); return;} */ ! gobj = gp->scalar; if (!gobj) gobj = canvas->list; else gobj = gobj->g_next; *************** *** 5213,5217 **** t_typedout *to = x->typedout; t_scalar *sc = (t_scalar *)gobj; ! gp->gp_un.gp_scalar = sc; for (int n = x->ntypedout; n--; to++) if (to->type == sc->t) {outlet_pointer(to->outlet, &x->gp); return;} --- 5213,5217 ---- t_typedout *to = x->typedout; t_scalar *sc = (t_scalar *)gobj; ! gp->scalar = sc; for (int n = x->ntypedout; n--; to++) if (to->type == sc->t) {outlet_pointer(to->outlet, &x->gp); return;} *************** *** 5310,5314 **** TEMPLATE_CHECK(x,x->templatesym,) if (!gpointer_check(gp, 0)) {pd_error(x, "stale or empty pointer"); return;} ! t_word *vec = gstub_which(gs)==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; vp = x->variables + nitems-1; for (int i=nitems-1; i>=0; i--, vp--) { --- 5310,5314 ---- TEMPLATE_CHECK(x,x->templatesym,) if (!gpointer_check(gp, 0)) {pd_error(x, "stale or empty pointer"); return;} ! t_word *vec = gstub_which(gs)==GP_ARRAY ? gp->w : gp->scalar->v; vp = x->variables + nitems-1; for (int i=nitems-1; i>=0; i--, vp--) { *************** *** 5384,5397 **** } if (!nitems) return; ! t_word *vec = gstub_which(gs) == GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; t_setvariable *vp=x->variables; if (x->issymbol) for (int i=0; i<nitems; i++,vp++) template_setsymbol(t, vp->sym, vec, vp->w.w_symbol, 1); else for (int i=0; i<nitems; i++,vp++) template_setfloat(t, vp->sym, vec, vp->w.w_float, 1); ! if (gstub_which(gs) == GP_CANVAS) scalar_redraw(gp->gp_un.gp_scalar, gs->canvas); else { t_array *owner_array = gs->array; while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->array; ! scalar_redraw(owner_array->gp.gp_un.gp_scalar, STUB(owner_array)->canvas); } } --- 5384,5397 ---- } if (!nitems) return; ! t_word *vec = gstub_which(gs) == GP_ARRAY ? gp->w : gp->scalar->v; t_setvariable *vp=x->variables; if (x->issymbol) for (int i=0; i<nitems; i++,vp++) template_setsymbol(t, vp->sym, vec, vp->w.w_symbol, 1); else for (int i=0; i<nitems; i++,vp++) template_setfloat(t, vp->sym, vec, vp->w.w_float, 1); ! if (gstub_which(gs) == GP_CANVAS) scalar_redraw(gp->scalar, gs->canvas); else { t_array *owner_array = gs->array; while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->array; ! scalar_redraw(owner_array->gp.scalar, STUB(owner_array)->canvas); } } *************** *** 5448,5452 **** return; } ! t_word *w = gstub_which(gparent->gp_stub)==GP_ARRAY ? gparent->gp_un.gp_w : gparent->gp_un.gp_scalar->v; TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(t, fieldsym, &onset, &type, &elemtemplatesym)) { --- 5448,5452 ---- return; } ! t_word *w = gstub_which(gparent->gp_stub)==GP_ARRAY ? gparent->w : gparent->scalar->v; TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(t, fieldsym, &onset, &type, &elemtemplatesym)) { *************** *** 5507,5511 **** return; } ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; t_array *array = *(t_array **)(((char *)w) + onset); outlet_float(x->ob_outlet, (float)(array->n)); --- 5507,5511 ---- return; } ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->w : gp->scalar->v; t_array *array = *(t_array **)(((char *)w) + onset); outlet_float(x->ob_outlet, (float)(array->n)); *************** *** 5542,5546 **** return; } ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; TEMPLATE_CHECK(x,x->templatesym,) t_symbol *elemtemplatesym; --- 5542,5546 ---- return; } ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->w : gp->scalar->v; TEMPLATE_CHECK(x,x->templatesym,) t_symbol *elemtemplatesym; *************** *** 5566,5574 **** scalar to erase. When graphics updates become queueable this may fall apart... */ if (gstub_which(gs) == GP_CANVAS) { ! if (canvas_isvisible(gs->canvas)) sys_mgui(gp->gp_un.gp_scalar,"delete",""); } else { t_array *o = gs->array; while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->array; ! if (canvas_isvisible(STUB(o)->canvas)) sys_mgui(o->gp.gp_un.gp_scalar, "delete",""); } --- 5566,5574 ---- scalar to erase. When graphics updates become queueable this may fall apart... */ if (gstub_which(gs) == GP_CANVAS) { ! if (canvas_isvisible(gs->canvas)) sys_mgui(gp->scalar,"delete",""); } else { t_array *o = gs->array; while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->array; ! if (canvas_isvisible(STUB(o)->canvas)) sys_mgui(o->gp.scalar, "delete",""); } *************** *** 5585,5593 **** } if (gstub_which(gs) == GP_CANVAS) { ! gobj_changed(gp->gp_un.gp_scalar,0); } else {/*is there something missing here?*/ t_array *o = gs->array; while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->array; ! gobj_changed(o->gp.gp_un.gp_scalar,0); } } --- 5585,5593 ---- } if (gstub_which(gs) == GP_CANVAS) { ! gobj_changed(gp->scalar,0); } else {/*is there something missing here?*/ t_array *o = gs->array; while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->array; ! gobj_changed(o->gp.scalar,0); } } *************** *** 5645,5653 **** t_scalar *sc = scalar_new(canvas,x->templatesym); if (!sc) {pd_error(x, "%s: couldn't create scalar", x->templatesym->s_name); return;} ! t_scalar *oldsc = gp->gp_un.gp_scalar; if (oldsc) {sc->g_next = oldsc->g_next; oldsc->g_next = sc;} else {sc->g_next = canvas->list; canvas->list = sc;} gobj_changed(sc,0); ! gp->gp_un.gp_scalar = sc; t_word *vec = sc->v; t_appendvariable *vp=x->variables; --- 5645,5653 ---- t_scalar *sc = scalar_new(canvas,x->templatesym); if (!sc) {pd_error(x, "%s: couldn't create scalar", x->templatesym->s_name); return;} ! t_scalar *oldsc = gp->scalar; if (oldsc) {sc->g_next = oldsc->g_next; oldsc->g_next = sc;} else {sc->g_next = canvas->list; canvas->list = sc;} gobj_changed(sc,0); ! gp->scalar = sc; t_word *vec = sc->v; t_appendvariable *vp=x->variables; *************** *** 5693,5697 **** } if (type != DT_LIST) {pd_error(x, "field %s not of type list", x->fieldsym->s_name); return;} ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; gpointer_setcanvas(&x->gp, *(t_canvas **)(((char *)w) + onset), 0); outlet_pointer(x->ob_outlet, &x->gp); --- 5693,5697 ---- } if (type != DT_LIST) {pd_error(x, "field %s not of type list", x->fieldsym->s_name); return;} ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->w : gp->scalar->v; gpointer_setcanvas(&x->gp, *(t_canvas **)(((char *)w) + onset), 0); outlet_pointer(x->ob_outlet, &x->gp);

1 0

pd/src desire.c, 1.1.2.217.2.104, 1.1.2.217.2.105 m_pd.h, 1.4.4.11.2.33.2.26, 1.4.4.11.2.33.2.27
by Mathieu Bouchard 03 Jan '07

03 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19015 Modified Files: Tag: desiredata desire.c m_pd.h Log Message: removed gs_un.gs_ prefixes Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.26 retrieving revision 1.4.4.11.2.33.2.27 diff -C2 -d -r1.4.4.11.2.33.2.26 -r1.4.4.11.2.33.2.27 *** m_pd.h 3 Jan 2007 04:12:13 -0000 1.4.4.11.2.33.2.26 --- m_pd.h 3 Jan 2007 04:42:12 -0000 1.4.4.11.2.33.2.27 *************** *** 100,103 **** --- 100,112 ---- #define GP_ARRAY 2 /* ... or array */ + #ifdef PD_PLUSPLUS_FACE + typedef struct _gstub { + union { + struct _glist *canvas; + struct _array *array; + }; + } t_gstub; + #define gs_refcount canvas->refcount + #else typedef struct _gstub { union { *************** *** 106,112 **** } gs_un; } t_gstub; - #ifdef PD_PLUSPLUS_FACE - #define gs_refcount gs_un.gs_glist->refcount - #else #define gs_refcount gs_un.gs_glist->gl_obj.refcount #endif --- 115,118 ---- *************** *** 152,156 **** typedef void *hashvalue; typedef void (*hash_iter)(void *data, hashkey k, hashvalue v); ! t_hash * hash_new(long capa); void hash_free(t_hash *self); long hash_size(t_hash *self); --- 158,162 ---- typedef void *hashvalue; typedef void (*hash_iter)(void *data, hashkey k, hashvalue v); ! t_hash *hash_new(long capa); void hash_free(t_hash *self); long hash_size(t_hash *self); Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.104 retrieving revision 1.1.2.217.2.105 diff -C2 -d -r1.1.2.217.2.104 -r1.1.2.217.2.105 *** desire.c 3 Jan 2007 03:54:16 -0000 1.1.2.217.2.104 --- desire.c 3 Jan 2007 04:42:10 -0000 1.1.2.217.2.105 *************** *** 1420,1424 **** static void array_resize_and_redraw(t_array *array, int n) { t_array *a2 = array; ! while (gstub_which(STUB(a2)) == GP_ARRAY) a2 = STUB(a2)->gs_un.gs_array; array_resize(array,n); gobj_changed(array,0); --- 1420,1424 ---- static void array_resize_and_redraw(t_array *array, int n) { t_array *a2 = array; ! while (gstub_which(STUB(a2)) == GP_ARRAY) a2 = STUB(a2)->array; array_resize(array,n); gobj_changed(array,0); *************** *** 1699,1703 **** static void array_redraw(t_array *a, t_canvas *canvas) { ! while (gstub_which(STUB(a)) == GP_ARRAY) a = STUB(a)->gs_un.gs_array; scalar_redraw(a->gp.gp_un.gp_scalar, canvas); } --- 1699,1703 ---- static void array_redraw(t_array *a, t_canvas *canvas) { ! while (gstub_which(STUB(a)) == GP_ARRAY) a = STUB(a)->array; scalar_redraw(a->gp.gp_un.gp_scalar, canvas); } *************** *** 5071,5076 **** t_gstub *gstub_new(t_canvas *gl, t_array *a) { t_gstub *gs = (t_gstub *)getbytes(sizeof(*gs)); ! if (gl) gs->gs_un.gs_glist = gl; ! else gs->gs_un.gs_array = a; gs->gs_refcount = 0; return gs; --- 5071,5076 ---- t_gstub *gstub_new(t_canvas *gl, t_array *a) { t_gstub *gs = (t_gstub *)getbytes(sizeof(*gs)); ! if (gl) gs->canvas = gl; ! else gs->array = a; gs->gs_refcount = 0; return gs; *************** *** 5091,5095 **** otherwise we wait for the last gstub_dis() to free it. */ void gstub_cutoff(t_gstub *gs) { ! gs->gs_un.gs_array = 0; if (gs->gs_refcount < 0) bug("gstub_cutoff"); if (!gs->gs_refcount) t_freebytes(gs, sizeof (*gs)); --- 5091,5095 ---- otherwise we wait for the last gstub_dis() to free it. */ void gstub_cutoff(t_gstub *gs) { ! gs->array = 0; if (gs->gs_refcount < 0) bug("gstub_cutoff"); if (!gs->gs_refcount) t_freebytes(gs, sizeof (*gs)); *************** *** 5097,5102 **** static int gstub_which(t_gstub *gs) { ! if (gs->gs_un.gs_array) return 0; ! if (gs->gs_un.gs_array->_class == array_class) return GP_ARRAY; else return GP_CANVAS; } --- 5097,5102 ---- static int gstub_which(t_gstub *gs) { ! if (gs->array) return 0; ! if (gs->array->_class == array_class) return GP_ARRAY; else return GP_CANVAS; } *************** *** 5118,5122 **** t_gstub *gs = gp->gp_stub; if (gstub_which(gs) == GP_CANVAS) {t_scalar *sc = gp->gp_un.gp_scalar; return sc ? sc->t : 0;} ! else {t_array *a = gs->gs_un.gs_array; return a->templatesym;} } --- 5118,5122 ---- t_gstub *gs = gp->gp_stub; if (gstub_which(gs) == GP_CANVAS) {t_scalar *sc = gp->gp_un.gp_scalar; return sc ? sc->t : 0;} ! else {t_array *a = gs->array; return a->templatesym;} } *************** *** 5201,5205 **** if (!gs) {pd_error(x, "next: no current pointer"); return;} if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "next: lists only, not arrays"); return;} ! canvas = gs->gs_un.gs_glist; if (isstale(gp)) {pd_error(x, "next: stale pointer"); return;} if (wantselected) {pd_error(x, "next: next-selected unsupported in desiredata"); return;} --- 5201,5205 ---- if (!gs) {pd_error(x, "next: no current pointer"); return;} if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "next: lists only, not arrays"); return;} ! canvas = gs->canvas; if (isstale(gp)) {pd_error(x, "next: stale pointer"); return;} if (wantselected) {pd_error(x, "next: next-selected unsupported in desiredata"); return;} *************** *** 5230,5238 **** if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} gs = x->gp.gp_stub; ! if (gstub_which(gs) == GP_CANVAS) canvas = gs->gs_un.gs_glist; else { ! t_array *owner_array = gs->gs_un.gs_array; ! while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->gs_un.gs_array; ! canvas = STUB(owner_array)->gs_un.gs_glist; } if (argc && argv->a_type == A_SYMBOL) --- 5230,5238 ---- if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} gs = x->gp.gp_stub; ! if (gstub_which(gs) == GP_CANVAS) canvas = gs->canvas; else { ! t_array *owner_array = gs->array; ! while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->array; ! canvas = STUB(owner_array)->canvas; } if (argc && argv->a_type == A_SYMBOL) *************** *** 5262,5266 **** gs = x->gp.gp_stub; if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "rewind: sorry, unavailable for arrays"); return;} ! canvas = gs->gs_un.gs_glist; gpointer_setcanvas(&x->gp, canvas, 0); ptrobj_bang(x); --- 5262,5266 ---- gs = x->gp.gp_stub; if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "rewind: sorry, unavailable for arrays"); return;} ! canvas = gs->canvas; gpointer_setcanvas(&x->gp, canvas, 0); ptrobj_bang(x); *************** *** 5389,5397 **** for (int i=0; i<nitems; i++,vp++) template_setsymbol(t, vp->sym, vec, vp->w.w_symbol, 1); else for (int i=0; i<nitems; i++,vp++) template_setfloat(t, vp->sym, vec, vp->w.w_float, 1); ! if (gstub_which(gs) == GP_CANVAS) scalar_redraw(gp->gp_un.gp_scalar, gs->gs_un.gs_glist); else { ! t_array *owner_array = gs->gs_un.gs_array; ! while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->gs_un.gs_array; ! scalar_redraw(owner_array->gp.gp_un.gp_scalar, STUB(owner_array)->gs_un.gs_glist); } } --- 5389,5397 ---- for (int i=0; i<nitems; i++,vp++) template_setsymbol(t, vp->sym, vec, vp->w.w_symbol, 1); else for (int i=0; i<nitems; i++,vp++) template_setfloat(t, vp->sym, vec, vp->w.w_float, 1); ! if (gstub_which(gs) == GP_CANVAS) scalar_redraw(gp->gp_un.gp_scalar, gs->canvas); else { ! t_array *owner_array = gs->array; ! while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->array; ! scalar_redraw(owner_array->gp.gp_un.gp_scalar, STUB(owner_array)->canvas); } } *************** *** 5566,5574 **** scalar to erase. When graphics updates become queueable this may fall apart... */ if (gstub_which(gs) == GP_CANVAS) { ! if (canvas_isvisible(gs->gs_un.gs_glist)) sys_mgui(gp->gp_un.gp_scalar,"delete",""); } else { ! t_array *o = gs->gs_un.gs_array; ! while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->gs_un.gs_array; ! if (canvas_isvisible(STUB(o)->gs_un.gs_glist)) sys_mgui(o->gp.gp_un.gp_scalar, "delete",""); } --- 5566,5574 ---- scalar to erase. When graphics updates become queueable this may fall apart... */ if (gstub_which(gs) == GP_CANVAS) { ! if (canvas_isvisible(gs->canvas)) sys_mgui(gp->gp_un.gp_scalar,"delete",""); } else { ! t_array *o = gs->array; ! while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->array; ! if (canvas_isvisible(STUB(o)->canvas)) sys_mgui(o->gp.gp_un.gp_scalar, "delete",""); } *************** *** 5587,5592 **** gobj_changed(gp->gp_un.gp_scalar,0); } else {/*is there something missing here?*/ ! t_array *o = gs->gs_un.gs_array; ! while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->gs_un.gs_array; gobj_changed(o->gp.gp_un.gp_scalar,0); } --- 5587,5592 ---- gobj_changed(gp->gp_un.gp_scalar,0); } else {/*is there something missing here?*/ ! t_array *o = gs->array; ! while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->array; gobj_changed(o->gp.gp_un.gp_scalar,0); } *************** *** 5639,5643 **** if (!gs) {pd_error(x, "no current pointer"); return;} if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "lists only, not arrays"); return;} ! t_canvas *canvas = gs->gs_un.gs_glist; if (isstale(gp)) {pd_error(x, "stale pointer"); return;} if (!nitems) return; --- 5639,5643 ---- if (!gs) {pd_error(x, "no current pointer"); return;} if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "lists only, not arrays"); return;} ! t_canvas *canvas = gs->canvas; if (isstale(gp)) {pd_error(x, "stale pointer"); return;} if (!nitems) return;

1 0

pd/src kernel.c,1.1.2.22,1.1.2.23
by Mathieu Bouchard 03 Jan '07

03 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13034 Modified Files: Tag: desiredata kernel.c Log Message: removed i_ and iu_ in t_inlet structs Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -C2 -d -r1.1.2.22 -r1.1.2.23 *** kernel.c 3 Jan 2007 04:12:13 -0000 1.1.2.22 --- kernel.c 3 Jan 2007 04:25:27 -0000 1.1.2.23 *************** *** 41,47 **** void *getbytes(size_t nbytes) { - void *ret; if (nbytes < 1) nbytes = 1; ! ret = (void *)calloc(nbytes, 1); if (!ret) post("pd: getbytes() failed -- out of memory"); return ret; --- 41,46 ---- void *getbytes(size_t nbytes) { if (nbytes < 1) nbytes = 1; ! void *ret = (void *)calloc(nbytes, 1); if (!ret) post("pd: getbytes() failed -- out of memory"); return ret; *************** *** 49,54 **** void *copybytes(void *src, size_t nbytes) { ! void *ret; ! ret = getbytes(nbytes); if (nbytes) memcpy(ret, src, nbytes); return ret; --- 48,52 ---- void *copybytes(void *src, size_t nbytes) { ! void *ret = getbytes(nbytes); if (nbytes) memcpy(ret, src, nbytes); return ret; *************** *** 111,116 **** /* TB: copy to aligned vector memory */ void *copyalignedbytes(void *src, size_t nbytes) { ! void *ret; ! ret = getalignedbytes(nbytes); if (nbytes) memcpy(ret, src, nbytes); return ret; --- 109,113 ---- /* TB: copy to aligned vector memory */ void *copyalignedbytes(void *src, size_t nbytes) { ! void *ret = getalignedbytes(nbytes); if (nbytes) memcpy(ret, src, nbytes); return ret; *************** *** 125,130 **** } t_hashentry; ! struct _hash { ! t_pd pd; long capa; long size; --- 122,126 ---- } t_hashentry; ! struct _hash : t_pd { long capa; long size; *************** *** 218,238 **** safe to return if there's an error. */ ! t_float atom_getfloat(t_atom *a) { ! return a->a_type==A_FLOAT ? a->a_float : 0; ! } ! ! t_int atom_getint(t_atom *a) {return (t_int)atom_getfloat(a);} ! ! /* why return &s_float here? */ ! t_symbol *atom_getsymbol(t_atom *a) { ! return a->a_type==A_SYMBOL ? a->a_symbol : &s_float; ! } t_symbol *atom_gensym(t_atom *a) { /* this works better for graph labels */ - char buf[30]; if (a->a_type == A_SYMBOL) return a->a_symbol; ! else if (a->a_type == A_FLOAT) sprintf(buf, "%g", a->a_float); ! else strcpy(buf, "???"); ! return gensym(buf); } --- 214,225 ---- safe to return if there's an error. */ ! t_float atom_getfloat( t_atom *a) {return a->a_type==A_FLOAT ? a->a_float : 0;} ! t_int atom_getint( t_atom *a) {return (t_int)atom_getfloat(a);} ! t_symbol *atom_getsymbol(t_atom *a) {return a->a_type==A_SYMBOL ? a->a_symbol : &s_symbol;} t_symbol *atom_gensym(t_atom *a) { /* this works better for graph labels */ if (a->a_type == A_SYMBOL) return a->a_symbol; ! if (a->a_type == A_FLOAT) {char buf[30]; sprintf(buf, "%g", a->a_float); return gensym(buf);} ! return gensym("???"); } *************** *** 514,539 **** union inletunion { ! t_symbol *iu_symto; ! t_gpointer *iu_pointerslot; ! t_float *iu_floatslot; ! t_symbol **iu_symslot; ! t_sample iu_floatsignalvalue; }; ! struct _inlet { ! t_pd i_pd; ! struct _inlet *i_next; ! t_object *i_owner; ! t_pd *i_dest; ! t_symbol *i_symfrom; ! union inletunion i_un; ! t_symbol* i_tip; }; - #define i_symto i_un.iu_symto - #define i_pointerslot i_un.iu_pointerslot - #define i_floatslot i_un.iu_floatslot - #define i_symslot i_un.iu_symslot - static t_class *inlet_class, *pointerinlet_class, *floatinlet_class, *symbolinlet_class; --- 501,520 ---- union inletunion { ! t_symbol *symto; ! t_gpointer *pointerslot; ! t_float *floatslot; ! t_symbol **symslot; ! t_sample floatsignalvalue; }; ! struct _inlet : t_pd { ! struct _inlet *next; ! t_object *owner; ! t_pd *dest; ! t_symbol *symfrom; ! union inletunion u; ! t_symbol* tip; }; static t_class *inlet_class, *pointerinlet_class, *floatinlet_class, *symbolinlet_class; *************** *** 549,554 **** t_inlet *y = owner->ob_inlet, *y2; if (y) { ! while ((y2 = y->i_next)) y = y2; ! y->i_next = x; } else owner->ob_inlet = x; } --- 530,535 ---- t_inlet *y = owner->ob_inlet, *y2; if (y) { ! while ((y2 = y->next)) y = y2; ! y->next = x; } else owner->ob_inlet = x; } *************** *** 556,565 **** t_inlet *inlet_new(t_object *owner, t_pd *dest, t_symbol *s1, t_symbol *s2) { t_inlet *x = (t_inlet *)pd_new(inlet_class); ! x->i_owner = owner; ! x->i_dest = dest; ! if (s1 == &s_signal) x->i_un.iu_floatsignalvalue = 0; else x->i_symto = s2; ! x->i_symfrom = s1; ! x->i_next = 0; ! x->i_tip = gensym("?"); object_append_inlet(owner,x); return x; --- 537,546 ---- t_inlet *inlet_new(t_object *owner, t_pd *dest, t_symbol *s1, t_symbol *s2) { t_inlet *x = (t_inlet *)pd_new(inlet_class); ! x->owner = owner; ! x->dest = dest; ! if (s1 == &s_signal) x->u.floatsignalvalue = 0; else x->u.symto = s2; ! x->symfrom = s1; ! x->next = 0; ! x->tip = gensym("?"); object_append_inlet(owner,x); return x; *************** *** 568,585 **** t_inlet *signalinlet_new(t_object *owner, t_float f) { t_inlet *x = inlet_new(owner, owner, &s_signal, &s_signal); ! x->i_un.iu_floatsignalvalue = f; return x; } static void inlet_wrong(t_inlet *x, t_symbol *s) { ! pd_error(x->i_owner, "inlet: expected '%s' but got '%s'", x->i_symfrom->s_name, s->s_name); } ! void inlet_settip(t_inlet* i,t_symbol* s) {i->i_tip = s;} char* inlet_tip(t_inlet* i,int num) { if (num < 0) return "???"; ! while (num-- && i) i = i->i_next; ! if (i && i->i_tip) return i->i_tip->s_name; return "?"; } --- 549,566 ---- t_inlet *signalinlet_new(t_object *owner, t_float f) { t_inlet *x = inlet_new(owner, owner, &s_signal, &s_signal); ! x->u.floatsignalvalue = f; return x; } static void inlet_wrong(t_inlet *x, t_symbol *s) { ! pd_error(x->owner, "inlet: expected '%s' but got '%s'", x->symfrom->s_name, s->s_name); } ! void inlet_settip(t_inlet* i,t_symbol* s) {i->tip = s;} char* inlet_tip(t_inlet* i,int num) { if (num < 0) return "???"; ! while (num-- && i) i = i->next; ! if (i && i->tip) return i->tip->s_name; return "?"; } *************** *** 587,632 **** /* LATER figure out how to make these efficient: */ static void inlet_bang(t_inlet *x) { ! if (x->i_symfrom == &s_bang) pd_vmess(x->i_dest, x->i_symto, ""); ! else if (!x->i_symfrom) pd_bang(x->i_dest); else inlet_wrong(x, &s_bang); } static void inlet_pointer(t_inlet *x, t_gpointer *gp) { ! if (x->i_symfrom == &s_pointer) pd_vmess(x->i_dest, x->i_symto, "p", gp); ! else if (!x->i_symfrom) pd_pointer(x->i_dest, gp); else inlet_wrong(x, &s_pointer); } static void inlet_float(t_inlet *x, t_float f) { ! if (x->i_symfrom == &s_float) pd_vmess(x->i_dest, x->i_symto, "f", (t_floatarg)f); ! else if (x->i_symfrom == &s_signal) x->i_un.iu_floatsignalvalue = f; ! else if (!x->i_symfrom) pd_float(x->i_dest, f); else inlet_wrong(x, &s_float); } static void inlet_symbol(t_inlet *x, t_symbol *s) { ! if (x->i_symfrom == &s_symbol) pd_vmess(x->i_dest, x->i_symto, "s", s); ! else if (!x->i_symfrom) pd_symbol(x->i_dest, s); else inlet_wrong(x, &s_symbol); } static void inlet_list(t_inlet *x, t_symbol *s, int argc, t_atom *argv) { ! if (x->i_symfrom == &s_list || x->i_symfrom == &s_float ! || x->i_symfrom == &s_symbol || x->i_symfrom == &s_pointer) ! typedmess(x->i_dest, x->i_symto, argc, argv); ! else if (!x->i_symfrom) pd_list(x->i_dest, s, argc, argv); else inlet_wrong(x, &s_list); } static void inlet_anything(t_inlet *x, t_symbol *s, int argc, t_atom *argv) { ! if (x->i_symfrom == s) typedmess(x->i_dest, x->i_symto, argc, argv); ! else if (!x->i_symfrom) typedmess(x->i_dest, s, argc, argv); else inlet_wrong(x, s); } void inlet_free(t_inlet *x) { ! t_object *y = x->i_owner; t_inlet *x2; ! if (y->ob_inlet == x) y->ob_inlet = x->i_next; ! else for (x2 = y->ob_inlet; x2; x2 = x2->i_next) if (x2->i_next == x) { ! x2->i_next = x->i_next; break; } --- 568,613 ---- /* LATER figure out how to make these efficient: */ static void inlet_bang(t_inlet *x) { ! if (x->symfrom == &s_bang) pd_vmess(x->dest, x->u.symto, ""); ! else if (!x->symfrom) pd_bang(x->dest); else inlet_wrong(x, &s_bang); } static void inlet_pointer(t_inlet *x, t_gpointer *gp) { ! if (x->symfrom == &s_pointer) pd_vmess(x->dest, x->u.symto, "p", gp); ! else if (!x->symfrom) pd_pointer(x->dest, gp); else inlet_wrong(x, &s_pointer); } static void inlet_float(t_inlet *x, t_float f) { ! if (x->symfrom == &s_float) pd_vmess(x->dest, x->u.symto, "f", (t_floatarg)f); ! else if (x->symfrom == &s_signal) x->u.floatsignalvalue = f; ! else if (!x->symfrom) pd_float(x->dest, f); else inlet_wrong(x, &s_float); } static void inlet_symbol(t_inlet *x, t_symbol *s) { ! if (x->symfrom == &s_symbol) pd_vmess(x->dest, x->u.symto, "s", s); ! else if (!x->symfrom) pd_symbol(x->dest, s); else inlet_wrong(x, &s_symbol); } static void inlet_list(t_inlet *x, t_symbol *s, int argc, t_atom *argv) { ! if (x->symfrom == &s_list || x->symfrom == &s_float ! || x->symfrom == &s_symbol || x->symfrom == &s_pointer) ! typedmess(x->dest, x->u.symto, argc, argv); ! else if (!x->symfrom) pd_list(x->dest, s, argc, argv); else inlet_wrong(x, &s_list); } static void inlet_anything(t_inlet *x, t_symbol *s, int argc, t_atom *argv) { ! if (x->symfrom == s) typedmess(x->dest, x->u.symto, argc, argv); ! else if (!x->symfrom) typedmess(x->dest, s, argc, argv); else inlet_wrong(x, s); } void inlet_free(t_inlet *x) { ! t_object *y = x->owner; t_inlet *x2; ! if (y->ob_inlet == x) y->ob_inlet = x->next; ! else for (x2 = y->ob_inlet; x2; x2 = x2->next) if (x2->next == x) { ! x2->next = x->next; break; } *************** *** 637,652 **** static void pointerinlet_pointer(t_inlet *x, t_gpointer *gp) { ! gpointer_unset(x->i_pointerslot); ! *(x->i_pointerslot) = *gp; if (gp->gp_stub) gp->gp_stub->gs_refcount++; } ! static void floatinlet_float( t_inlet *x, t_float f) { *(x->i_floatslot) = f; } ! static void symbolinlet_symbol(t_inlet *x, t_symbol *s) { *(x->i_symslot) = s; } #define COMMON \ ! x->i_owner = owner; \ ! x->i_dest = 0; \ ! x->i_next = 0; \ object_append_inlet(owner,x); \ return x; --- 618,633 ---- static void pointerinlet_pointer(t_inlet *x, t_gpointer *gp) { ! gpointer_unset(x->u.pointerslot); ! *(x->u.pointerslot) = *gp; if (gp->gp_stub) gp->gp_stub->gs_refcount++; } ! static void floatinlet_float( t_inlet *x, t_float f) { *(x->u.floatslot) = f; } ! static void symbolinlet_symbol(t_inlet *x, t_symbol *s) { *(x->u.symslot) = s; } #define COMMON \ ! x->owner = owner; \ ! x->dest = 0; \ ! x->next = 0; \ object_append_inlet(owner,x); \ return x; *************** *** 654,666 **** t_inlet *floatinlet_new(t_object *owner, t_float *fp) { t_inlet *x = (t_inlet *)pd_new(floatinlet_class); ! x->i_symfrom = &s_float; x->i_floatslot = fp; COMMON } t_inlet *symbolinlet_new(t_object *owner, t_symbol **sp) { t_inlet *x = (t_inlet *)pd_new(symbolinlet_class); ! x->i_symfrom = &s_symbol; x->i_symslot = sp; COMMON } t_inlet *pointerinlet_new(t_object *owner, t_gpointer *gp) { t_inlet *x = (t_inlet *)pd_new(pointerinlet_class); ! x->i_symfrom = &s_pointer; x->i_pointerslot = gp; COMMON } #undef COMMON --- 635,647 ---- t_inlet *floatinlet_new(t_object *owner, t_float *fp) { t_inlet *x = (t_inlet *)pd_new(floatinlet_class); ! x->symfrom = &s_float; x->u.floatslot = fp; COMMON } t_inlet *symbolinlet_new(t_object *owner, t_symbol **sp) { t_inlet *x = (t_inlet *)pd_new(symbolinlet_class); ! x->symfrom = &s_symbol; x->u.symslot = sp; COMMON } t_inlet *pointerinlet_new(t_object *owner, t_gpointer *gp) { t_inlet *x = (t_inlet *)pd_new(pointerinlet_class); ! x->symfrom = &s_pointer; x->u.pointerslot = gp; COMMON } #undef COMMON *************** *** 676,683 **** t_inlet *ip = ((t_object *)x)->ob_inlet; if (!argc) return; ! for (count = argc-1, ap = argv+1; ip && count--; ap++, ip = ip->i_next) { ! if (ap->a_type == A_POINTER) pd_pointer(&ip->i_pd, ap->a_w.w_gpointer); ! else if (ap->a_type == A_FLOAT) pd_float(&ip->i_pd, ap->a_float); ! else pd_symbol(&ip->i_pd, ap->a_symbol); } if (argv->a_type == A_POINTER) pd_pointer(x, argv->a_w.w_gpointer); --- 657,664 ---- t_inlet *ip = ((t_object *)x)->ob_inlet; if (!argc) return; ! for (count = argc-1, ap = argv+1; ip && count--; ap++, ip = ip->next) { ! if (ap->a_type == A_POINTER) pd_pointer(ip,ap->a_w.w_gpointer); ! else if (ap->a_type == A_FLOAT) pd_float(ip,ap->a_float); ! else pd_symbol(ip,ap->a_symbol); } if (argv->a_type == A_POINTER) pd_pointer(x, argv->a_w.w_gpointer); *************** *** 786,790 **** } ! #define each_inlet(i,obj) for ( t_inlet *i=obj->ob_inlet; i; i=i->i_next) #define each_outlet(o,obj) for (t_outlet *o=obj->ob_outlet; o; o=o->o_next) --- 767,771 ---- } ! #define each_inlet(i,obj) for ( t_inlet *i=obj->ob_inlet; i; i=i->next) #define each_outlet(o,obj) for (t_outlet *o=obj->ob_outlet; o; o=o->o_next) *************** *** 867,871 **** if (ISINLET(y)) { t_inlet *i = (t_inlet *)y; ! t_object *dest = i->i_owner; int n = dest->ob_pd->firstin; each_inlet(i2,dest) if (i2==i) break; else n++; --- 848,852 ---- if (ISINLET(y)) { t_inlet *i = (t_inlet *)y; ! t_object *dest = i->owner; int n = dest->ob_pd->firstin; each_inlet(i2,dest) if (i2==i) break; else n++; *************** *** 891,897 **** void obj_moveinletfirst(t_object *x, t_inlet *i) { if (x->ob_inlet == i) return; ! each_inlet(i2,x) if (i2->i_next == i) { ! i2->i_next = i->i_next; ! i->i_next = x->ob_inlet; x->ob_inlet = i; return; --- 872,878 ---- void obj_moveinletfirst(t_object *x, t_inlet *i) { if (x->ob_inlet == i) return; ! each_inlet(i2,x) if (i2->next == i) { ! i2->next = i->next; ! i->next = x->ob_inlet; x->ob_inlet = i; return; *************** *** 913,917 **** int obj_nsiginlets(t_object *x) { int n=0; ! each_inlet(i,x) if (i->i_symfrom == &s_signal) n++; if (x->ob_pd->firstin && x->ob_pd->floatsignalin) n++; return n; --- 894,898 ---- int obj_nsiginlets(t_object *x) { int n=0; ! each_inlet(i,x) if (i->symfrom == &s_signal) n++; if (x->ob_pd->firstin && x->ob_pd->floatsignalin) n++; return n; *************** *** 929,933 **** if (!m--) return 0; else n++; } ! each_inlet(i,x) if (i->i_symfrom == &s_signal) { if (!m) return n; n++; m--; --- 910,914 ---- if (!m--) return 0; else n++; } ! each_inlet(i,x) if (i->symfrom == &s_signal) { if (!m) return n; n++; m--; *************** *** 950,955 **** else m--; } ! for (i = x->ob_inlet; i && m; i = i->i_next, m--) {} ! return i && i->i_symfrom==&s_signal; } int obj_issignaloutlet(t_object *x, int m) { --- 931,936 ---- else m--; } ! for (i = x->ob_inlet; i && m; i = i->next, m--) {} ! return i && i->symfrom==&s_signal; } int obj_issignaloutlet(t_object *x, int m) { *************** *** 966,971 **** n++; } ! for (i = x->ob_inlet; i; i = i->i_next, m--) if (i->i_symfrom == &s_signal) { ! if (m == 0) return &i->i_un.iu_floatsignalvalue; n++; } --- 947,952 ---- n++; } ! for (i = x->ob_inlet; i; i = i->next, m--) if (i->symfrom == &s_signal) { ! if (m == 0) return &i->u.floatsignalvalue; n++; } *************** *** 976,980 **** int inlet_getsignalindex(t_inlet *x) { int n=0; t_inlet *i; ! for (i = x->i_owner->ob_inlet; i && i != x; i = i->i_next) if (i->i_symfrom == &s_signal) n++; return n; } --- 957,961 ---- int inlet_getsignalindex(t_inlet *x) { int n=0; t_inlet *i; ! for (i = x->owner->ob_inlet; i && i != x; i = i->next) if (i->symfrom == &s_signal) n++; return n; }

1 0

pd/src kernel.c, 1.1.2.21, 1.1.2.22 m_pd.h, 1.4.4.11.2.33.2.25, 1.4.4.11.2.33.2.26
by Mathieu Bouchard 03 Jan '07

03 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7939 Modified Files: Tag: desiredata kernel.c m_pd.h Log Message: kernel goes PD_PLUSPLUS_FACE Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.25 retrieving revision 1.4.4.11.2.33.2.26 diff -C2 -d -r1.4.4.11.2.33.2.25 -r1.4.4.11.2.33.2.26 *** m_pd.h 3 Jan 2007 03:54:18 -0000 1.4.4.11.2.33.2.25 --- m_pd.h 3 Jan 2007 04:12:13 -0000 1.4.4.11.2.33.2.26 *************** *** 208,214 **** #ifdef PD_PLUSPLUS_FACE typedef struct _outconnect : _gobj { ! struct _outconnect *oc_next; t_pd *oc_to; ! } t_outconnect; #else typedef struct _outconnect t_outconnect; --- 208,218 ---- #ifdef PD_PLUSPLUS_FACE typedef struct _outconnect : _gobj { ! struct _outconnect *next; t_pd *oc_to; ! struct t_text *from; ! struct t_text *to; ! short outlet, inlet; ! } t_outconnect, t_wire; ! #define oc_next next #else typedef struct _outconnect t_outconnect; Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -C2 -d -r1.1.2.21 -r1.1.2.22 *** kernel.c 3 Jan 2007 03:55:32 -0000 1.1.2.21 --- kernel.c 3 Jan 2007 04:12:13 -0000 1.1.2.22 *************** *** 11,14 **** --- 11,15 ---- */ + #define PD_PLUSPLUS_FACE #include "desire.h" #include "m_simd.h" *************** *** 262,266 **** void atom_init(t_atom *a, size_t n) { ! for (int i=0; i<n; i++) { a[i].a_type = A_FLOAT; a[i].a_w.w_float = 0.0; --- 263,267 ---- void atom_init(t_atom *a, size_t n) { ! for (unsigned int i=0; i<n; i++) { a[i].a_type = A_FLOAT; a[i].a_w.w_float = 0.0; *************** *** 312,316 **** } } break; ! case A_DOLLAR: sprintf(buf, "$%d", a->a_w.w_index); break; case A_DOLLSYM: strncpy(buf, a->a_symbol->s_name, bufsize); buf[bufsize-1] = 0; break; default: bug("atom_string"); --- 313,317 ---- } } break; ! case A_DOLLAR: sprintf(buf, "$%ld", a->a_w.w_index); break; case A_DOLLSYM: strncpy(buf, a->a_symbol->s_name, bufsize); buf[bufsize-1] = 0; break; default: bug("atom_string"); *************** *** 323,327 **** if (!c) bug("pd_new: apparently called before setup routine"); t_pd *x = (t_pd *)t_getbytes(c->size); ! *x = c; hash_set(object_table,x,(void*)0); if (c->gobj) ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x); --- 324,328 ---- if (!c) bug("pd_new: apparently called before setup routine"); t_pd *x = (t_pd *)t_getbytes(c->size); ! x->_class = c; hash_set(object_table,x,(void*)0); if (c->gobj) ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x); *************** *** 334,338 **** void pd_free(t_pd *x) { ! t_class *c = *x; if (c->freemethod) ((t_gotfn)(c->freemethod))(x); if (c->gobj) appendix_free((t_gobj *)x); --- 335,339 ---- void pd_free(t_pd *x) { ! t_class *c = x->_class; if (c->freemethod) ((t_gotfn)(c->freemethod))(x); if (c->gobj) appendix_free((t_gobj *)x); *************** *** 391,395 **** void pd_bind(t_pd *x, t_symbol *s) { if (s->s_thing) { ! if (*s->s_thing == bindlist_class) { t_bindlist *b = (t_bindlist *)s->s_thing; b->b_list = bindelem_new(x,b->b_list); --- 392,396 ---- void pd_bind(t_pd *x, t_symbol *s) { if (s->s_thing) { ! if (s->s_thing->_class == bindlist_class) { t_bindlist *b = (t_bindlist *)s->s_thing; b->b_list = bindelem_new(x,b->b_list); *************** *** 407,411 **** void pd_unbind(t_pd *x, t_symbol *s) { if (s->s_thing == x) {s->s_thing = 0; return;} ! if (s->s_thing && *s->s_thing == bindlist_class) { t_bindlist *b = (t_bindlist *)s->s_thing; t_bindelem *e, *e2; --- 408,412 ---- void pd_unbind(t_pd *x, t_symbol *s) { if (s->s_thing == x) {s->s_thing = 0; return;} ! if (s->s_thing && s->s_thing->_class == bindlist_class) { t_bindlist *b = (t_bindlist *)s->s_thing; t_bindelem *e, *e2; *************** *** 429,437 **** t_pd *x = 0; if (!s->s_thing) return 0; ! if (*s->s_thing == c) return s->s_thing; ! if (*s->s_thing == bindlist_class) { t_bindlist *b = (t_bindlist *)s->s_thing; int warned = 0; ! bind_each(e,b) if (*e->who == c) { if (x && !warned) {post("warning: %s: multiply defined", s->s_name); warned = 1;} x = e->who; --- 430,438 ---- t_pd *x = 0; if (!s->s_thing) return 0; ! if (s->s_thing->_class == c) return s->s_thing; ! if (s->s_thing->_class == bindlist_class) { t_bindlist *b = (t_bindlist *)s->s_thing; int warned = 0; ! bind_each(e,b) if (e->who->_class == c) { if (x && !warned) {post("warning: %s: multiply defined", s->s_name); warned = 1;} x = e->who; *************** *** 486,494 **** } ! void pd_bang(t_pd *x) {(*x)->bangmethod(x);} ! void pd_float(t_pd *x, t_float f) {(*x)->floatmethod(x, f);} ! void pd_pointer(t_pd *x, t_gpointer *gp) {(*x)->pointermethod(x, gp);} ! void pd_symbol(t_pd *x, t_symbol *s) {(*x)->symbolmethod(x, s);} ! void pd_list(t_pd *x, t_symbol *s, int argc, t_atom *argv) {(*x)->listmethod(x, &s_list, argc, argv);} /* this file handles Max-style patchable objects, i.e., objects which --- 487,495 ---- } ! void pd_bang(t_pd *x) {x->_class->bangmethod(x);} ! void pd_float(t_pd *x, t_float f) {x->_class->floatmethod(x, f);} ! void pd_pointer(t_pd *x, t_gpointer *gp) {x->_class->pointermethod(x, gp);} ! void pd_symbol(t_pd *x, t_symbol *s) {x->_class->symbolmethod(x, s);} ! void pd_list(t_pd *x, t_symbol *s, int ac, t_atom *av) {x->_class->listmethod(x, &s_list, ac, av);} /* this file handles Max-style patchable objects, i.e., objects which *************** *** 538,545 **** #define ISINLET(pd) ( \ ! *(pd) == inlet_class || \ ! *(pd) == pointerinlet_class || \ ! *(pd) == floatinlet_class || \ ! *(pd) == symbolinlet_class) /* --------------------- generic inlets ala max ------------------ */ --- 539,546 ---- #define ISINLET(pd) ( \ ! pd->_class == inlet_class || \ ! pd->_class == pointerinlet_class || \ ! pd->_class == floatinlet_class || \ ! pd->_class == symbolinlet_class) /* --------------------- generic inlets ala max ------------------ */ *************** *** 566,570 **** t_inlet *signalinlet_new(t_object *owner, t_float f) { ! t_inlet *x = inlet_new(owner, &owner->ob_pd, &s_signal, &s_signal); x->i_un.iu_floatsignalvalue = f; return x; --- 567,571 ---- t_inlet *signalinlet_new(t_object *owner, t_float f) { ! t_inlet *x = inlet_new(owner, owner, &s_signal, &s_signal); x->i_un.iu_floatsignalvalue = f; return x; *************** *** 680,686 **** else pd_symbol(&ip->i_pd, ap->a_symbol); } ! if (argv->a_type == A_POINTER) pd_pointer(&x->ob_pd, argv->a_w.w_gpointer); ! else if (argv->a_type == A_FLOAT) pd_float(&x->ob_pd, argv->a_float); ! else pd_symbol(&x->ob_pd, argv->a_symbol); } --- 681,687 ---- else pd_symbol(&ip->i_pd, ap->a_symbol); } ! if (argv->a_type == A_POINTER) pd_pointer(x, argv->a_w.w_gpointer); ! else if (argv->a_type == A_FLOAT) pd_float(x, argv->a_float); ! else pd_symbol(x, argv->a_symbol); } *************** *** 712,724 **** int sched_geteventno( void) {return outlet_eventno;} - typedef struct _outconnect { - t_gobj oc_gobj; - struct _outconnect *next; - t_pd *oc_to; - t_object *from; - t_object *to; - short outlet, inlet; - } t_wire; - struct _outlet { t_object *o_owner; --- 713,716 ---- *************** *** 731,735 **** t_wire *wire_new (t_symbol *s, int argc, t_atom *argv) { t_wire *self = (t_wire *)pd_new(wire_class); ! self->oc_gobj.g_adix = appendix_new((t_gobj *)self); return self; } --- 723,727 ---- t_wire *wire_new (t_symbol *s, int argc, t_atom *argv) { t_wire *self = (t_wire *)pd_new(wire_class); ! self->g_adix = appendix_new((t_gobj *)self); return self; } *************** *** 737,741 **** void wire_save (t_wire *self, t_binbuf *b) { ! t_canvas *c = self->oc_gobj.dix->canvas; binbuf_addv(b,"ttiiii;","#X","connect", canvas_getindex(c,(t_gobj *)self->from), self->outlet, --- 729,733 ---- void wire_save (t_wire *self, t_binbuf *b) { ! t_canvas *c = self->dix->canvas; binbuf_addv(b,"ttiiii;","#X","connect", canvas_getindex(c,(t_gobj *)self->from), self->outlet, *************** *** 892,896 **** it, correctly typed, or zero if the check failed. */ t_object *pd_checkobject(t_pd *x) { ! return (*x)->patchable ? (t_object *)x : 0; } --- 884,888 ---- it, correctly typed, or zero if the check failed. */ t_object *pd_checkobject(t_pd *x) { ! return x->_class->patchable ? (t_object *)x : 0; } *************** *** 1011,1015 **** static void pd_defaultanything(t_pd *x, t_symbol *s, int argc, t_atom *argv) { ! pd_error(x, "%s: no method for '%s'", (*x)->name->s_name, s->s_name); } --- 1003,1007 ---- static void pd_defaultanything(t_pd *x, t_symbol *s, int argc, t_atom *argv) { ! pd_error(x, "%s: no method for '%s'", x->_class->name->s_name, s->s_name); } *************** *** 1105,1111 **** #endif ! if (pd_objectmaker && newmethod) { /* add a "new" method by the name specified by the object */ ! class_addmethod(pd_objectmaker, (t_method)newmethod, s, vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]); if (class_loadsym) { /* if we're loading an extern it might have been invoked by a --- 1097,1103 ---- #endif ! if (pd_objectmaker._class && newmethod) { /* add a "new" method by the name specified by the object */ ! class_addmethod(pd_objectmaker._class, (t_method)newmethod, s, vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]); if (class_loadsym) { /* if we're loading an extern it might have been invoked by a *************** *** 1114,1118 **** l1 = strlen(s->s_name), l2 = strlen(loadstring); if (l2 > l1 && !strcmp(s->s_name, loadstring + (l2 - l1))) ! class_addmethod(pd_objectmaker, (t_method)newmethod, class_loadsym, vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]); } --- 1106,1110 ---- l1 = strlen(s->s_name), l2 = strlen(loadstring); if (l2 > l1 && !strcmp(s->s_name, loadstring + (l2 - l1))) ! class_addmethod(pd_objectmaker._class, (t_method)newmethod, class_loadsym, vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]); } *************** *** 1144,1148 **** // like a class_addcreator if (pd_library_name && newmethod) { ! class_addmethod(pd_objectmaker, (t_method)newmethod, S, vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]); } #endif --- 1136,1140 ---- // like a class_addcreator if (pd_library_name && newmethod) { ! class_addmethod(pd_objectmaker._class, (t_method)newmethod, S, vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]); } #endif *************** *** 1171,1175 **** } va_end(ap); ! class_addmethod(pd_objectmaker, (t_method)newmethod, s, vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]); #ifdef QUALIFIED_NAME --- 1163,1167 ---- } va_end(ap); ! class_addmethod(pd_objectmaker._class, (t_method)newmethod, s, vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]); #ifdef QUALIFIED_NAME *************** *** 1179,1183 **** s=gensym(namespacename); } ! class_addmethod(pd_objectmaker, (t_method)newmethod, s, vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]); #endif hash_set(class_table,s,0); --- 1171,1175 ---- s=gensym(namespacename); } ! class_addmethod(pd_objectmaker._class, (t_method)newmethod, s, vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]); #endif hash_set(class_table,s,0); *************** *** 1276,1284 **** static void pd_floatforsignal(t_pd *x, t_float f) { ! int offset = (*x)->floatsignalin; if (offset > 0) *(t_sample *)(((char *)x) + offset) = f; else ! pd_error(x, "%s: float unexpected for signal input", (*x)->name->s_name); } --- 1268,1276 ---- static void pd_floatforsignal(t_pd *x, t_float f) { ! int offset = x->_class->floatsignalin; if (offset > 0) *(t_sample *)(((char *)x) + offset) = f; else ! pd_error(x, "%s: float unexpected for signal input", x->_class->name->s_name); } *************** *** 1494,1498 **** void pd_typedmess(t_pd *x, t_symbol *s, int argc, t_atom *argv) { ! t_class *c = *x; t_methodentry *m; t_atomtype *wp, wanttype; --- 1486,1490 ---- void pd_typedmess(t_pd *x, t_symbol *s, int argc, t_atom *argv) { ! t_class *c = x->_class; t_methodentry *m; t_atomtype *wp, wanttype; *************** *** 1637,1641 **** 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; --- 1629,1633 ---- t_gotfn getfn(t_pd *x, t_symbol *s) { ! t_class *c = x->_class; t_methodentry *m = c->methods; for (int i=c->nmethod; i--; m++) if (m->me_name == s) return m->me_fun; *************** *** 1645,1649 **** 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; --- 1637,1641 ---- t_gotfn zgetfn(t_pd *x, t_symbol *s) { ! t_class *c = x->_class; t_methodentry *m = c->methods; for (int i=c->nmethod; i--; m++) if (m->me_name == s) return m->me_fun; *************** *** 1948,1953 **** case A_SEMI: SETSYMBOL(ap, gensym(";")); break; case A_COMMA: SETSYMBOL(ap, gensym(",")); break; ! case A_DOLLAR: sprintf(tbuf, "$%d", ap->a_w.w_index); SETSYMBOL(ap, gensym(tbuf)); break; ! case A_DOLLSYM: atom_string(ap, tbuf, MAXPDSTRING); SETSYMBOL(ap, gensym(tbuf)); break; case A_SYMBOL: /* FIXME make this general */ --- 1940,1945 ---- case A_SEMI: SETSYMBOL(ap, gensym(";")); break; case A_COMMA: SETSYMBOL(ap, gensym(",")); break; ! case A_DOLLAR: sprintf(tbuf, "$%ld", ap->a_w.w_index); SETSYMBOL(ap, gensym(tbuf)); break; ! case A_DOLLSYM: atom_string(ap, tbuf, MAXPDSTRING); SETSYMBOL(ap, gensym(tbuf)); break; case A_SYMBOL: /* FIXME make this general */ *************** *** 2404,2408 **** if (nextmess[i].a_type == A_DOLLAR) { char buf[100]; ! sprintf(buf, "$%d", nextmess[i].a_w.w_index); SETSYMBOL(nextmess+i, gensym(buf)); } else if (nextmess[i].a_type == A_DOLLSYM) { --- 2396,2400 ---- if (nextmess[i].a_type == A_DOLLAR) { char buf[100]; ! sprintf(buf, "$%ld", nextmess[i].a_w.w_index); SETSYMBOL(nextmess+i, gensym(buf)); } else if (nextmess[i].a_type == A_DOLLSYM) { *************** *** 2651,2661 **** 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(); --- 2643,2653 ---- t_symbol **sp; int i; ! if (pd_objectmaker._class) 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 = class_new(gensym("objectmaker"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL); ! pd_canvasmaker._class = class_new(gensym("canvasmaker"), 0, 0, sizeof(t_pd), CLASS_DEFAULT, A_NULL); pd_bind(&pd_canvasmaker, &s__N); ! class_addanything(pd_objectmaker._class, (t_method)new_anything); obj_init(); conf_init();

1 0

pd/src x_time.c,1.2.8.3,1.2.8.3.2.1
by Mathieu Bouchard 03 Jan '07

03 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4108 Modified Files: Tag: desiredata x_time.c Log Message: small fix so that [pipe] compiles again Index: x_time.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_time.c,v retrieving revision 1.2.8.3 retrieving revision 1.2.8.3.2.1 diff -C2 -d -r1.2.8.3 -r1.2.8.3.2.1 *** x_time.c 30 Nov 2005 13:36:58 -0000 1.2.8.3 --- x_time.c 3 Jan 2007 04:01:51 -0000 1.2.8.3.2.1 *************** *** 5,10 **** /* clock objects */ ! #include "m_pd.h" #include <stdio.h> /* -------------------------- delay ------------------------------ */ static t_class *delay_class; --- 5,11 ---- /* clock objects */ ! #include "desire.h" #include <stdio.h> + /* -------------------------- delay ------------------------------ */ static t_class *delay_class;

1 0

pd/src kernel.c,1.1.2.20,1.1.2.21
by Mathieu Bouchard 03 Jan '07

03 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1784 Modified Files: Tag: desiredata kernel.c Log Message: cleanup Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -C2 -d -r1.1.2.20 -r1.1.2.21 *** kernel.c 31 Dec 2006 19:21:40 -0000 1.1.2.20 --- kernel.c 3 Jan 2007 03:55:32 -0000 1.1.2.21 *************** *** 28,31 **** --- 28,34 ---- #endif + #define a_float a_w.w_float + #define a_symbol a_w.w_symbol + /* T.Grill - bit alignment for signal vectors (must be a multiple of 8!) */ /* if undefined no alignment occurs */ *************** *** 132,136 **** [...1055 lines suppressed...] if (classname == gensym("table")) classname = gensym("TABLE"); *************** *** 2594,2601 **** t_atom *a1 = &inbuf->vec[indexin + nmatched], *a2 = &searchbuf->vec[nmatched]; if (a1->a_type != a2->a_type || ! a1->a_type == A_SYMBOL && a1->a_w.w_symbol != a2->a_w.w_symbol || ! a1->a_type == A_FLOAT && a1->a_w.w_float != a2->a_w.w_float || a1->a_type == A_DOLLAR && a1->a_w.w_index != a2->a_w.w_index || ! a1->a_type == A_DOLLSYM && a1->a_w.w_symbol != a2->a_w.w_symbol) goto nomatch; } return 1; --- 2585,2592 ---- t_atom *a1 = &inbuf->vec[indexin + nmatched], *a2 = &searchbuf->vec[nmatched]; if (a1->a_type != a2->a_type || ! a1->a_type == A_SYMBOL && a1->a_symbol != a2->a_symbol || ! a1->a_type == A_FLOAT && a1->a_float != a2->a_float || a1->a_type == A_DOLLAR && a1->a_w.w_index != a2->a_w.w_index || ! a1->a_type == A_DOLLSYM && a1->a_symbol != a2->a_symbol) goto nomatch; } return 1;

1 0

pd/src desire.c, 1.1.2.217.2.103, 1.1.2.217.2.104 m_pd.h, 1.4.4.11.2.33.2.24, 1.4.4.11.2.33.2.25 desire.h, 1.1.2.49.2.21, 1.1.2.49.2.22
by Mathieu Bouchard 03 Jan '07

03 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1373 Modified Files: Tag: desiredata desire.c m_pd.h desire.h Log Message: removed gs_refcount Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.24 retrieving revision 1.4.4.11.2.33.2.25 diff -C2 -d -r1.4.4.11.2.33.2.24 -r1.4.4.11.2.33.2.25 *** m_pd.h 3 Jan 2007 03:13:43 -0000 1.4.4.11.2.33.2.24 --- m_pd.h 3 Jan 2007 03:54:18 -0000 1.4.4.11.2.33.2.25 *************** *** 105,111 **** struct _array *gs_array; } gs_un; - int gs_pointless; - int gs_refcount; /* number of gpointers pointing here */ } t_gstub; typedef struct _gpointer { --- 105,114 ---- struct _array *gs_array; } gs_un; } t_gstub; + #ifdef PD_PLUSPLUS_FACE + #define gs_refcount gs_un.gs_glist->refcount + #else + #define gs_refcount gs_un.gs_glist->gl_obj.refcount + #endif typedef struct _gpointer { *************** *** 237,244 **** t_inlet *inlet; /* linked list of inlets */ short x,y; /* x&y location (within the toplevel) */ ! //short width; /* requested width in chars, 0 if auto */ ! short unused; /* substitute for width */ ! //unsigned int type:2; /* from defs below */ ! short garbage; /* replacing a bitfield by this may be a problem on MSVC (?) */ } t_text, t_object; --- 240,244 ---- t_inlet *inlet; /* linked list of inlets */ short x,y; /* x&y location (within the toplevel) */ ! int refcount; /* there used to be a bitfield here, which may be a problem with ms-bitfields (?) */ } t_text, t_object; *************** *** 327,330 **** --- 327,335 ---- EXTERN void atom_string(t_atom *a, char *buf, unsigned int bufsize); + /* goes with desiredata's CLASS_NEWATOM */ + EXTERN void atom_init(t_atom *a, size_t n); + EXTERN void atom_copy(t_atom *a, t_atom *b, size_t n); + EXTERN void atom_delete(t_atom *a, size_t n); + /* ------------------ binbufs --------------- */ *************** *** 447,451 **** #define CLASS_PATCHABLE 3 #define CLASS_NOINLET 8 ! #define CLASS_NEWATOM 16 #define CLASS_TYPEMASK 3 --- 452,456 ---- #define CLASS_PATCHABLE 3 #define CLASS_NOINLET 8 ! #define CLASS_NEWATOMS 16 #define CLASS_TYPEMASK 3 Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.21 retrieving revision 1.1.2.49.2.22 diff -C2 -d -r1.1.2.49.2.21 -r1.1.2.49.2.22 *** desire.h 31 Dec 2006 19:21:38 -0000 1.1.2.49.2.21 --- desire.h 3 Jan 2007 03:54:18 -0000 1.1.2.49.2.22 *************** *** 174,178 **** unsigned int isgraph:1; /* show as graph on parent */ unsigned int hidetext:1; /* hide object-name + args when doing graph on parent */ - long next_add; /* insertion point for next call to canvas_add (for future use!?) */ }; --- 174,177 ---- *************** *** 211,220 **** } t_template; ! /* this is not really a gui object, but it needs to be observable. */ #ifdef PD_PLUSPLUS_FACE ! struct _array : t_gobj { #else struct _array { ! t_gobj meuh; #endif int n; /* number of elements */ --- 210,219 ---- } t_template; ! /* this is not really a t_object, but it needs to be observable and have a refcount, so... */ #ifdef PD_PLUSPLUS_FACE ! struct _array : t_object { #else struct _array { ! t_gobj gl_obj; #endif int n; /* number of elements */ Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.103 retrieving revision 1.1.2.217.2.104 diff -C2 -d -r1.1.2.217.2.103 -r1.1.2.217.2.104 *** desire.c 3 Jan 2007 03:13:41 -0000 1.1.2.217.2.103 --- desire.c 3 Jan 2007 03:54:16 -0000 1.1.2.217.2.104 *************** *** 166,169 **** --- 166,172 ---- } + /* for future use */ + t_canvas *gobj_canvas (t_gobj *self) {return self->dix->canvas;} + // if !k then suppose all of the object might have changed. void gobj_changed (t_gobj *self, const char *k) {

1 0

pd/src desire.c, 1.1.2.217.2.102, 1.1.2.217.2.103 m_pd.h, 1.4.4.11.2.33.2.23, 1.4.4.11.2.33.2.24
by Mathieu Bouchard 03 Jan '07

03 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18881 Modified Files: Tag: desiredata desire.c m_pd.h Log Message: removed gs_which Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.23 retrieving revision 1.4.4.11.2.33.2.24 diff -C2 -d -r1.4.4.11.2.33.2.23 -r1.4.4.11.2.33.2.24 *** m_pd.h 3 Jan 2007 02:36:26 -0000 1.4.4.11.2.33.2.23 --- m_pd.h 3 Jan 2007 03:13:43 -0000 1.4.4.11.2.33.2.24 *************** *** 102,109 **** typedef struct _gstub { union { ! struct _glist *gs_glist; struct _array *gs_array; } gs_un; ! int gs_which; /* GP_GLIST/GP_ARRAY */ int gs_refcount; /* number of gpointers pointing here */ } t_gstub; --- 102,109 ---- typedef struct _gstub { union { ! struct _glist *gs_glist; /* should be renamed to gs_canvas */ struct _array *gs_array; } gs_un; ! int gs_pointless; int gs_refcount; /* number of gpointers pointing here */ } t_gstub; *************** *** 120,128 **** typedef union word { t_float w_float; /* A_FLOAT */ ! t_symbol *w_symbol; /* A_SYMBOL */ t_gpointer *w_gpointer; /* A_POINTER */ ! t_array *w_array; /* DS nested array? */ ! struct _glist *w_list; /* DS nested list? */ ! int w_index; /* what's this? */ } t_word; --- 120,128 ---- typedef union word { t_float w_float; /* A_FLOAT */ ! t_symbol *w_symbol; /* A_SYMBOL or A_DOLLSYM */ t_gpointer *w_gpointer; /* A_POINTER */ ! t_array *w_array; /* DT_ARRAY */ ! struct _glist *w_list; /* DT_LIST */ ! t_int w_index; /* A_SEMI or A_COMMA or A_DOLLAR */ } t_word; Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.102 retrieving revision 1.1.2.217.2.103 diff -C2 -d -r1.1.2.217.2.102 -r1.1.2.217.2.103 *** desire.c 3 Jan 2007 02:36:24 -0000 1.1.2.217.2.102 --- desire.c 3 Jan 2007 03:13:41 -0000 1.1.2.217.2.103 *************** *** 1374,1379 **** scalars (g_scalar.c); their graphical behavior is defined accordingly. */ t_array *array_new(t_symbol *templatesym, t_gpointer *parent) { ! t_array *x = (t_array *)getbytes(sizeof (*x)); t_template *t = template_findbyname(templatesym); x->templatesym = templatesym; --- 1374,1381 ---- scalars (g_scalar.c); their graphical behavior is defined accordingly. */ + t_class *array_class; + t_array *array_new(t_symbol *templatesym, t_gpointer *parent) { ! t_array *x = (t_array *)pd_new(array_class); t_template *t = template_findbyname(templatesym); x->templatesym = templatesym; *************** *** 1411,1417 **** #define STUB(x) x->gp.gp_stub static void array_resize_and_redraw(t_array *array, int n) { t_array *a2 = array; ! while (STUB(a2)->gs_which == GP_ARRAY) a2 = STUB(a2)->gs_un.gs_array; array_resize(array,n); gobj_changed(array,0); --- 1413,1421 ---- #define STUB(x) x->gp.gp_stub + static int gstub_which(t_gstub *); + static void array_resize_and_redraw(t_array *array, int n) { t_array *a2 = array; ! while (gstub_which(STUB(a2)) == GP_ARRAY) a2 = STUB(a2)->gs_un.gs_array; array_resize(array,n); gobj_changed(array,0); *************** *** 1423,1433 **** t_template *scalartemplate = template_findbyname(x->templatesym); gstub_cutoff(x->stub); ! for (int i=0; i < x->n; i++) { ! t_word *wp = (t_word *)(x->vec + x->elemsize*i); ! word_free(wp, scalartemplate); ! } ! /* aligned free */ freealignedbytes(x->vec, x->elemsize * x->n); - freebytes(x, sizeof *x); } --- 1427,1432 ---- t_template *scalartemplate = template_findbyname(x->templatesym); gstub_cutoff(x->stub); ! for (int i=0; i < x->n; i++) word_free((t_word *)(x->vec + x->elemsize*i), scalartemplate); freealignedbytes(x->vec, x->elemsize * x->n); } *************** *** 1576,1580 **** saveit = (flags & 1) != 0; t_garray *x = graph_scalar(gl, s, templatesym, saveit); ! x->hidename = ((flags & 8) >> 3); if (n <= 0) n = 100; array_resize(x->scalar->v[zonset].w_array, n); --- 1575,1579 ---- saveit = (flags & 1) != 0; t_garray *x = graph_scalar(gl, s, templatesym, saveit); ! x->hidename = (flags>>3)&1; if (n <= 0) n = 100; array_resize(x->scalar->v[zonset].w_array, n); *************** *** 1697,1701 **** static void array_redraw(t_array *a, t_canvas *canvas) { ! while (STUB(a)->gs_which == GP_ARRAY) a = STUB(a)->gs_un.gs_array; scalar_redraw(a->gp.gp_un.gp_scalar, canvas); } --- 1696,1700 ---- static void array_redraw(t_array *a, t_canvas *canvas) { ! while (gstub_which(STUB(a)) == GP_ARRAY) a = STUB(a)->gs_un.gs_array; scalar_redraw(a->gp.gp_un.gp_scalar, canvas); } *************** *** 2168,2171 **** --- 2167,2172 ---- t_class *c = garray_class = class_new(gensym("array"), 0, (t_method)garray_free, sizeof(t_garray), CLASS_GOBJ, 0); + array_class = class_new(gensym("array_really"), 0, (t_method)array_free, + sizeof(t_array), CLASS_GOBJ, 0); class_addmethod3(c, garray_const, "const", "F"); class_addlist(garray_class, garray_list); *************** *** 3615,3619 **** t_dataslot *dt = t->vec; for (int i=0; i<t->n; i++, dt++) { ! if (dt->type == DT_ARRAY) array_free(wp[i].w_array); else if (dt->type == DT_LIST) canvas_free(wp[i].w_list); } --- 3616,3620 ---- t_dataslot *dt = t->vec; for (int i=0; i<t->n; i++, dt++) { ! if (dt->type == DT_ARRAY) pd_free(wp[i].w_array); else if (dt->type == DT_LIST) canvas_free(wp[i].w_list); } *************** *** 5067,5072 **** t_gstub *gstub_new(t_canvas *gl, t_array *a) { t_gstub *gs = (t_gstub *)getbytes(sizeof(*gs)); ! if (gl) {gs->gs_which = GP_CANVAS; gs->gs_un.gs_glist = gl;} ! else {gs->gs_which = GP_ARRAY; gs->gs_un.gs_array = a;} gs->gs_refcount = 0; return gs; --- 5068,5073 ---- t_gstub *gstub_new(t_canvas *gl, t_array *a) { t_gstub *gs = (t_gstub *)getbytes(sizeof(*gs)); ! if (gl) gs->gs_un.gs_glist = gl; ! else gs->gs_un.gs_array = a; gs->gs_refcount = 0; return gs; *************** *** 5079,5083 **** static void gstub_dis(t_gstub *gs) { int refcount = --gs->gs_refcount; ! if ((!refcount) && gs->gs_which == GP_NONE) t_freebytes(gs, sizeof (*gs)); else if (refcount < 0) bug("gstub_dis"); } --- 5080,5084 ---- static void gstub_dis(t_gstub *gs) { int refcount = --gs->gs_refcount; ! if (!refcount && gstub_which(gs) == GP_NONE) t_freebytes(gs, sizeof (*gs)); else if (refcount < 0) bug("gstub_dis"); } *************** *** 5087,5095 **** otherwise we wait for the last gstub_dis() to free it. */ void gstub_cutoff(t_gstub *gs) { ! gs->gs_which = GP_NONE; if (gs->gs_refcount < 0) bug("gstub_cutoff"); if (!gs->gs_refcount) t_freebytes(gs, sizeof (*gs)); } /* call this to verify that a pointer is fresh, i.e., that it either points to real data or to the head of a list, and that in either case --- 5088,5101 ---- otherwise we wait for the last gstub_dis() to free it. */ void gstub_cutoff(t_gstub *gs) { ! gs->gs_un.gs_array = 0; if (gs->gs_refcount < 0) bug("gstub_cutoff"); if (!gs->gs_refcount) t_freebytes(gs, sizeof (*gs)); } + static int gstub_which(t_gstub *gs) { + if (gs->gs_un.gs_array) return 0; + if (gs->gs_un.gs_array->_class == array_class) return GP_ARRAY; else return GP_CANVAS; + } + /* call this to verify that a pointer is fresh, i.e., that it either points to real data or to the head of a list, and that in either case *************** *** 5099,5104 **** t_gstub *gs = gp->gp_stub; if (!gs) return 0; ! if (gs->gs_which == GP_ARRAY) return 1; ! if (gs->gs_which == GP_CANVAS) return headok || gp->gp_un.gp_scalar; return 0; } --- 5105,5110 ---- t_gstub *gs = gp->gp_stub; if (!gs) return 0; ! if (gstub_which(gs) == GP_ARRAY) return 1; ! if (gstub_which(gs) == GP_CANVAS) return headok || gp->gp_un.gp_scalar; return 0; } *************** *** 5108,5113 **** static t_symbol *gpointer_gettemplatesym(const t_gpointer *gp) { t_gstub *gs = gp->gp_stub; ! if (gs->gs_which == GP_CANVAS) {t_scalar *sc = gp->gp_un.gp_scalar; return sc ? sc->t : 0;} ! else {t_array *a = gs->gs_un.gs_array; return a->templatesym;} } --- 5114,5119 ---- static t_symbol *gpointer_gettemplatesym(const t_gpointer *gp) { t_gstub *gs = gp->gp_stub; ! if (gstub_which(gs) == GP_CANVAS) {t_scalar *sc = gp->gp_un.gp_scalar; return sc ? sc->t : 0;} ! else {t_array *a = gs->gs_un.gs_array; return a->templatesym;} } *************** *** 5191,5195 **** int wantselected = f!=0; if (!gs) {pd_error(x, "next: no current pointer"); return;} ! if (gs->gs_which != GP_CANVAS) {pd_error(x, "next: lists only, not arrays"); return;} canvas = gs->gs_un.gs_glist; if (isstale(gp)) {pd_error(x, "next: stale pointer"); return;} --- 5197,5201 ---- int wantselected = f!=0; if (!gs) {pd_error(x, "next: no current pointer"); return;} ! if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "next: lists only, not arrays"); return;} canvas = gs->gs_un.gs_glist; if (isstale(gp)) {pd_error(x, "next: stale pointer"); return;} *************** *** 5221,5229 **** if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} gs = x->gp.gp_stub; ! if (gs->gs_which == GP_CANVAS) canvas = gs->gs_un.gs_glist; else { t_array *owner_array = gs->gs_un.gs_array; ! while (STUB(owner_array)->gs_which == GP_ARRAY) ! owner_array = STUB(owner_array)->gs_un.gs_array; canvas = STUB(owner_array)->gs_un.gs_glist; } --- 5227,5234 ---- if (!gpointer_check(&x->gp, 1)) {pd_error(x, "bang: empty pointer"); return;} gs = x->gp.gp_stub; ! if (gstub_which(gs) == GP_CANVAS) canvas = gs->gs_un.gs_glist; else { t_array *owner_array = gs->gs_un.gs_array; ! while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->gs_un.gs_array; canvas = STUB(owner_array)->gs_un.gs_glist; } *************** *** 5253,5257 **** if (!gpointer_check(&x->gp, 1)) {pd_error(x, "rewind: empty pointer"); return;} gs = x->gp.gp_stub; ! if (gs->gs_which != GP_CANVAS) {pd_error(x, "rewind: sorry, unavailable for arrays"); return;} canvas = gs->gs_un.gs_glist; gpointer_setcanvas(&x->gp, canvas, 0); --- 5258,5262 ---- if (!gpointer_check(&x->gp, 1)) {pd_error(x, "rewind: empty pointer"); return;} gs = x->gp.gp_stub; ! if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "rewind: sorry, unavailable for arrays"); return;} canvas = gs->gs_un.gs_glist; gpointer_setcanvas(&x->gp, canvas, 0); *************** *** 5302,5306 **** TEMPLATE_CHECK(x,x->templatesym,) if (!gpointer_check(gp, 0)) {pd_error(x, "stale or empty pointer"); return;} ! t_word *vec = gs->gs_which==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; vp = x->variables + nitems-1; for (int i=nitems-1; i>=0; i--, vp--) { --- 5307,5311 ---- TEMPLATE_CHECK(x,x->templatesym,) if (!gpointer_check(gp, 0)) {pd_error(x, "stale or empty pointer"); return;} ! t_word *vec = gstub_which(gs)==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; vp = x->variables + nitems-1; for (int i=nitems-1; i>=0; i--, vp--) { *************** *** 5376,5388 **** } if (!nitems) return; ! t_word *vec = gs->gs_which == GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; t_setvariable *vp=x->variables; if (x->issymbol) for (int i=0; i<nitems; i++,vp++) template_setsymbol(t, vp->sym, vec, vp->w.w_symbol, 1); else for (int i=0; i<nitems; i++,vp++) template_setfloat(t, vp->sym, vec, vp->w.w_float, 1); ! if (gs->gs_which == GP_CANVAS) scalar_redraw(gp->gp_un.gp_scalar, gs->gs_un.gs_glist); else { t_array *owner_array = gs->gs_un.gs_array; ! while (STUB(owner_array)->gs_which == GP_ARRAY) owner_array = STUB(owner_array)->gs_un.gs_array; scalar_redraw(owner_array->gp.gp_un.gp_scalar, STUB(owner_array)->gs_un.gs_glist); } --- 5381,5393 ---- } if (!nitems) return; ! t_word *vec = gstub_which(gs) == GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; t_setvariable *vp=x->variables; if (x->issymbol) for (int i=0; i<nitems; i++,vp++) template_setsymbol(t, vp->sym, vec, vp->w.w_symbol, 1); else for (int i=0; i<nitems; i++,vp++) template_setfloat(t, vp->sym, vec, vp->w.w_float, 1); ! if (gstub_which(gs) == GP_CANVAS) scalar_redraw(gp->gp_un.gp_scalar, gs->gs_un.gs_glist); else { t_array *owner_array = gs->gs_un.gs_array; ! while (gstub_which(STUB(owner_array)) == GP_ARRAY) owner_array = STUB(owner_array)->gs_un.gs_array; scalar_redraw(owner_array->gp.gp_un.gp_scalar, STUB(owner_array)->gs_un.gs_glist); } *************** *** 5440,5444 **** return; } ! t_word *w = gparent->gp_stub->gs_which==GP_ARRAY ? gparent->gp_un.gp_w : gparent->gp_un.gp_scalar->v; TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(t, fieldsym, &onset, &type, &elemtemplatesym)) { --- 5445,5449 ---- return; } ! t_word *w = gstub_which(gparent->gp_stub)==GP_ARRAY ? gparent->gp_un.gp_w : gparent->gp_un.gp_scalar->v; TEMPLATE_CHECK(x,x->templatesym,) if (!template_find_field(t, fieldsym, &onset, &type, &elemtemplatesym)) { *************** *** 5499,5503 **** return; } ! t_word *w = gs->gs_which==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; t_array *array = *(t_array **)(((char *)w) + onset); outlet_float(x->ob_outlet, (float)(array->n)); --- 5504,5508 ---- return; } ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; t_array *array = *(t_array **)(((char *)w) + onset); outlet_float(x->ob_outlet, (float)(array->n)); *************** *** 5534,5538 **** return; } ! t_word *w = gs->gs_which==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; TEMPLATE_CHECK(x,x->templatesym,) t_symbol *elemtemplatesym; --- 5539,5543 ---- return; } ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; TEMPLATE_CHECK(x,x->templatesym,) t_symbol *elemtemplatesym; *************** *** 5557,5565 **** but if we belong to an element of another array we have to search back until we get to a scalar to erase. When graphics updates become queueable this may fall apart... */ ! if (gs->gs_which == GP_CANVAS) { if (canvas_isvisible(gs->gs_un.gs_glist)) sys_mgui(gp->gp_un.gp_scalar,"delete",""); } else { t_array *o = gs->gs_un.gs_array; ! while (STUB(o)->gs_which == GP_ARRAY) o = STUB(o)->gs_un.gs_array; if (canvas_isvisible(STUB(o)->gs_un.gs_glist)) sys_mgui(o->gp.gp_un.gp_scalar, "delete",""); } --- 5562,5570 ---- but if we belong to an element of another array we have to search back until we get to a scalar to erase. When graphics updates become queueable this may fall apart... */ ! if (gstub_which(gs) == GP_CANVAS) { if (canvas_isvisible(gs->gs_un.gs_glist)) sys_mgui(gp->gp_un.gp_scalar,"delete",""); } else { t_array *o = gs->gs_un.gs_array; ! while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->gs_un.gs_array; if (canvas_isvisible(STUB(o)->gs_un.gs_glist)) sys_mgui(o->gp.gp_un.gp_scalar, "delete",""); } *************** *** 5576,5584 **** } } ! if (gs->gs_which == GP_CANVAS) { gobj_changed(gp->gp_un.gp_scalar,0); } else {/*is there something missing here?*/ t_array *o = gs->gs_un.gs_array; ! while (STUB(o)->gs_which == GP_ARRAY) o = STUB(o)->gs_un.gs_array; gobj_changed(o->gp.gp_un.gp_scalar,0); } --- 5581,5589 ---- } } ! if (gstub_which(gs) == GP_CANVAS) { gobj_changed(gp->gp_un.gp_scalar,0); } else {/*is there something missing here?*/ t_array *o = gs->gs_un.gs_array; ! while (gstub_which(STUB(o)) == GP_ARRAY) o = STUB(o)->gs_un.gs_array; gobj_changed(o->gp.gp_un.gp_scalar,0); } *************** *** 5630,5634 **** TEMPLATE_CHECK(x,x->templatesym,) if (!gs) {pd_error(x, "no current pointer"); return;} ! if (gs->gs_which != GP_CANVAS) {pd_error(x, "lists only, not arrays"); return;} t_canvas *canvas = gs->gs_un.gs_glist; if (isstale(gp)) {pd_error(x, "stale pointer"); return;} --- 5635,5639 ---- TEMPLATE_CHECK(x,x->templatesym,) if (!gs) {pd_error(x, "no current pointer"); return;} ! if (gstub_which(gs) != GP_CANVAS) {pd_error(x, "lists only, not arrays"); return;} t_canvas *canvas = gs->gs_un.gs_glist; if (isstale(gp)) {pd_error(x, "stale pointer"); return;} *************** *** 5685,5689 **** } if (type != DT_LIST) {pd_error(x, "field %s not of type list", x->fieldsym->s_name); return;} ! t_word *w = gs->gs_which==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; gpointer_setcanvas(&x->gp, *(t_canvas **)(((char *)w) + onset), 0); outlet_pointer(x->ob_outlet, &x->gp); --- 5690,5694 ---- } if (type != DT_LIST) {pd_error(x, "field %s not of type list", x->fieldsym->s_name); return;} ! t_word *w = gstub_which(gs)==GP_ARRAY ? gp->gp_un.gp_w : gp->gp_un.gp_scalar->v; gpointer_setcanvas(&x->gp, *(t_canvas **)(((char *)w) + onset), 0); outlet_pointer(x->ob_outlet, &x->gp);

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 January 2007