Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26359

Modified Files: Tag: desiredata d_misc.c m_binbuf.c m_glob.c Log Message: removed #ifdef DESIRE

Index: m_binbuf.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_binbuf.c,v retrieving revision 1.4.4.1.2.8 retrieving revision 1.4.4.1.2.8.2.1 diff -C2 -d -r1.4.4.1.2.8 -r1.4.4.1.2.8.2.1 *** m_binbuf.c 19 Nov 2006 08:01:55 -0000 1.4.4.1.2.8 --- m_binbuf.c 30 Nov 2006 03:54:58 -0000 1.4.4.1.2.8.2.1 *************** *** 585,594 **** else s = atom_getsymbol(at); target = s->s_thing; - #ifdef DESIRE /* IMPD: allows messages to unbound objects, via pointers */ if (!target) { if (!sscanf(s->s_name,".x%lx",(long*)&target)) target=0; } - #endif if (!target) { --- 585,592 ----

Index: d_misc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_misc.c,v retrieving revision 1.2.8.3 retrieving revision 1.2.8.3.2.1 diff -C2 -d -r1.2.8.3 -r1.2.8.3.2.1 *** d_misc.c 27 Nov 2006 18:17:34 -0000 1.2.8.3 --- d_misc.c 30 Nov 2006 03:54:58 -0000 1.2.8.3.2.1 *************** *** 80,176 **** }

- /* ------------------------- scope~ -------------------------- */ - /* this has been replaced by arrays; to be deleted later */ - - #ifndef DESIRE - #include "g_canvas.h" - - static t_class *scope_class; - - #define SCOPESIZE 256 - - typedef struct _scope - { - t_object x_obj; - t_sample x_samps[SCOPESIZE]; - int x_phase; - int x_drawn; - void *x_canvas; - } t_scope; - - static t_int *scope_perform(t_int *w) - { - t_scope *x = (t_scope *)(w[1]); - t_float *in = (t_float *)(w[2]); - int n = (int)(w[3]), phase = x->x_phase; - while (n--) - { - x->x_samps[phase] = *in++; - phase = (phase + 1) & (SCOPESIZE-1); - } - x->x_phase = phase; - return (w+4); - } - - static void scope_dsp(t_scope *x, t_signal **sp) - { - dsp_add(scope_perform, 3, x, sp[0]->s_vec, sp[0]->s_n); - } - - static void scope_erase(t_scope *x) - { - if (x->x_drawn) sys_vgui(".x%lx.c delete gumbo\n", x->x_canvas); - } - - #define X1 10. - #define X2 20. - #define YC 5. - static void scope_bang(t_scope *x) - { - int n, phase; - char hugebuf[10000], *s = hugebuf; - scope_erase(x); - sys_vgui(".x%lx.c create line 10c 5c 20c 5c -tags gumbo\n", x->x_canvas); - sprintf(s, ".x%lx.c create line ", (t_int)x->x_canvas); - s += strlen(s); - for (n = 0, phase = x->x_phase; - n < SCOPESIZE; phase = ((phase+1) & (SCOPESIZE-1)), n++) - { - sprintf(s, "%fc %fc ", X1 + (X2 - X1) * (float)n * (1./SCOPESIZE), - YC - 5 * x->x_samps[phase]); - s += strlen(s); - /* post("phase %d", phase); */ - } - sprintf(s, "-tags gumbo\n"); - sys_gui(hugebuf); - x->x_drawn = 1; - } - - static void scope_free(t_scope *x) - { - scope_erase(x); - } - - static void *scope_new(t_symbol *s) - { - t_scope *x = (t_scope *)pd_new(scope_class); - error("scope: this is now obsolete; use arrays and tabwrite~ instead"); - x->x_phase = 0; - x->x_drawn = 0; - x->x_canvas = canvas_getcurrent(); - return (x); - } - - static void scope_setup(void) - { - scope_class = class_new(gensym("scope~"), (t_newmethod)scope_new, - (t_method)scope_free, sizeof(t_scope), 0, A_DEFSYM, 0); - class_addmethod(scope_class, nullfn, gensym("signal"), 0); - class_addmethod(scope_class, (t_method)scope_dsp, gensym("dsp"), 0); - class_addbang(scope_class, scope_bang); - } - - #endif /* ndef DESIRE */ - /* ------------------------ bang~ -------------------------- */

--- 80,83 ---- *************** *** 227,237 **** { print_setup(); - #ifndef DESIRE - scope_setup(); - #endif bang_tilde_setup(); } - - - - --- 134,137 ----

Index: m_glob.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_glob.c,v retrieving revision 1.4.4.2.2.19 retrieving revision 1.4.4.2.2.19.2.1 diff -C2 -d -r1.4.4.2.2.19 -r1.4.4.2.2.19.2.1 *** m_glob.c 16 Sep 2006 04:20:29 -0000 1.4.4.2.2.19 --- m_glob.c 30 Nov 2006 03:54:58 -0000 1.4.4.2.2.19.2.1 *************** *** 118,124 **** }

- #ifdef DESIRE void desire_glob_init(void); - #endif

void glob_init(void) --- 118,122 ---- *************** *** 138,152 **** A_SYMBOL, A_SYMBOL, 0); class_addmethod(glob_pdobject, (t_method)glob_quit, gensym("quit"), 0); - #ifndef DESIRE - class_addmethod(glob_pdobject, (t_method)glob_verifyquit, - gensym("verifyquit"), A_DEFFLOAT, 0); - #endif class_addmethod(glob_pdobject, (t_method)glob_foo, gensym("foo"), A_GIMME, 0); class_addmethod(glob_pdobject, (t_method)glob_dsp, gensym("dsp"), A_GIMME, 0); class_addmethod(glob_pdobject, (t_method)glob_meters, gensym("meters"), A_FLOAT, 0); - #ifndef DESIRE - class_addmethod(glob_pdobject, (t_method)glob_key, gensym("key"), A_GIMME, 0); - #endif class_addmethod(glob_pdobject, (t_method)glob_audiostatus, gensym("audiostatus"), 0); --- 136,143 ---- *************** *** 220,225 **** pd_bind(&glob_pdobject, gensym("pd"));

- #ifdef DESIRE desire_glob_init(); - #endif } --- 211,214 ----