[PD-cvs] externals/unauthorized/exciter Makefile,1.1,1.2 exciter.c,1.6,1.7

Yves Degoyon sevyves at users.sourceforge.net
Wed Mar 2 03:45:07 CET 2005


Update of /cvsroot/pure-data/externals/unauthorized/exciter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4915

Modified Files:
	Makefile exciter.c 
Log Message:
Added GOP supoort

Index: exciter.c
===================================================================
RCS file: /cvsroot/pure-data/externals/unauthorized/exciter/exciter.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** exciter.c	30 May 2004 05:19:59 -0000	1.6
--- exciter.c	2 Mar 2005 02:45:05 -0000	1.7
***************
*** 38,43 ****
  #include <ctype.h>
  #include <time.h>
! #include <m_pd.h>
! 
  #include "m_imp.h"
  #include "g_canvas.h"
--- 38,43 ----
  #include <ctype.h>
  #include <time.h>
! #include <sys/time.h>
! #include "m_pd.h"
  #include "m_imp.h"
  #include "g_canvas.h"
***************
*** 47,54 ****
  #ifdef NT
  #include <io.h>
- #include <winsock2.h>
- #include <sys/timeb.h>
  #else
- #include <sys/time.h>
  #include <unistd.h>
  #endif
--- 47,51 ----
***************
*** 66,70 ****
  #define EXCITER_PIXEL_GRAIN 5
  
! static char   *exciter_version = "exciter: a bang-events sequencer, version 0.2 (ydegoyon at free.fr)"; 
  
  t_widgetbehavior exciter_widgetbehavior;
--- 63,67 ----
  #define EXCITER_PIXEL_GRAIN 5
  
! static char   *exciter_version = "exciter: a bang-events sequencer, version 0.4 (ydegoyon at free.fr)"; 
  
  t_widgetbehavior exciter_widgetbehavior;
***************
*** 121,132 ****
      SYS_VGUI13(".x%x.c create polygon %d %d %d %d %d %d %d %d -outline #000000 -fill #FFFFFF -tags %xEVENT%.4d%.4d\n",
  	     canvas, 
!              x->x_obj.te_xpix + ix*EXCITER_PIXEL_GRAIN, 
!              x->x_obj.te_ypix + x->x_height - (iy+1)*x->x_height/x->x_nbevents + 2*polyray,
!              x->x_obj.te_xpix + ix*EXCITER_PIXEL_GRAIN + polyray, 
!              x->x_obj.te_ypix + x->x_height - (iy+1)*x->x_height/x->x_nbevents + polyray,
!              x->x_obj.te_xpix + ix*EXCITER_PIXEL_GRAIN + 2*polyray, 
!              x->x_obj.te_ypix + x->x_height - (iy+1)*x->x_height/x->x_nbevents,
!              x->x_obj.te_xpix + ix*EXCITER_PIXEL_GRAIN + polyray, 
!              x->x_obj.te_ypix + x->x_height - (iy+1)*x->x_height/x->x_nbevents - polyray,
  	     x, ix, iy);
  }
--- 118,129 ----
      SYS_VGUI13(".x%x.c create polygon %d %d %d %d %d %d %d %d -outline #000000 -fill #FFFFFF -tags %xEVENT%.4d%.4d\n",
  	     canvas, 
!              text_xpix(&x->x_obj, glist) + ix*EXCITER_PIXEL_GRAIN, 
!              text_ypix(&x->x_obj, glist) + x->x_height - (iy+1)*x->x_height/x->x_nbevents + 2*polyray,
!              text_xpix(&x->x_obj, glist) + ix*EXCITER_PIXEL_GRAIN + polyray, 
!              text_ypix(&x->x_obj, glist) + x->x_height - (iy+1)*x->x_height/x->x_nbevents + polyray,
!              text_xpix(&x->x_obj, glist) + ix*EXCITER_PIXEL_GRAIN + 2*polyray, 
!              text_ypix(&x->x_obj, glist) + x->x_height - (iy+1)*x->x_height/x->x_nbevents,
!              text_xpix(&x->x_obj, glist) + ix*EXCITER_PIXEL_GRAIN + polyray, 
!              text_ypix(&x->x_obj, glist) + x->x_height - (iy+1)*x->x_height/x->x_nbevents - polyray,
  	     x, ix, iy);
  }
***************
*** 167,183 ****
  
      SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -outline #000000 -fill #902181 -tags %xLINE\n",
! 	     canvas, x->x_obj.te_xpix, x->x_obj.te_ypix,
! 	     x->x_obj.te_xpix+x->x_width, x->x_obj.te_ypix+x->x_height,
  	     x);
      SYS_VGUI5(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text \"0 s\" -tags %xLOWERCAPTION\n",
! 	     canvas, x->x_obj.te_xpix, x->x_obj.te_ypix + x->x_height + 10, x );
      SYS_VGUI6(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text \"%.2f s\" -tags %xHIGHERCAPTION\n",
! 	     canvas, x->x_obj.te_xpix + x->x_width, x->x_obj.te_ypix + x->x_height + 10, 
               x->x_width/EXCITER_PIXEL_GRAIN*x->x_timegrain , x);
      SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -outline #000000 -fill #000000 -tags %xIN\n",
! 	     canvas, x->x_obj.te_xpix, 
!              x->x_obj.te_ypix - 2,
! 	     x->x_obj.te_xpix + 5, 
!              x->x_obj.te_ypix ,
  	     x);
      if ( x->x_nbevents > 1 )
--- 164,180 ----
  
      SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -outline #000000 -fill #902181 -tags %xLINE\n",
! 	     canvas, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),
! 	     text_xpix(&x->x_obj, glist)+x->x_width, text_ypix(&x->x_obj, glist)+x->x_height,
  	     x);
      SYS_VGUI5(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text \"0 s\" -tags %xLOWERCAPTION\n",
! 	     canvas, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist) + x->x_height + 10, x );
      SYS_VGUI6(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text \"%.2f s\" -tags %xHIGHERCAPTION\n",
! 	     canvas, text_xpix(&x->x_obj, glist) + x->x_width, text_ypix(&x->x_obj, glist) + x->x_height + 10, 
               x->x_width/EXCITER_PIXEL_GRAIN*x->x_timegrain , x);
      SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -outline #000000 -fill #000000 -tags %xIN\n",
! 	     canvas, text_xpix(&x->x_obj, glist), 
!              text_ypix(&x->x_obj, glist) - 2,
! 	     text_xpix(&x->x_obj, glist) + 5, 
!              text_ypix(&x->x_obj, glist) ,
  	     x);
      if ( x->x_nbevents > 1 )
***************
*** 186,193 ****
        {
           SYS_VGUI8(".x%x.c create rectangle %d %d %d %d -outline #000000 -fill #000000 -tags %xOUT%d\n",
! 	     canvas, x->x_obj.te_xpix + ( ei * (x->x_width - 5) )/ (x->x_nbevents-1), 
!              x->x_obj.te_ypix + x->x_height,
! 	     x->x_obj.te_xpix + ( ei * (x->x_width - 5) )/ (x->x_nbevents-1) + 5, 
!              x->x_obj.te_ypix + x->x_height + 2,
  	     x, ei);
        }
--- 183,190 ----
        {
           SYS_VGUI8(".x%x.c create rectangle %d %d %d %d -outline #000000 -fill #000000 -tags %xOUT%d\n",
! 	     canvas, text_xpix(&x->x_obj, glist) + ( ei * (x->x_width - 5) )/ (x->x_nbevents-1), 
!              text_ypix(&x->x_obj, glist) + x->x_height,
! 	     text_xpix(&x->x_obj, glist) + ( ei * (x->x_width - 5) )/ (x->x_nbevents-1) + 5, 
!              text_ypix(&x->x_obj, glist) + x->x_height + 2,
  	     x, ei);
        }
***************
*** 196,203 ****
      {
         SYS_VGUI8(".x%x.c create rectangle %d %d %d %d -outline #000000 -fill #000000 -tags %xOUT%d\n",
! 	     canvas, x->x_obj.te_xpix, 
!              x->x_obj.te_ypix + x->x_height,
! 	     x->x_obj.te_xpix + 5, 
!              x->x_obj.te_ypix + x->x_height + 2,
  	     x, 0);
      }
--- 193,200 ----
      {
         SYS_VGUI8(".x%x.c create rectangle %d %d %d %d -outline #000000 -fill #000000 -tags %xOUT%d\n",
! 	     canvas, text_xpix(&x->x_obj, glist), 
!              text_ypix(&x->x_obj, glist) + x->x_height,
! 	     text_xpix(&x->x_obj, glist) + 5, 
!              text_ypix(&x->x_obj, glist) + x->x_height + 2,
  	     x, 0);
      }
***************
*** 212,227 ****
  
      SYS_VGUI7(".x%x.c coords %xLINE %d %d %d %d \n",
! 	     canvas, x, x->x_obj.te_xpix, x->x_obj.te_ypix,
! 	     x->x_obj.te_xpix+x->x_width, x->x_obj.te_ypix+x->x_height
  	     );
      SYS_VGUI5(".x%x.c coords %xLOWERCAPTION %d %d\n",
! 	     canvas, x, x->x_obj.te_xpix, x->x_obj.te_ypix + x->x_height + 10 );
      SYS_VGUI5(".x%x.c coords %xHIGHERCAPTION %d %d\n",
! 	     canvas, x, x->x_obj.te_xpix + x->x_width, x->x_obj.te_ypix + x->x_height + 10);
      SYS_VGUI7(".x%x.c coords %xIN %d %d %d %d\n",
! 	     canvas, x, x->x_obj.te_xpix, 
!              x->x_obj.te_ypix - 2,
! 	     x->x_obj.te_xpix + 5, 
!              x->x_obj.te_ypix
  	     );
      if ( x->x_nbevents > 1 )
--- 209,224 ----
  
      SYS_VGUI7(".x%x.c coords %xLINE %d %d %d %d \n",
! 	     canvas, x, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),
! 	     text_xpix(&x->x_obj, glist)+x->x_width, text_ypix(&x->x_obj, glist)+x->x_height
  	     );
      SYS_VGUI5(".x%x.c coords %xLOWERCAPTION %d %d\n",
! 	     canvas, x, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist) + x->x_height + 10 );
      SYS_VGUI5(".x%x.c coords %xHIGHERCAPTION %d %d\n",
! 	     canvas, x, text_xpix(&x->x_obj, glist) + x->x_width, text_ypix(&x->x_obj, glist) + x->x_height + 10);
      SYS_VGUI7(".x%x.c coords %xIN %d %d %d %d\n",
! 	     canvas, x, text_xpix(&x->x_obj, glist), 
!              text_ypix(&x->x_obj, glist) - 2,
! 	     text_xpix(&x->x_obj, glist) + 5, 
!              text_ypix(&x->x_obj, glist)
  	     );
      if ( x->x_nbevents > 1 )
***************
*** 230,237 ****
        {
           SYS_VGUI8(".x%x.c coords %xOUT%d %d %d %d %d\n",
! 	     canvas, x, ei, x->x_obj.te_xpix + ( ei * (x->x_width - 5) )/ (x->x_nbevents-1), 
!              x->x_obj.te_ypix + x->x_height,
! 	     x->x_obj.te_xpix + ( ei * (x->x_width - 5) )/ (x->x_nbevents-1) + 5, 
!              x->x_obj.te_ypix + x->x_height + 2
  	     );
        }
--- 227,234 ----
        {
           SYS_VGUI8(".x%x.c coords %xOUT%d %d %d %d %d\n",
! 	     canvas, x, ei, text_xpix(&x->x_obj, glist) + ( ei * (x->x_width - 5) )/ (x->x_nbevents-1), 
!              text_ypix(&x->x_obj, glist) + x->x_height,
! 	     text_xpix(&x->x_obj, glist) + ( ei * (x->x_width - 5) )/ (x->x_nbevents-1) + 5, 
!              text_ypix(&x->x_obj, glist) + x->x_height + 2
  	     );
        }
***************
*** 240,247 ****
      {
         SYS_VGUI8(".x%x.c coords %xOUT%d %d %d %d %d\n",
! 	     canvas, x, 0, x->x_obj.te_xpix, 
!              x->x_obj.te_ypix + x->x_height,
! 	     x->x_obj.te_xpix + 5, 
!              x->x_obj.te_ypix + x->x_height + 2
  	     );
      }
--- 237,244 ----
      {
         SYS_VGUI8(".x%x.c coords %xOUT%d %d %d %d %d\n",
! 	     canvas, x, 0, text_xpix(&x->x_obj, glist), 
!              text_ypix(&x->x_obj, glist) + x->x_height,
! 	     text_xpix(&x->x_obj, glist) + 5, 
!              text_ypix(&x->x_obj, glist) + x->x_height + 2
  	     );
      }
***************
*** 252,263 ****
           SYS_VGUI13(".x%x.c coords %xEVENT%.4d%.4d %d %d %d %d %d %d %d %d\n",
  	     canvas, x, gi, ei,  
!              x->x_obj.te_xpix + gi*EXCITER_PIXEL_GRAIN, 
!              x->x_obj.te_ypix + x->x_height - (ei+1)*x->x_height/x->x_nbevents + 2*polyray,
!              x->x_obj.te_xpix + gi*EXCITER_PIXEL_GRAIN + polyray, 
!              x->x_obj.te_ypix + x->x_height - (ei+1)*x->x_height/x->x_nbevents + polyray,
!              x->x_obj.te_xpix + gi*EXCITER_PIXEL_GRAIN + 2*polyray, 
!              x->x_obj.te_ypix + x->x_height - (ei+1)*x->x_height/x->x_nbevents,
!              x->x_obj.te_xpix + gi*EXCITER_PIXEL_GRAIN + polyray, 
!              x->x_obj.te_ypix + x->x_height - (ei+1)*x->x_height/x->x_nbevents - polyray
  	     );
         }
--- 249,260 ----
           SYS_VGUI13(".x%x.c coords %xEVENT%.4d%.4d %d %d %d %d %d %d %d %d\n",
  	     canvas, x, gi, ei,  
!              text_xpix(&x->x_obj, glist) + gi*EXCITER_PIXEL_GRAIN, 
!              text_ypix(&x->x_obj, glist) + x->x_height - (ei+1)*x->x_height/x->x_nbevents + 2*polyray,
!              text_xpix(&x->x_obj, glist) + gi*EXCITER_PIXEL_GRAIN + polyray, 
!              text_ypix(&x->x_obj, glist) + x->x_height - (ei+1)*x->x_height/x->x_nbevents + polyray,
!              text_xpix(&x->x_obj, glist) + gi*EXCITER_PIXEL_GRAIN + 2*polyray, 
!              text_ypix(&x->x_obj, glist) + x->x_height - (ei+1)*x->x_height/x->x_nbevents,
!              text_xpix(&x->x_obj, glist) + gi*EXCITER_PIXEL_GRAIN + polyray, 
!              text_ypix(&x->x_obj, glist) + x->x_height - (ei+1)*x->x_height/x->x_nbevents - polyray
  	     );
         }
***************
*** 295,299 ****
      {
          /* sets the main item in blue */
! 	SYS_VGUI3(".x%x.c itemconfigure %xLINE -outline #0000FF\n", glist_getcanvas(glist), x);
  
      }
--- 292,296 ----
      {
          /* sets the main item in blue */
! 	SYS_VGUI3(".x%x.c itemconfigure %xLINE -outline #0000FF\n", canvas, x);
  
      }
***************
*** 301,305 ****
      {
          /* sets the main item in black */
! 	SYS_VGUI3(".x%x.c itemconfigure %xLINE -outline #000000\n", glist_getcanvas(glist), x);
      }
  }
--- 298,302 ----
      {
          /* sets the main item in black */
! 	SYS_VGUI3(".x%x.c itemconfigure %xLINE -outline #000000\n", canvas, x);
      }
  }
***************
*** 313,320 ****
     t_exciter* x = (t_exciter*)z;
  
!    *xp1 = x->x_obj.te_xpix;
!    *yp1 = x->x_obj.te_ypix;
!    *xp2 = x->x_obj.te_xpix+x->x_width;
!    *yp2 = x->x_obj.te_ypix+x->x_height;
  }
  
--- 310,317 ----
     t_exciter* x = (t_exciter*)z;
  
!    *xp1 = text_xpix(&x->x_obj, owner);
!    *yp1 = text_ypix(&x->x_obj, owner);
!    *xp2 = text_xpix(&x->x_obj, owner)+x->x_width;
!    *yp2 = text_ypix(&x->x_obj, owner)+x->x_height;
  }
  
***************
*** 325,329 ****
  
     binbuf_addv(b, "ssiisiiifii", gensym("#X"),gensym("obj"),
! 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
  		gensym("exciter"), x->x_width, x->x_height,
  		x->x_nbevents, x->x_timegrain,
--- 322,326 ----
  
     binbuf_addv(b, "ssiisiiifii", gensym("#X"),gensym("obj"),
! 		(t_int)text_xpix(&x->x_obj, x->x_glist), (t_int)text_ypix(&x->x_obj, x->x_glist),
  		gensym("exciter"), x->x_width, x->x_height,
  		x->x_nbevents, x->x_timegrain,
***************
*** 368,375 ****
  static void exciter_vis(t_gobj *z, t_glist *glist, int vis)
  {
!    t_exciter *x = (t_exciter *)z;
!    t_rtext *y;
  
!    // post("exciter_vis : %d", vis );
     if (vis)
     {
--- 365,371 ----
  static void exciter_vis(t_gobj *z, t_glist *glist, int vis)
  {
!   t_exciter *x = (t_exciter *)z;
  
!    post("exciter_vis : %d", vis );
     if (vis)
     {
***************
*** 497,503 ****
  static void exciter_displace(t_gobj *z, t_glist *glist, int dx, int dy)
  {
!     t_exciter *x = (t_exciter *)z;
!     int xold = x->x_obj.te_xpix;
!     int yold = x->x_obj.te_ypix;
  
      // post( "exciter_displace dx=%d dy=%d", dx, dy );
--- 493,499 ----
  static void exciter_displace(t_gobj *z, t_glist *glist, int dx, int dy)
  {
!   t_exciter *x = (t_exciter *)z;
!   t_int xold = text_xpix(&x->x_obj, glist);
!   t_int yold = text_ypix(&x->x_obj, glist);
  
      // post( "exciter_displace dx=%d dy=%d", dx, dy );
***************
*** 505,511 ****
      x->x_obj.te_xpix += dx;
      x->x_obj.te_ypix += dy;
!     if(xold != x->x_obj.te_xpix || yold != x->x_obj.te_ypix)
      {
! 	exciter_draw_move(x, x->x_glist);
      }
  }
--- 501,507 ----
      x->x_obj.te_xpix += dx;
      x->x_obj.te_ypix += dy;
!     if(xold != text_xpix(&x->x_obj, glist) || yold != text_ypix(&x->x_obj, glist))
      {
! 	exciter_draw_move(x, glist);
      }
  }
***************
*** 515,519 ****
  {
    t_exciter* x = (t_exciter *)z;
-   t_canvas *canvas=glist_getcanvas(glist);
    t_int nevent, npix;
  
--- 511,514 ----
***************
*** 521,526 ****
      {
        nevent = ( 1 - ( ( ypix - ( (float)x->x_height / (float) x->x_nbevents / 2 ) 
!                    - x->x_obj.te_ypix) / (float)x->x_height ) )*(x->x_nbevents-1);
!       npix = ( xpix - 1  - x->x_obj.te_xpix) / EXCITER_PIXEL_GRAIN;
        // post( "exciter : selected event (%d,%d)", nevent, npix );
        // set or unset event
--- 516,521 ----
      {
        nevent = ( 1 - ( ( ypix - ( (float)x->x_height / (float) x->x_nbevents / 2 ) 
!                    - text_ypix(&x->x_obj, glist)) / (float)x->x_height ) )*(x->x_nbevents-1);
!       npix = ( xpix - 1  - text_xpix(&x->x_obj, glist)) / EXCITER_PIXEL_GRAIN;
        // post( "exciter : selected event (%d,%d)", nevent, npix );
        // set or unset event
***************
*** 543,553 ****
  static t_exciter *exciter_new(t_symbol *s, int argc, t_atom *argv)
  {
!     int bi, i, ei, gi;
!     t_exciter *x;
!     t_pd *x2;
   
      // post( "exciter_new : create : %s argc =%d", s->s_name, argc );
  
      x = (t_exciter *)pd_new(exciter_class);
      // new exciter created from the gui 
      if ( argc != 0 )
--- 538,549 ----
  static t_exciter *exciter_new(t_symbol *s, int argc, t_atom *argv)
  {
!   int bi, i, ei, gi;
!   t_exciter *x;
!   t_pd *x2;
   
      // post( "exciter_new : create : %s argc =%d", s->s_name, argc );
  
      x = (t_exciter *)pd_new(exciter_class);
+     x->x_glist = (t_glist *) canvas_getcurrent();
      // new exciter created from the gui 
      if ( argc != 0 )
***************
*** 601,605 ****
      x->x_gindex = -1;	
      x->x_looplength = x->x_timegrain * x->x_width * 1000 / EXCITER_PIXEL_GRAIN;
-     x->x_glist = (t_glist *) canvas_getcurrent();
  
      x->x_bangs = (t_outlet **) getbytes( x->x_nbevents*sizeof(t_outlet **) );
--- 597,600 ----
***************
*** 623,627 ****
         }
      }
!     // post( "exciter_new width: %d height : %d", x->x_width, x->x_height );
  
      return (x);
--- 618,622 ----
         }
      }
!     post( "exciter_new width: %d height : %d", x->x_width, x->x_height );
  
      return (x);
***************
*** 686,713 ****
  static t_int *exciter_perform(t_int *w)
  {
!     t_int ei, gi;
!     t_int gstart, gend;
!     t_exciter* x = (t_exciter*)(w[1]);
! #ifdef NT
!     time_t et;
!     struct _timeb tv;
! #else
!     struct timeval tv;
!     struct timezone tz;
! #endif
!     long long looptime = 0L; 
!     double preltime = x->x_reltime;
  
      if ( x->x_started )
      {
         // get current time in ms
! #ifdef NT
!       time( &et );
!       _ftime( &tv );
!       looptime = et*1000 + tv.millitm;
! #else
!       gettimeofday( &tv, &tz );
!       looptime = tv.tv_sec*1000 + tv.tv_usec/1000;      
! #endif
         if ( x->x_plooptime == 0L )
         {
--- 681,698 ----
  static t_int *exciter_perform(t_int *w)
  {
!   t_int ei, gi;
!   t_int gstart, gend;
!   t_exciter* x = (t_exciter*)(w[1]);
!   struct timeval tv;
!   struct timezone tz;
!   long long looptime = 0L; 
!   double preltime = x->x_reltime;
!   t_canvas *canvas=glist_getcanvas(x->x_glist);
  
      if ( x->x_started )
      {
         // get current time in ms
!        gettimeofday( &tv, &tz );
!        looptime = tv.tv_sec*1000 + tv.tv_usec/1000;
         if ( x->x_plooptime == 0L )
         {
***************
*** 750,754 ****
                  outlet_bang( x->x_bangs[ ei ] );
  	        SYS_VGUI5(".x%x.c itemconfigure %xEVENT%.4d%.4d -fill #00FF00\n", 
!                           glist_getcanvas(x->x_glist), x, gi, ei);
               }
             }
--- 735,739 ----
                  outlet_bang( x->x_bangs[ ei ] );
  	        SYS_VGUI5(".x%x.c itemconfigure %xEVENT%.4d%.4d -fill #00FF00\n", 
!                           canvas, x, gi, ei);
               }
             }
***************
*** 765,769 ****
               {
  	        SYS_VGUI5(".x%x.c itemconfigure %xEVENT%.4d%.4d -fill #FFFFFF\n", 
!                           glist_getcanvas(x->x_glist), x, gi, ei);
               }
             }
--- 750,754 ----
               {
  	        SYS_VGUI5(".x%x.c itemconfigure %xEVENT%.4d%.4d -fill #FFFFFF\n", 
!                           canvas, x, gi, ei);
               }
             }
***************
*** 791,795 ****
        for ( ei=0; ei<x->x_nbevents; ei++ )
        {
!           outlet_free( x->x_bangs[ei] );
        }
        freebytes( x->x_bangs, x->x_nbevents*sizeof(t_outlet*) );
--- 776,780 ----
        for ( ei=0; ei<x->x_nbevents; ei++ )
        {
!          outlet_free( x->x_bangs[ei] );
        }
        freebytes( x->x_bangs, x->x_nbevents*sizeof(t_outlet*) );
***************
*** 823,866 ****
      exciter_widgetbehavior.w_visfn =        exciter_vis;
      exciter_widgetbehavior.w_clickfn =      exciter_click;
! 	 /* 
! 	  * <hans at eds.org>: As of 0.37, pd does not have these last 
! 	  * two elements in t_widgetbehavoir anymore.
! 	  * see pd/src/notes.txt:
! 	  *           savefunction and dialog into class structure
! 	  */
! #if PD_MINOR_VERSION < 37  || !defined(PD_MINOR_VERSION)
      exciter_widgetbehavior.w_propertiesfn = exciter_properties;
      exciter_widgetbehavior.w_savefn =       exciter_save;
- #else
- 	 class_setsavefn(exciter_class, &exciter_save);
- 	 class_setpropertiesfn(exciter_class, &exciter_properties);
  #endif
-     class_setwidget(exciter_class, &exciter_widgetbehavior);
- }
- 
- /* OPTIONAL */
-     /* callback caught by canvas class for the creation of a exciter */
- /*
- void canvas_exciter(t_glist *gl, t_symbol *s, int argc, t_atom *argv)
- {
-     t_atom at;
-     t_binbuf *b = binbuf_new();
-     int xval, yval;
-     int i;
  
!     pd_vmess(&gl->gl_pd, gensym("editmode"), "i", 1);
!     glist_noselect(gl);
!     if ( argc == 0 )
!     {
!        SETSYMBOL(&at, gensym("exciter"));
!     }
!     else
!     {
!        SETSYMBOL(&at, argv[1].a_w.w_symbol);
!     }
!     binbuf_restore(b, 1, &at);
!     glist_getnextxy(gl, &xval, &yval);
!     canvas_objtext(gl, xval, yval, 1, b);
!     canvas_startmotion(glist_getcanvas(gl));
  }
- */
--- 808,821 ----
      exciter_widgetbehavior.w_visfn =        exciter_vis;
      exciter_widgetbehavior.w_clickfn =      exciter_click;
! 
! #if PD_MINOR_VERSION >= 37
!     class_setpropertiesfn(exciter_class, exciter_properties);
!     class_setsavefn(exciter_class, exciter_save);
! #else
      exciter_widgetbehavior.w_propertiesfn = exciter_properties;
      exciter_widgetbehavior.w_savefn =       exciter_save;
  #endif
  
!     class_setwidget(exciter_class, &exciter_widgetbehavior);
!     class_sethelpsymbol(exciter_class, gensym("exciter.pd"));
  }

Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/unauthorized/exciter/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	16 Aug 2003 08:13:16 -0000	1.1
--- Makefile	2 Mar 2005 02:45:04 -0000	1.2
***************
*** 68,72 ****
  
  .c.pd_linux:
! 	../tk2c.bash < $*.tk >$*.tk2c
  	cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
  	ld -export_dynamic  -shared -o $*.pd_linux $*.o -lc -lm
--- 68,72 ----
  
  .c.pd_linux:
! 	./tk2c.bash < $*.tk >$*.tk2c
  	cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
  	ld -export_dynamic  -shared -o $*.pd_linux $*.o -lc -lm





More information about the Pd-cvs mailing list