externals/unauthorized/audience~ CHANGES.LOG,1.1,1.2 Makefile,1.2,1.3 audience~.c,1.5,1.6 - Pd-cvs

2 Mar 2005


      Update of /cvsroot/pure-data/externals/unauthorized/audience~
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4445
Modified Files:
    CHANGES.LOG Makefile audience~.c 
Log Message:
Added GOP supoort
Index: CHANGES.LOG
===================================================================
RCS file: /cvsroot/pure-data/externals/unauthorized/audience~/CHANGES.LOG,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CHANGES.LOG	16 Aug 2003 07:36:16 -0000	1.1
--- CHANGES.LOG	2 Mar 2005 02:43:38 -0000	1.2
***************
*** 1,2 ****
--- 1,4 ----
+ 0.6
+    Adaptattions for pd 0.37
  0.5
     Install images in /tmp
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/unauthorized/audience~/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	16 Aug 2003 07:53:07 -0000	1.2
--- Makefile	2 Mar 2005 02:43:38 -0000	1.3
***************
*** 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
Index: audience~.c
===================================================================
RCS file: /cvsroot/pure-data/externals/unauthorized/audience~/audience~.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** audience~.c	15 Sep 2003 04:43:47 -0000	1.5
--- audience~.c	2 Mar 2005 02:43:38 -0000	1.6
***************
*** 37,41 ****
  #include <math.h>
  #include <ctype.h>
- 
  #include "m_pd.h"
  #include "m_imp.h"
--- 37,40 ----
***************
*** 67,71 ****
  #define PIXELSIZE 0.1
! static char   *audience_version = "audience : 2d audience simulation, version 0.5 (ydegoyon@free.fr)";
t_widgetbehavior audience_widgetbehavior;
--- 66,70 ----
  #define PIXELSIZE 0.1
! static char   *audience_version = "audience : 2d audience simulation, version 0.6 (ydegoyon@free.fr)";
t_widgetbehavior audience_widgetbehavior;
***************
*** 116,126 ****
         SYS_VGUI6(".x%x.c coords %xISPEAKER%d %d %d\n",
               canvas, x, ei, 
!              x->x_obj.te_xpix + x->x_inputs_x[ei],
!              x->x_obj.te_ypix + x->x_inputs_y[ei]
               );
         SYS_VGUI6(".x%x.c coords %xSPEAKERNUM%d %d %d\n",
            canvas, x, ei, 
!           x->x_obj.te_xpix + x->x_inputs_x[ei] - SPEAKER_WIDTH/2, 
!           x->x_obj.te_ypix + x->x_inputs_y[ei] - SPEAKER_HEIGHT/2
            );
      }
--- 115,125 ----
         SYS_VGUI6(".x%x.c coords %xISPEAKER%d %d %d\n",
               canvas, x, ei, 
!              text_xpix(&x->x_obj, glist) + x->x_inputs_x[ei],
!              text_ypix(&x->x_obj, glist) + x->x_inputs_y[ei]
               );
         SYS_VGUI6(".x%x.c coords %xSPEAKERNUM%d %d %d\n",
            canvas, x, ei, 
!           text_xpix(&x->x_obj, glist) + x->x_inputs_x[ei] - SPEAKER_WIDTH/2, 
!           text_ypix(&x->x_obj, glist) + x->x_inputs_y[ei] - SPEAKER_HEIGHT/2
            );
      }
***************
*** 129,139 ****
         SYS_VGUI6(".x%x.c coords %xILISTENER%d %d %d\n",
               canvas, x, ei, 
!              x->x_obj.te_xpix + x->x_outputs_x[ei],
!              x->x_obj.te_ypix + x->x_outputs_y[ei]
               );
         SYS_VGUI6(".x%x.c coords %xLISTENERNUM%d %d %d\n",
               canvas, x, ei, 
!              x->x_obj.te_xpix + x->x_outputs_x[ei] + LISTENER_WIDTH/2, 
!              x->x_obj.te_ypix + x->x_outputs_y[ei] + LISTENER_HEIGHT/2
               );
      }
--- 128,138 ----
         SYS_VGUI6(".x%x.c coords %xILISTENER%d %d %d\n",
               canvas, x, ei, 
!              text_xpix(&x->x_obj, glist) + x->x_outputs_x[ei],
!              text_ypix(&x->x_obj, glist) + x->x_outputs_y[ei]
               );
         SYS_VGUI6(".x%x.c coords %xLISTENERNUM%d %d %d\n",
               canvas, x, ei, 
!              text_xpix(&x->x_obj, glist) + x->x_outputs_x[ei] + LISTENER_WIDTH/2, 
!              text_ypix(&x->x_obj, glist) + x->x_outputs_y[ei] + LISTENER_HEIGHT/2
               );
      }
***************
*** 142,159 ****
  static void audience_draw_new(t_audience_tilde *x, t_glist *glist)
  {
!     t_canvas *canvas=glist_getcanvas(glist);
!     int ei;
SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -fill #EAF1E2 -tags %xAAUDIENCE\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);
      // create captions 
      SYS_VGUI5(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text "0m" -tags %xBLCAPTION\n",
!              canvas, x->x_obj.te_xpix - 10 , 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 "%dm" -tags %xBRCAPTION\n",
!              canvas, x->x_obj.te_xpix + x->x_width + 10 , x->x_obj.te_ypix + x->x_height + 10, x->x_width, x );
      SYS_VGUI6(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text "%dm" -tags %xULCAPTION\n",
!              canvas, x->x_obj.te_xpix - 10 , x->x_obj.te_ypix, x->x_height, x );
// draw all outlets
--- 141,158 ----
  static void audience_draw_new(t_audience_tilde *x, t_glist *glist)
  {
!   t_canvas *canvas=glist_getcanvas(glist);
!   int ei;
SYS_VGUI7(".x%x.c create rectangle %d %d %d %d -fill #EAF1E2 -tags %xAAUDIENCE\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);
      // create captions 
      SYS_VGUI5(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text "0m" -tags %xBLCAPTION\n",
!              canvas, text_xpix(&x->x_obj, glist) - 10 , 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 "%dm" -tags %xBRCAPTION\n",
!              canvas, text_xpix(&x->x_obj, glist) + x->x_width + 10 , text_ypix(&x->x_obj, glist) + x->x_height + 10, x->x_width, x );
      SYS_VGUI6(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text "%dm" -tags %xULCAPTION\n",
!              canvas, text_xpix(&x->x_obj, glist) - 10 , text_ypix(&x->x_obj, glist), x->x_height, x );
// draw all outlets
***************
*** 163,170 ****
        {
           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_nboutputs-1),
!              x->x_obj.te_ypix + x->x_height,
!              x->x_obj.te_xpix + ( ei * (x->x_width - 5) )/ (x->x_nboutputs-1) + 5,
!              x->x_obj.te_ypix + x->x_height + 2,
               x, ei);
        }
--- 162,169 ----
        {
           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_nboutputs-1),
!              text_ypix(&x->x_obj, glist) + x->x_height,
!              text_xpix(&x->x_obj, glist) + ( ei * (x->x_width - 5) )/ (x->x_nboutputs-1) + 5,
!              text_ypix(&x->x_obj, glist) + x->x_height + 2,
               x, ei);
        }
***************
*** 173,180 ****
      {
         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);
      }
--- 172,179 ----
      {
         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);
      }
***************
*** 183,190 ****
      {
           SYS_VGUI8(".x%x.c create rectangle %d %d %d %d -outline #000000 -fill #000000 -tags %xIN%d\n",
!              canvas, x->x_obj.te_xpix + ( ei * (x->x_width - 5) )/ (x->x_nbinputs),
!              x->x_obj.te_ypix - 2,
!              x->x_obj.te_xpix + ( ei * (x->x_width - 5) )/ (x->x_nbinputs) + 5,
!              x->x_obj.te_ypix,
               x, ei);
      }
--- 182,189 ----
      {
           SYS_VGUI8(".x%x.c create rectangle %d %d %d %d -outline #000000 -fill #000000 -tags %xIN%d\n",
!              canvas, text_xpix(&x->x_obj, glist) + ( ei * (x->x_width - 5) )/ (x->x_nbinputs),
!              text_ypix(&x->x_obj, glist) - 2,
!              text_xpix(&x->x_obj, glist) + ( ei * (x->x_width - 5) )/ (x->x_nbinputs) + 5,
!              text_ypix(&x->x_obj, glist),
               x, ei);
      }
***************
*** 196,205 ****
        SYS_VGUI8(".x%x.c create image %d %d -image %xSPEAKER%d -tags %xISPEAKER%d\n",
                            canvas, 
!                           x->x_obj.te_xpix + x->x_inputs_x[ei],
!                           x->x_obj.te_ypix + x->x_inputs_y[ei],
                            x, ei, x, ei );
        SYS_VGUI7(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text "s%d" -tags %xSPEAKERNUM%d\n",
!              canvas, x->x_obj.te_xpix + x->x_inputs_x[ei] - SPEAKER_WIDTH/2, 
!              x->x_obj.te_ypix + x->x_inputs_y[ei] - SPEAKER_HEIGHT/2, ei+1, x, ei );
      }
     // create listener images
--- 195,204 ----
        SYS_VGUI8(".x%x.c create image %d %d -image %xSPEAKER%d -tags %xISPEAKER%d\n",
                            canvas, 
!                           text_xpix(&x->x_obj, glist) + x->x_inputs_x[ei],
!                           text_ypix(&x->x_obj, glist) + x->x_inputs_y[ei],
                            x, ei, x, ei );
        SYS_VGUI7(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text "s%d" -tags %xSPEAKERNUM%d\n",
!              canvas, text_xpix(&x->x_obj, glist) + x->x_inputs_x[ei] - SPEAKER_WIDTH/2, 
!              text_ypix(&x->x_obj, glist) + x->x_inputs_y[ei] - SPEAKER_HEIGHT/2, ei+1, x, ei );
      }
     // create listener images
***************
*** 210,219 ****
        SYS_VGUI8(".x%x.c create image %d %d -image %xLISTENER%d -tags %xILISTENER%d\n",
                            canvas, 
!                           x->x_obj.te_xpix + x->x_outputs_x[ei],
!                           x->x_obj.te_ypix + x->x_outputs_y[ei],
                            x, ei, x, ei );
        SYS_VGUI7(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text "l%d" -tags %xLISTENERNUM%d\n",
!              canvas, x->x_obj.te_xpix + x->x_outputs_x[ei] + LISTENER_WIDTH/2, 
!              x->x_obj.te_ypix + x->x_outputs_y[ei] + LISTENER_HEIGHT/2, ei+1, x, ei );
      }
      canvas_fixlinesfor( canvas, (t_text*)x );
--- 209,218 ----
        SYS_VGUI8(".x%x.c create image %d %d -image %xLISTENER%d -tags %xILISTENER%d\n",
                            canvas, 
!                           text_xpix(&x->x_obj, glist) + x->x_outputs_x[ei],
!                           text_ypix(&x->x_obj, glist) + x->x_outputs_y[ei],
                            x, ei, x, ei );
        SYS_VGUI7(".x%x.c create text %d %d -font -*-courier-bold--normal--10-* -text "l%d" -tags %xLISTENERNUM%d\n",
!              canvas, text_xpix(&x->x_obj, glist) + x->x_outputs_x[ei] + LISTENER_WIDTH/2, 
!              text_ypix(&x->x_obj, glist) + x->x_outputs_y[ei] + LISTENER_HEIGHT/2, ei+1, x, ei );
      }
      canvas_fixlinesfor( canvas, (t_text*)x );
***************
*** 222,249 ****
  static void audience_draw_move(t_audience_tilde *x, t_glist *glist)
  {
!     t_canvas *canvas=glist_getcanvas(glist);
!     t_int ei;
SYS_VGUI7(".x%x.c coords %xAAUDIENCE %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 %xBLCAPTION %d %d\n",
         canvas, x,
!              x->x_obj.te_xpix - 10 , x->x_obj.te_ypix + x->x_height + 10);
      SYS_VGUI5(".x%x.c coords %xBRCAPTION %d %d\n",
         canvas, x,
!              x->x_obj.te_xpix + x->x_width + 10 , x->x_obj.te_ypix + x->x_height + 10 );
      SYS_VGUI5(".x%x.c coords %xULCAPTION %d %d\n",
         canvas, x,
!              x->x_obj.te_xpix - 10 , x->x_obj.te_ypix );
for ( ei=0; ei<x->x_nbinputs+1; ei++ )
      {
           SYS_VGUI8(".x%x.c coords %xIN%d %d %d %d %d\n",
!              canvas, x, ei, x->x_obj.te_xpix + ( ei * (x->x_width - 5) )/ (x->x_nbinputs),
!              x->x_obj.te_ypix - 2,
!              x->x_obj.te_xpix + ( ei * (x->x_width - 5) )/ (x->x_nbinputs) + 5,
!              x->x_obj.te_ypix 
               );
      }
--- 221,248 ----
  static void audience_draw_move(t_audience_tilde *x, t_glist *glist)
  {
!   t_canvas *canvas=glist_getcanvas(glist);
!   t_int ei;
SYS_VGUI7(".x%x.c coords %xAAUDIENCE %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 %xBLCAPTION %d %d\n",
         canvas, x,
!              text_xpix(&x->x_obj, glist) - 10 , text_ypix(&x->x_obj, glist) + x->x_height + 10);
      SYS_VGUI5(".x%x.c coords %xBRCAPTION %d %d\n",
         canvas, x,
!              text_xpix(&x->x_obj, glist) + x->x_width + 10 , text_ypix(&x->x_obj, glist) + x->x_height + 10 );
      SYS_VGUI5(".x%x.c coords %xULCAPTION %d %d\n",
         canvas, x,
!              text_xpix(&x->x_obj, glist) - 10 , text_ypix(&x->x_obj, glist) );
for ( ei=0; ei<x->x_nbinputs+1; ei++ )
      {
           SYS_VGUI8(".x%x.c coords %xIN%d %d %d %d %d\n",
!              canvas, x, ei, text_xpix(&x->x_obj, glist) + ( ei * (x->x_width - 5) )/ (x->x_nbinputs),
!              text_ypix(&x->x_obj, glist) - 2,
!              text_xpix(&x->x_obj, glist) + ( ei * (x->x_width - 5) )/ (x->x_nbinputs) + 5,
!              text_ypix(&x->x_obj, glist) 
               );
      }
***************
*** 252,262 ****
          SYS_VGUI6(".x%x.c coords %xISPEAKER%d %d %d\n",
            canvas, x, ei, 
!           x->x_obj.te_xpix + x->x_inputs_x[ei],
!           x->x_obj.te_ypix + x->x_inputs_y[ei]
            );
          SYS_VGUI6(".x%x.c coords %xSPEAKERNUM%d %d %d\n",
            canvas, x, ei, 
!           x->x_obj.te_xpix + x->x_inputs_x[ei] - SPEAKER_WIDTH/2, 
!           x->x_obj.te_ypix + x->x_inputs_y[ei] - SPEAKER_HEIGHT/2
            );
      }
--- 251,261 ----
          SYS_VGUI6(".x%x.c coords %xISPEAKER%d %d %d\n",
            canvas, x, ei, 
!           text_xpix(&x->x_obj, glist) + x->x_inputs_x[ei],
!           text_ypix(&x->x_obj, glist) + x->x_inputs_y[ei]
            );
          SYS_VGUI6(".x%x.c coords %xSPEAKERNUM%d %d %d\n",
            canvas, x, ei, 
!           text_xpix(&x->x_obj, glist) + x->x_inputs_x[ei] - SPEAKER_WIDTH/2, 
!           text_ypix(&x->x_obj, glist) + x->x_inputs_y[ei] - SPEAKER_HEIGHT/2
            );
      }
***************
*** 266,283 ****
        {
           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_nboutputs-1),
!              x->x_obj.te_ypix + x->x_height,
!              x->x_obj.te_xpix + ( ei * (x->x_width - 5) )/ (x->x_nboutputs-1) + 5,
!              x->x_obj.te_ypix + x->x_height + 2
               );
           SYS_VGUI6(".x%x.c coords %xILISTENER%d %d %d\n",
               canvas, x, ei, 
!              x->x_obj.te_xpix + x->x_outputs_x[ei],
!              x->x_obj.te_ypix + x->x_outputs_y[ei]
               );
           SYS_VGUI6(".x%x.c coords %xLISTENERNUM%d %d %d\n",
               canvas, x, ei, 
!              x->x_obj.te_xpix + x->x_outputs_x[ei] + LISTENER_WIDTH/2, 
!              x->x_obj.te_ypix + x->x_outputs_y[ei] + LISTENER_HEIGHT/2
               );
        }
--- 265,282 ----
        {
           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_nboutputs-1),
!              text_ypix(&x->x_obj, glist) + x->x_height,
!              text_xpix(&x->x_obj, glist) + ( ei * (x->x_width - 5) )/ (x->x_nboutputs-1) + 5,
!              text_ypix(&x->x_obj, glist) + x->x_height + 2
               );
           SYS_VGUI6(".x%x.c coords %xILISTENER%d %d %d\n",
               canvas, x, ei, 
!              text_xpix(&x->x_obj, glist) + x->x_outputs_x[ei],
!              text_ypix(&x->x_obj, glist) + x->x_outputs_y[ei]
               );
           SYS_VGUI6(".x%x.c coords %xLISTENERNUM%d %d %d\n",
               canvas, x, ei, 
!              text_xpix(&x->x_obj, glist) + x->x_outputs_x[ei] + LISTENER_WIDTH/2, 
!              text_ypix(&x->x_obj, glist) + x->x_outputs_y[ei] + LISTENER_HEIGHT/2
               );
        }
***************
*** 286,303 ****
      {
           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
               );
           SYS_VGUI6(".x%x.c coords %xILISTENER%d %d %d\n",
               canvas, x, 0, 
!              x->x_obj.te_xpix + x->x_outputs_x[0],
!              x->x_obj.te_ypix + x->x_outputs_y[0]
               );
           SYS_VGUI6(".x%x.c coords %xLISTENERNUM%d %d %d\n",
               canvas, x, 0, 
!              x->x_obj.te_xpix + x->x_outputs_x[0] + LISTENER_WIDTH/2, 
!              x->x_obj.te_ypix + x->x_outputs_y[0] + LISTENER_HEIGHT/2
               );
      }
--- 285,302 ----
      {
           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
               );
           SYS_VGUI6(".x%x.c coords %xILISTENER%d %d %d\n",
               canvas, x, 0, 
!              text_xpix(&x->x_obj, glist) + x->x_outputs_x[0],
!              text_ypix(&x->x_obj, glist) + x->x_outputs_y[0]
               );
           SYS_VGUI6(".x%x.c coords %xLISTENERNUM%d %d %d\n",
               canvas, x, 0, 
!              text_xpix(&x->x_obj, glist) + x->x_outputs_x[0] + LISTENER_WIDTH/2, 
!              text_ypix(&x->x_obj, glist) + x->x_outputs_y[0] + LISTENER_HEIGHT/2
               );
      }
***************
*** 307,312 ****
  static void audience_draw_erase(t_audience_tilde* x,t_glist* glist)
  {
!     t_canvas *canvas=glist_getcanvas(glist);
!     int ei;
SYS_VGUI3(".x%x.c delete %xAAUDIENCE\n", canvas, x);
--- 306,311 ----
  static void audience_draw_erase(t_audience_tilde* x,t_glist* glist)
  {
!   t_canvas *canvas=glist_getcanvas(glist);
!   int ei;
SYS_VGUI3(".x%x.c delete %xAAUDIENCE\n", canvas, x);
***************
*** 356,363 ****
     t_audience_tilde* x = (t_audience_tilde*)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;
  }
--- 355,362 ----
     t_audience_tilde* x = (t_audience_tilde*)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;
  }
***************
*** 368,372 ****
binbuf_addv(b, "ssiisiiiifi", gensym("#X"),gensym("obj"),
! 		(t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
    	gensym("audience~"), x->x_width, x->x_height,
                  x->x_nbinputs, x->x_nboutputs, x->x_attenuation, x->x_applydelay );
--- 367,371 ----
binbuf_addv(b, "ssiisiiiifi", 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("audience~"), x->x_width, x->x_height,
                  x->x_nbinputs, x->x_nboutputs, x->x_attenuation, x->x_applydelay );
***************
*** 589,594 ****
  {
    t_audience_tilde *x = (t_audience_tilde *)z;
!   int xold = x->x_obj.te_xpix;
!   int yold = x->x_obj.te_ypix;
// post( "audience_displace dx=%d dy=%d", dx, dy );
--- 588,593 ----
  {
    t_audience_tilde *x = (t_audience_tilde *)z;
!   int xold = text_xpix(&x->x_obj, glist);
!   int yold = text_ypix(&x->x_obj, glist);
// post( "audience_displace dx=%d dy=%d", dx, dy );
***************
*** 638,643 ****
      if ( doit) 
      {
!      t_int relx = xpix-x->x_obj.te_xpix;
!      t_int rely = ypix-x->x_obj.te_ypix;
// post( "audience~ : relx : %d : rely : %d", relx, rely );
--- 637,642 ----
      if ( doit) 
      {
!      t_int relx = xpix-text_xpix(&x->x_obj, glist);
!      t_int rely = ypix-text_ypix(&x->x_obj, glist);
// post( "audience~ : relx : %d : rely : %d", relx, rely );
***************
*** 1050,1068 ****
      audience_widgetbehavior.w_visfn =        audience_vis;
      audience_widgetbehavior.w_clickfn =      audience_click;
! 	 /* 
! 	  * hans@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)
      audience_widgetbehavior.w_propertiesfn = audience_properties;
      audience_widgetbehavior.w_savefn =       audience_save;
- #else
- 	 class_setsavefn(audience_class_tilde, &audience_save);
- 	 class_setpropertiesfn(audience_class_tilde, &audience_properties);
  #endif
class_setwidget(audience_class_tilde, &audience_widgetbehavior);
!     class_sethelpsymbol(audience_class_tilde, gensym("help-audience~.pd"));
  }
--- 1049,1062 ----
      audience_widgetbehavior.w_visfn =        audience_vis;
      audience_widgetbehavior.w_clickfn =      audience_click;
! 
! #if PD_MINOR_VERSION >= 37
!     class_setpropertiesfn(audience_class_tilde, audience_properties);
!     class_setsavefn(audience_class_tilde, audience_save);
! #else
      audience_widgetbehavior.w_propertiesfn = audience_properties;
      audience_widgetbehavior.w_savefn =       audience_save;
  #endif
class_setwidget(audience_class_tilde, &audience_widgetbehavior);
!     class_sethelpsymbol(audience_class_tilde, gensym("audience~.pd"));
  }