[PD-cvs] pd/src g_all_guis.c,1.1.1.4.2.4.2.30,1.1.1.4.2.4.2.31 g_all_guis.h,1.1.1.4.2.2.2.25,1.1.1.4.2.2.2.26 g_bang.c,1.1.1.3.2.2.2.26,1.1.1.3.2.2.2.27 g_dropper.c,1.1.2.19,1.1.2.20

[Mathieu Bouchard]

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

Modified Files:
      Tag: impd_0_37
	g_all_guis.c g_all_guis.h g_bang.c g_dropper.c 
Log Message:
removing x_locked,x_flashed from t_iemgui


Index: g_all_guis.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v
retrieving revision 1.1.1.4.2.2.2.25
retrieving revision 1.1.1.4.2.2.2.26
diff -C2 -d -r1.1.1.4.2.2.2.25 -r1.1.1.4.2.2.2.26
*** g_all_guis.h	12 May 2004 07:44:15 -0000	1.1.1.4.2.2.2.25
--- g_all_guis.h	12 May 2004 08:46:21 -0000	1.1.1.4.2.2.2.26
***************
*** 8,13 ****
  */
  
! #define IEM_GUI_DRAW_MODE_SELECT 3
! #define IEM_GUI_DRAW_MODE_ERASE  4
  #define IS_A_FLOAT(atom,index)   ((atom+index)->a_type == A_FLOAT)
  #define IS_A_SYMBOL(atom,index)  ((atom+index)->a_type == A_SYMBOL)
--- 8,13 ----
  */
  
! #define IEM_GUI_DRAW_MODE_SELECT 3 /*die*/
! #define IEM_GUI_DRAW_MODE_ERASE  4 /*die*/
  #define IS_A_FLOAT(atom,index)   ((atom+index)->a_type == A_FLOAT)
  #define IS_A_SYMBOL(atom,index)  ((atom+index)->a_type == A_SYMBOL)
***************
*** 17,26 ****
  {
      t_object x_obj;
!     t_glist *x_glist;
!     t_iemfunptr x_draw;
      int x_h, x_w;
      int x_ldx, x_ldy;
      /* formerly x_isa: */
!     unsigned int x_loadinit:1, x_scale:1, x_flashed:1, x_locked:1;
      /* formerly x_fsf: */
      unsigned int x_selected:1,x_finemoved:1,x_put_in2out:1,
--- 17,26 ----
  {
      t_object x_obj;
!     t_glist *x_glist; /* why? */
!     t_iemfunptr x_draw; /* this will die soon */
      int x_h, x_w;
      int x_ldx, x_ldy;
      /* formerly x_isa: */
!     unsigned int x_loadinit:1, x_scale:1/*,x_flashed:1, x_locked:1*/;
      /* formerly x_fsf: */
      unsigned int x_selected:1,x_finemoved:1,x_put_in2out:1,
***************
*** 35,38 ****
--- 35,39 ----
      t_iemgui x_gui;
      int      x_flashed;
+     int      x_locked;
      int      x_flashtime_break;
      int      x_flashtime_hold;

Index: g_dropper.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/g_dropper.c,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -C2 -d -r1.1.2.19 -r1.1.2.20
*** g_dropper.c	12 May 2004 07:44:15 -0000	1.1.2.19
--- g_dropper.c	12 May 2004 08:46:21 -0000	1.1.2.20
***************
*** 66,70 ****
      t_iemgui *y = iemgui_new(dropper_class);
      t_dropper *x = (t_dropper *)y;
-     y->x_locked = 0;
      outlet_new((t_text *)x, &s_symbol);
      dropper_reload(x,0,argc,argv);
--- 66,69 ----

Index: g_bang.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v
retrieving revision 1.1.1.3.2.2.2.26
retrieving revision 1.1.1.3.2.2.2.27
diff -C2 -d -r1.1.1.3.2.2.2.26 -r1.1.1.3.2.2.2.27
*** g_bang.c	12 May 2004 07:44:15 -0000	1.1.1.3.2.2.2.26
--- g_bang.c	12 May 2004 08:46:21 -0000	1.1.1.3.2.2.2.27
***************
*** 51,55 ****
  static void bng_bout2(t_bng *x)
  {
!     if(!x->x_gui.x_put_in2out) {x->x_gui.x_locked = 1; clock_delay(x->x_clock_lck, 2);}
      outlet_bang(x->x_gui.x_obj.ob_outlet);
      if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_bang(x->x_gui.x_snd->s_thing);
--- 51,55 ----
  static void bng_bout2(t_bng *x)
  {
!     if(!x->x_gui.x_put_in2out) {x->x_locked=1; clock_delay(x->x_clock_lck, 2);}
      outlet_bang(x->x_gui.x_obj.ob_outlet);
      if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing) pd_bang(x->x_gui.x_snd->s_thing);
***************
*** 58,69 ****
  static void bng_bang(t_bng *x)
  {
!     if(x->x_gui.x_locked) return;
      bng_set(x);
!     if(!x->x_gui.x_put_in2out) {x->x_gui.x_locked = 1; clock_delay(x->x_clock_lck, 2);}
      outlet_bang(x->x_gui.x_obj.ob_outlet);
      if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing && x->x_gui.x_put_in2out) pd_bang(x->x_gui.x_snd->s_thing);
  }
  static void bng_bang2(t_bng *x) {
! 	if(x->x_gui.x_locked) return;
  	bng_set(x);
  	bng_bout2(x);
--- 58,69 ----
  static void bng_bang(t_bng *x)
  {
!     if(x->x_locked) return;
      bng_set(x);
!     if(!x->x_gui.x_put_in2out) {x->x_locked = 1; clock_delay(x->x_clock_lck, 2);}
      outlet_bang(x->x_gui.x_obj.ob_outlet);
      if(x->x_gui.x_snd && x->x_gui.x_snd->s_thing && x->x_gui.x_put_in2out) pd_bang(x->x_gui.x_snd->s_thing);
  }
  static void bng_bang2(t_bng *x) {
! 	if(x->x_locked) return;
  	bng_set(x);
  	bng_bout2(x);
***************
*** 88,92 ****
  static void bng_tick_hld(t_bng *x) {x->x_flashed = 0;}
  static void bng_tick_brk(t_bng *x) {}
! static void bng_tick_lck(t_bng *x) {x->x_gui.x_locked = 0;}
  
  static void bng_reload(t_bng *x, t_symbol *s, int argc, t_atom *argv)
--- 88,92 ----
  static void bng_tick_hld(t_bng *x) {x->x_flashed = 0;}
  static void bng_tick_brk(t_bng *x) {}
! static void bng_tick_lck(t_bng *x) {x->x_locked = 0;}
  
  static void bng_reload(t_bng *x, t_symbol *s, int argc, t_atom *argv)
***************
*** 115,119 ****
      bng_check_minmax(x, x->x_flashtime_break, x->x_flashtime_hold);
      x->x_flashed = 0;
!     y->x_locked = 0;
      x->x_clock_hld = clock_new(x, (t_method)bng_tick_hld);
      x->x_clock_brk = clock_new(x, (t_method)bng_tick_brk);
--- 115,119 ----
      bng_check_minmax(x, x->x_flashtime_break, x->x_flashtime_hold);
      x->x_flashed = 0;
!     x->x_locked = 0;
      x->x_clock_hld = clock_new(x, (t_method)bng_tick_hld);
      x->x_clock_brk = clock_new(x, (t_method)bng_tick_brk);

Index: g_all_guis.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v
retrieving revision 1.1.1.4.2.4.2.30
retrieving revision 1.1.1.4.2.4.2.31
diff -C2 -d -r1.1.1.4.2.4.2.30 -r1.1.1.4.2.4.2.31
*** g_all_guis.c	12 May 2004 07:44:15 -0000	1.1.1.4.2.4.2.30
--- g_all_guis.c	12 May 2004 08:46:21 -0000	1.1.1.4.2.4.2.31
***************
*** 195,200 ****
      self->x_loadinit = n>>0;
      self->x_scale = n>>20;
-     self->x_flashed = 0;
-     self->x_locked = 0;
  }
  
--- 195,198 ----