[PD-cvs] pd/src SConscript, 1.1.4.60, 1.1.4.61 d_misc.c, 1.2.8.3, 1.2.8.4 g_rtext.c, 1.4.8.7, 1.4.8.8 m_binbuf.c, 1.4.4.1.2.8, 1.4.4.1.2.9 m_class.c, 1.3.4.7.2.22, 1.3.4.7.2.23 m_glob.c, 1.4.4.2.2.19, 1.4.4.2.2.20 m_obj.c, 1.2.4.3.2.10, 1.2.4.3.2.11 m_pd.c, 1.3.8.8, 1.3.8.9 s_inter.c, 1.5.4.10.2.25, 1.5.4.10.2.26 s_main.c, 1.7.4.17.2.22, 1.7.4.17.2.23 s_midi_pm.c, 1.4.4.1.2.8, 1.4.4.1.2.9 s_path.c, 1.3.4.6.2.8, 1.3.4.6.2.9 x_connective.c, 1.3.4.1.2.10, 1.3.4.1.2.11 x_list.c, 1.2.2.9, 1.2.2.10

Mathieu Bouchard matju at users.sourceforge.net
Thu Nov 30 02:43:26 CET 2006


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

Modified Files:
      Tag: devel_0_39
	SConscript d_misc.c g_rtext.c m_binbuf.c m_class.c m_glob.c 
	m_obj.c m_pd.c s_inter.c s_main.c s_midi_pm.c s_path.c 
	x_connective.c x_list.c 
Log Message:
DesireData moves on


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.9
diff -C2 -d -r1.4.4.1.2.8 -r1.4.4.1.2.9
*** m_binbuf.c	19 Nov 2006 08:01:55 -0000	1.4.4.1.2.8
--- m_binbuf.c	30 Nov 2006 01:43:23 -0000	1.4.4.1.2.9
***************
*** 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,588 ----

Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.7.4.17.2.22
retrieving revision 1.7.4.17.2.23
diff -C2 -d -r1.7.4.17.2.22 -r1.7.4.17.2.23
*** s_main.c	23 Nov 2006 20:15:50 -0000	1.7.4.17.2.22
--- s_main.c	30 Nov 2006 01:43:23 -0000	1.7.4.17.2.23
***************
*** 178,189 ****
  }
  
- #ifdef DESIRE
- /* in DesireData you *shouldn't* use sys_fontwidth nor sys_fontheight */
- int sys_fontwidth(int fontsize)  {return 42;}
- int sys_fontheight(int fontsize) {return 42;}
- #else
  int sys_fontwidth(int fontsize)  {return (sys_findfont(fontsize)->fi_width);}
  int sys_fontheight(int fontsize) {return (sys_findfont(fontsize)->fi_height);}
- #endif
  
  int sys_defaultfont;
--- 178,183 ----
***************
*** 218,249 ****
  open(), read(), etc, calls to be served somehow from the GUI too. */
  
- #ifdef DESIRE
- /* for DesireData this should be eventually nuked */
- void glob_initfromgui(void *dummy, t_symbol *s, int argc, t_atom *argv)
- {
-     char cwd[666];
-     t_namelist *nl;
-     getcwd(cwd,665);
-     /* load dynamic libraries specified with "-lib" args */
-     for  (nl = sys_externlist; nl; nl = nl->nl_next)
-         if (!sys_load_lib(cwd, nl->nl_string, 0))
-             post("%s: can't load library", nl->nl_string);
-     /* open patches specifies with "-open" args */
-     for  (nl = sys_openlist; nl; nl = nl->nl_next)
-         openit(cwd, nl->nl_string);
-     namelist_free(sys_openlist);
-     sys_openlist = 0;
-     /* send messages specified with "-send" args */
-     for (nl = sys_messagelist; nl; nl = nl->nl_next) {
-         t_binbuf *b = binbuf_new();
-         binbuf_text(b, nl->nl_string, strlen(nl->nl_string));
-         binbuf_eval(b, 0, 0, 0);
-         binbuf_free(b);
-     }
-     namelist_free(sys_messagelist);
-     sys_messagelist = 0;
-     sys_oldtclversion = atom_getfloatarg(1 + 3 * NHOSTFONT, argc, argv);
- }
- #else
  void glob_initfromgui(void *dummy, t_symbol *s, int argc, t_atom *argv)
  {
--- 212,215 ----
***************
*** 296,307 ****
      sys_oldtclversion = atom_getfloatarg(1 + 3 * NHOSTFONT, argc, argv);
  }
- #endif
  
  static void sys_afterargparse(void);
  
- #ifdef DESIRE
- EXTERN t_hash *class_table;
- #endif
- 
  /* this is called from main() in s_entry.c */
  int sys_main(int argc, char **argv)
--- 262,268 ----
***************
*** 309,316 ****
  	int defeat_presets = 0, i;
  
- #ifdef DESIRE
-     class_table = hash_new(127);
- #endif
- 
      /* jsarlo { */
      sys_externalschedlib = 0;
--- 270,273 ----

Index: s_path.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_path.c,v
retrieving revision 1.3.4.6.2.8
retrieving revision 1.3.4.6.2.9
diff -C2 -d -r1.3.4.6.2.8 -r1.3.4.6.2.9
*** s_path.c	19 Nov 2006 08:02:21 -0000	1.3.4.6.2.8
--- s_path.c	30 Nov 2006 01:43:23 -0000	1.3.4.6.2.9
***************
*** 614,625 ****
      }
  }
- 
- 
- #ifdef DESIRE
- void glob_update_path (void) {
-     t_namelist *nl;
-     sys_vgui("global pd_path; set pd_path {");
-     for (nl=sys_searchpath; nl; nl=nl->nl_next) sys_vgui("%s ",nl->nl_string);
-     sys_vgui("}\n");
- }
- #endif
--- 614,615 ----

Index: s_inter.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v
retrieving revision 1.5.4.10.2.25
retrieving revision 1.5.4.10.2.26
diff -C2 -d -r1.5.4.10.2.25 -r1.5.4.10.2.26
*** s_inter.c	28 Nov 2006 20:52:05 -0000	1.5.4.10.2.25
--- s_inter.c	30 Nov 2006 01:43:23 -0000	1.5.4.10.2.26
***************
*** 11,17 ****
  #include "s_stuff.h"
  #include "m_imp.h"
- #ifndef DESIRE
  #include "g_canvas.h"
- #endif
  #ifdef UNISTD
  #include <unistd.h>
--- 11,15 ----
***************
*** 523,530 ****
  void sys_exit(void);
  
- #ifdef DESIRE
- void binbuf_eval_from_client(t_binbuf *b);
- #endif
- 
  void socketreceiver_read(t_socketreceiver *x, int fd)
  {
--- 521,524 ----
***************
*** 586,594 ****
                          (*x->sr_socketreceivefn)(x->sr_owner, inbinbuf);
                      else {
- #ifdef DESIRE
- 			binbuf_eval_from_client(inbinbuf);
- #else
  			binbuf_eval(inbinbuf, 0, 0, 0);
- #endif
  		    }
                  }
--- 580,584 ----
***************
*** 1011,1020 ****
      else    /* default behavior: start up the GUI ourselves. */
      {
- #ifdef DESIRE
- 	fprintf(stderr,
- 		"PureData in DesireData mode does not currently support starting without\n"
- 		"a -guiport option. Please start using the command 'wish desire.tk' instead.\n");
- 	exit(1);
- #else
  #ifdef MSW
          char scriptbuf[MAXPDSTRING+30], wishbuf[MAXPDSTRING+30], portbuf[80];
--- 1001,1004 ----
***************
*** 1187,1196 ****
                      "/Applications/Wish.app/Contents/MacOS/Wish");
              foundit:
- #ifndef DESIRE
                  sprintf(cmdbuf, "\"%s\" %s/pd.tk %d\n", filename, guidir, portno);
  #else
-                 sprintf(cmdbuf, "\"%s\" %s/desire.tk %d\n", filename, guidir, portno);
- #endif
- #else
                  sprintf(cmdbuf,
  "TCL_LIBRARY=\"%s/tcl/library\" TK_LIBRARY=\"%s/tk/library\" \
--- 1171,1176 ----
***************
*** 1237,1241 ****
          ;
  #endif /* MSW */
- #endif /* DESIRE */
      }
  
--- 1217,1220 ----

Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.60
retrieving revision 1.1.4.61
diff -C2 -d -r1.1.4.60 -r1.1.4.61
*** SConscript	20 Nov 2006 06:42:53 -0000	1.1.4.60
--- SConscript	30 Nov 2006 01:43:23 -0000	1.1.4.61
***************
*** 31,36 ****
      ('optimize', 'Optimize for specific architecture (give cpu model)', None),
      ('prefix', 'install prefix', '/usr/local'),
-     BoolOption('desire', 'Build with desire (obsolete: use ./configure && make)', False),
      BoolOption('pablio','Build portaudio with pablio', True),
      )
  
--- 31,36 ----
      ('optimize', 'Optimize for specific architecture (give cpu model)', None),
      ('prefix', 'install prefix', '/usr/local'),
      BoolOption('pablio','Build portaudio with pablio', True),
+     BoolOption('desire','instead see http://desiredata.goto10.org/wiki/QuickStart', False),
      )
  
***************
*** 55,63 ****
  
  if pdenv['desire']:
!   print "DesireData doesn't use scons anymore. now do:"
!   print "  cd src"
!   print "  ./configure"
!   print "  make"
!   print "  make install"
    os._exit(42)
  
--- 55,59 ----
  
  if pdenv['desire']:
!   print "please see http://desiredata.goto10.org/wiki/QuickStart for new instructions."
    os._exit(42)
  

Index: m_obj.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_obj.c,v
retrieving revision 1.2.4.3.2.10
retrieving revision 1.2.4.3.2.11
diff -C2 -d -r1.2.4.3.2.10 -r1.2.4.3.2.11
*** m_obj.c	2 Jul 2006 00:50:23 -0000	1.2.4.3.2.10
--- m_obj.c	30 Nov 2006 01:43:23 -0000	1.2.4.3.2.11
***************
*** 338,344 ****
  struct _outconnect
  {
- #ifdef DESIRE
-     t_gobj oc_gobj;
- #endif
      struct _outconnect *oc_next;
      t_pd *oc_to;
--- 338,341 ----
***************
*** 353,374 ****
  };
  
- #ifdef DESIRE
- typedef struct _outconnect t_wire;
- t_class *wire_class;
- t_wire *wire_new (t_symbol *s, int argc, t_atom *argv) {
-     t_wire *self = (t_wire *)pd_new(wire_class);
-     self->oc_gobj.g_adix = appendix_new((t_gobj *)self);
-     return self;
- }
- void wire_free (t_wire *self) {
- 	appendix_free((t_gobj *)self);
- 	pd_free((t_pd *)self);
- }
- void m_obj_setup(void) {
-     wire_class = class_new(gensym("__wire"), (t_newmethod)wire_new,
- 	(t_method)wire_free, sizeof(t_wire), CLASS_GOBJ, A_GIMME, 0);
- }
- #endif
- 
  t_outlet *outlet_new(t_object *owner, t_symbol *s)
  {
--- 350,353 ----
***************
*** 557,565 ****
      to = &i->i_pd;
  doit:
- #ifdef DESIRE
-     oc = wire_new(0,0,0);
- #else
      oc = (t_outconnect *)t_getbytes(sizeof(*oc));
- #endif
      oc->oc_next = 0;
      oc->oc_to = to;
--- 536,540 ----

Index: s_midi_pm.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_midi_pm.c,v
retrieving revision 1.4.4.1.2.8
retrieving revision 1.4.4.1.2.9
diff -C2 -d -r1.4.4.1.2.8 -r1.4.4.1.2.9
*** s_midi_pm.c	23 Nov 2006 19:44:36 -0000	1.4.4.1.2.8
--- s_midi_pm.c	30 Nov 2006 01:43:23 -0000	1.4.4.1.2.9
***************
*** 19,32 ****
  #include <string.h>
  #include <errno.h>
- #ifdef DESIRE
- #include <portaudio.h>
- #include <portmidi.h>
- #include <porttime.h>
- #else
  #include "portaudio.h"
  #include "portmidi.h"
  #include "porttime.h"
  #include "pminternal.h"
- #endif
  
  static PmStream *mac_midiindevlist[MAXMIDIINDEV];
--- 19,26 ----

Index: m_class.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_class.c,v
retrieving revision 1.3.4.7.2.22
retrieving revision 1.3.4.7.2.23
diff -C2 -d -r1.3.4.7.2.22 -r1.3.4.7.2.23
*** m_class.c	28 Nov 2006 21:12:59 -0000	1.3.4.7.2.22
--- m_class.c	30 Nov 2006 01:43:23 -0000	1.3.4.7.2.23
***************
*** 27,34 ****
  #endif
  
- #ifdef DESIRE
- t_hash *class_table=0;
- #endif
- 
  static t_symbol *class_loadsym;     /* name under which an extern is invoked */
  static void pd_defaultfloat(t_pd *x, t_float f);
--- 27,30 ----
***************
*** 162,168 ****
      how this is handled.  */
  
- #ifndef DESIRE
  extern t_widgetbehavior text_widgetbehavior;
- #endif
  extern void text_save(t_gobj *z, t_binbuf *b);
  
--- 158,162 ----
***************
*** 237,250 ****
      c->c_listmethod = pd_defaultlist;
      c->c_anymethod = pd_defaultanything;
- #ifndef DESIRE
      c->c_wb = (typeflag == CLASS_PATCHABLE ? &text_widgetbehavior : 0);
- #endif
      c->c_pwb = 0;
      c->c_firstin = ((flags & CLASS_NOINLET) == 0);
      c->c_firsttip = gensym("?");
- #ifdef DESIRE
-     c->c_fields = (t_symbol **)malloc(sizeof(t_symbol *)*31);
-     c->c_nfields = 0;
- #endif
      c->c_patchable = (typeflag == CLASS_PATCHABLE);
      c->c_gobj = (typeflag >= CLASS_GOBJ);
--- 231,238 ----
***************
*** 266,272 ****
  #endif
  
- #ifdef DESIRE
-     hash_set(class_table, c->c_name, c);
- #endif
     return (c);
  }
--- 254,257 ----
***************
*** 314,320 ****
  		    vec[0], vec[1], vec[2], vec[3], vec[4], vec[5]);
  #endif
- #ifdef DESIRE
-     hash_set(class_table,s,0);
- #endif
  }
  
--- 299,302 ----
***************
*** 428,437 ****
  }
  
- #ifndef DESIRE
  void class_setwidget(t_class *c, t_widgetbehavior *w)
  {
      c->c_wb = w;
  }
- #endif
  
  void class_setparentwidget(t_class *c, t_parentwidgetbehavior *pw)
--- 410,417 ----
***************
*** 470,481 ****
  }
  
- #ifdef DESIRE
- void class_setnotice(t_class *c, t_notice notice) 
- {
-     c->c_notice = notice;
- }
- #endif
- 
- 
  static void pd_floatforsignal(t_pd *x, t_float f)
  {
--- 450,453 ----
***************
*** 525,529 ****
  }
  
- #ifndef DESIRE
  void class_setpropertiesfn(t_class *c, t_propertiesfn f)
  {
--- 497,500 ----
***************
*** 535,539 ****
      return (c->c_propertiesfn);
  }
- #endif
  
  /* ---------------- the symbol table ------------------------ */
--- 506,509 ----
***************
*** 784,791 ****
      t_floatarg d1, t_floatarg d2, t_floatarg d3, t_floatarg d4, t_floatarg d5);
  
- #ifdef DESIRE
- void pd_set_newest(t_pd *x);
- #endif
- 
  void pd_typedmess(t_pd *x, t_symbol *s, int argc, t_atom *argv)
  {
--- 754,757 ----
***************
*** 836,844 ****
          {
              if (x == &pd_objectmaker)
- #ifdef DESIRE
-                 pd_set_newest(((t_newgimme)(m->me_fun))(s, argc, argv));
- #else
                  newest = (*((t_newgimme)(m->me_fun)))(s, argc, argv);
- #endif
              else (*((t_messgimme)(m->me_fun)))(x, s, argc, argv);
              return;
--- 802,806 ----
***************
*** 922,930 ****
          }
          if (x == &pd_objectmaker)
- #ifdef DESIRE
- 	    pd_set_newest(bonzo);
- #else
              newest = bonzo;
- #endif
          return;
      }
--- 884,888 ----
***************
*** 1019,1078 ****
  }
  
- #ifdef DESIRE
- /* ---------------------------------------------------------------- */
- /* desiredata-specific stuff */
- 
- /* must be called only once */
- void class_setfieldnames(t_class *x, const char *s) {
-     char foo[64];
-     while (*s) {
- 	char *t = strchr(s,' ');
- 	int i = t-s;
- 	if (!t) return;
- 	memcpy(foo,s,i);
- 	foo[i]=0;
- 	x->c_fields[x->c_nfields++] = gensym(foo);
- 	s=s+i+1;
-     }
- }
- 
- int class_getfieldindex(t_class *x, const char *s) {
- 	t_symbol *sy = gensym((char *)s);
- 	int i;
- 	for (i=0; i<x->c_nfields; i++) if (x->c_fields[i]==sy) return i;
- 	return -1;
- }
- 
- /* O(n) asymptotic time :-} */
- /* only looks for already loaded classes though. */
- 
- t_class *class_find (t_symbol *s) {return hash_get(class_table,s);}
- 
- void glob_update_class_info (t_pd *bogus, t_symbol *s, t_symbol *cb_recv, t_symbol *cb_sel) {
-     t_class *c = class_find(s);
-     if (!c) { post("class not found!"); return; }
-     sys_vgui("global class_info; set class_info(%s) [list "
-                 "helpname \"%s\" externdir \"%s\" size \"%d\" "
- /*
-     t_methodentry *c_methods; int c_nmethod;
-     t_method c_freemethod;
-     struct _widgetbehavior *c_wb;
-     struct _parentwidgetbehavior *c_pwb;
-     t_savefn c_savefn;
-     int c_floatsignalin;
- */
-     "gobj \"%d\" patchable \"%d\" firstin \"%d\" "
-     "firsttip \"%s\" methods {",s->s_name,c->c_helpname->s_name,c->c_externdir->s_name,
- c->c_size,c->c_gobj,c->c_patchable,c->c_firstin,c->c_firsttip->s_name);
-     if (c->   c_bangmethod != pd_defaultbang)     sys_vgui("<bang> ");
-     if (c->c_pointermethod != pd_defaultpointer)  sys_vgui("<pointer> ");
-     if (c->  c_floatmethod != pd_defaultfloat)    sys_vgui("<float> ");
-     if (c-> c_symbolmethod != pd_defaultsymbol)   sys_vgui("<symbol> ");
-     if (c->   c_listmethod != pd_defaultlist)     sys_vgui("<list> ");
-     if (c->    c_anymethod != pd_defaultanything) sys_vgui("<any> ");
-     {int i; for (i=0; i<c->c_nmethod; i++) sys_vgui("%s ",c->c_methods[i].me_name->s_name);}
-     sys_vgui("}]; %s %s %s\n",cb_recv->s_name, cb_sel->s_name, s->s_name);
- }
- 
- 
- #endif
--- 977,978 ----

Index: g_rtext.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_rtext.c,v
retrieving revision 1.4.8.7
retrieving revision 1.4.8.8
diff -C2 -d -r1.4.8.7 -r1.4.8.8
*** g_rtext.c	23 Jun 2006 17:59:40 -0000	1.4.8.7
--- g_rtext.c	30 Nov 2006 01:43:23 -0000	1.4.8.8
***************
*** 7,13 ****
  /* all changes are labeled with      iemlib      */
  
- /*HAAACK!!!*/
- #undef DESIRE
- 
  #include <stdlib.h>
  #include <string.h>
--- 7,10 ----

Index: x_list.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/x_list.c,v
retrieving revision 1.2.2.9
retrieving revision 1.2.2.10
diff -C2 -d -r1.2.2.9 -r1.2.2.10
*** x_list.c	29 Nov 2006 16:06:29 -0000	1.2.2.9
--- x_list.c	30 Nov 2006 01:43:23 -0000	1.2.2.10
***************
*** 396,403 ****
  static void *list_new(t_pd *dummy, t_symbol *s, int argc, t_atom *argv)
  {
- #ifdef DESIRE
-     void pd_set_newest(t_pd *);
-     t_pd *newest = 0; /* hide global var */
- #endif
      if (!argc || argv[0].a_type != A_SYMBOL)
          newest = list_append_new(s, argc, argv);
--- 396,399 ----
***************
*** 419,426 ****
          }
      }
- #ifdef DESIRE
-     /* workaround for bug in m_class.c */
-     pd_set_newest(newest);
- #endif
      return (newest);
  }
--- 415,418 ----

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.4
diff -C2 -d -r1.2.8.3 -r1.2.8.4
*** d_misc.c	27 Nov 2006 18:17:34 -0000	1.2.8.3
--- d_misc.c	30 Nov 2006 01:43:23 -0000	1.2.8.4
***************
*** 83,87 ****
  /* this has been replaced by arrays; to be deleted later */
  
- #ifndef DESIRE
  #include "g_canvas.h"
  
--- 83,86 ----
***************
*** 171,176 ****
  }
  
- #endif /* ndef DESIRE */
- 
  /* ------------------------ bang~ -------------------------- */
  
--- 170,173 ----
***************
*** 227,237 ****
  {
      print_setup();
- #ifndef DESIRE
      scope_setup();
- #endif
      bang_tilde_setup();
  }
- 
- 
- 
- 
--- 224,228 ----

Index: m_pd.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/m_pd.c,v
retrieving revision 1.3.8.8
retrieving revision 1.3.8.9
diff -C2 -d -r1.3.8.8 -r1.3.8.9
*** m_pd.c	6 Jul 2006 18:02:02 -0000	1.3.8.8
--- m_pd.c	30 Nov 2006 01:43:23 -0000	1.3.8.9
***************
*** 16,22 ****
      x = (t_pd *)t_getbytes(c->c_size);
      *x = c;
- #ifdef DESIRE
-     if (c->c_gobj) ((t_gobj *)x)->g_adix = appendix_new((t_gobj *)x);
- #endif
      if (c->c_patchable)
      {
--- 16,19 ----
***************
*** 31,37 ****
      t_class *c = *x;
      if (c->c_freemethod) (*(t_gotfn)(c->c_freemethod))(x);
- #ifdef DESIRE
-     if (c->c_gobj) appendix_free((t_gobj *)x);
- #endif
      if (c->c_patchable)
      {
--- 28,31 ----
***************
*** 219,226 ****
  */
  
- #ifdef DESIRE
- #undef g_next
- #endif
- 
  typedef struct _gstack
  {
--- 213,216 ----

Index: x_connective.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/x_connective.c,v
retrieving revision 1.3.4.1.2.10
retrieving revision 1.3.4.1.2.11
diff -C2 -d -r1.3.4.1.2.10 -r1.3.4.1.2.11
*** x_connective.c	29 Nov 2006 16:06:29 -0000	1.3.4.1.2.10
--- x_connective.c	30 Nov 2006 01:43:23 -0000	1.3.4.1.2.11
***************
*** 11,19 ****
  extern t_pd *newest;
  
- #ifdef DESIRE
- void pd_set_newest(t_pd *);
- #else
  #define pd_set_newest(x) (newest=(x))
- #endif
  
  /* -------------------------- int ------------------------------ */
--- 11,15 ----

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.20
diff -C2 -d -r1.4.4.2.2.19 -r1.4.4.2.2.20
*** m_glob.c	16 Sep 2006 04:20:29 -0000	1.4.4.2.2.19
--- m_glob.c	30 Nov 2006 01:43:23 -0000	1.4.4.2.2.20
***************
*** 118,125 ****
  }
  
- #ifdef DESIRE
- void desire_glob_init(void);
- #endif
- 
  void glob_init(void)
  {
--- 118,121 ----
***************
*** 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);
--- 134,144 ----
***************
*** 220,225 ****
      pd_bind(&glob_pdobject, gensym("pd"));
  
- #ifdef DESIRE
-     desire_glob_init();
- #endif
  }
--- 212,214 ----





More information about the Pd-cvs mailing list