[PD-cvs] pd/src desire.c,1.1.2.27,1.1.2.28

[Mathieu Bouchard]

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

Modified Files:
      Tag: devel_0_39
	desire.c 
Log Message:
.


Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -C2 -d -r1.1.2.27 -r1.1.2.28
*** desire.c	24 Sep 2005 03:54:20 -0000	1.1.2.27
--- desire.c	24 Sep 2005 08:29:38 -0000	1.1.2.28
***************
*** 5278,5282 ****
      y->g_next = 0;
      pd_upload(y);
!     sys_mgui(y,"draw","");
      if (!x->gl_list) x->gl_list = y;
      else
--- 5278,5282 ----
      y->g_next = 0;
      pd_upload(y);
! /*    sys_mgui(y,"draw","");*/
      if (!x->gl_list) x->gl_list = y;
      else
***************
*** 5443,5464 ****
      t_gobj *g = 0, *g9 = 0;
      float f1 = 0, f2 = 0;
!     if (g1)
!         f1 = gobj_getxforsort(g1);
!     if (g2)
!         f2 = gobj_getxforsort(g2);
      while (1)
      {
!         if (g1)
!         {
!             if (g2)
!             {
!                 if (f1 <= f2)
!                     goto put1;
!                 else goto put2;
!             }
!             else goto put1;     
!         }
!         else if (g2)
!             goto put2;
          else break;
      put1:
--- 5443,5453 ----
      t_gobj *g = 0, *g9 = 0;
      float f1 = 0, f2 = 0;
!     if (g1) f1 = gobj_getxforsort(g1);
!     if (g2) f2 = gobj_getxforsort(g2);
      while (1)
      {
!         if (g1) {
!             if (g2 && f1>f2) goto put2; else goto put1;
!         } else if (g2) goto put2;
          else break;
      put1:
***************
*** 5480,5489 ****
  }
  
! static t_gobj *glist_dosort(t_glist *x,
!     t_gobj *g, int nitems)
  {
!     if (nitems < 2)
!         return (g);
!     else
      {
          int n1 = nitems/2, n2 = nitems - n1, i;
--- 5469,5475 ----
  }
  
! static t_gobj *glist_dosort(t_glist *x, t_gobj *g, int nitems)
  {
!     if (nitems < 2) return g;
      {
          int n1 = nitems/2, n2 = nitems - n1, i;
***************
*** 12350,12359 ****
  	    case 'i': NEXT;    *(int*)p =   atom_getintarg(i,argc,argv); break;
  	    case 'b': NEXT;    *(int*)p = !!atom_getintarg(i,argc,argv); break; /* 0 or 1 */
! 	    case 'c': { /* colour, from IEM format to RGB 8:8:8 format */
! 		      NEXT; *(int*)p    = convert_color(atom_getintarg(i,argc,argv));
! 	    } break;
  	    case 's': NEXT; *(t_symbol**)p=atom_getsymbolarg(i,argc,argv); break;
! 	    case 'a': {
! 		NEXT;
  		if (IS_A_SYMBOL(argv,i))
  			*(t_symbol**)p = atom_getsymbolarg(i,argc,argv);
--- 12336,12342 ----
  	    case 'i': NEXT;    *(int*)p =   atom_getintarg(i,argc,argv); break;
  	    case 'b': NEXT;    *(int*)p = !!atom_getintarg(i,argc,argv); break; /* 0 or 1 */
! 	    case 'c': NEXT; *(int*)p    = convert_color(atom_getintarg(i,argc,argv)); break; /* IEM-style 8:8:8 colour */
  	    case 's': NEXT; *(t_symbol**)p=atom_getsymbolarg(i,argc,argv); break;
! 	    case 'a': NEXT;
  		if (IS_A_SYMBOL(argv,i))
  			*(t_symbol**)p = atom_getsymbolarg(i,argc,argv);
***************
*** 12363,12367 ****
  			*(t_symbol**)p = gensym(str);
  		} else *(t_symbol**)p = gensym("empty");
! 	    } break;
  	    default: post("WARNING: bug using pd_scanargs()"); goto err; /* WHAT? */
  	}
--- 12346,12350 ----
  			*(t_symbol**)p = gensym(str);
  		} else *(t_symbol**)p = gensym("empty");
! 	    break;
  	    default: post("WARNING: bug using pd_scanargs()"); goto err; /* WHAT? */
  	}
***************
*** 12430,12436 ****
  	va_start(val,fmt);
  	if (foo->b) {
! 		return pd_saveargs(foo->b,fmt,val);
  	} else {
! 		return pd_scanargs(foo->argc,foo->argv,fmt,val);
  	}
  	va_end(val);
--- 12413,12419 ----
  	va_start(val,fmt);
  	if (foo->b) {
! 		return pd_vsaveargs(foo->b,fmt,val);
  	} else {
! 		return pd_vscanargs(foo->argc,foo->argv,fmt,val);
  	}
  	va_end(val);