diff options
author | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2011-10-03 17:15:34 +0000 |
---|---|---|
committer | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2011-10-03 17:15:34 +0000 |
commit | 6af1bae3aa930ec70d495ddd644c00bce14eb3fb (patch) | |
tree | fd572a8c664e347eb9565c301c20a85c5755db12 /src | |
parent | f2dc8bbfc49d98835db4b767ac0ae3265f592000 (diff) |
replaced &s_ with gensym()
svn path=/trunk/externals/zexy/; revision=15490
Diffstat (limited to 'src')
50 files changed, 107 insertions, 107 deletions
diff --git a/src/0x260x260x7e.c b/src/0x260x260x7e.c index fd4fa8d..fd20e30 100644 --- a/src/0x260x260x7e.c +++ b/src/0x260x260x7e.c @@ -47,15 +47,15 @@ static void *andand_tilde_new(t_symbol *s, int argc, t_atom *argv) t_scalarandand_tilde *x = (t_scalarandand_tilde *)pd_new(scalarandand_tilde_class); floatinlet_new(&x->x_obj, &x->x_g); x->x_g = atom_getfloatarg(0, argc, argv); - outlet_new(&x->x_obj, &s_signal); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } else { t_andand_tilde *x = (t_andand_tilde *)pd_new(andand_tilde_class); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); - outlet_new(&x->x_obj, &s_signal); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } diff --git a/src/0x3c0x7e.c b/src/0x3c0x7e.c index 02966d7..6e1e843 100644 --- a/src/0x3c0x7e.c +++ b/src/0x3c0x7e.c @@ -47,15 +47,15 @@ static void *lt_tilde_new(t_symbol *s, int argc, t_atom *argv) t_scalarlt_tilde *x = (t_scalarlt_tilde *)pd_new(scalarlt_tilde_class); floatinlet_new(&x->x_obj, &x->x_g); x->x_g = atom_getfloatarg(0, argc, argv); - outlet_new(&x->x_obj, &s_signal); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } else { t_lt_tilde *x = (t_lt_tilde *)pd_new(lt_tilde_class); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); - outlet_new(&x->x_obj, &s_signal); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } diff --git a/src/0x3d0x3d0x7e.c b/src/0x3d0x3d0x7e.c index d1e527f..593fa56 100644 --- a/src/0x3d0x3d0x7e.c +++ b/src/0x3d0x3d0x7e.c @@ -44,15 +44,15 @@ static void *eq_tilde_new(t_symbol *s, int argc, t_atom *argv) t_scalareq_tilde *x = (t_scalareq_tilde *)pd_new(scalareq_tilde_class); floatinlet_new(&x->x_obj, &x->x_g); x->x_g = atom_getfloatarg(0, argc, argv); - outlet_new(&x->x_obj, &s_signal); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } else { t_eq_tilde *x = (t_eq_tilde *)pd_new(eq_tilde_class); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); - outlet_new(&x->x_obj, &s_signal); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } diff --git a/src/0x3e0x7e.c b/src/0x3e0x7e.c index 7526584..2757d9e 100644 --- a/src/0x3e0x7e.c +++ b/src/0x3e0x7e.c @@ -47,15 +47,15 @@ static void *gt_tilde_new(t_symbol *s, int argc, t_atom *argv) t_scalargt_tilde *x = (t_scalargt_tilde *)pd_new(scalargt_tilde_class); floatinlet_new(&x->x_obj, &x->x_g); x->x_g = atom_getfloatarg(0, argc, argv); - outlet_new(&x->x_obj, &s_signal); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } else { t_gt_tilde *x = (t_gt_tilde *)pd_new(gt_tilde_class); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); - outlet_new(&x->x_obj, &s_signal); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } diff --git a/src/0x7c0x7c0x7e.c b/src/0x7c0x7c0x7e.c index b2249ab..6aca363 100644 --- a/src/0x7c0x7c0x7e.c +++ b/src/0x7c0x7c0x7e.c @@ -44,15 +44,15 @@ static void *oror_tilde_new(t_symbol *s, int argc, t_atom *argv) t_scalaroror_tilde *x = (t_scalaroror_tilde *)pd_new(scalaroror_tilde_class); floatinlet_new(&x->x_obj, &x->x_g); x->x_g = atom_getfloatarg(0, argc, argv); - outlet_new(&x->x_obj, &s_signal); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } else { t_oror_tilde *x = (t_oror_tilde *)pd_new(oror_tilde_class); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); - outlet_new(&x->x_obj, &s_signal); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } @@ -74,7 +74,7 @@ static void atoi_list(t_atoi *x, t_symbol *s, int argc, t_atom *argv) static void *atoi_new(void) { t_atoi *x = (t_atoi *)pd_new(atoi_class); - outlet_new(&x->x_obj, &s_float); + outlet_new(&x->x_obj, gensym("float")); return (x); } @@ -63,7 +63,7 @@ static void avg_dsp(t_avg *x, t_signal **sp) static void *avg_new(void) { t_avg *x = (t_avg *)pd_new(avg_class); - outlet_new(&x->x_obj, &s_float); + outlet_new(&x->x_obj, gensym("float")); return (x); } @@ -90,12 +90,12 @@ static void *date_new(t_symbol *s, int argc, t_atom *argv) x->GMT = 1; } - x->x_outlet1 = outlet_new(&x->x_obj, &s_float); - x->x_outlet2 = outlet_new(&x->x_obj, &s_float); - x->x_outlet3 = outlet_new(&x->x_obj, &s_float); - x->x_outlet4 = outlet_new(&x->x_obj, &s_float); - x->x_outlet5 = outlet_new(&x->x_obj, &s_float); - x->x_outlet6 = outlet_new(&x->x_obj, &s_float); + x->x_outlet1 = outlet_new(&x->x_obj, gensym("float")); + x->x_outlet2 = outlet_new(&x->x_obj, gensym("float")); + x->x_outlet3 = outlet_new(&x->x_obj, gensym("float")); + x->x_outlet4 = outlet_new(&x->x_obj, gensym("float")); + x->x_outlet5 = outlet_new(&x->x_obj, gensym("float")); + x->x_outlet6 = outlet_new(&x->x_obj, gensym("float")); return (x); } diff --git a/src/demultiplex.c b/src/demultiplex.c index 3b7d976..199d609 100644 --- a/src/demultiplex.c +++ b/src/demultiplex.c @@ -83,7 +83,7 @@ static void *demux_new(t_symbol *s, int argc, t_atom *argv) x->n_out = n - 1; - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("select")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("select")); x->out = (t_outlet **)getbytes(n * sizeof(t_outlet *)); for (n=0; n<=x->n_out; n++) { diff --git a/src/envrms~.c b/src/envrms~.c index c956b3c..263c2a9 100644 --- a/src/envrms~.c +++ b/src/envrms~.c @@ -71,7 +71,7 @@ static void *sigenvrms_new(t_floatarg fnpoints, t_floatarg fperiod) buf[i] = (1. - cos((2 * 3.141592654 * i) / npoints))/npoints; for (; i < npoints+MAXVSTAKEN; i++) buf[i] = 0; x->x_clock = clock_new(x, (t_method)sigenvrms_tick); - x->x_outlet = outlet_new(&x->x_obj, &s_float); + x->x_outlet = outlet_new(&x->x_obj, gensym("float")); return (x); } diff --git a/src/fifop.c b/src/fifop.c index 49ebc83..874e73e 100644 --- a/src/fifop.c +++ b/src/fifop.c @@ -193,7 +193,7 @@ static void fifop_bang(t_fifop *x) freebytes(fifo, sizeof(t_fifop_list)); /* output the list */ - outlet_list(x->x_out, &s_list, argc, argv); + outlet_list(x->x_out, gensym("list"), argc, argv); /* free the list */ freebytes(argv, argc*sizeof(t_atom)); @@ -250,7 +250,7 @@ static void fifop_dump(t_fifop*x) int argc=fifo->argc; /* output the list */ - outlet_list(x->x_out, &s_list, argc, argv); + outlet_list(x->x_out, gensym("list"), argc, argv); fifo=fifo->next; } @@ -278,7 +278,7 @@ static void *fifop_new(void) floatinlet_new(&x->x_obj, &x->priority); x->x_out =outlet_new(&x->x_obj, gensym("list" )); - x->x_infout=outlet_new(&x->x_obj, &s_float); + x->x_infout=outlet_new(&x->x_obj, gensym("float")); x->fifo_list = 0; x->priority=0; diff --git a/src/freadln.c b/src/freadln.c index 58f5e9c..05d2276 100644 --- a/src/freadln.c +++ b/src/freadln.c @@ -237,8 +237,8 @@ static void freadln_free (t_freadln *x) static void *freadln_new(void) { t_freadln *x = (t_freadln *)pd_new(freadln_class); - x->x_message_outlet = outlet_new(&x->x_ob, &s_list); - x->x_readybang_outlet = outlet_new(&x->x_ob, &s_bang); + x->x_message_outlet = outlet_new(&x->x_ob, gensym("list")); + x->x_readybang_outlet = outlet_new(&x->x_ob, gensym("bang")); x->x_filename=0; x->x_file=0; x->x_textbuf=0; diff --git a/src/index.c b/src/index.c index dd0cf97..5540358 100644 --- a/src/index.c +++ b/src/index.c @@ -315,7 +315,7 @@ static void *index_new(t_symbol *s, int argc, t_atom *argv) while (maxentries--) buf[maxentries]=0; - outlet_new(&x->x_obj, &s_float); + outlet_new(&x->x_obj, gensym("float")); return (x); } diff --git a/src/length.c b/src/length.c index 98e3948..6a065ce 100644 --- a/src/length.c +++ b/src/length.c @@ -41,7 +41,7 @@ static void length_any(t_length *x, t_symbol *s, int argc, t_atom *argv) static void *length_new(void) { t_length *x = (t_length *)pd_new(length_class); - outlet_new(&x->x_obj, &s_float); + outlet_new(&x->x_obj, gensym("float")); return (x); } diff --git a/src/lifop.c b/src/lifop.c index ade1e3d..f533164 100644 --- a/src/lifop.c +++ b/src/lifop.c @@ -177,7 +177,7 @@ static void lifop_bang(t_lifop *x) freebytes(lifo, sizeof(t_lifop_list)); /* output the list */ - outlet_list(x->x_out, &s_list, argc, argv); + outlet_list(x->x_out, gensym("list"), argc, argv); /* free the list */ freebytes(argv, argc*sizeof(t_atom)); @@ -233,7 +233,7 @@ static void lifop_dump(t_lifop*x) int argc=lifo->argc; /* output the list */ - outlet_list(x->x_out, &s_list, argc, argv); + outlet_list(x->x_out, gensym("list"), argc, argv); lifo=lifo->next; } @@ -255,7 +255,7 @@ static void *lifop_new(void) floatinlet_new(&x->x_obj, &x->priority); x->x_out=outlet_new(&x->x_obj, gensym("list")); - x->x_infout=outlet_new(&x->x_obj, &s_float); + x->x_infout=outlet_new(&x->x_obj, gensym("float")); x->lifo_list = 0; x->priority=0; diff --git a/src/limiter~.c b/src/limiter~.c index 128226a..73399d6 100644 --- a/src/limiter~.c +++ b/src/limiter~.c @@ -674,10 +674,10 @@ static void *limiter_new(t_symbol *s, int argc, t_atom *argv) while (argc--) { - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); } - outlet_new(&x->x_obj, &s_signal); + outlet_new(&x->x_obj, gensym("signal")); x->in = (t_inbuf*)getbytes(sizeof(t_inbuf) * x->number_of_inlets); while (i < x->number_of_inlets) diff --git a/src/list2lists.c b/src/list2lists.c index b948c6f..67efa46 100644 --- a/src/list2lists.c +++ b/src/list2lists.c @@ -78,7 +78,7 @@ static void list2lists_output(t_list2lists*x, int argc, t_atom*argv) if(argc<=0) outlet_bang(out); else - outlet_list(out, &s_list, argc, argv); + outlet_list(out, gensym("list"), argc, argv); } static void list2lists_list(t_list2lists *x, t_symbol *s, int argc, t_atom *argv) diff --git a/src/liststorage.c b/src/liststorage.c index 1afffe7..145c3ff 100644 --- a/src/liststorage.c +++ b/src/liststorage.c @@ -345,8 +345,8 @@ static void *liststorage_new(t_floatarg f) t_liststorage *x = (t_liststorage *)pd_new(liststorage_class); int slots=f; - x->x_slotin=inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("slot")); - x->x_dataout=outlet_new(&x->x_obj, &s_list); + x->x_slotin=inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("slot")); + x->x_dataout=outlet_new(&x->x_obj, gensym("list")); x->x_infoout=outlet_new(&x->x_obj, 0); @@ -169,8 +169,8 @@ static void *lpt_new(t_symbol *s, int argc, t_atom *argv) error("lpt: the use of 'lp' has been deprecated; use 'lpt' instead"); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("control")); - outlet_new(&x->x_obj, &s_float); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("control")); + outlet_new(&x->x_obj, gensym("float")); x->mode = MODE_NONE; x->port = 0; x->device = -1; diff --git a/src/makesymbol.c b/src/makesymbol.c index ab24fcc..a36da12 100644 --- a/src/makesymbol.c +++ b/src/makesymbol.c @@ -121,7 +121,7 @@ static void *makesymbol_new(t_symbol *s, int argc, t_atom *argv) x->x_sym = gensym(""); } - outlet_new(&x->x_obj, &s_symbol); + outlet_new(&x->x_obj, gensym("symbol")); inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("symbol"), gensym("sym1")); return (x); diff --git a/src/matchbox.c b/src/matchbox.c index 9625834..7bda2e5 100644 --- a/src/matchbox.c +++ b/src/matchbox.c @@ -544,7 +544,7 @@ static void matchbox_list(t_matchbox*x, t_symbol*s, int argc, t_atom*argv) { outlet_float(x->x_outNumResults, (t_float)results); for(dummylist=resultlist; 0!=dummylist; dummylist=dummylist->next) - outlet_list(x->x_outResult, &s_list, dummylist->argc, dummylist->argv); + outlet_list(x->x_outResult, gensym("list"), dummylist->argc, dummylist->argv); } static void matchbox_add(t_matchbox*x, t_symbol*s, int argc, t_atom*argv) { @@ -587,7 +587,7 @@ static void matchbox_dump(t_matchbox*x) { for(lp=x->x_lists->next; 0!=lp; lp=lp->next) { - outlet_list(x->x_outResult, &s_list, lp->argc, lp->argv); + outlet_list(x->x_outResult, gensym("list"), lp->argc, lp->argv); } } @@ -626,7 +626,7 @@ static void *matchbox_new(t_symbol *s, int argc, t_atom*argv) inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("symbol"), gensym("add")); x->x_outResult =outlet_new(&x->x_obj, gensym("list")); - x->x_outNumResults=outlet_new(&x->x_obj, &s_float); + x->x_outNumResults=outlet_new(&x->x_obj, gensym("float")); x->x_lists=(t_listlist*)getbytes(sizeof(t_listlist)); @@ -83,8 +83,8 @@ static void *mavg_new(t_floatarg f) int i = (f<1)?2:f; t_float *dumbuf; - outlet_new(&x->x_obj, &s_float); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("")); + outlet_new(&x->x_obj, gensym("float")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("")); x->buf = x->wp = (t_float *)getbytes(sizeof(t_float) * i); x->size = i; diff --git a/src/minmax.c b/src/minmax.c index 58f82b2..ed4f017 100644 --- a/src/minmax.c +++ b/src/minmax.c @@ -61,8 +61,8 @@ static void *minmax_new(void) { t_minmax *x = (t_minmax *)pd_new(minmax_class); - x->mino=outlet_new(&x->x_obj, &s_float); - x->maxo=outlet_new(&x->x_obj, &s_float); + x->mino=outlet_new(&x->x_obj, gensym("float")); + x->maxo=outlet_new(&x->x_obj, gensym("float")); x->min = x->max = 0; diff --git a/src/msgfile.c b/src/msgfile.c index 9d09a6f..06488f0 100644 --- a/src/msgfile.c +++ b/src/msgfile.c @@ -917,8 +917,8 @@ static void *msgfile_new(t_symbol *s, int argc, t_atom *argv) } } - outlet_new(&x->x_obj, &s_list); - x->x_secondout = outlet_new(&x->x_obj, &s_float); + outlet_new(&x->x_obj, gensym("list")); + x->x_secondout = outlet_new(&x->x_obj, gensym("float")); x->x_canvas = canvas_getcurrent(); x->eol=' '; diff --git a/src/multiline~.c b/src/multiline~.c index 2ba2fe7..1e4871d 100644 --- a/src/multiline~.c +++ b/src/multiline~.c @@ -220,14 +220,14 @@ static void *mline_new(t_symbol *s, int argc, t_atom *argv) i = argc-1; - outlet_new(&x->x_obj, &s_signal); + outlet_new(&x->x_obj, gensym("signal")); while (i--) { - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); - outlet_new(&x->x_obj, &s_signal); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); + outlet_new(&x->x_obj, gensym("signal")); } - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("")); floatinlet_new(&x->x_obj, &x->time); x->sigIN = (t_sample **)getbytes(x->sigNUM * sizeof(t_sample **)); diff --git a/src/multiplex.c b/src/multiplex.c index dac41e8..2b05d21 100644 --- a/src/multiplex.c +++ b/src/multiplex.c @@ -93,7 +93,7 @@ static void *mux_new(t_symbol *s, int argc, t_atom *argv) x->in[n] = inlet_new ((t_object*)x, (t_pd*)x->x_proxy[n], 0,0); } - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("")); outlet_new(&x->x_obj, 0); return (x); diff --git a/src/multiplex~.c b/src/multiplex~.c index 3441cb7..bd045d5 100644 --- a/src/multiplex~.c +++ b/src/multiplex~.c @@ -87,7 +87,7 @@ static void *mux_tilde_new(t_symbol *s, int argc, t_atom *argv) x->input=0; argc--; - while(argc--)inlet_new(&x->x_obj,&x->x_obj.ob_pd,&s_signal,&s_signal); + while(argc--)inlet_new(&x->x_obj,&x->x_obj.ob_pd,gensym("signal"),gensym("signal")); x->in = (t_sample **)getbytes(x->n_in * sizeof(t_sample *)); i=x->n_in; diff --git a/src/niagara.c b/src/niagara.c index 2242b8a..ae2c9bb 100644 --- a/src/niagara.c +++ b/src/niagara.c @@ -89,8 +89,8 @@ static void *niagara_new(t_floatarg f) x->rock = f; - x->left = outlet_new(&x->x_obj, &s_list); - x->right = outlet_new(&x->x_obj, &s_list); + x->left = outlet_new(&x->x_obj, gensym("list")); + x->right = outlet_new(&x->x_obj, gensym("list")); floatinlet_new(&x->x_obj, &x->rock); diff --git a/src/pack~.c b/src/pack~.c index fe9da16..89901b3 100644 --- a/src/pack~.c +++ b/src/pack~.c @@ -33,7 +33,7 @@ typedef struct _sigpack static void sigpack_tick(t_sigpack*x) { - outlet_list(x->x_obj.ob_outlet, &s_list, x->vector_length, x->buffer); + outlet_list(x->x_obj.ob_outlet, gensym("list"), x->vector_length, x->buffer); } static t_int *sigpack_perform(t_int *w) @@ -58,7 +58,7 @@ static void pdf_bang(t_pdf *x) { SETFLOAT(a, *buf++*max); SETFLOAT(a+1,x->size-n-1); - outlet_list(x->x_obj.ob_outlet, &s_list, 2, (t_atom*)&a); + outlet_list(x->x_obj.ob_outlet, gensym("list"), 2, (t_atom*)&a); } } @@ -101,7 +101,7 @@ static void *pdf_new(t_floatarg f) x->buf = (t_float *)getbytes(x->size * sizeof(*x->buf)); clear_pdfbuf(x); - outlet_new(&x->x_obj, &s_list); + outlet_new(&x->x_obj, gensym("list")); return (x); } diff --git a/src/prime.c b/src/prime.c index b4d127f..633d082 100644 --- a/src/prime.c +++ b/src/prime.c @@ -59,7 +59,7 @@ static void *prime_new(void) { t_prime *x = (t_prime *)pd_new(prime_class); - outlet_new(&x->x_obj, &s_float); + outlet_new(&x->x_obj, gensym("float")); return (x); } diff --git a/src/regex.c b/src/regex.c index 7aba77d..95fdd22 100644 --- a/src/regex.c +++ b/src/regex.c @@ -271,7 +271,7 @@ static void *regex_new(t_symbol *s, int argc, t_atom*argv) x->x_outResult=outlet_new(&x->x_obj, 0); x->x_outDetails=outlet_new(&x->x_obj, gensym("list")); - x->x_outNumDetails=outlet_new(&x->x_obj, &s_float); + x->x_outNumDetails=outlet_new(&x->x_obj, gensym("float")); #ifdef HAVE_REGEX_H diff --git a/src/relay.c b/src/relay.c index af1159c..0383cfd 100644 --- a/src/relay.c +++ b/src/relay.c @@ -96,7 +96,7 @@ static void relay_list(t_relay *x, t_symbol *sel, int argc, t_atom *argv) { for (nelement = x->x_nelement, e = x->x_vec; nelement--; e++) { - if (e->e_w.w_symbol == &s_bang) + if (e->e_w.w_symbol == gensym("bang")) { outlet_bang(e->e_outlet); return; @@ -107,7 +107,7 @@ static void relay_list(t_relay *x, t_symbol *sel, int argc, t_atom *argv) { for (nelement = x->x_nelement, e = x->x_vec; nelement--; e++) { - if (e->e_w.w_symbol == &s_list) + if (e->e_w.w_symbol == gensym("list")) { outlet_anything(e->e_outlet, sel, argc, argv); return; @@ -118,7 +118,7 @@ static void relay_list(t_relay *x, t_symbol *sel, int argc, t_atom *argv) { for (nelement = x->x_nelement, e = x->x_vec; nelement--; e++) { - if (e->e_w.w_symbol == &s_float) + if (e->e_w.w_symbol == gensym("float")) { outlet_float(e->e_outlet, argv[0].a_w.w_float); return; @@ -129,7 +129,7 @@ static void relay_list(t_relay *x, t_symbol *sel, int argc, t_atom *argv) { for (nelement = x->x_nelement, e = x->x_vec; nelement--; e++) { - if (e->e_w.w_symbol == &s_symbol) + if (e->e_w.w_symbol == gensym("symbol")) { outlet_symbol(e->e_outlet, argv[0].a_w.w_symbol); return; @@ -137,7 +137,7 @@ static void relay_list(t_relay *x, t_symbol *sel, int argc, t_atom *argv) } } } - outlet_list(x->x_rejectout, &s_list, argc, argv); + outlet_list(x->x_rejectout, gensym("list"), argc, argv); } @@ -164,12 +164,12 @@ static void *relay_new(t_symbol *s, int argc, t_atom *argv) x->x_vec = (t_relayelement *)getbytes(argc * sizeof(*x->x_vec)); for (n = 0, e = x->x_vec; n < argc; n++, e++) { - e->e_outlet = outlet_new(&x->x_obj, &s_list); + e->e_outlet = outlet_new(&x->x_obj, gensym("list")); if (x->x_type == A_FLOAT) e->e_w.w_float = atom_getfloatarg(n, argc, argv); else e->e_w.w_symbol = atom_getsymbolarg(n, argc, argv); } - x->x_rejectout = outlet_new(&x->x_obj, &s_list); + x->x_rejectout = outlet_new(&x->x_obj, gensym("list")); return (x); } diff --git a/src/repack.c b/src/repack.c index dd32f8a..1d15863 100644 --- a/src/repack.c +++ b/src/repack.c @@ -152,7 +152,7 @@ static void *repack_new(t_floatarg f) x->buffer = (t_atom *)getbytes(x->bufsize * sizeof(t_atom)); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("")); outlet_new(&x->x_obj, 0); return (x); diff --git a/src/route~.c b/src/route~.c index 9a03843..c69d94e 100644 --- a/src/route~.c +++ b/src/route~.c @@ -58,7 +58,7 @@ static void route_tilde_free(t_route_tilde *x) static void *route_tilde_new(void) { t_route_tilde *x = (t_route_tilde *)pd_new(route_tilde_class); - x->x_sigout=outlet_new(&x->x_obj, &s_signal); + x->x_sigout=outlet_new(&x->x_obj, gensym("signal")); x->x_msgout=outlet_new(&x->x_obj, 0); return (x); } diff --git a/src/sfplay.c b/src/sfplay.c index 87b0c2b..ed73d02 100644 --- a/src/sfplay.c +++ b/src/sfplay.c @@ -625,7 +625,7 @@ static void *sfplay_new(t_floatarg chan,t_floatarg skip) while (c--) { outlet_new(&x->x_obj, gensym("signal")); /* channels outlet */ } - x->bangout = outlet_new(&x->x_obj, &s_bang); + x->bangout = outlet_new(&x->x_obj, gensym("bang")); x->filep = t_getbytes(DACBLKSIZE*sizeof(short)*x->x_channels); diff --git a/src/sfrecord.c b/src/sfrecord.c index c56adaf..c59fc6c 100644 --- a/src/sfrecord.c +++ b/src/sfrecord.c @@ -526,7 +526,7 @@ static void *sfrecord_new(t_floatarg chan) default: c=1; break; } - outlet_new(&x->x_obj, &s_float); + outlet_new(&x->x_obj, gensym("float")); x->x_channels = c; x->x_skip = x->x_offset = 0; @@ -548,7 +548,7 @@ static void *sfrecord_new(t_floatarg chan) #ifdef DEBUG_ME post("create extra channel #%d", c); #endif - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); /* channels inlet */ + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); /* channels inlet */ } x->filep = t_getbytes(DACBLKSIZE*sizeof(short)*x->x_channels); diff --git a/src/sigzero~.c b/src/sigzero~.c index da8c350..2947a7d 100644 --- a/src/sigzero~.c +++ b/src/sigzero~.c @@ -93,7 +93,7 @@ static void sigzero_tilde_helper(void) static void *sigzero_new(void) { t_sigzero *x = (t_sigzero *)pd_new(sigzero_class); - outlet_new(&x->x_obj, &s_float); + outlet_new(&x->x_obj, gensym("float")); return (x); } @@ -106,13 +106,13 @@ static void sort_list(t_sort *x, t_symbol *s, int argc, t_atom *argv) else for (n = 0, i=argc-1; n < argc; n++, i--) SETFLOAT(&atombuf[n], idx[i]); - outlet_list(x->indexOut , &s_list, n, atombuf); + outlet_list(x->indexOut , gensym("list"), n, atombuf); if (x->ascending) for (n = 0; n < argc; n++) SETFLOAT(&atombuf[n], buf[n]); else for (n = 0, i=argc-1; n < argc; n++, i--) SETFLOAT(&atombuf[n], buf[i]); - outlet_list(x->sortedOut, &s_list, n, atombuf); + outlet_list(x->sortedOut, gensym("list"), n, atombuf); freebytes(atombuf, argc*sizeof(t_atom)); @@ -123,13 +123,13 @@ static void *sort_new(t_floatarg f) t_sort *x = (t_sort *)pd_new(sort_class); x->ascending = (f < 0.f)?0:1; - x->sortedOut=outlet_new(&x->x_obj, &s_list); - x->indexOut=outlet_new(&x->x_obj, &s_list); + x->sortedOut=outlet_new(&x->x_obj, gensym("list")); + x->indexOut=outlet_new(&x->x_obj, gensym("list")); x->bufsize = 0; x->buffer = NULL; - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("direction")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("direction")); return (x); } diff --git a/src/step~.c b/src/step~.c index 5772208..d1e8757 100644 --- a/src/step~.c +++ b/src/step~.c @@ -116,8 +116,8 @@ static void *step_new(t_floatarg farg) { t_step *x = (t_step *)pd_new(step_class); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("ft1")); - outlet_new(&x->x_obj, &s_signal); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("ft1")); + outlet_new(&x->x_obj, gensym("signal")); x->position = 0; x->wait4start = x->wait4stop = 0; @@ -40,7 +40,7 @@ static void *sum_new(void) { t_sum *x = (t_sum *)pd_new(sum_class); - outlet_new(&x->x_obj, &s_float); + outlet_new(&x->x_obj, gensym("float")); return (x); } diff --git a/src/symbol2list.c b/src/symbol2list.c index dcaaaeb..f692a7c 100644 --- a/src/symbol2list.c +++ b/src/symbol2list.c @@ -73,7 +73,7 @@ static void symbol2list_process(t_symbol2list *x) cc=x->s->s_name; cp=cc; - if (x->delimiter==NULL || x->delimiter==&s_){ + if (x->delimiter==NULL || x->delimiter==gensym("")){ i=strlen(cc); if(x->argnum<i){ freebytes(x->argv, x->argnum*sizeof(t_atom)); @@ -121,7 +121,7 @@ static void symbol2list_process(t_symbol2list *x) if(cp)string2atom(x->argv+i, cp, strlen(cp)); } static void symbol2list_bang(t_symbol2list *x){ - if(!(x->s) || x->s==&s_){ + if(!(x->s) || x->s==gensym("")){ outlet_bang(x->x_obj.ob_outlet); return; } diff --git a/src/tabdump.c b/src/tabdump.c index a91acc2..90d421e 100644 --- a/src/tabdump.c +++ b/src/tabdump.c @@ -53,7 +53,7 @@ static void tabdump_bang(t_tabdump *x) atombuf = (t_atom *)getbytes(sizeof(t_atom)*npoints); for (n = 0; n < npoints; n++) SETFLOAT(&atombuf[n], zarray_getfloat(vec, start+n)); - outlet_list(x->x_obj.ob_outlet, &s_list, npoints, atombuf); + outlet_list(x->x_obj.ob_outlet, gensym("list"), npoints, atombuf); freebytes(atombuf,sizeof(t_atom)*npoints); } } @@ -86,7 +86,7 @@ static void *tabdump_new(t_symbol *s) x->x_arrayname = s; x->startindex=0; x->stopindex=-1; - outlet_new(&x->x_obj, &s_list); + outlet_new(&x->x_obj, gensym("list")); return (x); } diff --git a/src/tabminmax.c b/src/tabminmax.c index ca49bf8..9aa660a 100644 --- a/src/tabminmax.c +++ b/src/tabminmax.c @@ -75,11 +75,11 @@ static void tabminmax_bang(t_tabminmax *x) SETFLOAT(atombuf, max); SETFLOAT(atombuf+1, maxdex); - outlet_list(x->max_out, &s_list, 2, atombuf); + outlet_list(x->max_out, gensym("list"), 2, atombuf); SETFLOAT(atombuf, min); SETFLOAT(atombuf+1, mindex); - outlet_list(x->min_out, &s_list, 2, atombuf); + outlet_list(x->min_out, gensym("list"), 2, atombuf); } } @@ -111,8 +111,8 @@ static void *tabminmax_new(t_symbol *s) x->x_arrayname = s; x->startindex=0; x->stopindex=-1; - x->min_out=outlet_new(&x->x_obj, &s_list); - x->max_out=outlet_new(&x->x_obj, &s_list); + x->min_out=outlet_new(&x->x_obj, gensym("list")); + x->max_out=outlet_new(&x->x_obj, gensym("list")); return (x); } diff --git a/src/tabread4~~.c b/src/tabread4~~.c index 3c07e47..6c53508 100644 --- a/src/tabread4~~.c +++ b/src/tabread4~~.c @@ -41,8 +41,8 @@ static void *tabread4_tilde_new(t_symbol *s) x->x_vec = 0; x->x_npoints=0; - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_signal, &s_signal); - outlet_new(&x->x_obj, &s_signal); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("signal"), gensym("signal")); + outlet_new(&x->x_obj, gensym("signal")); x->x_f = 0; return (x); } diff --git a/src/tavg~.c b/src/tavg~.c index 5d80e9f..0d0231a 100644 --- a/src/tavg~.c +++ b/src/tavg~.c @@ -62,7 +62,7 @@ static void tavg_dsp(t_tavgtilde *x, t_signal **sp) static void *tavg_new(void) { t_tavgtilde *x = (t_tavgtilde *)pd_new(tavg_class); - outlet_new(&x->x_obj, &s_float); + outlet_new(&x->x_obj, gensym("float")); return (x); } @@ -70,10 +70,10 @@ static void *time_new(t_symbol *s, int argc, t_atom *argv) x->GMT = 1; } - x->x_outlet1 = outlet_new(&x->x_obj, &s_float); - x->x_outlet2 = outlet_new(&x->x_obj, &s_float); - x->x_outlet3 = outlet_new(&x->x_obj, &s_float); - x->x_outlet4 = outlet_new(&x->x_obj, &s_float); + x->x_outlet1 = outlet_new(&x->x_obj, gensym("float")); + x->x_outlet2 = outlet_new(&x->x_obj, gensym("float")); + x->x_outlet3 = outlet_new(&x->x_obj, gensym("float")); + x->x_outlet4 = outlet_new(&x->x_obj, gensym("float")); return (x); } @@ -110,9 +110,9 @@ static void *urn_new(t_symbol *s, int argc, t_atom *argv) t_float f=0.; ZEXY_USEVAR(s); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("")); - x->x_floatout=outlet_new(&x->x_obj, &s_float); - x->x_bangout =outlet_new(&x->x_obj, &s_bang); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("")); + x->x_floatout=outlet_new(&x->x_obj, gensym("float")); + x->x_bangout =outlet_new(&x->x_obj, gensym("bang")); x->x_seed = makeseed(); x->x_noauto = 0; @@ -62,8 +62,8 @@ static void *wrap_new(t_symbol *s, int argc, t_atom*argv) t_wrap *x = (t_wrap *)pd_new(wrap_class); wrap_set(x, s, argc, argv); - outlet_new(&x->x_obj, &s_float); - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("set")); + outlet_new(&x->x_obj, gensym("float")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("set")); return (x); } @@ -104,7 +104,7 @@ static void *zNdelay_new(t_floatarg f) } x->phase = 0; - inlet_new(&x->x_obj, &x->x_obj.ob_pd, &s_float, gensym("ft1")); + inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("ft1")); outlet_new(&x->x_obj, gensym("signal")); return (x); } |