[PD-cvs] externals/miXed/cyclone/hammer Append.c,1.4,1.5 Decode.c,1.4,1.5 Makefile.objects,1.4,1.5 bangbang.c,1.4,1.5 counter.c,1.3,1.4 cycle.c,1.4,1.5 gate.c,1.4,1.5 hammer.c,1.4,1.5 maximum.c,1.4,1.5 minimum.c,1.4,1.5 mtr.c,1.6,1.7 past.c,1.4,1.5 prepend.c,1.4,1.5 prob.c,1.5,1.6 seq.c,1.8,1.9 switch.c,1.4,1.5 urn.c,1.5,1.6

Krzysztof Czaja krzyszcz at users.sourceforge.net
Thu Jan 27 15:42:49 CET 2005


Update of /cvsroot/pure-data/externals/miXed/cyclone/hammer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23748/cyclone/hammer

Modified Files:
	Append.c Decode.c Makefile.objects bangbang.c counter.c 
	cycle.c gate.c hammer.c maximum.c minimum.c mtr.c past.c 
	prepend.c prob.c seq.c switch.c urn.c 
Log Message:
cyclone alpha52 and toxy alpha15 (see notes.txt for cyclone, toxy and shared)

Index: mtr.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/mtr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mtr.c	11 Jan 2005 10:33:19 -0000	1.6
--- mtr.c	27 Jan 2005 14:42:47 -0000	1.7
***************
*** 861,864 ****
  #endif
      hammerfile_setup(mtr_class, 0);
!     fitter_setup(mtr_class, 0, 0);
  }
--- 861,864 ----
  #endif
      hammerfile_setup(mtr_class, 0);
!     fitter_setup(mtr_class, 0);
  }

Index: cycle.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/cycle.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cycle.c	11 Jan 2005 10:33:19 -0000	1.4
--- cycle.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 152,155 ****
      class_addmethod(cycle_class, (t_method)cycle_thresh,
  		    gensym("thresh"), A_FLOAT, 0);
!     fitter_setup(cycle_class, 0, 0);
  }
--- 152,155 ----
      class_addmethod(cycle_class, (t_method)cycle_thresh,
  		    gensym("thresh"), A_FLOAT, 0);
!     fitter_setup(cycle_class, 0);
  }

Index: seq.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/seq.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** seq.c	11 Jan 2005 10:33:19 -0000	1.8
--- seq.c	27 Jan 2005 14:42:47 -0000	1.9
***************
*** 50,53 ****
--- 50,54 ----
      int            x_mode;
      int            x_playhead;
+     double         x_nextscoretime;
      float          x_timescale;
      float          x_newtimescale;
***************
*** 249,252 ****
--- 250,254 ----
      clock_unset(x->x_clock);
      x->x_playhead = 0;
+     x->x_nextscoretime = 0.;
  }
  
***************
*** 257,260 ****
--- 259,263 ----
      clock_unset(x->x_slaveclock);
      x->x_playhead = 0;
+     x->x_nextscoretime = 0.;
  }
  
***************
*** 276,279 ****
--- 279,283 ----
  	{
  	    x->x_playhead = 0;
+ 	    x->x_nextscoretime = x->x_sequence->e_delta;
  	    /* playback data never sent within the scheduler event of
  	       a start message (even for the first delta <= 0), LATER rethink */
***************
*** 281,294 ****
  	}
  	else
! 	{
! 	    /* CHECKED timescale change */
! 	    x->x_clockdelay -= clock_gettimesince(x->x_prevtime);
  	    x->x_clockdelay *= x->x_newtimescale / x->x_timescale;
  	}
  	if (x->x_clockdelay < 0.)
  	    x->x_clockdelay = 0.;
  	clock_delay(x->x_clock, x->x_clockdelay);
  	x->x_prevtime = clock_getlogicaltime();
- 	x->x_timescale = x->x_newtimescale;
      }
      else x->x_mode = SEQ_IDLEMODE;
--- 285,298 ----
  	}
  	else
! 	{  /* CHECKED timescale change */
! 	    if (x->x_prevtime > 0.)  /* running state */
! 		x->x_clockdelay -= clock_gettimesince(x->x_prevtime);
  	    x->x_clockdelay *= x->x_newtimescale / x->x_timescale;
  	}
  	if (x->x_clockdelay < 0.)
  	    x->x_clockdelay = 0.;
+ 	x->x_timescale = x->x_newtimescale;
  	clock_delay(x->x_clock, x->x_clockdelay);
  	x->x_prevtime = clock_getlogicaltime();
      }
      else x->x_mode = SEQ_IDLEMODE;
***************
*** 300,303 ****
--- 304,308 ----
      {
  	x->x_playhead = 0;
+ 	x->x_nextscoretime = 0.;
  	x->x_prevtime = 0.;
  	x->x_slaveprevtime = 0.;
***************
*** 381,384 ****
--- 386,390 ----
  	{
  	    ep++;
+ 	    x->x_nextscoretime += ep->e_delta;
  	    if (ep->e_delta < SEQ_TICKEPSILON)
  		/* continue output in the same scheduler event, LATER rethink */
***************
*** 557,561 ****
  	warned = 1;
      }
!     if (x->x_mode == SEQ_PLAYMODE && x->x_prevtime > 0.)
      {
  	x->x_clockdelay -= clock_gettimesince(x->x_prevtime);
--- 563,568 ----
  	warned = 1;
      }
!     if (x->x_mode == SEQ_PLAYMODE &&
! 	x->x_prevtime > 0.)  /* running state */
      {
  	x->x_clockdelay -= clock_gettimesince(x->x_prevtime);
***************
*** 575,579 ****
  	warned = 1;
      }
!     if (x->x_mode == SEQ_PLAYMODE)
      {
  	if (x->x_clockdelay < 0.)
--- 582,587 ----
  	warned = 1;
      }
!     if (x->x_mode == SEQ_PLAYMODE &&
! 	x->x_prevtime <= 0.)  /* pause state */
      {
  	if (x->x_clockdelay < 0.)
***************
*** 592,596 ****
  	warned = 1;
      }
!     if (x->x_nevents && x->x_mode == SEQ_PLAYMODE)
      {
  	t_seqevent *ev;
--- 600,604 ----
  	warned = 1;
      }
!     if (x->x_nevents)
      {
  	t_seqevent *ev;
***************
*** 599,602 ****
--- 607,618 ----
  	if (ms < SEQ_TICKEPSILON)
  	    ms = 0.;
+ 	if (x->x_mode != SEQ_PLAYMODE)
+ 	{
+ 	    seq_settimescale(x, x->x_timescale);
+ 	    seq_setmode(x, SEQ_PLAYMODE);
+ 	    /* clock_delay() has been called in setmode, LATER avoid */
+ 	    clock_unset(x->x_clock);
+ 	    x->x_prevtime = 0.;
+ 	}
  	for (ndx = 0, ev = x->x_sequence, sum = SEQ_TICKEPSILON; ndx < nevents;
  	     ndx++, ev++)
***************
*** 605,613 ****
  	    {
  		x->x_playhead = ndx;
  		x->x_clockdelay = sum - SEQ_TICKEPSILON - ms;
  		if (x->x_clockdelay < 0.)
  		    x->x_clockdelay = 0.;
! 		clock_delay(x->x_clock, x->x_clockdelay);
! 		x->x_prevtime = clock_getlogicaltime();
  		break;
  	    }
--- 621,633 ----
  	    {
  		x->x_playhead = ndx;
+ 		x->x_nextscoretime = sum;
  		x->x_clockdelay = sum - SEQ_TICKEPSILON - ms;
  		if (x->x_clockdelay < 0.)
  		    x->x_clockdelay = 0.;
! 		if (x->x_prevtime > 0.)  /* running state */
! 		{
! 		    clock_delay(x->x_clock, x->x_clockdelay);
! 		    x->x_prevtime = clock_getlogicaltime();
! 		}
  		break;
  	    }
***************
*** 616,619 ****
--- 636,688 ----
  }
  
+ static void seq_scoretime(t_seq *x, t_symbol *s)
+ {
+     static int warned = 0;
+     if (fittermax_get() && !warned)
+     {
+ 	fittermax_warning(*(t_pd *)x, "'scoretime' not supported in Max");
+ 	warned = 1;
+     }
+     if (s && s->s_thing &&
+ 	x->x_mode == SEQ_PLAYMODE)  /* LATER other modes */
+     {
+ 	t_atom aout[2];
+ 	double ms, clockdelay = x->x_clockdelay;
+ 	t_float f1, f2;
+ 	if (x->x_prevtime > 0.)  /* running state */
+ 	    clockdelay -= clock_gettimesince(x->x_prevtime);
+ 	ms = x->x_nextscoretime - clockdelay / x->x_timescale;
+ 	f1 = ms / 1000.;
+ 	f2 = ms - f1;
+ 	SETFLOAT(&aout[0], f1);
+ 	SETFLOAT(&aout[1], f2);
+ 	pd_list(s->s_thing, &s_list, 2, aout);
+     }
+ }
+ 
+ static void seq_cd(t_seq *x, t_symbol *s)
+ {
+     static int warned = 0;
+     if (fittermax_get() && !warned)
+     {
+ 	fittermax_warning(*(t_pd *)x, "'cd' not supported in Max");
+ 	warned = 1;
+     }
+     hammerpanel_setopendir(x->x_filehandle, s);
+ }
+ 
+ static void seq_pwd(t_seq *x, t_symbol *s)
+ {
+     t_symbol *dir;
+     static int warned = 0;
+     if (fittermax_get() && !warned)
+     {
+ 	fittermax_warning(*(t_pd *)x, "'pwd' not supported in Max");
+ 	warned = 1;
+     }
+     if (s && s->s_thing && (dir = hammerpanel_getopendir(x->x_filehandle)))
+ 	pd_symbol(s->s_thing, dir);
+ }
+ 
  static int seq_eventcomparehook(const void *e1, const void *e2)
  {
***************
*** 964,968 ****
      if (s && s != &s_)
  	seq_doread(x, s, 0);
!     else  /* CHECKED no default */
  	hammerpanel_open(x->x_filehandle, 0);
  }
--- 1033,1038 ----
      if (s && s != &s_)
  	seq_doread(x, s, 0);
!     else  /* CHECKED no default file name */
! 	/* start in a dir last read from, if any, otherwise in a canvas dir */
  	hammerpanel_open(x->x_filehandle, 0);
  }
***************
*** 972,977 ****
      if (s && s != &s_)
  	seq_dowrite(x, s);
!     else  /* CHECKED creation arg is a default */
  	hammerpanel_save(x->x_filehandle,
  			 canvas_getdir(x->x_canvas), x->x_defname);
  }
--- 1042,1048 ----
      if (s && s != &s_)
  	seq_dowrite(x, s);
!     else  /* CHECKED creation arg is a default file name */
  	hammerpanel_save(x->x_filehandle,
+ 			 /* always start in canvas dir */
  			 canvas_getdir(x->x_canvas), x->x_defname);
  }
***************
*** 1124,1130 ****
      class_addmethod(seq_class, (t_method)seq_goto,
  		    gensym("goto"), A_DEFFLOAT, A_DEFFLOAT, 0);
  
      forky_setpropertiesfn(seq_class, seq_properties);
      hammerfile_setup(seq_class, 0);
!     fitter_setup(seq_class, 0, 0);
  }
--- 1195,1207 ----
      class_addmethod(seq_class, (t_method)seq_goto,
  		    gensym("goto"), A_DEFFLOAT, A_DEFFLOAT, 0);
+     class_addmethod(seq_class, (t_method)seq_scoretime,
+ 		    gensym("scoretime"), A_SYMBOL, 0);
+     class_addmethod(seq_class, (t_method)seq_cd,
+ 		    gensym("cd"), A_DEFSYM, 0);
+     class_addmethod(seq_class, (t_method)seq_pwd,
+ 		    gensym("pwd"), A_SYMBOL, 0);
  
      forky_setpropertiesfn(seq_class, seq_properties);
      hammerfile_setup(seq_class, 0);
!     fitter_setup(seq_class, 0);
  }

Index: bangbang.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/bangbang.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bangbang.c	11 Jan 2005 10:33:19 -0000	1.4
--- bangbang.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 72,75 ****
      class_addbang(bangbang_class, bangbang_bang);
      class_addanything(bangbang_class, bangbang_anything);
!     fitter_setup(bangbang_class, 0, 0);
  }
--- 72,75 ----
      class_addbang(bangbang_class, bangbang_bang);
      class_addanything(bangbang_class, bangbang_anything);
!     fitter_setup(bangbang_class, 0);
  }

Index: prepend.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/prepend.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** prepend.c	11 Jan 2005 10:33:19 -0000	1.4
--- prepend.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 35,40 ****
  static t_class *prependxy_class;
  
! static t_symbol *prependps_compatibility = 0;
! static t_symbol *prependps_max;
  
  /* Usually a preallocation method is used, except in special cases of:
--- 35,39 ----
  static t_class *prependxy_class;
  
! static int prepend_iscompatible = 0;  /* FIXME per-object */
  
  /* Usually a preallocation method is used, except in special cases of:
***************
*** 154,158 ****
      if (x->x_selector)
      {
! 	if (prependps_compatibility == prependps_max)
  	{
  	    t_atom at;
--- 153,157 ----
      if (x->x_selector)
      {
! 	if (prepend_iscompatible)
  	{
  	    t_atom at;
***************
*** 325,329 ****
      else
      {
! 	if (prependps_compatibility == prependps_max)
  	    /* CHECKED in max an object without an outlet is created,
  	       and there is no warning when loading from a file. */
--- 324,328 ----
      else
      {
! 	if (prepend_iscompatible)
  	    /* CHECKED in max an object without an outlet is created,
  	       and there is no warning when loading from a file. */
***************
*** 338,341 ****
--- 337,345 ----
  }
  
+ static void prepend_fitter(void)
+ {
+     prepend_iscompatible = fittermax_get();
+ }
+ 
  void prepend_setup(void)
  {
***************
*** 361,365 ****
      class_addanything(prependxy_class, prependxy_anything);
  
!     prependps_max = gensym("max");
!     fitter_setup(prepend_class, &prependps_compatibility, 0);
  }
--- 365,368 ----
      class_addanything(prependxy_class, prependxy_anything);
  
!     fitter_setup(prepend_class, prepend_fitter);
  }

Index: prob.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/prob.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** prob.c	11 Jan 2005 10:33:19 -0000	1.5
--- prob.c	27 Jan 2005 14:42:47 -0000	1.6
***************
*** 308,311 ****
  		    A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
      hammerfile_setup(prob_class, 1);
!     fitter_setup(prob_class, 0, 0);
  }
--- 308,311 ----
  		    A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
      hammerfile_setup(prob_class, 1);
!     fitter_setup(prob_class, 0);
  }

Index: hammer.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/hammer.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** hammer.c	11 Jan 2005 10:33:19 -0000	1.4
--- hammer.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 14,19 ****
  {
      t_object       x_ob;
-     t_symbol      *x_dir;
-     t_symbol      *x_canvasdir;
      t_hammerfile  *x_filehandle;
  } t_hammer;
--- 14,17 ----
***************
*** 25,39 ****
  static void hammer_readhook(t_pd *z, t_symbol *fn, int ac, t_atom *av)
  {
!     import_max(fn->s_name, "");
  }
  
! static void hammer_doimport(t_hammer *x, t_symbol *fn, t_symbol *dir)
  {
-     if (!dir || dir == &s_)
- 	dir = x->x_dir;
      if (fn && fn != &s_)
! 	import_max(fn->s_name, (dir && dir != &s_) ? dir->s_name : "");
!     else
! 	hammerpanel_open(x->x_filehandle, dir);
  }
  
--- 23,40 ----
  static void hammer_readhook(t_pd *z, t_symbol *fn, int ac, t_atom *av)
  {
!     int result = import_max(fn->s_name, "");
!     outlet_float(((t_object *)z)->ob_outlet, (t_float)result);
  }
  
! static void hammer_doimport(t_hammer *x, t_symbol *fn)
  {
      if (fn && fn != &s_)
!     {
! 	t_symbol *dir = hammerpanel_getopendir(x->x_filehandle);
! 	int result =
! 	    import_max(fn->s_name, (dir && dir != &s_ ? dir->s_name : ""));
! 	outlet_float(((t_object *)x)->ob_outlet, (t_float)result);
!     }
!     else hammerpanel_open(x->x_filehandle, 0);
  }
  
***************
*** 41,61 ****
  			 t_floatarg shift, t_floatarg ctrl, t_floatarg alt)
  {
!     hammer_doimport(x, 0, 0);
  }
  
  static void hammer_import(t_hammer *x, t_symbol *fn)
  {
!     hammer_doimport(x, fn, 0);
  }
  
  static void hammer_cd(t_hammer *x, t_symbol *dir)
  {
!     /* LATER hammerfile interface for relative jumps, etc. */
!     x->x_dir = (dir && dir != &s_ ? dir : x->x_canvasdir);
  }
  
! static void hammer_pwd(t_hammer *x)
  {
!     outlet_symbol(((t_object *)x)->ob_outlet, x->x_dir);
  }
  
--- 42,63 ----
  			 t_floatarg shift, t_floatarg ctrl, t_floatarg alt)
  {
!     hammer_doimport(x, 0);
  }
  
  static void hammer_import(t_hammer *x, t_symbol *fn)
  {
!     hammer_doimport(x, fn);
  }
  
  static void hammer_cd(t_hammer *x, t_symbol *dir)
  {
!     hammerpanel_setopendir(x->x_filehandle, dir);
  }
  
! static void hammer_pwd(t_hammer *x, t_symbol *s)
  {
!     t_symbol *dir;
!     if (s && s->s_thing && (dir = hammerpanel_getopendir(x->x_filehandle)))
! 	pd_symbol(s->s_thing, dir);
  }
  
***************
*** 75,81 ****
      t_hammer *x = (t_hammer *)pd_new(hammer_class);
      x->x_filehandle = hammerfile_new((t_pd *)x, 0, hammer_readhook, 0, 0);
!     x->x_canvasdir = canvas_getdir(x->x_filehandle->f_canvas);
!     x->x_dir = x->x_canvasdir;
!     outlet_new((t_object *)x, &s_symbol);
      return (x);
  }
--- 77,81 ----
      t_hammer *x = (t_hammer *)pd_new(hammer_class);
      x->x_filehandle = hammerfile_new((t_pd *)x, 0, hammer_readhook, 0, 0);
!     outlet_new((t_object *)x, &s_float);
      return (x);
  }
***************
*** 107,111 ****
  		    gensym("cd"), A_DEFSYM, 0);
      class_addmethod(hammer_class, (t_method)hammer_pwd,
! 		    gensym("pwd"), 0);
      class_addmethod(hammer_class, (t_method)hammer_import,
  		    gensym("import"), A_DEFSYM, 0);
--- 107,111 ----
  		    gensym("cd"), A_DEFSYM, 0);
      class_addmethod(hammer_class, (t_method)hammer_pwd,
! 		    gensym("pwd"), A_SYMBOL, 0);
      class_addmethod(hammer_class, (t_method)hammer_import,
  		    gensym("import"), A_DEFSYM, 0);

Index: gate.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/gate.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gate.c	11 Jan 2005 10:33:19 -0000	1.4
--- gate.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 146,149 ****
      class_addlist(gate_proxy_class, gate_proxy_list);
      class_addanything(gate_proxy_class, gate_proxy_anything);
!     fitter_setup(gate_class, 0, 0);
  }
--- 146,149 ----
      class_addlist(gate_proxy_class, gate_proxy_list);
      class_addanything(gate_proxy_class, gate_proxy_anything);
!     fitter_setup(gate_class, 0);
  }

Index: Decode.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/Decode.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Decode.c	11 Jan 2005 10:33:19 -0000	1.4
--- Decode.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 109,112 ****
      class_addmethod(Decode_class, (t_method)Decode_alloff,
  		    gensym("ft2"), A_FLOAT, 0); 
!     fitter_setup(Decode_class, 0, 0);
  }
--- 109,112 ----
      class_addmethod(Decode_class, (t_method)Decode_alloff,
  		    gensym("ft2"), A_FLOAT, 0); 
!     fitter_setup(Decode_class, 0);
  }

Index: past.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/past.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** past.c	11 Jan 2005 10:33:19 -0000	1.4
--- past.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 153,156 ****
      class_addmethod(past_class, (t_method)past_clear, gensym("clear"), 0);
      class_addmethod(past_class, (t_method)past_set, gensym("set"), A_GIMME, 0);
!     fitter_setup(past_class, 0, 0);
  }
--- 153,156 ----
      class_addmethod(past_class, (t_method)past_clear, gensym("clear"), 0);
      class_addmethod(past_class, (t_method)past_set, gensym("set"), A_GIMME, 0);
!     fitter_setup(past_class, 0);
  }

Index: counter.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/counter.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** counter.c	11 Jan 2005 10:33:19 -0000	1.3
--- counter.c	27 Jan 2005 14:42:47 -0000	1.4
***************
*** 399,402 ****
      class_addbang(counter_proxy_class, counter_proxy_bang);
      class_addfloat(counter_proxy_class, counter_proxy_float);
!     fitter_setup(counter_class, 0, 0);
  }
--- 399,402 ----
      class_addbang(counter_proxy_class, counter_proxy_bang);
      class_addfloat(counter_proxy_class, counter_proxy_float);
!     fitter_setup(counter_class, 0);
  }

Index: Makefile.objects
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/Makefile.objects,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.objects	11 Jan 2005 10:33:19 -0000	1.4
--- Makefile.objects	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 5,8 ****
--- 5,9 ----
  common/loud.o \
  common/grow.o \
+ common/os.o \
  common/fitter.o \
  common/rand.o \

Index: Append.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/Append.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Append.c	11 Jan 2005 10:33:19 -0000	1.4
--- Append.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 35,40 ****
  static t_class *appendxy_class;
  
! static t_symbol *appendps_compatibility = 0;
! static t_symbol *appendps_max;
  
  /* Usually a preallocation method is used, except in special cases of:
--- 35,39 ----
  static t_class *appendxy_class;
  
! static int append_iscompatible = 0;  /* FIXME per-object */
  
  /* Usually a preallocation method is used, except in special cases of:
***************
*** 156,160 ****
  static void append_bang(t_append *x)
  {
!     if (appendps_compatibility == appendps_max)
      {
  	/* CHECKED: a nop */
--- 155,159 ----
  static void append_bang(t_append *x)
  {
!     if (append_iscompatible)
      {
  	/* CHECKED: a nop */
***************
*** 326,329 ****
--- 325,333 ----
  }
  
+ static void append_fitter(void)
+ {
+     append_iscompatible = fittermax_get();
+ }
+ 
  void Append_setup(void)
  {
***************
*** 349,353 ****
      class_addanything(appendxy_class, appendxy_anything);
  
!     appendps_max = gensym("max");
!     fitter_setup(append_class, &appendps_compatibility, 0);
  }
--- 353,356 ----
      class_addanything(appendxy_class, appendxy_anything);
  
!     fitter_setup(append_class, append_fitter);
  }

Index: urn.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/urn.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** urn.c	11 Jan 2005 10:33:19 -0000	1.5
--- urn.c	27 Jan 2005 14:42:47 -0000	1.6
***************
*** 147,150 ****
      class_addmethod(urn_class, (t_method)urn_clear,
  		    gensym("clear"), 0);
!     fitter_setup(urn_class, 0, 0);
  }
--- 147,150 ----
      class_addmethod(urn_class, (t_method)urn_clear,
  		    gensym("clear"), 0);
!     fitter_setup(urn_class, 0);
  }

Index: maximum.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/maximum.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** maximum.c	11 Jan 2005 10:33:19 -0000	1.4
--- maximum.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 90,93 ****
      class_addfloat(maximum_class, maximum_float);
      class_addlist(maximum_class, maximum_list);
!     fitter_setup(maximum_class, 0, 0);
  }
--- 90,93 ----
      class_addfloat(maximum_class, maximum_float);
      class_addlist(maximum_class, maximum_list);
!     fitter_setup(maximum_class, 0);
  }

Index: minimum.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/minimum.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** minimum.c	11 Jan 2005 10:33:19 -0000	1.4
--- minimum.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 90,93 ****
      class_addfloat(minimum_class, minimum_float);
      class_addlist(minimum_class, minimum_list);
!     fitter_setup(minimum_class, 0, 0);
  }
--- 90,93 ----
      class_addfloat(minimum_class, minimum_float);
      class_addlist(minimum_class, minimum_list);
!     fitter_setup(minimum_class, 0);
  }

Index: switch.c
===================================================================
RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/switch.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** switch.c	11 Jan 2005 10:33:19 -0000	1.4
--- switch.c	27 Jan 2005 14:42:47 -0000	1.5
***************
*** 151,154 ****
      class_addlist(switch_proxy_class, switch_proxy_list);
      class_addanything(switch_proxy_class, switch_proxy_anything);
!     fitter_setup(switch_class, 0, 0);
  }
--- 151,154 ----
      class_addlist(switch_proxy_class, switch_proxy_list);
      class_addanything(switch_proxy_class, switch_proxy_anything);
!     fitter_setup(switch_class, 0);
  }





More information about the Pd-cvs mailing list