From 691dabc423f0ac541038484ff69a2ec871c121d9 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Sat, 17 Apr 2004 17:45:29 +0000 Subject: importing ints svn path=/trunk/externals/miXed/; revision=1608 --- toxy/plustot.c | 6 +++--- toxy/plustot.env.c | 2 +- toxy/tot.c | 4 ++-- toxy/tow.c | 2 +- toxy/widget.c | 2 +- toxy/widgettype.c | 10 +++++----- 6 files changed, 13 insertions(+), 13 deletions(-) (limited to 'toxy') diff --git a/toxy/plustot.c b/toxy/plustot.c index bfaeb32..ec1c575 100644 --- a/toxy/plustot.c +++ b/toxy/plustot.c @@ -45,7 +45,7 @@ static t_symbol *totps_query; static void plusloud_tcldirty(t_pd *caller, char *fnname) { - loud_warning((caller == PLUSBOB_OWNER ? 0 : caller), + loud_warning((caller == PLUSBOB_OWNER ? 0 : caller), "+tot", "(%s) tcl plays dirty tricks, sorry", fnname); } @@ -350,7 +350,7 @@ Tcl_Obj *plustob_set(t_plustob *tob, t_plustin *tin, Tcl_Obj *ob) if (tin != tob->tob_tin) { /* FIXME */ - loud_warning(0, "+To: environment mismatch"); + loud_warning(0, "+tot", "+To: environment mismatch"); return (0); } if (ob != tob->tob_value) @@ -1655,7 +1655,7 @@ static int plustot_ifgrabshared(t_plustot *x, Tcl_Obj *ob) if (!x->x_grabwarned) { x->x_grabwarned = 1; - loud_warning((t_pd *)x, "shared result of a command '%s'", + loud_warning((t_pd *)x, 0, "shared result of a command '%s'", (x->x_cname ? Tcl_GetString(x->x_cname) : "???")); } return (1); diff --git a/toxy/plustot.env.c b/toxy/plustot.env.c index c1dbfe2..e0e08f3 100644 --- a/toxy/plustot.env.c +++ b/toxy/plustot.env.c @@ -128,7 +128,7 @@ void *plustot_env_new(t_symbol *s, int ac, t_atom *av) plustot_env_evalfile(x, av->a_w.w_symbol); else if (!warned) { - loud_warning((t_pd *)x, "bad atom"); + loud_warning((t_pd *)x, 0, "bad atom"); warned = 1; } av++; diff --git a/toxy/tot.c b/toxy/tot.c index 0b21e64..cf6e742 100644 --- a/toxy/tot.c +++ b/toxy/tot.c @@ -130,7 +130,7 @@ static t_canvas *tot_getcanvas(t_tot *x, int complain) { x->x_warned = 1; if (!cv) cv = x->x_glist; /* redundant */ - loud_warning((t_pd *)x, "using containing canvas ('%s')", + loud_warning((t_pd *)x, 0, "using containing canvas ('%s')", cv->gl_name->s_name); } return (cv); @@ -477,7 +477,7 @@ static void totspy_anything(t_totspy *ts, t_symbol *s, int ac, t_atom *av) ts->ts_selector, cnt, ts->ts_outbuf); ts->ts_lasttime = clock_getlogicaltime(); } - else loud_warning((t_pd *)ts, + else loud_warning((t_pd *)ts, 0, "unexpectedly long message (\"%s...\"), ignored", s->s_name); } diff --git a/toxy/tow.c b/toxy/tow.c index 5e4f902..3003de8 100644 --- a/toxy/tow.c +++ b/toxy/tow.c @@ -13,7 +13,7 @@ void tow_setup(void) { int result = LOADER_OK; if (zgetfn(&pd_objectmaker, gensym("widget"))) - loud_warning(0, "widget is already loaded"); + loud_warning(0, "tow", "widget is already loaded"); else result = unstable_load_lib("", "widget"); if (result == LOADER_NOFILE) diff --git a/toxy/widget.c b/toxy/widget.c index f75b991..d544145 100644 --- a/toxy/widget.c +++ b/toxy/widget.c @@ -661,7 +661,7 @@ static void widget_remove(t_widget *x, t_symbol *s) if (op == x->x_options) x->x_update = WIDGET_REVIS; widget_update(x, op); } - else loud_warning((t_pd *)x, "%s %s has not been specified", + else loud_warning((t_pd *)x, 0, "%s %s has not been specified", props_getname(op), s->s_name); } } diff --git a/toxy/widgettype.c b/toxy/widgettype.c index 4541947..3cb7d6e 100644 --- a/toxy/widgettype.c +++ b/toxy/widgettype.c @@ -106,7 +106,7 @@ static t_scriptlet *masterwidget_cmnthook(t_pd *caller, char *rc, if (typeval) { /* LATER rethink */ - loud_warning((t_pd *)mw, "redefinition of '%s'\ + loud_warning((t_pd *)mw, 0, "redefinition of '%s'\ in \"%s.wid\" file, ignored", buf, rc); return (SCRIPTLET_LOCK); } @@ -116,7 +116,7 @@ static t_scriptlet *masterwidget_cmnthook(t_pd *caller, char *rc, { /* .wid */ if (caller != (t_pd *)typeval) { - loud_warning((t_pd *)mw, "alien definition of '%s'\ + loud_warning((t_pd *)mw, 0, "alien definition of '%s'\ in \"%s.wid\" file, ignored", buf, rc); return (SCRIPTLET_LOCK); } @@ -154,7 +154,7 @@ static t_scriptlet *masterwidget_cmnthook(t_pd *caller, char *rc, empty = props_add(pp = mw->mw_parsedtype->wt_arguments, 0, 0, ac, av); if (empty) - loud_warning((t_pd *)mw, + loud_warning((t_pd *)mw, 0, "no value given for %s '%s'\ of a widget type '%s' in \"%s.wid\" file", props_getname(pp), empty->s_name, @@ -311,7 +311,7 @@ void masterwidget_initialize(void) } else { - loud_warning((t_pd *)masterwidget, + loud_warning((t_pd *)masterwidget, 0, "no file 'setup.wid'... using built-in defaults"); } typekey = dict_key(masterwidget->mw_typemap, "master"); @@ -324,7 +324,7 @@ void masterwidget_initialize(void) else if (rcresult == SCRIPTLET_OK) { /* LATER think about adding only missing part to existing local defs */ - loud_warning((t_pd *)masterwidget, "%s missing in file 'setup.wid'", + loud_warning((t_pd *)masterwidget, 0, "%s missing in file 'setup.wid'", (typeval ? "setup definitions" : "master initializer")); masterwidget->mw_mastertype = widgettype_new(masterwidget, "master", 0, 0); -- cgit v1.2.1