pd/src g_array.c,1.3.4.2,1.3.4.3 - Pd-cvs

14 Dec 2004


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17017
Modified Files:
      Tag: devel_0_38
    g_array.c 
Log Message:
miller's changes to 0.38-test13
Index: g_array.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_array.c,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -C2 -d -r1.3.4.2 -r1.3.4.3
*** g_array.c	15 Nov 2004 22:19:46 -0000	1.3.4.2
--- g_array.c	14 Dec 2004 09:32:43 -0000	1.3.4.3
***************
*** 267,271 ****
      if (x->x_name->s_name[0] == '$')
          sprintf(cmdbuf, "pdtk_array_dialog %%s \%s %d %d 0\n",
!             x->x_name->s_name, x->x_n, x->x_saveit);
      else sprintf(cmdbuf, "pdtk_array_dialog %%s %s %d %d 0\n",
          x->x_name->s_name, x->x_n, x->x_saveit + (x->x_drawasrects<<1));
--- 267,271 ----
      if (x->x_name->s_name[0] == '$')
          sprintf(cmdbuf, "pdtk_array_dialog %%s \%s %d %d 0\n",
!             x->x_name->s_name, x->x_n, x->x_saveit + (x->x_drawasrects<<1));
      else sprintf(cmdbuf, "pdtk_array_dialog %%s %s %d %d 0\n",
          x->x_name->s_name, x->x_n, x->x_saveit + (x->x_drawasrects<<1));
***************
*** 645,651 ****
  {
      t_garray *x = (t_garray *)z;
- #ifdef GARRAY_THREAD_LOCK /* TB: array lock */
-     garray_lock(x); 
- #endif
      float x1 = 0x7fffffff, y1 = 0x7fffffff, x2 = -0x7fffffff, y2 = -0x7fffffff;
      t_canvas *elemtemplatecanvas;
--- 645,648 ----
***************
*** 653,656 ****
--- 650,656 ----
      int elemsize, yonset, wonset, xonset, i;
+ #ifdef GARRAY_THREAD_LOCK /* TB: array lock */
+     garray_lock(x); 
+ #endif
      if (!array_getfields(x->x_templatesym, &elemtemplatecanvas,
          &elemtemplate, &elemsize, &xonset, &yonset, &wonset))
***************
*** 975,978 ****
--- 975,1013 ----
  }
+ 
+ /* /* add user to t_garray list */ */
+ /* static void garray_adduser(t_garray *x, int *size, t_float **vec) */
+ /* { */
+ /* 	t_arrayuser * list = x->a_user */
+ /* 	t_arrayuser * elem = getbytes (sizeof (t_arrayuser)); */
+ 	
+ /* 	elem->n_ptr = size; */
+ /* 	elem->vec_prt = vec; */
+ /* 	elem->next = NULL; */
+ 	
+ /* 	while(list->next != NULL) list = list->next; */
+ 	
+ /* 	list->next = elem; */
+ 
+ /* 	return; */
+ /* } */
+ 
+ /* /* add user to t_garray list */ */
+ /* static void garray_updateusers(t_garray *x) */
+ /* { */
+ /* 	t_arrayuser * list = x->a_user */
+ /* 	t_arrayuser * elem = getbytes (sizeof (t_arrayuser)); */
+ 	
+ /* 	elem->n_ptr = size; */
+ /* 	elem->vec_prt = vec; */
+ /* 	elem->next = NULL; */
+ 	
+ /* 	while(list->next != NULL) list = list->next; */
+ 	
+ /* 	list->next = elem; */
+ 
+ /* 	return; */
+ /* } */
+ 
      /* routine that checks if we're just an array of floats and if
      so returns the goods */
***************
*** 996,999 ****
--- 1031,1036 ----
      else
      {
+ /* 		garray_adduser(x, size, vec); */
+ 
          *size = garray_npoints(x);
          *vec =  (float *)garray_vec(x);