Update of /cvsroot/pure-data/externals/miXed/toxy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14365/toxy
Modified Files: plustot.c plustot.env.c tot.c tow.c widget.c widgettype.c Log Message: importing ints
Index: widgettype.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/widgettype.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** widgettype.c 16 Mar 2004 12:13:54 -0000 1.6 --- widgettype.c 17 Apr 2004 17:45:29 -0000 1.7 *************** *** 107,111 **** { /* LATER rethink */ ! loud_warning((t_pd *)mw, "redefinition of '%s'\ in "%s.wid" file, ignored", buf, rc); return (SCRIPTLET_LOCK); --- 107,111 ---- { /* LATER rethink */ ! loud_warning((t_pd *)mw, 0, "redefinition of '%s'\ in "%s.wid" file, ignored", buf, rc); return (SCRIPTLET_LOCK); *************** *** 117,121 **** if (caller != (t_pd *)typeval) { ! loud_warning((t_pd *)mw, "alien definition of '%s'\ in "%s.wid" file, ignored", buf, rc); return (SCRIPTLET_LOCK); --- 117,121 ---- if (caller != (t_pd *)typeval) { ! loud_warning((t_pd *)mw, 0, "alien definition of '%s'\ in "%s.wid" file, ignored", buf, rc); return (SCRIPTLET_LOCK); *************** *** 155,159 **** 0, 0, ac, av); if (empty) ! loud_warning((t_pd *)mw, "no value given for %s '%s'\ of a widget type '%s' in "%s.wid" file", --- 155,159 ---- 0, 0, ac, av); if (empty) ! loud_warning((t_pd *)mw, 0, "no value given for %s '%s'\ of a widget type '%s' in "%s.wid" file", *************** *** 312,316 **** else { ! loud_warning((t_pd *)masterwidget, "no file 'setup.wid'... using built-in defaults"); } --- 312,316 ---- else { ! loud_warning((t_pd *)masterwidget, 0, "no file 'setup.wid'... using built-in defaults"); } *************** *** 325,329 **** { /* LATER think about adding only missing part to existing local defs */ ! loud_warning((t_pd *)masterwidget, "%s missing in file 'setup.wid'", (typeval ? "setup definitions" : "master initializer")); masterwidget->mw_mastertype = --- 325,329 ---- { /* LATER think about adding only missing part to existing local defs */ ! loud_warning((t_pd *)masterwidget, 0, "%s missing in file 'setup.wid'", (typeval ? "setup definitions" : "master initializer")); masterwidget->mw_mastertype =
Index: plustot.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/plustot.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plustot.c 19 Feb 2004 22:23:18 -0000 1.1 --- plustot.c 17 Apr 2004 17:45:29 -0000 1.2 *************** *** 46,50 **** static void plusloud_tcldirty(t_pd *caller, char *fnname) { ! loud_warning((caller == PLUSBOB_OWNER ? 0 : caller), "(%s) tcl plays dirty tricks, sorry", fnname); } --- 46,50 ---- static void plusloud_tcldirty(t_pd *caller, char *fnname) { ! loud_warning((caller == PLUSBOB_OWNER ? 0 : caller), "+tot", "(%s) tcl plays dirty tricks, sorry", fnname); } *************** *** 351,355 **** { /* FIXME */ ! loud_warning(0, "+To: environment mismatch"); return (0); } --- 351,355 ---- { /* FIXME */ ! loud_warning(0, "+tot", "+To: environment mismatch"); return (0); } *************** *** 1656,1660 **** { x->x_grabwarned = 1; ! loud_warning((t_pd *)x, "shared result of a command '%s'", (x->x_cname ? Tcl_GetString(x->x_cname) : "???")); } --- 1656,1660 ---- { x->x_grabwarned = 1; ! loud_warning((t_pd *)x, 0, "shared result of a command '%s'", (x->x_cname ? Tcl_GetString(x->x_cname) : "???")); }
Index: tow.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/tow.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tow.c 24 Sep 2003 10:46:19 -0000 1.1 --- tow.c 17 Apr 2004 17:45:29 -0000 1.2 *************** *** 14,18 **** int result = LOADER_OK; if (zgetfn(&pd_objectmaker, gensym("widget"))) ! loud_warning(0, "widget is already loaded"); else result = unstable_load_lib("", "widget"); --- 14,18 ---- int result = LOADER_OK; if (zgetfn(&pd_objectmaker, gensym("widget"))) ! loud_warning(0, "tow", "widget is already loaded"); else result = unstable_load_lib("", "widget");
Index: widget.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/widget.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** widget.c 16 Mar 2004 12:13:54 -0000 1.8 --- widget.c 17 Apr 2004 17:45:29 -0000 1.9 *************** *** 662,666 **** widget_update(x, op); } ! else loud_warning((t_pd *)x, "%s %s has not been specified", props_getname(op), s->s_name); } --- 662,666 ---- widget_update(x, op); } ! else loud_warning((t_pd *)x, 0, "%s %s has not been specified", props_getname(op), s->s_name); }
Index: plustot.env.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/plustot.env.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plustot.env.c 19 Feb 2004 22:23:18 -0000 1.1 --- plustot.env.c 17 Apr 2004 17:45:29 -0000 1.2 *************** *** 129,133 **** else if (!warned) { ! loud_warning((t_pd *)x, "bad atom"); warned = 1; } --- 129,133 ---- else if (!warned) { ! loud_warning((t_pd *)x, 0, "bad atom"); warned = 1; }
Index: tot.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/toxy/tot.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tot.c 29 Mar 2004 17:09:53 -0000 1.4 --- tot.c 17 Apr 2004 17:45:29 -0000 1.5 *************** *** 131,135 **** x->x_warned = 1; if (!cv) cv = x->x_glist; /* redundant */ ! loud_warning((t_pd *)x, "using containing canvas ('%s')", cv->gl_name->s_name); } --- 131,135 ---- x->x_warned = 1; if (!cv) cv = x->x_glist; /* redundant */ ! loud_warning((t_pd *)x, 0, "using containing canvas ('%s')", cv->gl_name->s_name); } *************** *** 478,482 **** ts->ts_lasttime = clock_getlogicaltime(); } ! else loud_warning((t_pd *)ts, "unexpectedly long message ("%s..."), ignored", s->s_name); --- 478,482 ---- ts->ts_lasttime = clock_getlogicaltime(); } ! else loud_warning((t_pd *)ts, 0, "unexpectedly long message ("%s..."), ignored", s->s_name);