Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11718
Modified Files: Tag: devel_0_39 desire.c Log Message: reintroducing canvas_deletelinesfor
Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.131 retrieving revision 1.1.2.132 diff -C2 -d -r1.1.2.131 -r1.1.2.132 *** desire.c 2 Sep 2006 06:32:17 -0000 1.1.2.131 --- desire.c 2 Sep 2006 06:36:41 -0000 1.1.2.132 *************** *** 880,888 **** t_outconnect *oc; linetraverser_start(&t, x); ! while ((oc = linetraverser_next(&t))) { if ((t.tr_ob == text && t.tr_outlet == outp) || (t.tr_ob2 == text && t.tr_inlet == inp)) obj_disconnect(t.tr_ob, t.tr_outno, t.tr_ob2, t.tr_inno); ! } }
--- 880,896 ---- t_outconnect *oc; linetraverser_start(&t, x); ! while ((oc = linetraverser_next(&t))) if ((t.tr_ob == text && t.tr_outlet == outp) || (t.tr_ob2 == text && t.tr_inlet == inp)) obj_disconnect(t.tr_ob, t.tr_outno, t.tr_ob2, t.tr_inno); ! } ! ! void canvas_deletelinesfor(t_canvas *x, t_text *text) { ! t_linetraverser t; ! t_outconnect *oc; ! linetraverser_start(&t, x); ! while (oc = linetraverser_next(&t)) ! if (t.tr_ob == text || t.tr_ob2 == text) ! obj_disconnect(t.tr_ob, t.tr_outno, t.tr_ob2, t.tr_inno); }
*************** *** 1707,1711 **** }
! void canvas_stowconnections(t_canvas *x, t_gobj *o) { t_gobj *selhead = 0, *seltail = 0, *nonhead = 0, *nontail = 0, *y, *y2; t_linetraverser t; --- 1715,1719 ---- }
! static void canvas_stowconnections(t_canvas *x, t_gobj *o) { t_gobj *selhead = 0, *seltail = 0, *nonhead = 0, *nontail = 0, *y, *y2; t_linetraverser t; *************** *** 1747,1751 **** }
! void canvas_restoreconnections(t_canvas *x) { pd_bind(&x->gl_pd, gensym("#X")); binbuf_eval(x->gl_editor->e_connectbuf, 0, 0, 0); --- 1755,1759 ---- }
! static void canvas_restoreconnections(t_canvas *x) { pd_bind(&x->gl_pd, gensym("#X")); binbuf_eval(x->gl_editor->e_connectbuf, 0, 0, 0); *************** *** 3140,3145 **** canvas_redrawallfortemplate(template_findbyname(canvas_makebindsym(glist_getcanvas(x)->gl_name)), 2);
! /* shouldn't all connections to the object be deleted before gobj_delete ? */ ! gobj_delete(y, x);
--- 3148,3152 ---- canvas_redrawallfortemplate(template_findbyname(canvas_makebindsym(glist_getcanvas(x)->gl_name)), 2);
! canvas_deletelinesfor(x,y); gobj_delete(y, x);