[PD-cvs] pd/src desire.c, 1.1.2.217.2.111, 1.1.2.217.2.112 m_pd.h, 1.4.4.11.2.33.2.35, 1.4.4.11.2.33.2.36 kernel.c, 1.1.2.29, 1.1.2.30
Mathieu Bouchard
matju at users.sourceforge.net
Thu Jan 4 22:37:10 CET 2007
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14160
Modified Files:
Tag: desiredata
desire.c m_pd.h kernel.c
Log Message:
we won't need original_name after all
Index: m_pd.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v
retrieving revision 1.4.4.11.2.33.2.35
retrieving revision 1.4.4.11.2.33.2.36
diff -C2 -d -r1.4.4.11.2.33.2.35 -r1.4.4.11.2.33.2.36
*** m_pd.h 4 Jan 2007 19:24:51 -0000 1.4.4.11.2.33.2.35
--- m_pd.h 4 Jan 2007 21:37:08 -0000 1.4.4.11.2.33.2.36
***************
*** 486,494 ****
EXTERN t_class *class_new2(const char *name,t_newmethod nu,t_method freem,size_t size,int flags,const char *sig);
EXTERN void class_addcreator( t_newmethod nu, t_symbol *sel, t_atomtypearg arg1, ...);
! EXTERN void class_addcreator2(const char *name, t_newmethod nu, const char *original_name, const char *sig);
EXTERN void class_addmethod( t_class *c, t_method fn, t_symbol *sel, t_atomtypearg arg1, ...);
EXTERN void class_addmethod2( t_class *c, t_method fn, const char *sel, const char *sig);
#define class_new2(NAME,NU,FREE,SIZE,FLAGS,SIG) class_new2(NAME,(t_newmethod)NU,(t_method)FREE,SIZE,FLAGS,SIG)
! #define class_addcreator2(NAME,NU,ORIG,SIG) class_addcreator2(NAME,(t_newmethod)NU,ORIG,SIG)
#define class_addmethod2(NAME,METH,SEL,SIG) class_addmethod2(NAME,(t_method)METH,SEL,SIG)
--- 486,494 ----
EXTERN t_class *class_new2(const char *name,t_newmethod nu,t_method freem,size_t size,int flags,const char *sig);
EXTERN void class_addcreator( t_newmethod nu, t_symbol *sel, t_atomtypearg arg1, ...);
! EXTERN void class_addcreator2(const char *name, t_newmethod nu, const char *sig);
EXTERN void class_addmethod( t_class *c, t_method fn, t_symbol *sel, t_atomtypearg arg1, ...);
EXTERN void class_addmethod2( t_class *c, t_method fn, const char *sel, const char *sig);
#define class_new2(NAME,NU,FREE,SIZE,FLAGS,SIG) class_new2(NAME,(t_newmethod)NU,(t_method)FREE,SIZE,FLAGS,SIG)
! #define class_addcreator2(NAME,NU,SIG) class_addcreator2(NAME,(t_newmethod)NU,SIG)
#define class_addmethod2(NAME,METH,SEL,SIG) class_addmethod2(NAME,(t_method)METH,SEL,SIG)
Index: kernel.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v
retrieving revision 1.1.2.29
retrieving revision 1.1.2.30
diff -C2 -d -r1.1.2.29 -r1.1.2.30
*** kernel.c 4 Jan 2007 19:24:51 -0000 1.1.2.29
--- kernel.c 4 Jan 2007 21:37:08 -0000 1.1.2.30
***************
*** 1098,1102 ****
can belong to, but this won't be used until the newmethod is actually
called back (and the new method explicitly takes care of this.) */
! void class_addcreator2(const char *ss, t_newmethod newmethod, const char *original_name, const char *sig) {
t_symbol *s = gensym(ss);
class_addmethod2(pd_objectmaker._class, (t_method)newmethod, ss, sig);
--- 1098,1102 ----
can belong to, but this won't be used until the newmethod is actually
called back (and the new method explicitly takes care of this.) */
! void class_addcreator2(const char *ss, t_newmethod newmethod, const char *sig) {
t_symbol *s = gensym(ss);
class_addmethod2(pd_objectmaker._class, (t_method)newmethod, ss, sig);
***************
*** 1111,1115 ****
t_methodentry *m;
int argtype = *fmt++;
- int nargs;
/* "signal" method specifies that we take audio signals but
that we don't want automatic float to signal conversion. This
--- 1111,1114 ----
***************
*** 1134,1138 ****
m->me_name = sel;
m->me_fun = (t_gotfn)fn;
! nargs = 0;
while (argtype && nargs < MAXPDARG) {
t_atomtype t;
--- 1133,1137 ----
m->me_name = sel;
m->me_fun = (t_gotfn)fn;
! int nargs = 0;
while (argtype && nargs < MAXPDARG) {
t_atomtype t;
***************
*** 1179,1183 ****
t=(t_atomtype)va_arg(ap,int);
}
! *f=0; va_end(ap); class_addcreator2(s->name,newmethod,0,fmt);
}
void class_addmethod(t_class *c, t_method fn, t_symbol *sel, t_atomtypearg arg1, ...) {
--- 1178,1182 ----
t=(t_atomtype)va_arg(ap,int);
}
! *f=0; va_end(ap); class_addcreator2(s->name,newmethod,fmt);
}
void class_addmethod(t_class *c, t_method fn, t_symbol *sel, t_atomtypearg arg1, ...) {
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.217.2.111
retrieving revision 1.1.2.217.2.112
diff -C2 -d -r1.1.2.217.2.111 -r1.1.2.217.2.112
*** desire.c 4 Jan 2007 18:25:10 -0000 1.1.2.217.2.111
--- desire.c 4 Jan 2007 21:37:05 -0000 1.1.2.217.2.112
***************
*** 3305,3309 ****
static void vinlet_setup(void) {
t_class *c = vinlet_class = class_new2("inlet",vinlet_new,vinlet_free,sizeof(t_vinlet),CLASS_NOINLET,"S");
! class_addcreator2("inlet~",vinlet_newsig,"inlet","S");
class_addbang( c, vinlet_bang);
class_addpointer( c, vinlet_pointer);
--- 3305,3309 ----
static void vinlet_setup(void) {
t_class *c = vinlet_class = class_new2("inlet",vinlet_new,vinlet_free,sizeof(t_vinlet),CLASS_NOINLET,"S");
! class_addcreator2("inlet~",vinlet_newsig,"S");
class_addbang( c, vinlet_bang);
class_addpointer( c, vinlet_pointer);
***************
*** 3546,3550 ****
static void voutlet_setup(void) {
t_class *c = voutlet_class = class_new2("outlet",voutlet_new,voutlet_free,sizeof(t_voutlet),CLASS_NOINLET,"S");
! class_addcreator2("outlet~",voutlet_newsig,"outlet~","S");
class_addbang( c, voutlet_bang);
class_addpointer( c, voutlet_pointer);
--- 3546,3550 ----
static void voutlet_setup(void) {
t_class *c = voutlet_class = class_new2("outlet",voutlet_new,voutlet_free,sizeof(t_voutlet),CLASS_NOINLET,"S");
! class_addcreator2("outlet~",voutlet_newsig,"S");
class_addbang( c, voutlet_bang);
class_addpointer( c, voutlet_pointer);
***************
*** 5046,5056 ****
class_addmethod2(pd_canvasmaker._class, template_usetemplate, "struct", "*");
gtemplate_class = class_new2("struct",gtemplate_new,gtemplate_free,sizeof(t_gtemplate),CLASS_NOINLET,"*");
! class_addcreator2("template",gtemplate_new_old,0,"*");
curve_class = class_new2("drawpolygon",curve_new,curve_free,sizeof(t_curve),0,"*");
class_setdrawcommand(curve_class);
! class_addcreator2("drawcurve", curve_new,0,"*");
! class_addcreator2("filledpolygon",curve_new,0,"*");
! class_addcreator2("filledcurve", curve_new,0,"*");
class_addfloat(curve_class, curve_float);
plot_class = class_new2("plot",plot_new,0,sizeof(t_plot),0,"*");
--- 5046,5056 ----
class_addmethod2(pd_canvasmaker._class, template_usetemplate, "struct", "*");
gtemplate_class = class_new2("struct",gtemplate_new,gtemplate_free,sizeof(t_gtemplate),CLASS_NOINLET,"*");
! class_addcreator2("template",gtemplate_new_old,"*");
curve_class = class_new2("drawpolygon",curve_new,curve_free,sizeof(t_curve),0,"*");
class_setdrawcommand(curve_class);
! class_addcreator2("drawcurve", curve_new,"*");
! class_addcreator2("filledpolygon",curve_new,"*");
! class_addcreator2("filledcurve", curve_new,"*");
class_addfloat(curve_class, curve_float);
plot_class = class_new2("plot",plot_new,0,sizeof(t_plot),0,"*");
***************
*** 5060,5064 ****
class_setdrawcommand(drawnumber_class);
class_addfloat(drawnumber_class, drawnumber_float);
! class_addcreator2("drawsymbol",drawnumber_new,0,"*");
}
--- 5060,5064 ----
class_setdrawcommand(drawnumber_class);
class_addfloat(drawnumber_class, drawnumber_float);
! class_addcreator2("drawsymbol",drawnumber_new,"*");
}
More information about the Pd-cvs
mailing list