Pd-cvs May 2007

pd-cvs@lists.iem.at

12 participants
178 discussions

externals/zexy/reference tabset-help.pd,1.1,1.2
by IOhannes m zmölnig 10 May '07

10 May '07

Update of /cvsroot/pure-data/externals/zexy/reference In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16764 Modified Files: tabset-help.pd Log Message: fixed typos, use $0 to avoid duplicate arrays (when opening several help-patches) Index: tabset-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/reference/tabset-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tabset-help.pd 14 Mar 2007 09:08:55 -0000 1.1 --- tabset-help.pd 10 May 2007 08:33:56 -0000 1.2 *************** *** 1,23 **** #N canvas 275 479 861 353 10; ! #N canvas 0 0 450 300 graph2 0; ! #X array my_array99 5 float 0; ! #X array my_array97 8 float 0; #X coords 0 1 8 -1 200 140 1; #X restore 603 117 graph; - #X obj 283 138 loadbang; - #X msg 132 126 set my_array99; - #X msg 133 148 set my_array97; - #X msg 283 164 \; my_array99 resize 5 \; my_array97 resize 8 \; my_array99 - 0.1 0.3 0.2 0.5 0.2 -0.1 \; my_array97 0.1 0.1 0.2 0.3 0.5 0.8 0.13 - 0.21 0.34; - #X obj 176 22 tabdump; - #X text 273 24 dump the contents of a table as a list; #X msg 83 73 1 0.7 0.5 0.3 0.2 0.1; - #X obj 83 168 tabset my_array99; - #X floatatom 97 95 4 0 0 0 - - -; #X text 631 28 part of zexy; ! #X connect 1 0 4 0; ! #X connect 2 0 8 0; ! #X connect 3 0 8 0; ! #X connect 7 0 8 0; #X connect 9 0 8 0; --- 1,26 ---- #N canvas 275 479 861 353 10; ! #N canvas 0 0 450 300 (subpatch) 0; ! #X array \$0_array1 5 float 1; ! #A 0 0.3 0.2 0.5 0.2 -0.1; ! #X array \$0_array2 8 float 1; ! #A 0 0.1 0.2 0.3 0.5 0.8 0.13 0.21 0.34; #X coords 0 1 8 -1 200 140 1; #X restore 603 117 graph; #X msg 83 73 1 0.7 0.5 0.3 0.2 0.1; #X text 631 28 part of zexy; ! #X obj 176 22 tabset; ! #X text 273 24 set the contents of a table via a list; ! #X obj 83 208 tabset \$0_array1; ! #X msg 132 154 set \$1; ! #X floatatom 97 95 4 0 0 0 - - -; ! #X obj 132 133 symbol \$0_array1; ! #X msg 132 115 bang; ! #X msg 234 114 bang; ! #X obj 234 132 symbol \$0_array2; ! #X connect 1 0 5 0; ! #X connect 6 0 5 0; ! #X connect 7 0 5 0; ! #X connect 8 0 6 0; #X connect 9 0 8 0; + #X connect 10 0 11 0; + #X connect 11 0 6 0;

1 0

externals/zexy/abs tabset.pd,NONE,1.1
by IOhannes m zmölnig 10 May '07

10 May '07

Update of /cvsroot/pure-data/externals/zexy/abs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16599 Added Files: tabset.pd Log Message: abstraction implementation of [tabset] --- NEW FILE: tabset.pd --- #N canvas 205 66 450 337 10; #X obj 57 67 inlet; #X obj 142 109 list prepend 0; #X obj 142 275 s; #X obj 57 84 route set float; #X obj 179 254 symbol \$1; #X obj 228 234 symbol; #X msg 99 183 const \$1; #X obj 142 209 t a b b; #X msg 160 227 const 0; #X text 48 317 (c) 2007 IOhannes m zmoelnig(a)iem.at; #X text 215 53 part of zexy; #X text 59 12 set the contents of a table via list; #X text 61 29 (legacy object); #X connect 0 0 3 0; #X connect 1 0 7 0; #X connect 3 0 5 0; #X connect 3 1 6 0; #X connect 3 2 1 0; #X connect 4 0 2 1; #X connect 5 0 4 1; #X connect 6 0 7 0; #X connect 7 0 2 0; #X connect 7 1 8 0; #X connect 7 2 4 0; #X connect 8 0 2 0;

1 0

externals/miXed/doc/help/cyclone counter-help.pd,1.2,1.3
by IOhannes m zmölnig 10 May '07

10 May '07

Update of /cvsroot/pure-data/externals/miXed/doc/help/cyclone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26266 Modified Files: counter-help.pd Log Message: fixed bug with setting minimum/maximum with objects instead of messages. (this tells us that people really don't read the documentation ;-)); added a note on the 3rd inlet which is labeled as "min" but really is a "set" and which is likely (though unconfirmed by me) to be a bug in either the original (Max'ish) documentation or implementation Index: counter-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/doc/help/cyclone/counter-help.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** counter-help.pd 2 Apr 2007 21:12:05 -0000 1.2 --- counter-help.pd 10 May 2007 07:35:08 -0000 1.3 *************** *** 43,47 **** #X floatatom 217 380 5 0 0 0 - - -; #X floatatom 224 398 5 0 0 0 - - -; - #X text 254 361 set min; #X text 267 399 set max; #X text 262 378 set counter value; --- 43,46 ---- *************** *** 66,71 **** #X msg 319 259 next; #X text 208 260 number = bang =; ! #X obj 437 414 min \$1; ! #X obj 485 413 max \$1; #X floatatom 437 393 5 0 0 0 - - -; #X floatatom 485 392 5 0 0 0 - - -; --- 65,70 ---- #X msg 319 259 next; #X text 208 260 number = bang =; ! #X msg 437 414 min \$1; ! #X msg 485 413 max \$1; #X floatatom 437 393 5 0 0 0 - - -; #X floatatom 485 392 5 0 0 0 - - -; *************** *** 128,131 **** --- 127,134 ---- #X text 431 221 would be to reset to 0 as well ...); #X obj 460 531 pddp_open all_about_cyclone; + #X text 254 361 set min **; + #X text -6 538 ** (there seems to be a bug in the original documentation + or implementation: the 3rd inlet is indeed a "set" message instead + of a "min" message...); #X connect 5 0 18 0; #X connect 6 0 5 0; *************** *** 144,158 **** #X connect 32 0 21 3; #X connect 33 0 21 4; #X connect 38 0 37 0; ! #X connect 39 0 38 0; ! #X connect 40 0 37 0; ! #X connect 41 0 40 0; #X connect 47 0 21 0; #X connect 48 0 21 0; ! #X connect 49 0 21 0; #X connect 51 0 21 0; ! #X connect 52 0 21 0; ! #X connect 57 0 37 0; ! #X connect 58 0 37 0; #X connect 59 0 57 0; - #X connect 60 0 58 0; --- 147,162 ---- #X connect 32 0 21 3; #X connect 33 0 21 4; + #X connect 37 0 36 0; #X connect 38 0 37 0; ! #X connect 39 0 36 0; ! #X connect 40 0 39 0; ! #X connect 44 0 36 0; ! #X connect 46 0 21 0; #X connect 47 0 21 0; #X connect 48 0 21 0; ! #X connect 50 0 21 0; #X connect 51 0 21 0; ! #X connect 56 0 36 0; ! #X connect 57 0 36 0; ! #X connect 58 0 56 0; #X connect 59 0 57 0;

1 0

externals/pidip/doc help-pdp_colorgrid.pd,1.1,1.2
by Hans-Christoph Steiner 10 May '07

10 May '07

Update of /cvsroot/pure-data/externals/pidip/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10110/doc Modified Files: help-pdp_colorgrid.pd Log Message: replaced colorgrid with pdp_colorgrid Index: help-pdp_colorgrid.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/help-pdp_colorgrid.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-pdp_colorgrid.pd 27 Dec 2005 18:03:28 -0000 1.1 --- help-pdp_colorgrid.pd 10 May 2007 05:28:27 -0000 1.2 *************** *** 28,32 **** #X text 330 108 Set position :; #X msg 339 159 goto \$1 \$2; ! #X obj 90 376 colorgrid colorgrid1 256 0 256 50 0 50 0 1 1 10 10 147 392.06; #X connect 2 0 4 0; --- 28,32 ---- #X text 330 108 Set position :; #X msg 339 159 goto \$1 \$2; ! #X obj 90 376 pdp_colorgrid colorgrid1 256 0 256 50 0 50 0 1 1 10 10 147 392.06; #X connect 2 0 4 0;

1 0

externals/pidip configure.ac,1.17,1.18
by Hans-Christoph Steiner 10 May '07

10 May '07

Update of /cvsroot/pure-data/externals/pidip In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9737 Modified Files: configure.ac Log Message: removed my stupidity Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/configure.ac,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** configure.ac 9 May 2007 05:39:14 -0000 1.17 --- configure.ac 10 May 2007 05:27:58 -0000 1.18 *************** *** 23,26 **** --- 23,27 ---- case "$host" in *-darwin* | *-macos10*) + PDP_CAPTURE_OBJECT="$PDP_CAPTURE_OBJECT pdp_ieee1394.o" if test -d /sw ; then # Fink *************** *** 29,33 **** CPPFLAGS="$CPPFLAGS -I/sw/include" LDFLAGS="$LDFLAGS -L/sw/lib" - PDP_CAPTURE_OBJECT="$PDP_CAPTURE_OBJECT pdp_ieee1394.o" elif test -d /opt/local ; then # DarwinPorts --- 30,33 ---- *************** *** 36,40 **** CPPFLAGS="$CPPFLAGS -I/opt/local/include" LDFLAGS="$LDFLAGS -L/opt/local/lib" - PDP_CAPTURE_OBJECT="$PDP_CAPTURE_OBJECT pdp_ieee1394.o" fi ;; --- 36,39 ----

1 0

externals/pidip/modules pdp_colorgrid.c,1.1.2.2,1.1.2.3
by Hans-Christoph Steiner 10 May '07

10 May '07

Update of /cvsroot/pure-data/externals/pidip/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5413/modules Modified Files: Tag: branch-v0-39-2-extended pdp_colorgrid.c Log Message: extended image path kludge to GNU/Linux Index: pdp_colorgrid.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_colorgrid.c,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** pdp_colorgrid.c 10 May 2007 05:03:57 -0000 1.1.2.2 --- pdp_colorgrid.c 10 May 2007 05:16:50 -0000 1.1.2.3 *************** *** 25,29 **** #endif ! #define COLORGRID_IMG "/Applications/Pd-extended.app/Contents/Resources/extra/colorgrid.pnm" #define DEFAULT_COLORGRID_WIDTH 256 #define DEFAULT_COLORGRID_HEIGHT 50 --- 25,34 ---- #endif ! #ifdef __APPLE__ ! #define COLORGRID_IMG "/Applications/Pd-0.39.2-extended-rc2.app/Contents/Resources/doc/examples/pidip/images/colorgrid.pnm" ! #endif ! #ifdef __gnu_linux__ ! #define COLORGRID_IMG "/usr/local/lib/pd/doc/examples/pidip/images/colorgrid.pnm" ! #endif #define DEFAULT_COLORGRID_WIDTH 256 #define DEFAULT_COLORGRID_HEIGHT 50

1 0

externals/pidip/system pidip.c,1.16,1.16.2.1
by Hans-Christoph Steiner 10 May '07

10 May '07

Update of /cvsroot/pure-data/externals/pidip/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32601/system Modified Files: Tag: branch-v0-39-2-extended pidip.c Log Message: imported recent changes from HEAD; quick kludge for absolute path to pdp_colorgrid background image; fixed object name in pdp_colorgrid help Index: pidip.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/system/pidip.c,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -d -r1.16 -r1.16.2.1 *** pidip.c 22 Nov 2005 06:18:01 -0000 1.16 --- pidip.c 10 May 2007 05:04:00 -0000 1.16.2.1 *************** *** 52,56 **** void pdp_noquark_setup(void); void pdp_juxta_setup(void); - void pdp_capture_setup(void); void pdp_smuck_setup(void); void pdp_lumafilt_setup(void); --- 52,55 ---- *************** *** 82,85 **** --- 81,88 ---- void pdp_hue_setup(void); + #ifdef HAVE_IMAGE_MAGICK + void pdp_capture_setup(void); + #endif + #ifdef HAVE_PIDIP_FFMPEG void pdp_ffmpeg_tilde_setup(void); *************** *** 139,143 **** pdp_noquark_setup(); pdp_juxta_setup(); - pdp_capture_setup(); pdp_smuck_setup(); pdp_lumafilt_setup(); --- 142,145 ---- *************** *** 169,172 **** --- 171,178 ---- pdp_hue_setup(); + #ifdef HAVE_IMAGE_MAGICK + pdp_capture_setup(); + #endif + #ifdef HAVE_PIDIP_FFMPEG pdp_ffmpeg_tilde_setup();

1 0

externals/pidip/modules Makefile.in, 1.16, 1.16.2.1 pdp_aa.c, 1.2.2.1, 1.2.2.2 pdp_aging.c, 1.2.2.1, 1.2.2.2 pdp_ascii.c, 1.5.2.1, 1.5.2.2 pdp_background.c, 1.1.2.1, 1.1.2.2 pdp_baltan.c, 1.2.2.1, 1.2.2.2 pdp_binary.c, 1.2.2.1, 1.2.2.2 pdp_cache.c, 1.1.2.1, 1.1.2.2 pdp_canvas.c, 1.5.2.1, 1.5.2.2 pdp_capture.c, 1.4.2.1, 1.4.2.2 pdp_cmap.c, 1.3.2.1, 1.3.2.2 pdp_colorgrid.c, 1.1.2.1, 1.1.2.2 pdp_compose.c, 1.4.2.1, 1.4.2.2 pdp_cropper.c, 1.1.2.1, 1.1.2.2 pdp_ctrack.c, 1.4.2.1, 1.4.2.2 pdp_cycle.c, 1.2
by Hans-Christoph Steiner 10 May '07

10 May '07

Update of /cvsroot/pure-data/externals/pidip/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32601/modules Modified Files: Tag: branch-v0-39-2-extended Makefile.in pdp_aa.c pdp_aging.c pdp_ascii.c pdp_background.c pdp_baltan.c pdp_binary.c pdp_cache.c pdp_canvas.c pdp_capture.c pdp_cmap.c pdp_colorgrid.c pdp_compose.c pdp_cropper.c pdp_ctrack.c pdp_cycle.c pdp_dice.c pdp_dilate.c pdp_disintegration.c pdp_distance.c pdp_edge.c pdp_erode.c pdp_fcqt.c pdp_fdiff.c pdp_ffmpeg~.c pdp_form.c pdp_fqt.c pdp_hitandmiss.c pdp_hue.c pdp_i.c pdp_icedthe~.c pdp_ieee1394.c pdp_imgloader.c pdp_imgsaver.c pdp_intrusion.c pdp_juxta.c pdp_lens.c pdp_live~.c pdp_lumafilt.c pdp_mapper.c pdp_mgrid.c pdp_mosaic.c pdp_nervous.c pdp_noquark.c pdp_o.c pdp_ocanvas.c pdp_pen.c pdp_puzzle.c pdp_qtext.c pdp_quark.c pdp_radioactiv.c pdp_rec~.c pdp_rev.c pdp_ripple.c pdp_segsnd~.c pdp_shagadelic.c pdp_shape.c pdp_simura.c pdp_smuck.c pdp_spigot.c pdp_spiral.c pdp_spotlight.c pdp_text.c pdp_theonice~.c pdp_theorin~.c pdp_theorout~.c pdp_transform.c pdp_transition.c pdp_underwatch.c pdp_vertigo.c pdp_warhol.c pdp_warp.c pdp_xcanvas.c pdp_yqt.c pdp_yvu2rgb.c Log Message: imported recent changes from HEAD; quick kludge for absolute path to pdp_colorgrid background image; fixed object name in pdp_colorgrid help Index: pdp_cropper.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_cropper.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_cropper.c 9 May 2007 04:54:13 -0000 1.1.2.1 --- pdp_cropper.c 10 May 2007 05:03:57 -0000 1.1.2.2 *************** *** 36,50 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_csizex; ! t_int x_csizey; ! t_int x_csizev; unsigned int x_encoding; --- 36,50 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_csizex; ! int x_csizey; ! int x_csizev; unsigned int x_encoding; *************** *** 60,64 **** if ( ( fcropx1>=0 ) && ( fcropx1<x->x_vwidth ) ) { ! x->x_cropx1 = (t_int)fcropx1; } } --- 60,64 ---- if ( ( fcropx1>=0 ) && ( fcropx1<x->x_vwidth ) ) { ! x->x_cropx1 = (int)fcropx1; } } *************** *** 68,72 **** if ( ( fcropx2>=0 ) && ( fcropx2<x->x_vwidth ) ) { ! x->x_cropx2 = (t_int)fcropx2; } } --- 68,72 ---- if ( ( fcropx2>=0 ) && ( fcropx2<x->x_vwidth ) ) { ! x->x_cropx2 = (int)fcropx2; } } *************** *** 76,80 **** if ( ( fcropy1>=0 ) && ( fcropy1<x->x_vheight ) ) { ! x->x_cropy1 = (t_int)fcropy1; } } --- 76,80 ---- if ( ( fcropy1>=0 ) && ( fcropy1<x->x_vheight ) ) { ! x->x_cropy1 = (int)fcropy1; } } *************** *** 84,88 **** if ( ( fcropy2>=0 ) && ( fcropy2<x->x_vheight ) ) { ! x->x_cropy2 = (t_int)fcropy2; } } --- 84,88 ---- if ( ( fcropy2>=0 ) && ( fcropy2<x->x_vheight ) ) { ! x->x_cropy2 = (int)fcropy2; } } *************** *** 103,108 **** /* allocate all ressources */ ! if ( ( (t_int)header->info.image.width != x->x_vwidth ) || ! ( (t_int)header->info.image.height != x->x_vheight ) ) { x->x_vwidth = header->info.image.width; --- 103,108 ---- /* allocate all ressources */ ! if ( ( (int)header->info.image.width != x->x_vwidth ) || ! ( (int)header->info.image.height != x->x_vheight ) ) { x->x_vwidth = header->info.image.width; Index: pdp_form.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_form.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_form.c 9 May 2007 04:54:14 -0000 1.3.2.1 --- pdp_form.c 10 May 2007 05:03:58 -0000 1.3.2.2 *************** *** 47,52 **** { t_form_type type; ! t_int n1,n2,n3,n4; // numerical coordinates or rays ! t_int r,g,b; } t_form; --- 47,52 ---- { t_form_type type; ! int n1,n2,n3,n4; // numerical coordinates or rays ! int r,g,b; } t_form; *************** *** 61,78 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; t_form *x_forms; ! t_int x_nbforms; ! t_int x_current; ! t_int x_capacity; t_float x_alpha; --- 61,78 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; t_form *x_forms; ! int x_nbforms; ! int x_current; ! int x_capacity; t_float x_alpha; *************** *** 301,305 **** static void pdp_form_delete(t_pdp_form *x, t_floatarg fnum ) { ! t_int i; char *lostword; --- 301,305 ---- static void pdp_form_delete(t_pdp_form *x, t_floatarg fnum ) { ! int i; char *lostword; *************** *** 325,329 **** { t_form *forms; ! t_int i, csize; if ( (int) fnewsize<=0 ) return; --- 325,329 ---- { t_form *forms; ! int i, csize; if ( (int) fnewsize<=0 ) return; *************** *** 391,396 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int ti; ! t_int px, py; unsigned char y, u, v; DATA32 *imdata; --- 391,396 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int ti; ! int px, py; unsigned char y, u, v; DATA32 *imdata; Index: pdp_xcanvas.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_xcanvas.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_xcanvas.c 9 May 2007 04:54:14 -0000 1.3.2.1 --- pdp_xcanvas.c 10 May 2007 05:04:00 -0000 1.3.2.2 *************** *** 41,64 **** t_float x_f; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_opacket; ! t_int x_current; t_float x_xmouse; t_float x_ymouse; ! t_int *x_packets; ! t_int *x_widths; ! t_int *x_heights; t_float *x_xoffsets; t_float *x_yoffsets; ! t_int *x_sizes; ! t_int x_owidth; ! t_int x_oheight; ! t_int x_osize; ! t_int x_nbinputs; // X data --- 41,64 ---- t_float x_f; ! int x_dropped; ! int x_queue_id; ! int x_opacket; ! int x_current; t_float x_xmouse; t_float x_ymouse; ! int *x_packets; ! int *x_widths; ! int *x_heights; t_float *x_xoffsets; t_float *x_yoffsets; ! int *x_sizes; ! int x_owidth; ! int x_oheight; ! int x_osize; ! int x_nbinputs; // X data *************** *** 141,145 **** static void pdp_xcanvas_process_yv12(t_pdp_xcanvas *x) { ! t_int px, py, ppx, ppy, ii, nbs; char *pY, *pU, *pV; char *ppY, *ppU, *ppV; --- 141,145 ---- static void pdp_xcanvas_process_yv12(t_pdp_xcanvas *x) { ! int px, py, ppx, ppy, ii, nbs; char *pY, *pU, *pV; char *ppY, *ppU, *ppV; *************** *** 147,151 **** char *odata, *pdata; t_pdp *iheader; ! t_int mx, dx, my, dy; if ( !x->x_initialized ) --- 147,151 ---- char *odata, *pdata; t_pdp *iheader; ! int mx, dx, my, dy; if ( !x->x_initialized ) *************** *** 214,223 **** for ( py=x->x_yoffsets[ii]+my; py<x->x_yoffsets[ii]+dy; py++) { ! memcpy( pY+(py*x->x_owidth)+(t_int)x->x_xoffsets[ii]+mx, ! ppY+(py-(t_int)x->x_yoffsets[ii])*x->x_widths[ii]+mx, dx ); ! memcpy( pU+((py>>1)*(x->x_owidth>>1))+((t_int)(x->x_xoffsets[ii]+mx)>>1), ! ppU+((py-(t_int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), (dx>>1) ); ! memcpy( pV+((py>>1)*(x->x_owidth>>1))+((t_int)(x->x_xoffsets[ii]+mx)>>1), ! ppV+((py-(t_int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), (dx>>1) ); } } --- 214,223 ---- for ( py=x->x_yoffsets[ii]+my; py<x->x_yoffsets[ii]+dy; py++) { ! memcpy( pY+(py*x->x_owidth)+(int)x->x_xoffsets[ii]+mx, ! ppY+(py-(int)x->x_yoffsets[ii])*x->x_widths[ii]+mx, dx ); ! memcpy( pU+((py>>1)*(x->x_owidth>>1))+((int)(x->x_xoffsets[ii]+mx)>>1), ! ppU+((py-(int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), (dx>>1) ); ! memcpy( pV+((py>>1)*(x->x_owidth>>1))+((int)(x->x_xoffsets[ii]+mx)>>1), ! ppV+((py-(int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), (dx>>1) ); } } *************** *** 241,245 **** } ! static void pdp_xcanvas_process(t_pdp_xcanvas *x, t_int ni) { int encoding; --- 241,245 ---- } ! static void pdp_xcanvas_process(t_pdp_xcanvas *x, int ni) { int encoding; *************** *** 279,283 **** static void pdp_xcanvas_select(t_pdp_xcanvas *x, t_floatarg X, t_floatarg Y) { ! t_int ii; x->x_current = -1; --- 279,283 ---- static void pdp_xcanvas_select(t_pdp_xcanvas *x, t_floatarg X, t_floatarg Y) { ! int ii; x->x_current = -1; *************** *** 320,324 **** } ! static void pdp_xcanvas_input(t_pdp_xcanvas *x, t_symbol *s, t_floatarg f, t_int ni) { t_pdp *header; --- 320,324 ---- } ! static void pdp_xcanvas_input(t_pdp_xcanvas *x, t_symbol *s, t_floatarg f, int ni) { t_pdp *header; *************** *** 404,408 **** static void pdp_xcanvas_free(t_pdp_xcanvas *x) { ! t_int ii; pdp_queue_finish(x->x_queue_id); --- 404,408 ---- static void pdp_xcanvas_free(t_pdp_xcanvas *x) { ! int ii; pdp_queue_finish(x->x_queue_id); *************** *** 412,419 **** } pdp_packet_mark_unused(x->x_opacket); ! if ( x->x_packets ) freebytes( x->x_packets, x->x_nbinputs*sizeof(t_int) ); ! if ( x->x_widths ) freebytes( x->x_widths, x->x_nbinputs*sizeof(t_int) ); ! if ( x->x_heights ) freebytes( x->x_heights, x->x_nbinputs*sizeof(t_int) ); ! if ( x->x_sizes ) freebytes( x->x_sizes, x->x_nbinputs*sizeof(t_int) ); if ( x->x_xoffsets ) freebytes( x->x_xoffsets, x->x_nbinputs*sizeof(t_float) ); if ( x->x_yoffsets ) freebytes( x->x_yoffsets, x->x_nbinputs*sizeof(t_float) ); --- 412,419 ---- } pdp_packet_mark_unused(x->x_opacket); ! if ( x->x_packets ) freebytes( x->x_packets, x->x_nbinputs*sizeof(int) ); ! if ( x->x_widths ) freebytes( x->x_widths, x->x_nbinputs*sizeof(int) ); ! if ( x->x_heights ) freebytes( x->x_heights, x->x_nbinputs*sizeof(int) ); ! if ( x->x_sizes ) freebytes( x->x_sizes, x->x_nbinputs*sizeof(int) ); if ( x->x_xoffsets ) freebytes( x->x_xoffsets, x->x_nbinputs*sizeof(t_float) ); if ( x->x_yoffsets ) freebytes( x->x_yoffsets, x->x_nbinputs*sizeof(t_float) ); *************** *** 428,432 **** { t_pdp_xcanvas *x = (t_pdp_xcanvas *)pd_new(pdp_xcanvas_class); ! t_int ii; char *imes[32]; --- 428,432 ---- { t_pdp_xcanvas *x = (t_pdp_xcanvas *)pd_new(pdp_xcanvas_class); ! int ii; char *imes[32]; *************** *** 474,481 **** post ( "pdp_xcanvas : new %dx%d canvas with %d inputs", x->x_owidth, x->x_oheight, x->x_nbinputs ); ! x->x_packets = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); ! x->x_widths = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); ! x->x_heights = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); ! x->x_sizes = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); x->x_xoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); x->x_yoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); --- 474,481 ---- post ( "pdp_xcanvas : new %dx%d canvas with %d inputs", x->x_owidth, x->x_oheight, x->x_nbinputs ); ! x->x_packets = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); ! x->x_widths = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); ! x->x_heights = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); ! x->x_sizes = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); x->x_xoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); x->x_yoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); Index: pdp_aging.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_aging.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_aging.c 9 May 2007 04:54:13 -0000 1.2.2.1 --- pdp_aging.c 10 May 2007 05:03:57 -0000 1.2.2.2 *************** *** 37,44 **** typedef struct _scratch { ! t_int life; ! t_int x; ! t_int dx; ! t_int init; } scratch; --- 37,44 ---- typedef struct _scratch { ! int life; ! int x; ! int dx; ! int init; } scratch; *************** *** 49,64 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_area_scale; ! t_int x_nb_scratches; ! t_int x_dust_interval; ! t_int x_pits_interval; scratch x_scratches[PDP_AGING_MAX_SCRATCHES]; --- 49,64 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_area_scale; ! int x_nb_scratches; ! int x_dusinterval; ! int x_pits_interval; scratch x_scratches[PDP_AGING_MAX_SCRATCHES]; *************** *** 168,175 **** const int height = x->x_vheight; ! if(x->x_dust_interval == 0) { if((inline_fastrand()&0xf0000000) == 0) { ! x->x_dust_interval = inline_fastrand()>>29; } return; --- 168,175 ---- const int height = x->x_vheight; ! if(x->x_dusinterval == 0) { if((inline_fastrand()&0xf0000000) == 0) { ! x->x_dusinterval = inline_fastrand()>>29; } return; *************** *** 192,196 **** } } ! x->x_dust_interval--; } --- 192,196 ---- } } ! x->x_dusinterval--; } Index: pdp_juxta.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_juxta.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_juxta.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_juxta.c 10 May 2007 05:03:58 -0000 1.2.2.2 *************** *** 36,56 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_packet; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth0; ! t_int x_vheight0; ! t_int x_vsize0; ! t_int x_vwidth1; ! t_int x_vheight1; ! t_int x_vsize1; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; } t_pdp_juxta; --- 36,56 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_packet; ! int x_dropped; ! int x_queue_id; ! int x_vwidth0; ! int x_vheight0; ! int x_vsize0; ! int x_vwidth1; ! int x_vheight1; ! int x_vsize1; ! int x_vwidth; ! int x_vheight; ! int x_vsize; } t_pdp_juxta; Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/Makefile.in,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -C2 -d -r1.16 -r1.16.2.1 *** Makefile.in 22 Nov 2005 06:18:01 -0000 1.16 --- Makefile.in 10 May 2007 05:03:57 -0000 1.16.2.1 *************** *** 13,17 **** pdp_compose.o pdp_cmap.o pdp_ascii.o \ pdp_segsnd~.o pdp_noquark.o pdp_juxta.o \ ! pdp_capture.o pdp_smuck.o pdp_lumafilt.o \ pdp_transition.o pdp_imgloader.o pdp_imgsaver.o pdp_cache.o \ pdp_canvas.o pdp_pen.o pdp_shape.o pdp_fqt.o pdp_fcqt.o \ --- 13,17 ---- pdp_compose.o pdp_cmap.o pdp_ascii.o \ pdp_segsnd~.o pdp_noquark.o pdp_juxta.o \ ! pdp_smuck.o pdp_lumafilt.o \ pdp_transition.o pdp_imgloader.o pdp_imgsaver.o pdp_cache.o \ pdp_canvas.o pdp_pen.o pdp_shape.o pdp_fqt.o pdp_fcqt.o \ *************** *** 22,26 **** pdp_mapper.o pdp_theonice~.o pdp_icedthe~.o\ pdp_fdiff.o pdp_hue.o pdp_qtext.o \ ! @PDP_STREAMING_OBJECTS@ # pdp_xcanvas.o pdp_aa.o all_modules: $(OBJECTS) --- 22,26 ---- pdp_mapper.o pdp_theonice~.o pdp_icedthe~.o\ pdp_fdiff.o pdp_hue.o pdp_qtext.o \ ! @PDP_CAPTURE_OBJECT@ @PDP_STREAMING_OBJECTS@ # pdp_xcanvas.o pdp_aa.o all_modules: $(OBJECTS) Index: pdp_spiral.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_spiral.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_spiral.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_spiral.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 84,110 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; short int *x_buffer; short int *x_planetable[PLANES]; ! t_int x_plane; ! t_int *x_depthmap; ! t_int x_mode; ! t_int x_focus_x; ! t_int x_focus_y; ! t_int x_cursor_state; ! t_int x_cursor_local; ! t_int x_toggle_xor; ! t_int x_animate_focus; ! t_int x_focus_interval; ! t_int x_focus_counter; unsigned int x_depth_shift; // Cheesy way to adjust intensity ! t_int x_focus_radius; double x_focus_degree; double x_focus_increment; --- 84,110 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; short int *x_buffer; short int *x_planetable[PLANES]; ! int x_plane; ! int *x_depthmap; ! int x_mode; ! int x_focus_x; ! int x_focus_y; ! int x_cursor_state; ! int x_cursor_local; ! int x_toggle_xor; ! int x_animate_focus; ! int x_focus_interval; ! int x_focus_counter; unsigned int x_depth_shift; // Cheesy way to adjust intensity ! int x_focus_radius; double x_focus_degree; double x_focus_increment; *************** *** 114,118 **** static void pdp_spiral_define_waves(t_pdp_spiral *x) { ! t_int i, w, iw; double sinus_val = M_PI/2.0; --- 114,118 ---- static void pdp_spiral_define_waves(t_pdp_spiral *x) { ! int i, w, iw; double sinus_val = M_PI/2.0; *************** *** 157,164 **** void pdp_spiral_create_map(t_pdp_spiral *x) { ! t_int px, py, rel_x, rel_y, yy; float x_ratio; float y_ratio; ! t_int v, i, wave_offset; if ( x->x_vsize == -1 ) --- 157,164 ---- void pdp_spiral_create_map(t_pdp_spiral *x) { ! int px, py, rel_x, rel_y, yy; float x_ratio; float y_ratio; ! int v, i, wave_offset; if ( x->x_vsize == -1 ) *************** *** 285,289 **** } ! x->x_depthmap = (t_int*) malloc ( x->x_vsize * sizeof ( t_int ) ); if ( !the_wave_table || !x->x_buffer || !x->x_depthmap ) --- 285,289 ---- } ! x->x_depthmap = (int*) malloc ( x->x_vsize * sizeof ( int ) ); if ( !the_wave_table || !x->x_buffer || !x->x_depthmap ) Index: pdp_edge.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_edge.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_edge.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_edge.c 10 May 2007 05:03:58 -0000 1.2.2.2 *************** *** 37,52 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_mapw; ! t_int x_maph; ! t_int x_video_width_margin; ! t_int *x_map; } t_pdp_edge; --- 37,52 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_mapw; ! int x_maph; ! int x_video_width_margin; ! int *x_map; } t_pdp_edge; *************** *** 54,64 **** static void pdp_edge_allocate(t_pdp_edge *x) { ! x->x_map = (t_int*) getbytes ( ( x->x_vwidth * x->x_vheight * sizeof (t_int) ) << 1 ); ! bzero(x->x_map, ( x->x_vwidth * x->x_vheight * sizeof (t_int) ) << 1 ); } static void pdp_edge_free_ressources(t_pdp_edge *x) { ! if ( x->x_map ) freebytes ( x->x_map, ( x->x_vwidth * x->x_vheight * sizeof (t_int) ) << 1 ); } --- 54,64 ---- static void pdp_edge_allocate(t_pdp_edge *x) { ! x->x_map = (int*) getbytes ( ( x->x_vwidth * x->x_vheight * sizeof (int) ) << 1 ); ! bzero(x->x_map, ( x->x_vwidth * x->x_vheight * sizeof (int) ) << 1 ); } static void pdp_edge_free_ressources(t_pdp_edge *x) { ! if ( x->x_map ) freebytes ( x->x_map, ( x->x_vwidth * x->x_vheight * sizeof (int) ) << 1 ); } *************** *** 71,80 **** int i; ! t_int px, py; ! t_int y, u, v; ! t_int y0, u0, v0; ! t_int y1, u1, v1; ! t_int y2, u2, v2; ! t_int y3, u3, v3; short int *pdata, *pnewdata; --- 71,80 ---- int i; ! int px, py; ! int y, u, v; ! int y0, u0, v0; ! int y1, u1, v1; ! int y2, u2, v2; ! int y3, u3, v3; short int *pdata, *pnewdata; Index: pdp_smuck.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_smuck.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_smuck.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_smuck.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 43,56 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_n; // transform number } t_pdp_smuck; --- 43,56 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_n; // transform number } t_pdp_smuck; *************** *** 80,84 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int px, py, pxx, pyy; short int *pnY, *pnU, *pnV; --- 80,84 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int px, py, pxx, pyy; short int *pnY, *pnU, *pnV; Index: pdp_colorgrid.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_colorgrid.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_colorgrid.c 9 May 2007 04:54:13 -0000 1.1.2.1 --- pdp_colorgrid.c 10 May 2007 05:03:57 -0000 1.1.2.2 *************** *** 19,23 **** #include "g_colorgrid.h" ! #ifdef NT #include <io.h> #else --- 19,23 ---- #include "g_colorgrid.h" ! #ifdef _WIN32 #include <io.h> #else *************** *** 25,29 **** #endif ! #define COLORGRID_IMG PWD"/patches/images/colorgrid.pnm" #define DEFAULT_COLORGRID_WIDTH 256 #define DEFAULT_COLORGRID_HEIGHT 50 --- 25,29 ---- #endif ! #define COLORGRID_IMG "/Applications/Pd-extended.app/Contents/Resources/extra/colorgrid.pnm" #define DEFAULT_COLORGRID_WIDTH 256 #define DEFAULT_COLORGRID_HEIGHT 50 *************** *** 75,79 **** { t_canvas *canvas=glist_getcanvas(glist); ! t_int xpoint=x->x_current, ypoint=x->y_current; // later : try to figure out what's this test for ?? --- 75,79 ---- { t_canvas *canvas=glist_getcanvas(glist); ! int xpoint=x->x_current, ypoint=x->y_current; // later : try to figure out what's this test for ?? *************** *** 415,419 **** // post( "saving pdp_colorgrid : %s", x->x_name->s_name ); binbuf_addv(b, "ssiissiffiffiffiiff", gensym("#X"),gensym("obj"), ! (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix, gensym("pdp_colorgrid"), x->x_name, x->x_width, x->x_min, x->x_max, x->x_height, --- 415,419 ---- // post( "saving pdp_colorgrid : %s", x->x_name->s_name ); binbuf_addv(b, "ssiissiffiffiffiiff", gensym("#X"),gensym("obj"), ! (int)x->x_obj.te_xpix, (int)x->x_obj.te_ypix, gensym("pdp_colorgrid"), x->x_name, x->x_width, x->x_min, x->x_max, x->x_height, Index: pdp_erode.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_erode.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_erode.c 9 May 2007 04:54:14 -0000 1.1.2.1 --- pdp_erode.c 10 May 2007 05:03:58 -0000 1.1.2.2 *************** *** 33,47 **** t_object x_obj; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_queue_id; ! t_int x_dropped; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_kernelw; // width of the (square) kernel ! t_int x_kernelh; // height of the square kernel ! t_int x_nbpasses; // number of passes short int *x_frame; // keep a copy of current frame for transformations --- 33,47 ---- t_object x_obj; ! int x_packet0; ! int x_packet1; ! int x_queue_id; ! int x_dropped; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_kernelw; // width of the (square) kernel ! int x_kernelh; // height of the square kernel ! int x_nbpasses; // number of passes short int *x_frame; // keep a copy of current frame for transformations *************** *** 54,58 **** if ( fpasses>=1.) { ! x->x_nbpasses = (t_int)fpasses; } } --- 54,58 ---- if ( fpasses>=1.) { ! x->x_nbpasses = (int)fpasses; } } *************** *** 62,66 **** if ( fkernelw>=0.) { ! x->x_kernelw = (t_int)fkernelw; } } --- 62,66 ---- if ( fkernelw>=0.) { ! x->x_kernelw = (int)fkernelw; } } *************** *** 70,74 **** if ( fkernelh>=0.) { ! x->x_kernelh = (t_int)fkernelh; } } --- 70,74 ---- if ( fkernelh>=0.) { ! x->x_kernelh = (int)fkernelh; } } *************** *** 96,103 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i; ! t_int px=0, py=0; short int *pfY, *pfU, *pfV; ! t_int ppx, ppy, ix, iy, pn, kx, ky; // allocate all ressources --- 96,103 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i; ! int px=0, py=0; short int *pfY, *pfU, *pfV; ! int ppx, ppy, ix, iy, pn, kx, ky; // allocate all ressources Index: pdp_distance.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_distance.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_distance.c 9 May 2007 04:54:14 -0000 1.1.2.1 --- pdp_distance.c 10 May 2007 05:03:58 -0000 1.1.2.2 *************** *** 34,51 **** t_object x_obj; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_queue_id; ! t_int x_dropped; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; short int *x_frame; // keep a copy of current frame for transformations ! t_int x_coeff1; ! t_int x_coeff2; ! t_int x_coeff3; ! t_int x_coeff4; t_outlet *x_pdp_output; // output packets --- 34,51 ---- t_object x_obj; ! int x_packet0; ! int x_packet1; ! int x_queue_id; ! int x_dropped; ! int x_vwidth; ! int x_vheight; ! int x_vsize; short int *x_frame; // keep a copy of current frame for transformations ! int x_coeff1; ! int x_coeff2; ! int x_coeff3; ! int x_coeff4; t_outlet *x_pdp_output; // output packets *************** *** 95,102 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i; ! t_int px=0, py=0; short int *pfY, *pfU, *pfV; ! t_int nvalues, values[5], ival, mval; // allocate all ressources --- 95,102 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i; ! int px=0, py=0; short int *pfY, *pfU, *pfV; ! int nvalues, values[5], ival, mval; // allocate all ressources Index: pdp_yvu2rgb.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_yvu2rgb.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_yvu2rgb.c 9 May 2007 04:54:15 -0000 1.3.2.1 --- pdp_yvu2rgb.c 10 May 2007 05:04:00 -0000 1.3.2.2 *************** *** 32,42 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; unsigned int *x_RGBFrame; ! t_int x_RGBFrameSize; --- 32,42 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; unsigned int *x_RGBFrame; ! int x_RGBFrameSize; Index: pdp_live~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_live~.c,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** pdp_live~.c 9 May 2007 04:54:14 -0000 1.6.2.1 --- pdp_live~.c 10 May 2007 05:03:58 -0000 1.6.2.2 *************** *** 65,76 **** t_float x_f; ! t_int x_packet0; ! t_int x_dropped; t_pdp *x_header; unsigned char *x_data; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; t_outlet *x_pdp_out; // output decoded pdp packets --- 65,76 ---- t_float x_f; ! int x_packet0; ! int x_dropped; t_pdp *x_header; unsigned char *x_data; ! int x_vwidth; ! int x_vheight; ! int x_vsize; t_outlet *x_pdp_out; // output decoded pdp packets *************** *** 86,112 **** pthread_mutex_t x_audiolock; // audio mutex pthread_mutex_t x_videolock; // video mutex ! t_int x_usethread; // flag to activate decoding in a thread ! t_int x_autoplay; // flag to autoplay the file ( default = true ) ! t_int x_nextimage; // flag to play next image in manual mode ! t_int x_priority; // priority of decoding thread char *x_url; ! t_int x_streaming; // streaming flag ! t_int x_decoding; // decoding flag ! t_int x_loop; // looping flag ( default = on ) ! t_int x_nopackets; // no packet to decode ! t_int x_endofstream; // end of the stream reached ! t_int x_nbframes; // number of frames emitted ! t_int x_framerate; // framerate ! t_int x_samplerate; // audio sample rate ! t_int x_audiochannels; // audio channels ! t_int x_audioon; // enough audio data to start playing ! t_int x_blocksize; // audio block size struct timeval x_starttime; // streaming starting time ! t_int x_cursec; // current second ! t_int x_secondcount; // number of frames received in the current second ! t_int x_nbvideostreams; // number of video streams ! t_int x_nbaudiostreams; // number of audio streams ! t_int x_videoindex; // index of the first video stream /* AV data structures */ --- 86,112 ---- pthread_mutex_t x_audiolock; // audio mutex pthread_mutex_t x_videolock; // video mutex ! int x_usethread; // flag to activate decoding in a thread ! int x_autoplay; // flag to autoplay the file ( default = true ) ! int x_nextimage; // flag to play next image in manual mode ! int x_priority; // priority of decoding thread char *x_url; ! int x_streaming; // streaming flag ! int x_decoding; // decoding flag ! int x_loop; // looping flag ( default = on ) ! int x_nopackets; // no packet to decode ! int x_endofstream; // end of the stream reached ! int x_nbframes; // number of frames emitted ! int x_framerate; // framerate ! int x_samplerate; // audio sample rate ! int x_audiochannels; // audio channels ! int x_audioon; // enough audio data to start playing ! int x_blocksize; // audio block size struct timeval x_starttime; // streaming starting time ! int x_cursec; // current second ! int x_secondcount; // number of frames received in the current second ! int x_nbvideostreams; // number of video streams ! int x_nbaudiostreams; // number of audio streams ! int x_videoindex; // index of the first video stream /* AV data structures */ *************** *** 118,128 **** long long int x_previouspts; // previous presentation time stamp long long int x_firstpts; // first presentation time stamp ( time origin ) ! t_int x_newpicture; /* audio structures */ ! t_int x_audio; // flag to activate the decoding of audio short x_audio_buf[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for audio from stream*/ short x_audio_in[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for resampled PCM audio */ ! t_int x_audioin_position; // writing position for incoming audio ReSampleContext *x_audio_resample_ctx; // structures for audio resample --- 118,128 ---- long long int x_previouspts; // previous presentation time stamp long long int x_firstpts; // first presentation time stamp ( time origin ) ! int x_newpicture; /* audio structures */ ! int x_audio; // flag to activate the decoding of audio short x_audio_buf[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for audio from stream*/ short x_audio_in[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for resampled PCM audio */ ! int x_audioin_position; // writing position for incoming audio ReSampleContext *x_audio_resample_ctx; // structures for audio resample *************** *** 181,186 **** static void pdp_live_frame_cold(t_pdp_live *x, t_floatarg frameindex) { ! t_int frame = (int)frameindex; ! t_int ret, flags=0; uint64_t newpts; --- 181,186 ---- static void pdp_live_frame_cold(t_pdp_live *x, t_floatarg frameindex) { ! int frame = (int)frameindex; ! int ret, flags=0; uint64_t newpts; *************** *** 210,222 **** } ! static t_int pdp_live_decode_packet(t_pdp_live *x) { ! t_int chunksize=0, length, err, ret; ! t_int audiosize, sizeout, imagesize, pictureok; AVFrame frame; uint8_t *pcktptr; unsigned char *pY, *pU, *pV; uint8_t *psY, *psU, *psV; ! t_int px, py; long long tplaying; long long ttheoretical; --- 210,222 ---- } ! static int pdp_live_decode_packet(t_pdp_live *x) { ! int chunksize=0, length, err, ret; ! int audiosize, sizeout, imagesize, pictureok; AVFrame frame; uint8_t *pcktptr; unsigned char *pY, *pU, *pV; uint8_t *psY, *psU, *psV; ! int px, py; long long tplaying; long long ttheoretical; *************** *** 383,387 **** x->x_avcontext->streams[x->x_pkt.stream_index]->codec->height * 3) / 2; // yuv planar ! x->x_framerate = ( t_int ) av_q2d( x->x_avcontext->streams[x->x_pkt.stream_index]->r_frame_rate ); if ( x->x_framerate == 0 ) x->x_framerate = DEFAULT_FRAME_RATE; x->x_videoindex = x->x_pkt.stream_index; --- 383,387 ---- x->x_avcontext->streams[x->x_pkt.stream_index]->codec->height * 3) / 2; // yuv planar ! x->x_framerate = ( int ) av_q2d( x->x_avcontext->streams[x->x_pkt.stream_index]->r_frame_rate ); if ( x->x_framerate == 0 ) x->x_framerate = DEFAULT_FRAME_RATE; x->x_videoindex = x->x_pkt.stream_index; *************** *** 529,533 **** t_pdp_live *x = (t_pdp_live*)tdata; struct sched_param schedprio; ! t_int pmin, pmax; struct timespec twait; --- 529,533 ---- t_pdp_live *x = (t_pdp_live*)tdata; struct sched_param schedprio; ! int pmin, pmax; struct timespec twait; *************** *** 757,761 **** static void pdp_live_disconnect(t_pdp_live *x) { ! t_int ret, i, count=0; struct timespec twait; --- 757,761 ---- static void pdp_live_disconnect(t_pdp_live *x) { ! int ret, i, count=0; struct timespec twait; *************** *** 808,812 **** static void pdp_live_connect(t_pdp_live *x, t_symbol *s) { ! t_int ret, i; pthread_attr_t connect_child_attr; --- 808,812 ---- static void pdp_live_connect(t_pdp_live *x, t_symbol *s) { ! int ret, i; pthread_attr_t connect_child_attr; *************** *** 854,858 **** short sampleL, sampleR; struct timeval etime; ! t_int sn; // decode a packet if not in thread mode --- 854,858 ---- short sampleL, sampleR; struct timeval etime; ! int sn; // decode a packet if not in thread mode Index: pdp_o.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_o.c,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -C2 -d -r1.3.2.2 -r1.3.2.3 *** pdp_o.c 9 May 2007 04:54:14 -0000 1.3.2.2 --- pdp_o.c 10 May 2007 05:03:59 -0000 1.3.2.3 *************** *** 35,40 **** #include <sys/types.h> #include <sys/socket.h> - #include <quicktime/quicktime.h> - #include <quicktime/colormodels.h> #include <bzlib.h> // bz2 compression routines --- 35,38 ---- *************** *** 52,75 **** t_float x_f; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_hsize; // size of huffman coded data ! t_int x_packet0; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_emitflag; /* connection data */ int x_fd; // info about connection status ! t_int x_framessent; ! t_int x_framesdropped; ! t_int x_secondcount; ! t_int x_bandwidthcount; ! t_int x_cursec; ! t_int x_framerate; ! t_int x_smoothing; t_hpacket x_hpacket; // packet header --- 50,73 ---- t_float x_f; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_hsize; // size of huffman coded data ! int x_packet0; ! int x_dropped; ! int x_queue_id; ! int x_emitflag; /* connection data */ int x_fd; // info about connection status ! int x_framessent; ! int x_framesdropped; ! int x_secondcount; ! int x_bandwidthcount; ! int x_cursec; ! int x_framerate; ! int x_smoothing; t_hpacket x_hpacket; // packet header *************** *** 142,148 **** /* smoothe image */ ! static void pdp_o_smoothe(t_pdp_o *x, short int *source, t_int size ) { ! t_int i; char evalue, eevalue; char value; --- 140,146 ---- /* smoothe image */ ! static void pdp_o_smoothe(t_pdp_o *x, short int *source, int size ) { ! int i; char evalue, eevalue; char value; *************** *** 184,193 **** /* huffman coding */ ! static int pdp_o_huffman(t_pdp_o *x, char *source, char *dest, t_int size, t_int *csize ) { ! t_int i; int value = source[0]; char count = 0; ! t_int tcount=0; char *pcount=dest; char *pvalue=dest+1; --- 182,191 ---- /* huffman coding */ ! static int pdp_o_huffman(t_pdp_o *x, char *source, char *dest, int size, int *csize ) { ! int i; int value = source[0]; char count = 0; ! int tcount=0; char *pcount=dest; char *pvalue=dest+1; *************** *** 325,329 **** t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); ! t_int count, i, ret=0; /* setting video track */ --- 323,327 ---- t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); ! int count, i, ret=0; /* setting video track */ *************** *** 346,350 **** for ( i=0; i<x->x_vsize; i++ ) { ! t_int downvalue; downvalue = (data[i]>>7); --- 344,348 ---- for ( i=0; i<x->x_vsize; i++ ) { ! int downvalue; downvalue = (data[i]>>7); *************** *** 366,370 **** for ( i=x->x_vsize; i<(x->x_vsize+(x->x_vsize>>1)); i++ ) { ! t_int downvalue; downvalue = (data[i]>>8); --- 364,368 ---- for ( i=x->x_vsize; i<(x->x_vsize+(x->x_vsize>>1)); i++ ) { ! int downvalue; downvalue = (data[i]>>8); Index: pdp_theonice~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_theonice~.c,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** pdp_theonice~.c 9 May 2007 04:54:14 -0000 1.2.2.2 --- pdp_theonice~.c 10 May 2007 05:03:59 -0000 1.2.2.3 *************** *** 83,101 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_tvwidth; // theora 16 pixels aligned width value ! t_int x_vheight; ! t_int x_tvheight; // theora 16 pixels aligned height value ! t_int x_vsize; pthread_t x_connectchild; // thread used for connecting to a stream int x_socketfd; // connection socket ! t_int x_streaming; // streaming on : connected and all ! t_int x_pstreaming; // previous state char *x_passwd; // password char x_title[MAX_COMMENT_LENGTH]; // title of the stream --- 83,101 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_tvwidth; // theora 16 pixels aligned width value ! int x_vheight; ! int x_tvheight; // theora 16 pixels aligned height value ! int x_vsize; pthread_t x_connectchild; // thread used for connecting to a stream int x_socketfd; // connection socket ! int x_streaming; // streaming on : connected and all ! int x_pstreaming; // previous state char *x_passwd; // password char x_title[MAX_COMMENT_LENGTH]; // title of the stream *************** *** 108,123 **** char x_hostname[MAX_COMMENT_LENGTH]; // name or IP of host to connect to char x_mountpoint[MAX_COMMENT_LENGTH]; // mountpoint ! t_int x_port; // port number ! t_int x_public; // publish on www.oggcast.com ! t_int x_framerate; ! t_int x_mframerate; // measured framerate ! t_int x_pmframerate; // previous state ! t_int x_einit; ! t_int x_frameswritten; ! t_int x_pframeswritten; ! t_int x_frameslate; ! t_int x_nbframes_dropped; ! t_int x_pnbframes_dropped; ! t_int x_frames; t_float x_maxdrift; /* maximum delay between audio and video */ struct timeval x_tstart; --- 108,123 ---- char x_hostname[MAX_COMMENT_LENGTH]; // name or IP of host to connect to char x_mountpoint[MAX_COMMENT_LENGTH]; // mountpoint ! int x_port; // port number ! int x_public; // publish on www.oggcast.com ! int x_framerate; ! int x_mframerate; // measured framerate ! int x_pmframerate; // previous state ! int x_einit; ! int x_frameswritten; ! int x_pframeswritten; ! int x_frameslate; ! int x_nbframes_dropped; ! int x_pnbframes_dropped; ! int x_frames; t_float x_maxdrift; /* maximum delay between audio and video */ struct timeval x_tstart; *************** *** 125,130 **** struct timeval x_tcurrent; struct timeval x_tprevstream; ! t_int x_cursec; // current second ! t_int x_secondcount; // number of frames emitted in the current second /* vorbis/theora structures */ --- 125,130 ---- struct timeval x_tcurrent; struct timeval x_tprevstream; ! int x_cursec; // current second ! int x_secondcount; // number of frames emitted in the current second /* vorbis/theora structures */ *************** *** 143,154 **** vorbis_comment x_vorbis_comment; // vorbis comment yuv_buffer x_yuvbuffer; // yuv buffer ! t_int x_eos; // end of stream ! t_int x_akbps; // audio bit rate ! t_int x_vkbps; // video bit rate t_float x_aquality; // audio quality ! t_int x_vquality; // video quality ! t_int x_abytesout; // audio bytes written ! t_int x_vbytesout; // video bytes written double x_audiotime; // audio stream time double x_paudiotime; // previous value --- 143,154 ---- vorbis_comment x_vorbis_comment; // vorbis comment yuv_buffer x_yuvbuffer; // yuv buffer ! int x_eos; // end of stream ! int x_akbps; // audio bit rate ! int x_vkbps; // video bit rate t_float x_aquality; // audio quality ! int x_vquality; // video quality ! int x_abytesout; // audio bytes written ! int x_vbytesout; // video bytes written double x_audiotime; // audio stream time double x_paudiotime; // previous value *************** *** 158,165 **** /* audio structures */ t_float x_audio_buf[DEFAULT_CHANNELS][MAX_AUDIO_PACKET_SIZE]; // buffer for incoming audio ! t_int x_audioin_position; // writing position for incoming audio ! t_int x_channels; // audio channels ! t_int x_samplerate; // audio sample rate ! t_int x_bits; // audio bits t_outlet *x_outlet_streaming; // indicates the action of streaming --- 158,165 ---- /* audio structures */ t_float x_audio_buf[DEFAULT_CHANNELS][MAX_AUDIO_PACKET_SIZE]; // buffer for incoming audio ! int x_audioin_position; // writing position for incoming audio ! int x_channels; // audio channels ! int x_samplerate; // audio sample rate ! int x_bits; // audio bits t_outlet *x_outlet_streaming; // indicates the action of streaming *************** *** 186,192 **** x->x_yuvbuffer.uv_stride=x->x_vwidth>>1; ! x->x_yuvbuffer.y = (char *)malloc( x->x_yuvbuffer.y_width * x->x_yuvbuffer.y_height ); ! x->x_yuvbuffer.u = (char *)malloc( x->x_yuvbuffer.uv_width * x->x_yuvbuffer.uv_height ); ! x->x_yuvbuffer.v = (char *)malloc( x->x_yuvbuffer.uv_width * x->x_yuvbuffer.uv_height ); } --- 186,192 ---- x->x_yuvbuffer.uv_stride=x->x_vwidth>>1; ! x->x_yuvbuffer.y = (unsigned char *)malloc( x->x_yuvbuffer.y_width * x->x_yuvbuffer.y_height ); ! x->x_yuvbuffer.u = (unsigned char *)malloc( x->x_yuvbuffer.uv_width * x->x_yuvbuffer.uv_height ); ! x->x_yuvbuffer.v = (unsigned char *)malloc( x->x_yuvbuffer.uv_width * x->x_yuvbuffer.uv_height ); } *************** *** 202,206 **** static void pdp_theonice_init_encoder(t_pdp_theonice *x) { ! t_int ret; x->x_einit=0; --- 202,206 ---- static void pdp_theonice_init_encoder(t_pdp_theonice *x) { ! int ret; x->x_einit=0; *************** *** 276,280 **** static void pdp_theonice_shutdown_encoder(t_pdp_theonice *x) { ! t_int ret; if ( x->x_streaming ) --- 276,280 ---- static void pdp_theonice_shutdown_encoder(t_pdp_theonice *x) { ! int ret; if ( x->x_streaming ) *************** *** 341,345 **** static int pdp_theonice_write_headers(t_pdp_theonice *x) { ! t_int ret; ogg_packet aheader, aheadercomm, aheadercode; --- 341,345 ---- static int pdp_theonice_write_headers(t_pdp_theonice *x) { ! int ret; ogg_packet aheader, aheadercomm, aheadercode; *************** *** 471,475 **** { time_t start_t; ! t_int ret; if ( gettimeofday(&x->x_tstart, NULL) == -1) --- 471,475 ---- { time_t start_t; ! int ret; if ( gettimeofday(&x->x_tstart, NULL) == -1) *************** *** 513,517 **** static void pdp_theonice_title(t_pdp_theonice *x, t_symbol *s, int argc, t_atom *argv) { ! t_int i; strcpy( x->x_title, "" ); --- 513,517 ---- static void pdp_theonice_title(t_pdp_theonice *x, t_symbol *s, int argc, t_atom *argv) { ! int i; strcpy( x->x_title, "" ); *************** *** 525,529 **** if (argv[i].a_type == A_FLOAT) { ! sprintf( x->x_title, "%s %d", x->x_title, (t_int)argv[i].a_w.w_float ); } } --- 525,529 ---- if (argv[i].a_type == A_FLOAT) { ! sprintf( x->x_title, "%s %d", x->x_title, (int)argv[i].a_w.w_float ); } } *************** *** 535,539 **** static void pdp_theonice_artist(t_pdp_theonice *x, t_symbol *s, int argc, t_atom *argv) { ! t_int i; strcpy( x->x_artist, "" ); --- 535,539 ---- static void pdp_theonice_artist(t_pdp_theonice *x, t_symbol *s, int argc, t_atom *argv) { ! int i; strcpy( x->x_artist, "" ); *************** *** 547,551 **** if (argv[i].a_type == A_FLOAT) { ! sprintf( x->x_artist, "%s %d", x->x_artist, (t_int)argv[i].a_w.w_float ); } } --- 547,551 ---- if (argv[i].a_type == A_FLOAT) { ! sprintf( x->x_artist, "%s %d", x->x_artist, (int)argv[i].a_w.w_float ); } } *************** *** 557,561 **** static void pdp_theonice_description(t_pdp_theonice *x, t_symbol *s, int argc, t_atom *argv) { ! t_int i; strcpy( x->x_description, "" ); --- 557,561 ---- static void pdp_theonice_description(t_pdp_theonice *x, t_symbol *s, int argc, t_atom *argv) { ! int i; strcpy( x->x_description, "" ); *************** *** 569,573 **** if (argv[i].a_type == A_FLOAT) { ! sprintf( x->x_description, "%s %d", x->x_description, (t_int)argv[i].a_w.w_float ); } } --- 569,573 ---- if (argv[i].a_type == A_FLOAT) { ! sprintf( x->x_description, "%s %d", x->x_description, (int)argv[i].a_w.w_float ); } } *************** *** 579,583 **** static void pdp_theonice_genre(t_pdp_theonice *x, t_symbol *s, int argc, t_atom *argv) { ! t_int i; strcpy( x->x_genre, "" ); --- 579,583 ---- static void pdp_theonice_genre(t_pdp_theonice *x, t_symbol *s, int argc, t_atom *argv) { ! int i; strcpy( x->x_genre, "" ); *************** *** 591,595 **** if (argv[i].a_type == A_FLOAT) { ! sprintf( x->x_genre, "%s %d", x->x_genre, (t_int)argv[i].a_w.w_float ); } } --- 591,595 ---- if (argv[i].a_type == A_FLOAT) { ! sprintf( x->x_genre, "%s %d", x->x_genre, (int)argv[i].a_w.w_float ); } } *************** *** 632,638 **** } ! static void sendsock( t_int sockfd, char *buf, size_t buflen ) { ! if ( send( sockfd, buf, buflen, MSG_NOSIGNAL ) != (t_int)buflen ) { post( "pdp_theonice~ : could not send message to the server" ); --- 632,638 ---- } ! static void sendsock( int sockfd, char *buf, size_t buflen ) { ! if ( send( sockfd, buf, buflen, MSG_NOSIGNAL ) != (int)buflen ) { post( "pdp_theonice~ : could not send message to the server" ); *************** *** 650,654 **** fd_set fdset; struct timeval tv; ! t_int sockfd, ret; struct sockaddr_in sinfo; struct hostent *hp; --- 650,654 ---- fd_set fdset; struct timeval tv; ! int sockfd, ret; struct sockaddr_in sinfo; struct hostent *hp; *************** *** 788,792 **** static void pdp_theonice_connect(t_pdp_theonice *x, t_symbol *shost, t_symbol *smountpoint, t_floatarg fport) { ! t_int ret=0; pthread_attr_t connect_child_attr; --- 788,792 ---- static void pdp_theonice_connect(t_pdp_theonice *x, t_symbol *shost, t_symbol *smountpoint, t_floatarg fport) { ! int ret=0; pthread_attr_t connect_child_attr; *************** *** 802,806 **** } ! if ( ( (t_int)fport < 0 ) || ( (t_int)fport > 65535 ) ) { post("pdp_theonice~ : wrong port number." ); --- 802,806 ---- } ! if ( ( (int)fport < 0 ) || ( (int)fport > 65535 ) ) { post("pdp_theonice~ : wrong port number." ); *************** *** 809,813 **** else { ! x->x_port = (t_int)fport; } --- 809,813 ---- else { ! x->x_port = (int)fport; } *************** *** 850,860 **** static void pdp_theonice_vbitrate(t_pdp_theonice *x, t_floatarg vbitrate ) { ! if ( ( (t_int) vbitrate < MIN_VIDEO_BITRATE ) || ( (t_int) vbitrate > MAX_VIDEO_BITRATE ) ) { post( "pdp_theonice~ : wrong video bitrate %d : should be in [%d,%d] kbps", ! (t_int) vbitrate, MIN_VIDEO_BITRATE, MAX_VIDEO_BITRATE ); return; } ! x->x_vkbps = (t_int) vbitrate; } --- 850,860 ---- static void pdp_theonice_vbitrate(t_pdp_theonice *x, t_floatarg vbitrate ) { ! if ( ( (int) vbitrate < MIN_VIDEO_BITRATE ) || ( (int) vbitrate > MAX_VIDEO_BITRATE ) ) { post( "pdp_theonice~ : wrong video bitrate %d : should be in [%d,%d] kbps", ! (int) vbitrate, MIN_VIDEO_BITRATE, MAX_VIDEO_BITRATE ); return; } ! x->x_vkbps = (int) vbitrate; } *************** *** 862,872 **** static void pdp_theonice_abitrate(t_pdp_theonice *x, t_floatarg abitrate ) { ! if ( ( (t_int) abitrate < MIN_AUDIO_BITRATE ) || ( (t_int) abitrate > MAX_AUDIO_BITRATE ) ) { post( "pdp_theonice~ : wrong audio bitrate %d : should be in [%d,%d] kbps", ! (t_int) abitrate, MIN_AUDIO_BITRATE, MAX_AUDIO_BITRATE ); return; } ! x->x_akbps = (t_int) abitrate; } --- 862,872 ---- static void pdp_theonice_abitrate(t_pdp_theonice *x, t_floatarg abitrate ) { ! if ( ( (int) abitrate < MIN_AUDIO_BITRATE ) || ( (int) abitrate > MAX_AUDIO_BITRATE ) ) { post( "pdp_theonice~ : wrong audio bitrate %d : should be in [%d,%d] kbps", ! (int) abitrate, MIN_AUDIO_BITRATE, MAX_AUDIO_BITRATE ); return; } ! x->x_akbps = (int) abitrate; } *************** *** 874,884 **** static void pdp_theonice_vquality(t_pdp_theonice *x, t_floatarg vquality ) { ! if ( ( (t_int) vquality < MIN_VIDEO_QUALITY ) || ( (t_int) vquality > MAX_VIDEO_QUALITY ) ) { post( "pdp_theonice~ : wrong video quality %d : should be in [%d,%d]", ! (t_int) vquality, MIN_VIDEO_QUALITY, MAX_VIDEO_QUALITY ); return; } ! x->x_vquality = (t_int) vquality; } --- 874,884 ---- static void pdp_theonice_vquality(t_pdp_theonice *x, t_floatarg vquality ) { ! if ( ( (int) vquality < MIN_VIDEO_QUALITY ) || ( (int) vquality > MAX_VIDEO_QUALITY ) ) { post( "pdp_theonice~ : wrong video quality %d : should be in [%d,%d]", ! (int) vquality, MIN_VIDEO_QUALITY, MAX_VIDEO_QUALITY ); return; } ! x->x_vquality = (int) vquality; } *************** *** 886,896 **** static void pdp_theonice_aquality(t_pdp_theonice *x, t_floatarg aquality ) { ! if ( ( (t_int) aquality < MIN_AUDIO_QUALITY ) || ( (t_int) aquality > MAX_AUDIO_QUALITY ) ) { post( "pdp_theonice~ : wrong audio quality %d : should be in [%d,%d]", ! (t_int) aquality, MIN_AUDIO_QUALITY, MAX_AUDIO_QUALITY ); return; } ! x->x_aquality = (t_int) aquality; } --- 886,896 ---- static void pdp_theonice_aquality(t_pdp_theonice *x, t_floatarg aquality ) { ! if ( ( (int) aquality < MIN_AUDIO_QUALITY ) || ( (int) aquality > MAX_AUDIO_QUALITY ) ) { post( "pdp_theonice~ : wrong audio quality %d : should be in [%d,%d]", ! (int) aquality, MIN_AUDIO_QUALITY, MAX_AUDIO_QUALITY ); return; } ! x->x_aquality = (int) aquality; } *************** *** 898,908 **** static void pdp_theonice_framerate(t_pdp_theonice *x, t_floatarg fframerate ) { ! if ( ( (t_int) fframerate < MIN_FRAMERATE ) || ( (t_int) fframerate > MAX_FRAMERATE ) ) { post( "pdp_theonice~ : wrong framerate %d : should be in [%d,%d]", ! (t_int) fframerate, MIN_FRAMERATE, MAX_FRAMERATE ); return; } ! x->x_framerate = (t_int) fframerate; } --- 898,908 ---- static void pdp_theonice_framerate(t_pdp_theonice *x, t_floatarg fframerate ) { ! if ( ( (int) fframerate < MIN_FRAMERATE ) || ( (int) fframerate > MAX_FRAMERATE ) ) { post( "pdp_theonice~ : wrong framerate %d : should be in [%d,%d]", ! (int) fframerate, MIN_FRAMERATE, MAX_FRAMERATE ); return; } ! x->x_framerate = (int) fframerate; } *************** *** 915,919 **** int n = (int)(w[4]); // number of samples t_float fsample; ! t_int isample, i; if ( x->x_streaming ) --- 915,919 ---- int n = (int)(w[4]); // number of samples t_float fsample; ! int isample, i; if ( x->x_streaming ) *************** *** 981,992 **** t_pdp *header = pdp_packet_header(x->x_packet0); unsigned char *data = (unsigned char *)pdp_packet_data(x->x_packet0); ! t_int i, ret; ! t_int px, py; ! char *pY, *pU, *pV; struct timeval tstream; struct timeval etime; ! t_int nbaudiosamples, nbusecs, nbsamples; t_float fframerate=0.0; ! t_int ttime, atime; if ( ( (int)(header->info.image.width) != x->x_vwidth ) || --- 981,992 ---- t_pdp *header = pdp_packet_header(x->x_packet0); unsigned char *data = (unsigned char *)pdp_packet_data(x->x_packet0); ! int i, ret; ! int px, py; ! unsigned char *pY, *pU, *pV; struct timeval tstream; struct timeval etime; ! int nbaudiosamples, nbusecs, nbsamples; t_float fframerate=0.0; ! int ttime, atime; if ( ( (int)(header->info.image.width) != x->x_vwidth ) || *************** *** 1236,1240 **** void *pdp_theonice_new(void) { ! t_int i; t_pdp_theonice *x = (t_pdp_theonice *)pd_new(pdp_theonice_class); --- 1236,1240 ---- void *pdp_theonice_new(void) { ! int i; t_pdp_theonice *x = (t_pdp_theonice *)pd_new(pdp_theonice_class); Index: pdp_text.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_text.c,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** pdp_text.c 9 May 2007 04:54:14 -0000 1.4.2.1 --- pdp_text.c 10 May 2007 05:03:59 -0000 1.4.2.2 *************** *** 48,74 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; char **x_text_array; ! t_int *x_xoffsets; ! t_int *x_yoffsets; ! t_int *x_r; ! t_int *x_g; ! t_int *x_b; t_float *x_angle; t_float x_alpha; ! t_int *x_scroll; ! t_int x_nbtexts; ! t_int x_current; ! t_int x_capacity; /* imlib data */ --- 48,74 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; char **x_text_array; ! int *x_xoffsets; ! int *x_yoffsets; ! int *x_r; ! int *x_g; ! int *x_b; t_float *x_angle; t_float x_alpha; ! int *x_scroll; ! int x_nbtexts; ! int x_current; ! int x_capacity; /* imlib data */ *************** *** 83,87 **** char *pname; char *pdname; ! t_int len; if ( x->x_nbtexts >= x->x_capacity ) --- 83,87 ---- char *pname; char *pdname; ! int len; if ( x->x_nbtexts >= x->x_capacity ) *************** *** 111,116 **** if ( (*pname=='%') && ( isdigit(*(pname+1)) || (*(pname+1)=='%') ) ) { ! t_int ivalue; ! t_int ndigits; char *piname; --- 111,116 ---- if ( (*pname=='%') && ( isdigit(*(pname+1)) || (*(pname+1)=='%') ) ) { ! int ivalue; ! int ndigits; char *piname; *************** *** 268,272 **** static void pdp_text_delete(t_pdp_text *x, t_floatarg fnum ) { ! t_int i; char *lostword; --- 268,272 ---- static void pdp_text_delete(t_pdp_text *x, t_floatarg fnum ) { ! int i; char *lostword; *************** *** 293,305 **** { char **text_array; ! t_int *xoffsets; ! t_int *yoffsets; ! t_int *r; ! t_int *g; ! t_int *b; t_float *angle; ! t_int *scroll; ! t_int i, csize; if ( (int) fnewsize<=0 ) return; --- 293,305 ---- { char **text_array; ! int *xoffsets; ! int *yoffsets; ! int *r; ! int *g; ! int *b; t_float *angle; ! int *scroll; ! int i, csize; if ( (int) fnewsize<=0 ) return; *************** *** 307,317 **** // allocate new structures text_array = (char**) getbytes( fnewsize*sizeof(char*) ); ! xoffsets = (t_int*) getbytes( fnewsize*sizeof(t_int) ); ! yoffsets = (t_int*) getbytes( fnewsize*sizeof(t_int) ); ! r = (t_int*) getbytes( fnewsize*sizeof(t_int) ); ! g = (t_int*) getbytes( fnewsize*sizeof(t_int) ); ! b = (t_int*) getbytes( fnewsize*sizeof(t_int) ); angle = (t_float*) getbytes( fnewsize*sizeof(t_float) ); ! scroll = (t_int*) getbytes( fnewsize*sizeof(t_int) ); --- 307,317 ---- // allocate new structures text_array = (char**) getbytes( fnewsize*sizeof(char*) ); ! xoffsets = (int*) getbytes( fnewsize*sizeof(int) ); ! yoffsets = (int*) getbytes( fnewsize*sizeof(int) ); ! r = (int*) getbytes( fnewsize*sizeof(int) ); ! g = (int*) getbytes( fnewsize*sizeof(int) ); ! b = (int*) getbytes( fnewsize*sizeof(int) ); angle = (t_float*) getbytes( fnewsize*sizeof(t_float) ); ! scroll = (int*) getbytes( fnewsize*sizeof(int) ); *************** *** 348,358 **** // free old structures if ( x->x_text_array ) freebytes( x->x_text_array, x->x_capacity*sizeof(char*) ); ! if ( x->x_xoffsets ) freebytes( x->x_xoffsets, x->x_capacity*sizeof(t_int) ); ! if ( x->x_yoffsets ) freebytes( x->x_yoffsets, x->x_capacity*sizeof(t_int) ); ! if ( x->x_r ) freebytes( x->x_r, x->x_capacity*sizeof(t_int) ); ! if ( x->x_g ) freebytes( x->x_g, x->x_capacity*sizeof(t_int) ); ! if ( x->x_b ) freebytes( x->x_b, x->x_capacity*sizeof(t_int) ); if ( x->x_angle) freebytes( x->x_angle, x->x_capacity*sizeof(t_float) ); ! if ( x->x_scroll) freebytes( x->x_scroll, x->x_capacity*sizeof(t_int) ); // set new structures --- 348,358 ---- // free old structures if ( x->x_text_array ) freebytes( x->x_text_array, x->x_capacity*sizeof(char*) ); ! if ( x->x_xoffsets ) freebytes( x->x_xoffsets, x->x_capacity*sizeof(int) ); ! if ( x->x_yoffsets ) freebytes( x->x_yoffsets, x->x_capacity*sizeof(int) ); ! if ( x->x_r ) freebytes( x->x_r, x->x_capacity*sizeof(int) ); ! if ( x->x_g ) freebytes( x->x_g, x->x_capacity*sizeof(int) ); ! if ( x->x_b ) freebytes( x->x_b, x->x_capacity*sizeof(int) ); if ( x->x_angle) freebytes( x->x_angle, x->x_capacity*sizeof(t_float) ); ! if ( x->x_scroll) freebytes( x->x_scroll, x->x_capacity*sizeof(int) ); // set new structures *************** *** 414,419 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int ti; ! t_int px, py; unsigned char y, u, v; DATA32 *imdata; --- 414,419 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int ti; ! int px, py; unsigned char y, u, v; DATA32 *imdata; *************** *** 585,595 **** x->x_text_array = (char**) getbytes( x->x_capacity*sizeof(char*) ); ! x->x_xoffsets = (t_int*) getbytes( x->x_capacity*sizeof(t_int) ); ! x->x_yoffsets = (t_int*) getbytes( x->x_capacity*sizeof(t_int) ); ! x->x_r = (t_int*) getbytes( x->x_capacity*sizeof(t_int) ); ! x->x_g = (t_int*) getbytes( x->x_capacity*sizeof(t_int) ); ! x->x_b = (t_int*) getbytes( x->x_capacity*sizeof(t_int) ); x->x_angle = (t_float*) getbytes( x->x_capacity*sizeof(t_float) ); ! x->x_scroll = (t_int*) getbytes( x->x_capacity*sizeof(t_int) ); for ( i=0; i<x->x_capacity; i++ ) --- 585,595 ---- x->x_text_array = (char**) getbytes( x->x_capacity*sizeof(char*) ); ! x->x_xoffsets = (int*) getbytes( x->x_capacity*sizeof(int) ); ! x->x_yoffsets = (int*) getbytes( x->x_capacity*sizeof(int) ); ! x->x_r = (int*) getbytes( x->x_capacity*sizeof(int) ); ! x->x_g = (int*) getbytes( x->x_capacity*sizeof(int) ); ! x->x_b = (int*) getbytes( x->x_capacity*sizeof(int) ); x->x_angle = (t_float*) getbytes( x->x_capacity*sizeof(t_float) ); ! x->x_scroll = (int*) getbytes( x->x_capacity*sizeof(int) ); for ( i=0; i<x->x_capacity; i++ ) Index: pdp_compose.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_compose.c,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** pdp_compose.c 9 May 2007 04:54:13 -0000 1.4.2.1 --- pdp_compose.c 10 May 2007 05:03:57 -0000 1.4.2.2 *************** *** 32,43 **** { char *x_buf; ! t_int x_bufsize; ! t_int x_selstart; ! t_int x_selend; ! t_int x_active; ! t_int x_dragfrom; ! t_int x_height; ! t_int x_drawnwidth; ! t_int x_drawnheight; t_text *x_text; t_glist *x_glist; --- 32,43 ---- { char *x_buf; ! int x_bufsize; ! int x_selstart; ! int x_selend; ! int x_active; ! int x_dragfrom; ! int x_height; ! int x_drawnwidth; ! int x_drawnheight; t_text *x_text; t_glist *x_glist; *************** *** 61,83 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_colorR; // RGB components of mixing color ! t_int x_colorG; ! t_int x_colorB; ! t_int x_colorY; // YUV components of mixing color ! t_int x_colorU; ! t_int x_colorV; ! t_int x_tolerance; // tolerance ! t_int x_cursX; // X coordinate of cursor ! t_int x_cursY; // Y coordinate of cursor ! t_int x_cursor; // cursor drawing flag ! t_int x_luminosity; // flag to indicate if luminosity is used short int *x_frame; // keep a copy of current frame for picking color short int *x_right_frame; // 2nd video source --- 61,83 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_colorR; // RGB components of mixing color ! int x_colorG; ! int x_colorB; ! int x_colorY; // YUV components of mixing color ! int x_colorU; ! int x_colorV; ! int x_tolerance; // tolerance ! int x_cursX; // X coordinate of cursor ! int x_cursY; // Y coordinate of cursor ! int x_cursor; // cursor drawing flag ! int x_luminosity; // flag to indicate if luminosity is used short int *x_frame; // keep a copy of current frame for picking color short int *x_right_frame; // 2nd video source *************** *** 91,95 **** static void pdp_compose_draw_color(t_pdp_compose *x) { ! t_int width, height; char color[32]; --- 91,95 ---- static void pdp_compose_draw_color(t_pdp_compose *x) { ! int width, height; char color[32]; *************** *** 191,195 **** static void pdp_compose_pick(t_pdp_compose *x) { ! t_int y,u,v; if ( x->x_frame && ( x->x_cursX > 0 ) && ( x->x_cursX < x->x_vwidth ) --- 191,195 ---- static void pdp_compose_pick(t_pdp_compose *x) { ! int y,u,v; if ( x->x_frame && ( x->x_cursX > 0 ) && ( x->x_cursX < x->x_vwidth ) *************** *** 233,241 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i, cf; ! t_int px=0, py=0, ppx=0, ppy=0, found=0, xcell=0, ycell=0; ! t_int celldiff=0, cellwidth=0, cellheight=0; ! t_int y=0, u=0, v=0; ! t_int sum; short int *pfY, *pfV, *pfU, *prY, *prV, *prU, *pdY, *pdV, *pdU; --- 233,241 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i, cf; ! int px=0, py=0, ppx=0, ppy=0, found=0, xcell=0, ycell=0; ! int celldiff=0, cellwidth=0, cellheight=0; ! int y=0, u=0, v=0; ! int sum; short int *pfY, *pfV, *pfU, *prY, *prV, *prU, *pdY, *pdV, *pdU; Index: pdp_cmap.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_cmap.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_cmap.c 9 May 2007 04:54:13 -0000 1.3.2.1 --- pdp_cmap.c 10 May 2007 05:03:57 -0000 1.3.2.2 *************** *** 53,60 **** typedef struct _color { ! t_int on; ! t_int y,u,v; ! t_int oy,ou,ov; ! t_int tolerance; } t_color; --- 53,60 ---- typedef struct _color { ! int on; ! int y,u,v; ! int oy,ou,ov; ! int tolerance; } t_color; *************** *** 69,92 **** t_float x_f; ! t_int x_packet0; ! t_int x_dropped; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_capacity; // number of mapped colors ! t_int x_current; // current color t_color *x_colors; // color substitution table ! t_int x_cursor; // show cursor or not ! t_int x_luminosity; // use luminosity or not ! t_int x_colorR; // setable r ! t_int x_colorG; // setable g ! t_int x_colorB; // setable b ! t_int x_cursX; // X coordinate of cursor ! t_int x_cursY; // Y coordinate of cursor short int *x_frame; // keep a copy of current frame for picking color --- 69,92 ---- t_float x_f; ! int x_packet0; ! int x_dropped; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_capacity; // number of mapped colors ! int x_current; // current color t_color *x_colors; // color substitution table ! int x_cursor; // show cursor or not ! int x_luminosity; // use luminosity or not ! int x_colorR; // setable r ! int x_colorG; // setable g ! int x_colorB; // setable b ! int x_cursX; // X coordinate of cursor ! int x_cursY; // Y coordinate of cursor short int *x_frame; // keep a copy of current frame for picking color *************** *** 97,103 **** } t_pdp_cmap; ! static void pdp_cmap_draw_color(t_pdp_cmap *x, t_int r, t_int g, t_int b) { ! t_int width, height; char color[32]; --- 97,103 ---- } t_pdp_cmap; ! static void pdp_cmap_draw_color(t_pdp_cmap *x, int r, int g, int b) { ! int width, height; char color[32]; *************** *** 190,194 **** static void pdp_cmap_clear(t_pdp_cmap *x) { ! t_int ci; for ( ci=0; ci<x->x_capacity; ci++) --- 190,194 ---- static void pdp_cmap_clear(t_pdp_cmap *x) { ! int ci; for ( ci=0; ci<x->x_capacity; ci++) *************** *** 202,206 **** { t_color *colors; ! t_int ci, csize; if ( (int) fnewsize<=0 ) return; --- 202,206 ---- { t_color *colors; ! int ci, csize; if ( (int) fnewsize<=0 ) return; *************** *** 268,272 **** static void pdp_cmap_pick(t_pdp_cmap *x) { ! t_int y,u,v; if ( x->x_frame && ( x->x_cursX > 0 ) && ( x->x_cursX < x->x_vwidth ) --- 268,272 ---- static void pdp_cmap_pick(t_pdp_cmap *x) { ! int y,u,v; if ( x->x_frame && ( x->x_cursX > 0 ) && ( x->x_cursX < x->x_vwidth ) *************** *** 310,319 **** t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); ! t_int i, ci; ! t_int px=0, py=0, ppx=0, ppy=0; ! t_int y=0, u=0, v=0; short int *pfY, *pfU, *pfV; short int *poY, *poU, *poV; ! t_int diff; /* allocate all ressources */ --- 310,319 ---- t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); ! int i, ci; ! int px=0, py=0, ppx=0, ppy=0; ! int y=0, u=0, v=0; short int *pfY, *pfU, *pfV; short int *poY, *poU, *poV; ! int diff; /* allocate all ressources */ *************** *** 472,476 **** void *pdp_cmap_new(void) { ! t_int ci; t_pdp_cmap *x = (t_pdp_cmap *)pd_new(pdp_cmap_class); --- 472,476 ---- void *pdp_cmap_new(void) { ! int ci; t_pdp_cmap *x = (t_pdp_cmap *)pd_new(pdp_cmap_class); Index: pdp_rec~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_rec~.c,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** pdp_rec~.c 9 May 2007 04:54:14 -0000 1.4.2.1 --- pdp_rec~.c 10 May 2007 05:03:59 -0000 1.4.2.2 *************** *** 25,33 **** #include "pdp.h" #include <math.h> #include <time.h> #include <sys/time.h> ! #include <quicktime/quicktime.h> #include <quicktime/colormodels.h> #define DEFAULT_FRAME_RATE 25 --- 25,39 ---- #include "pdp.h" + #include "pidip_config.h" #include <math.h> #include <time.h> #include <sys/time.h> ! #ifdef QUICKTIME_NEWER ! #include <lqt/lqt.h> ! #include <lqt/colormodels.h> ! #else ! #include <quicktime/lqt.h> #include <quicktime/colormodels.h> + #endif #define DEFAULT_FRAME_RATE 25 *************** *** 46,68 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; quicktime_t *x_qtfile; unsigned char **x_yuvpointers; unsigned char *x_yuvbuffer; ! t_int x_framerate; ! t_int x_forced_framerate; ! t_int x_jpeg_quality; ! t_int x_newfile; char *x_compressor; ! t_int x_recflag; ! t_int x_frameswritten; struct timeval x_tstart; struct timeval x_tstop; --- 52,74 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; quicktime_t *x_qtfile; unsigned char **x_yuvpointers; unsigned char *x_yuvbuffer; ! int x_framerate; ! int x_forced_framerate; ! int x_jpeg_quality; ! int x_newfile; char *x_compressor; ! int x_recflag; ! int x_frameswritten; struct timeval x_tstart; struct timeval x_tstop; *************** *** 71,79 **** /* audio structures */ int16_t **x_audio_buf; /* buffer for incoming audio */ ! t_int x_audioin_position; // writing position for incoming audio char *x_acompressor; // audio compressor ! t_int x_channels; // audio channels ! t_int x_samplerate; // audio sample rate ! t_int x_bits; // audio bits } t_pdp_rec; --- 77,85 ---- /* audio structures */ int16_t **x_audio_buf; /* buffer for incoming audio */ ! int x_audioin_position; // writing position for incoming audio char *x_acompressor; // audio compressor ! int x_channels; // audio channels ! int x_samplerate; // audio sample rate ! int x_bits; // audio bits } t_pdp_rec; *************** *** 108,112 **** static void pdp_rec_set_video(t_pdp_rec *x) { ! t_int ret; if ( !x->x_qtfile ) { --- 114,118 ---- static void pdp_rec_set_video(t_pdp_rec *x) { ! int ret; if ( !x->x_qtfile ) { *************** *** 130,134 **** static void pdp_rec_set_framerate(t_pdp_rec *x) { ! t_int ret; if ( !x->x_qtfile ) { --- 136,140 ---- static void pdp_rec_set_framerate(t_pdp_rec *x) { ! int ret; if ( !x->x_qtfile ) { *************** *** 145,149 **** static void pdp_rec_set_audio(t_pdp_rec *x) { ! t_int ret; if ( !x->x_qtfile ) { --- 151,155 ---- static void pdp_rec_set_audio(t_pdp_rec *x) { ! int ret; if ( !x->x_qtfile ) { *************** *** 166,170 **** static void pdp_rec_set_cmodel(t_pdp_rec *x) { ! t_int ret; if ( !x->x_qtfile ) { --- 172,176 ---- static void pdp_rec_set_cmodel(t_pdp_rec *x) { ! int ret; if ( !x->x_qtfile ) { *************** *** 344,348 **** static void pdp_rec_open(t_pdp_rec *x, t_symbol *sfile) { ! t_int ret=0; // close previous video file if existing --- 350,354 ---- static void pdp_rec_open(t_pdp_rec *x, t_symbol *sfile) { ! int ret=0; // close previous video file if existing *************** *** 436,440 **** int n = (int)(w[4]); // number of samples t_float fsample; ! t_int isample, i; if ( x->x_recflag ) --- 442,446 ---- int n = (int)(w[4]); // number of samples t_float fsample; ! int isample, i; if ( x->x_recflag ) *************** *** 475,483 **** t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); ! t_int i, ret; ! t_int px, py; unsigned short *poy, *pou, *pov; struct timeval trec; ! t_int nbaudiosamples, nbusecs, nbrecorded; t_float fframerate=0.0; --- 481,489 ---- t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); ! int i, ret; ! int px, py; unsigned short *poy, *pou, *pov; struct timeval trec; ! int nbaudiosamples, nbusecs, nbrecorded; t_float fframerate=0.0; *************** *** 646,650 **** void *pdp_rec_new(void) { ! t_int i; t_pdp_rec *x = (t_pdp_rec *)pd_new(pdp_rec_class); --- 652,656 ---- void *pdp_rec_new(void) { ! int i; t_pdp_rec *x = (t_pdp_rec *)pd_new(pdp_rec_class); Index: pdp_ripple.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_ripple.c,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** pdp_ripple.c 9 May 2007 04:54:14 -0000 1.4.2.1 --- pdp_ripple.c 10 May 2007 05:03:59 -0000 1.4.2.2 *************** *** 56,79 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_maph; ! t_int x_mapw; ! t_int x_mode; ! t_int x_threshold; ! t_int *x_map; ! t_int *x_map1; ! t_int *x_map2; ! t_int *x_map3; signed char *x_vtable; short int *x_diff; short int *x_bdata; ! t_int x_snapshot; } t_pdp_ripple; --- 56,79 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_maph; ! int x_mapw; ! int x_mode; ! int x_threshold; ! int *x_map; ! int *x_map1; ! int *x_map2; ! int *x_map3; signed char *x_vtable; short int *x_diff; short int *x_bdata; ! int x_snapshot; } t_pdp_ripple; *************** *** 106,110 **** if ( x->x_diff != NULL ) freebytes( x->x_diff, (x->x_vsize + (x->x_vsize>>1))<<1 ); if ( x->x_bdata ) freebytes( x->x_bdata, (( x->x_vsize + (x->x_vsize>>1))<<1)); ! if ( x->x_map ) freebytes(x->x_map, x->x_maph*x->x_mapw*3*sizeof(t_int)); if ( x->x_vtable ) freebytes(x->x_vtable, x->x_maph*x->x_mapw*2*sizeof(signed char)); } --- 106,110 ---- if ( x->x_diff != NULL ) freebytes( x->x_diff, (x->x_vsize + (x->x_vsize>>1))<<1 ); if ( x->x_bdata ) freebytes( x->x_bdata, (( x->x_vsize + (x->x_vsize>>1))<<1)); ! if ( x->x_map ) freebytes(x->x_map, x->x_maph*x->x_mapw*3*sizeof(int)); if ( x->x_vtable ) freebytes(x->x_vtable, x->x_maph*x->x_mapw*2*sizeof(signed char)); } *************** *** 118,122 **** x->x_maph = x->x_vheight / 2 + 1; x->x_mapw = x->x_vwidth / 2 + 1; ! x->x_map = (int *)getbytes(x->x_maph*x->x_mapw*3*sizeof(t_int)); x->x_vtable = (signed char *)getbytes(x->x_maph*x->x_mapw*2*sizeof(signed char)); if( !x->x_map || !x->x_vtable || !x->x_bdata || !x->x_diff ) { --- 118,122 ---- x->x_maph = x->x_vheight / 2 + 1; x->x_mapw = x->x_vwidth / 2 + 1; ! x->x_map = (int *)getbytes(x->x_maph*x->x_mapw*3*sizeof(int)); x->x_vtable = (signed char *)getbytes(x->x_maph*x->x_mapw*2*sizeof(signed char)); if( !x->x_map || !x->x_vtable || !x->x_bdata || !x->x_diff ) { Index: pdp_mapper.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_mapper.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_mapper.c 9 May 2007 04:54:14 -0000 1.1.2.1 --- pdp_mapper.c 10 May 2007 05:03:58 -0000 1.1.2.2 *************** *** 34,47 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; unsigned int x_encoding; ! t_int *x_pixelmap; } t_pdp_mapper; --- 34,47 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; unsigned int x_encoding; ! int *x_pixelmap; } t_pdp_mapper; *************** *** 54,58 **** ( toY >= 0 ) && ( toY < x->x_vheight ) ) { ! x->x_pixelmap[ (t_int)toY*x->x_vwidth+(t_int)toX ] = x->x_pixelmap[ (t_int)fromY*x->x_vwidth+(t_int)fromX ]; } } --- 54,58 ---- ( toY >= 0 ) && ( toY < x->x_vheight ) ) { ! x->x_pixelmap[ (int)toY*x->x_vwidth+(int)toX ] = x->x_pixelmap[ (int)fromY*x->x_vwidth+(int)fromX ]; } } *************** *** 60,64 **** static void pdp_mapper_reset(t_pdp_mapper *x) { ! t_int px, py; if ( x->x_vsize > 0 ) --- 60,64 ---- static void pdp_mapper_reset(t_pdp_mapper *x) { ! int px, py; if ( x->x_vsize > 0 ) *************** *** 77,81 **** { ! t_int tval; if ( ( fromX >= 0 ) && ( fromX < x->x_vwidth ) && --- 77,81 ---- { ! int tval; if ( ( fromX >= 0 ) && ( fromX < x->x_vwidth ) && *************** *** 84,94 **** ( toY >= 0 ) && ( toY < x->x_vheight ) ) { ! tval = x->x_pixelmap[ (t_int)toY*x->x_vwidth+(t_int)toX ]; ! x->x_pixelmap[ (t_int)toY*x->x_vwidth+(t_int)toX ] = x->x_pixelmap[ (t_int)fromY*x->x_vwidth+(t_int)fromX ]; ! x->x_pixelmap[ (t_int)fromY*x->x_vwidth+(t_int)fromX ] = tval; } } ! static void pdp_mapper_allocate(t_pdp_mapper *x, t_int newsize) { int i, px, py; --- 84,94 ---- ( toY >= 0 ) && ( toY < x->x_vheight ) ) { ! tval = x->x_pixelmap[ (int)toY*x->x_vwidth+(int)toX ]; ! x->x_pixelmap[ (int)toY*x->x_vwidth+(int)toX ] = x->x_pixelmap[ (int)fromY*x->x_vwidth+(int)fromX ]; ! x->x_pixelmap[ (int)fromY*x->x_vwidth+(int)fromX ] = tval; } } ! static void pdp_mapper_allocate(t_pdp_mapper *x, int newsize) { int i, px, py; *************** *** 96,104 **** if ( x->x_pixelmap != NULL ) { ! freebytes( x->x_pixelmap, x->x_vsize*sizeof(t_int) ); } x->x_vsize = newsize; ! x->x_pixelmap = (t_int*) getbytes( x->x_vsize*sizeof(t_int) ); for ( py=0; py<x->x_vheight; py++ ) --- 96,104 ---- if ( x->x_pixelmap != NULL ) { ! freebytes( x->x_pixelmap, x->x_vsize*sizeof(int) ); } x->x_vsize = newsize; ! x->x_pixelmap = (int*) getbytes( x->x_vsize*sizeof(int) ); for ( py=0; py<x->x_vheight; py++ ) *************** *** 119,130 **** int i; ! t_int px, py, ppx, ppy, offset; short int *sy, *su, *sv, t; ! t_int *spy; short int *sny, *snu, *snv; /* allocate all ressources */ ! if ( ((t_int)header->info.image.width != x->x_vwidth ) || ! ((t_int)header->info.image.height != x->x_vheight ) ) { x->x_vwidth = header->info.image.width; --- 119,130 ---- int i; ! int px, py, ppx, ppy, offset; short int *sy, *su, *sv, t; ! int *spy; short int *sny, *snu, *snv; /* allocate all ressources */ ! if ( ((int)header->info.image.width != x->x_vwidth ) || ! ((int)header->info.image.height != x->x_vheight ) ) { x->x_vwidth = header->info.image.width; *************** *** 233,237 **** pdp_packet_mark_unused(x->x_packet0); ! if ( x->x_pixelmap ) freebytes( x->x_pixelmap, x->x_vsize*sizeof(t_int) ); } --- 233,237 ---- pdp_packet_mark_unused(x->x_packet0); ! if ( x->x_pixelmap ) freebytes( x->x_pixelmap, x->x_vsize*sizeof(int) ); } Index: pdp_spotlight.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_spotlight.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_spotlight.c 9 May 2007 04:54:14 -0000 1.1.2.1 --- pdp_spotlight.c 10 May 2007 05:03:59 -0000 1.1.2.2 *************** *** 38,57 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_cx; // coordinates of lens center ! t_int x_cy; // coordinates of lens center ! t_int x_ssize; // width of the spotlight t_float x_strength; // strength of the light (0<=strength<=1) ! t_int x_colorR; // red component of the color ! t_int x_colorG; // green component of the color ! t_int x_colorB; // blue component of the color } t_pdp_spotlight; --- 38,57 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_cx; // coordinates of lens center ! int x_cy; // coordinates of lens center ! int x_ssize; // width of the spotlight t_float x_strength; // strength of the light (0<=strength<=1) ! int x_colorR; // red component of the color ! int x_colorG; // green component of the color ! int x_colorB; // blue component of the color } t_pdp_spotlight; Index: pdp_shape.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_shape.c,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** pdp_shape.c 9 May 2007 04:54:14 -0000 1.5.2.1 --- pdp_shape.c 10 May 2007 05:03:59 -0000 1.5.2.2 *************** *** 35,63 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_red; ! t_int x_green; ! t_int x_blue; ! t_int x_cursX; ! t_int x_cursY; ! t_int x_colorY; // YUV components of selected color ! t_int x_colorU; ! t_int x_colorV; ! t_int x_tolerance; // tolerance ! t_int x_paint; // paint option ! t_int x_isolate; // isolate option ! t_int x_shape; // drawing shape option ! t_int x_luminosity; // use luminosity or not short int *x_bdata; --- 35,63 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_red; ! int x_green; ! int x_blue; ! int x_cursX; ! int x_cursY; ! int x_colorY; // YUV components of selected color ! int x_colorU; ! int x_colorV; ! int x_tolerance; // tolerance ! int x_paint; // paint option ! int x_isolate; // isolate option ! int x_shape; // drawing shape option ! int x_luminosity; // use luminosity or not short int *x_bdata; *************** *** 69,81 **** t_outlet *x_x2; // output x2 coordinate of blob t_outlet *x_y2; // output y2 coordinate of blob ! t_int x_vx1; // x1 coordinate of blob ! t_int x_vx2; // x1 coordinate of blob ! t_int x_vy1; // x1 coordinate of blob ! t_int x_vy2; // x1 coordinate of blob } t_pdp_shape; ! static void pdp_shape_allocate(t_pdp_shape *x, t_int newsize) { int i; --- 69,81 ---- t_outlet *x_x2; // output x2 coordinate of blob t_outlet *x_y2; // output y2 coordinate of blob ! int x_vx1; // x1 coordinate of blob ! int x_vx2; // x1 coordinate of blob ! int x_vy1; // x1 coordinate of blob ! int x_vy2; // x1 coordinate of blob } t_pdp_shape; ! static void pdp_shape_allocate(t_pdp_shape *x, int newsize) { int i; *************** *** 118,124 **** static void pdp_shape_paint(t_pdp_shape *x, t_floatarg fpaint ) { ! if ( ( (t_int)fpaint == 0 ) || ( (t_int)fpaint == 1 ) ) { ! x->x_paint = (t_int)fpaint; } } --- 118,124 ---- static void pdp_shape_paint(t_pdp_shape *x, t_floatarg fpaint ) { ! if ( ( (int)fpaint == 0 ) || ( (int)fpaint == 1 ) ) { ! x->x_paint = (int)fpaint; } } *************** *** 126,132 **** static void pdp_shape_shape(t_pdp_shape *x, t_floatarg fshape ) { ! if ( ( (t_int)fshape == 0 ) || ( (t_int)fshape == 1 ) ) { ! x->x_shape = (t_int)fshape; } } --- 126,132 ---- static void pdp_shape_shape(t_pdp_shape *x, t_floatarg fshape ) { ! if ( ( (int)fshape == 0 ) || ( (int)fshape == 1 ) ) { ! x->x_shape = (int)fshape; } } *************** *** 135,143 **** static void pdp_shape_frame_detect(t_pdp_shape *x, t_floatarg X, t_floatarg Y); ! static t_int pdp_shape_check_point(t_pdp_shape *x, t_int nX, t_int nY) { short int *pbY, *pbU, *pbV; short int y, v, u; ! t_int diff; if ( ( nX < 0 ) || ( nX >= x->x_vwidth ) || --- 135,143 ---- static void pdp_shape_frame_detect(t_pdp_shape *x, t_floatarg X, t_floatarg Y); ! static int pdp_shape_check_point(t_pdp_shape *x, int nX, int nY) { short int *pbY, *pbU, *pbV; short int y, v, u; ! int diff; if ( ( nX < 0 ) || ( nX >= x->x_vwidth ) || *************** *** 164,168 **** } ! static void pdp_shape_propagate(t_pdp_shape *x, t_int nX, t_int nY) { --- 164,168 ---- } ! static void pdp_shape_propagate(t_pdp_shape *x, int nX, int nY) { *************** *** 182,186 **** short int nX, nY, y, v, u; short int *data; ! t_int diff, px, py, inc, maxXY; pbY = x->x_bdata; --- 182,186 ---- short int nX, nY, y, v, u; short int *data; ! int diff, px, py, inc, maxXY; pbY = x->x_bdata; *************** *** 191,202 **** pbbV = (x->x_bbdata+x->x_vsize+(x->x_vsize>>2)); ! if ( ( (t_int)X < 0 ) || ( (t_int)X >= x->x_vwidth ) || ! ( (t_int)Y < 0 ) || ( (t_int)Y >= x->x_vheight ) ) { return; } ! nX = (t_int) X; ! nY = (t_int) Y; *(x->x_checked + nY*x->x_vwidth + nX) = 1; --- 191,202 ---- pbbV = (x->x_bbdata+x->x_vsize+(x->x_vsize>>2)); ! if ( ( (int)X < 0 ) || ( (int)X >= x->x_vwidth ) || ! ( (int)Y < 0 ) || ( (int)Y >= x->x_vheight ) ) { return; } ! nX = (int) X; ! nY = (int) Y; *(x->x_checked + nY*x->x_vwidth + nX) = 1; *************** *** 240,245 **** for ( inc=0; inc<=maxXY; inc++ ) { ! nX = (t_int) X+inc; ! nY = (t_int) Y; if ( pdp_shape_check_point( x, nX, nY ) ) { --- 240,245 ---- for ( inc=0; inc<=maxXY; inc++ ) { ! nX = (int) X+inc; ! nY = (int) Y; if ( pdp_shape_check_point( x, nX, nY ) ) { *************** *** 248,253 **** } ! nX = (t_int) X-inc; ! nY = (t_int) Y; if ( pdp_shape_check_point( x, nX, nY ) ) { --- 248,253 ---- } ! nX = (int) X-inc; ! nY = (int) Y; if ( pdp_shape_check_point( x, nX, nY ) ) { *************** *** 256,261 **** } ! nX = (t_int) X-inc; ! nY = (t_int) Y-inc; if ( pdp_shape_check_point( x, nX, nY ) ) { --- 256,261 ---- } ! nX = (int) X-inc; ! nY = (int) Y-inc; if ( pdp_shape_check_point( x, nX, nY ) ) { *************** *** 264,269 **** } ! nX = (t_int) X; ! nY = (t_int) Y-inc; if ( pdp_shape_check_point( x, nX, nY ) ) { --- 264,269 ---- } ! nX = (int) X; ! nY = (int) Y-inc; if ( pdp_shape_check_point( x, nX, nY ) ) { *************** *** 272,277 **** } ! nX = (t_int) X+inc; ! nY = (t_int) Y-inc; if ( pdp_shape_check_point( x, nX, nY ) ) { --- 272,277 ---- } ! nX = (int) X+inc; ! nY = (int) Y-inc; if ( pdp_shape_check_point( x, nX, nY ) ) { *************** *** 280,285 **** } ! nX = (t_int) X-inc; ! nY = (t_int) Y+inc; if ( pdp_shape_check_point( x, nX, nY ) ) { --- 280,285 ---- } ! nX = (int) X-inc; ! nY = (int) Y+inc; if ( pdp_shape_check_point( x, nX, nY ) ) { *************** *** 288,293 **** } ! nX = (t_int) X; ! nY = (t_int) Y+inc; if ( pdp_shape_check_point( x, nX, nY ) ) { --- 288,293 ---- } ! nX = (int) X; ! nY = (int) Y+inc; if ( pdp_shape_check_point( x, nX, nY ) ) { *************** *** 296,301 **** } ! nX = (t_int) X+inc; ! nY = (t_int) Y+inc; if ( pdp_shape_check_point( x, nX, nY ) ) { --- 296,301 ---- } ! nX = (int) X+inc; ! nY = (int) Y+inc; if ( pdp_shape_check_point( x, nX, nY ) ) { *************** *** 327,360 **** } ! nX = (t_int) X+1; ! nY = (t_int) Y; pdp_shape_propagate(x, nX, nY); ! nX = (t_int) X-1; ! nY = (t_int) Y; pdp_shape_propagate(x, nX, nY); ! nX = (t_int) X-1; ! nY = (t_int) Y-1; pdp_shape_propagate(x, nX, nY); ! nX = (t_int) X; ! nY = (t_int) Y-1; pdp_shape_propagate(x, nX, nY); ! nX = (t_int) X+1; ! nY = (t_int) Y-1; pdp_shape_propagate(x, nX, nY); ! nX = (t_int) X-1; ! nY = (t_int) Y+1; pdp_shape_propagate(x, nX, nY); ! nX = (t_int) X; ! nY = (t_int) Y+1; pdp_shape_propagate(x, nX, nY); ! nX = (t_int) X+1; ! nY = (t_int) Y+1; pdp_shape_propagate(x, nX, nY); --- 327,360 ---- } ! nX = (int) X+1; ! nY = (int) Y; pdp_shape_propagate(x, nX, nY); ! nX = (int) X-1; ! nY = (int) Y; pdp_shape_propagate(x, nX, nY); ! nX = (int) X-1; ! nY = (int) Y-1; pdp_shape_propagate(x, nX, nY); ! nX = (int) X; ! nY = (int) Y-1; pdp_shape_propagate(x, nX, nY); ! nX = (int) X+1; ! nY = (int) Y-1; pdp_shape_propagate(x, nX, nY); ! nX = (int) X-1; ! nY = (int) Y+1; pdp_shape_propagate(x, nX, nY); ! nX = (int) X; ! nY = (int) Y+1; pdp_shape_propagate(x, nX, nY); ! nX = (int) X+1; ! nY = (int) Y+1; pdp_shape_propagate(x, nX, nY); *************** *** 363,370 **** static void pdp_shape_pick(t_pdp_shape *x, t_floatarg X, t_floatarg Y) { ! t_int y,u,v; ! x->x_cursX = (t_int) (X*(t_float)x->x_vwidth); ! x->x_cursY = (t_int) (Y*(t_float)x->x_vheight); // post( "pdp_shape : pick color at : %d,%d", x->x_cursX, x->x_cursY ); if ( ( x->x_cursX >= 0 ) && ( x->x_cursX < x->x_vwidth ) --- 363,370 ---- static void pdp_shape_pick(t_pdp_shape *x, t_floatarg X, t_floatarg Y) { ! int y,u,v; ! x->x_cursX = (int) (X*(t_float)x->x_vwidth); ! x->x_cursY = (int) (Y*(t_float)x->x_vheight); // post( "pdp_shape : pick color at : %d,%d", x->x_cursX, x->x_cursY ); if ( ( x->x_cursX >= 0 ) && ( x->x_cursX < x->x_vwidth ) *************** *** 389,393 **** if ( x->x_bdata == NULL ) return; ! // post( "pdp_shape : detect %d %d", (t_int)x->x_cursX, (t_int)x->x_cursY ); x->x_vx1 = -1; x->x_vx2 = -1; --- 389,393 ---- if ( x->x_bdata == NULL ) return; ! // post( "pdp_shape : detect %d %d", (int)x->x_cursX, (int)x->x_cursY ); x->x_vx1 = -1; x->x_vx2 = -1; *************** *** 405,412 **** static void pdp_shape_detect(t_pdp_shape *x, t_floatarg X, t_floatarg Y) { ! t_int wX, wY; ! wX = (t_int) (X*(t_float)x->x_vwidth); ! wY = (t_int) (Y*(t_float)x->x_vheight); // post( "pdp_shape : detect %d %d", wX, wY ); if ( (wX<0) || (wX>x->x_vwidth) ) --- 405,412 ---- static void pdp_shape_detect(t_pdp_shape *x, t_floatarg X, t_floatarg Y) { ! int wX, wY; ! wX = (int) (X*(t_float)x->x_vwidth); ! wY = (int) (Y*(t_float)x->x_vheight); // post( "pdp_shape : detect %d %d", wX, wY ); if ( (wX<0) || (wX>x->x_vwidth) ) *************** *** 446,451 **** /* allocate all ressources */ ! if ( ((t_int)header->info.image.width != x->x_vwidth ) || ! ((t_int)header->info.image.height != x->x_vheight ) ) { pdp_shape_allocate(x, header->info.image.width*header->info.image.height ); --- 446,451 ---- /* allocate all ressources */ ! if ( ((int)header->info.image.width != x->x_vwidth ) || ! ((int)header->info.image.height != x->x_vheight ) ) { pdp_shape_allocate(x, header->info.image.width*header->info.image.height ); Index: pdp_mosaic.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_mosaic.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_mosaic.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_mosaic.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 40,56 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_censor_level; ! t_int x_ssize; short int *x_diff; short int *x_bdata; ! t_int x_snapshot; } t_pdp_mosaic; --- 40,56 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_censor_level; ! int x_ssize; short int *x_diff; short int *x_bdata; ! int x_snapshot; } t_pdp_mosaic; Index: pdp_radioactiv.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_radioactiv.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_radioactiv.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_radioactiv.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 45,73 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; unsigned char *x_blurzoombuf; ! t_int *x_blurzoomx; ! t_int *x_blurzoomy; ! t_int x_buf_width_blocks; ! t_int x_buf_width; ! t_int x_buf_height; ! t_int x_buf_area; ! t_int x_buf_margin_right; ! t_int x_buf_margin_left; ! t_int x_palette[COLORS]; ! t_int x_mode; /* 0=normal 1=strobe 2=strobe2 3=trigger */ ! t_int x_snap_time; ! t_int x_snap_interval; short int *x_snapframe; short int *x_diff; short int *x_bdata; ! t_int x_snapshot; } t_pdp_radioactiv; --- 45,73 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; unsigned char *x_blurzoombuf; ! int *x_blurzoomx; ! int *x_blurzoomy; ! int x_buf_width_blocks; ! int x_buf_width; ! int x_buf_height; ! int x_buf_area; ! int x_buf_margin_right; ! int x_buf_margin_left; ! int x_palette[COLORS]; ! int x_mode; /* 0=normal 1=strobe 2=strobe2 3=trigger */ ! int x_snap_time; ! int x_snap_interval; short int *x_snapframe; short int *x_diff; short int *x_bdata; ! int x_snapshot; } t_pdp_radioactiv; *************** *** 76,81 **** { if ( x->x_blurzoombuf ) freebytes ( x->x_blurzoombuf, x->x_buf_area*2 ); ! if ( x->x_blurzoomx ) freebytes ( x->x_blurzoomx, x->x_buf_width*sizeof(t_int) ); ! if ( x->x_blurzoomy ) freebytes ( x->x_blurzoomy, x->x_buf_height*sizeof(t_int) ); if ( x->x_snapframe ) freebytes ( x->x_snapframe, ( ( x->x_vsize + x->x_vsize>>1 ) << 1 ) ); if ( x->x_diff ) freebytes( x->x_diff, (x->x_vsize + (x->x_vsize>>1))<<1 ); --- 76,81 ---- { if ( x->x_blurzoombuf ) freebytes ( x->x_blurzoombuf, x->x_buf_area*2 ); ! if ( x->x_blurzoomx ) freebytes ( x->x_blurzoomx, x->x_buf_width*sizeof(int) ); ! if ( x->x_blurzoomy ) freebytes ( x->x_blurzoomy, x->x_buf_height*sizeof(int) ); if ( x->x_snapframe ) freebytes ( x->x_snapframe, ( ( x->x_vsize + x->x_vsize>>1 ) << 1 ) ); if ( x->x_diff ) freebytes( x->x_diff, (x->x_vsize + (x->x_vsize>>1))<<1 ); *************** *** 95,100 **** x->x_blurzoombuf = (unsigned char *) getbytes (x->x_buf_area*2); ! x->x_blurzoomx = (t_int *) getbytes (x->x_buf_width*sizeof(t_int)); ! x->x_blurzoomy = (t_int *) getbytes (x->x_buf_height*sizeof(t_int)); x->x_snapframe = (short int *) getbytes ( ( ( x->x_vsize + x->x_vsize>>1 ) << 1 ) ); x->x_diff = (short int*) getbytes((x->x_vsize + (x->x_vsize>>1))<<1); --- 95,100 ---- x->x_blurzoombuf = (unsigned char *) getbytes (x->x_buf_area*2); ! x->x_blurzoomx = (int *) getbytes (x->x_buf_width*sizeof(int)); ! x->x_blurzoomy = (int *) getbytes (x->x_buf_height*sizeof(int)); x->x_snapframe = (short int *) getbytes ( ( ( x->x_vsize + x->x_vsize>>1 ) << 1 ) ); x->x_diff = (short int*) getbytes((x->x_vsize + (x->x_vsize>>1))<<1); *************** *** 216,220 **** if ( fsnaptime > 0 ) { ! x->x_snap_time = (t_int) fsnaptime; } } --- 216,220 ---- if ( fsnaptime > 0 ) { ! x->x_snap_time = (int) fsnaptime; } } *************** *** 224,228 **** if ( fsnapinterval > 1 ) { ! x->x_snap_interval = (t_int) fsnapinterval; } } --- 224,228 ---- if ( fsnapinterval > 1 ) { ! x->x_snap_interval = (int) fsnapinterval; } } Index: pdp_background.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_background.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_background.c 9 May 2007 04:54:13 -0000 1.1.2.1 --- pdp_background.c 10 May 2007 05:03:57 -0000 1.1.2.2 *************** *** 38,52 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_colorR; ! t_int x_colorG; ! t_int x_colorB; ! t_int x_colorY; ! t_int x_colorU; ! t_int x_colorV; ! t_int x_width; ! t_int x_height; } t_pdp_background; --- 38,52 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_colorR; ! int x_colorG; ! int x_colorB; ! int x_colorY; ! int x_colorU; ! int x_colorV; ! int x_width; ! int x_height; } t_pdp_background; *************** *** 58,66 **** unsigned char *data; unsigned char *pY, *pU, *pV; ! t_int px, py; x->x_packet0 = pdp_packet_new_bitmap_yv12( x->x_width, x->x_height ); ! data = (char *)pdp_packet_data(x->x_packet0); pY = data; pV = data+(x->x_width*x->x_height); --- 58,66 ---- unsigned char *data; unsigned char *pY, *pU, *pV; ! int px, py; x->x_packet0 = pdp_packet_new_bitmap_yv12( x->x_width, x->x_height ); ! data = (unsigned char *)pdp_packet_data(x->x_packet0); pY = data; pV = data+(x->x_width*x->x_height); *************** *** 77,97 **** static void pdp_background_dim(t_pdp_background *x, t_floatarg fwidth, t_floatarg fheight) { ! if ( ( (t_int)fwidth>0 ) && ( (t_int) fheight>0 ) ) { ! if ( ((t_int)fwidth)%8 == 0 ) { ! x->x_width = (t_int)fwidth; } else { ! x->x_width = (t_int)fwidth + (8-((t_int)fwidth)%8); // align on 8 } ! if ( ((t_int)fheight)%8 == 0 ) { ! x->x_height = (t_int)fheight; } else { ! x->x_height = (t_int)fheight + (8-((t_int)fheight)%8); // align on 8 } } --- 77,97 ---- static void pdp_background_dim(t_pdp_background *x, t_floatarg fwidth, t_floatarg fheight) { ! if ( ( (int)fwidth>0 ) && ( (int) fheight>0 ) ) { ! if ( ((int)fwidth)%8 == 0 ) { ! x->x_width = (int)fwidth; } else { ! x->x_width = (int)fwidth + (8-((int)fwidth)%8); // align on 8 } ! if ( ((int)fheight)%8 == 0 ) { ! x->x_height = (int)fheight; } else { ! x->x_height = (int)fheight + (8-((int)fheight)%8); // align on 8 } } *************** *** 100,106 **** static void pdp_background_red(t_pdp_background *x, t_floatarg fred) { ! if ( ( (t_int)fred>=0 ) && ( (t_int) fred <= 255 ) ) { ! x->x_colorR = (t_int) fred; x->x_colorY = yuv_RGBtoY( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); x->x_colorU = yuv_RGBtoU( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); --- 100,106 ---- static void pdp_background_red(t_pdp_background *x, t_floatarg fred) { ! if ( ( (int)fred>=0 ) && ( (int) fred <= 255 ) ) { ! x->x_colorR = (int) fred; x->x_colorY = yuv_RGBtoY( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); x->x_colorU = yuv_RGBtoU( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); *************** *** 111,117 **** static void pdp_background_green(t_pdp_background *x, t_floatarg fgreen) { ! if ( ( (t_int)fgreen>=0 ) && ( (t_int) fgreen <= 255 ) ) { ! x->x_colorG = (t_int) fgreen; x->x_colorY = yuv_RGBtoY( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); x->x_colorU = yuv_RGBtoU( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); --- 111,117 ---- static void pdp_background_green(t_pdp_background *x, t_floatarg fgreen) { ! if ( ( (int)fgreen>=0 ) && ( (int) fgreen <= 255 ) ) { ! x->x_colorG = (int) fgreen; x->x_colorY = yuv_RGBtoY( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); x->x_colorU = yuv_RGBtoU( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); *************** *** 122,128 **** static void pdp_background_blue(t_pdp_background *x, t_floatarg fblue) { ! if ( ( (t_int)fblue>=0 ) && ( (t_int) fblue <= 255 ) ) { ! x->x_colorB = (t_int) fblue; x->x_colorY = yuv_RGBtoY( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); x->x_colorU = yuv_RGBtoU( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); --- 122,128 ---- static void pdp_background_blue(t_pdp_background *x, t_floatarg fblue) { ! if ( ( (int)fblue>=0 ) && ( (int) fblue <= 255 ) ) { ! x->x_colorB = (int) fblue; x->x_colorY = yuv_RGBtoY( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); x->x_colorU = yuv_RGBtoU( (x->x_colorR << 16) + (x->x_colorG << 8) + x->x_colorB ); Index: pdp_i.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_i.c,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -C2 -d -r1.5.2.2 -r1.5.2.3 *** pdp_i.c 9 May 2007 04:54:14 -0000 1.5.2.2 --- pdp_i.c 10 May 2007 05:03:58 -0000 1.5.2.3 *************** *** 104,132 **** { t_object x_obj; ! t_int x_socket; t_outlet *x_connection_status; t_outlet *x_frames; t_outlet *x_connectionip; t_outlet *x_pdp_output; ! t_int x_serversocket; ! t_int x_framesreceived; // total number of frames received void *x_inbuffer; /* accumulation buffer for incoming frames */ ! t_int x_inwriteposition; ! t_int x_inbuffersize; /* PDP data structures */ ! t_int x_packet; t_pdp *x_header; ! t_int x_vheight; ! t_int x_vwidth; ! t_int x_vsize; ! t_int x_psize; ! t_int x_hsize; ! t_int x_bsize; ! t_int x_bzsize; short int *x_data; ! unsigned char *x_hdata; // huffman coded data ! unsigned char *x_ddata; // decompressed data unsigned short *x_bdata; // previous data --- 104,132 ---- { t_object x_obj; ! int x_socket; t_outlet *x_connection_status; t_outlet *x_frames; t_outlet *x_connectionip; t_outlet *x_pdp_output; ! int x_serversocket; ! int x_framesreceived; // total number of frames received void *x_inbuffer; /* accumulation buffer for incoming frames */ ! int x_inwriteposition; ! int x_inbuffersize; /* PDP data structures */ ! int x_packet; t_pdp *x_header; ! int x_vheight; ! int x_vwidth; ! int x_vsize; ! int x_psize; ! int x_hsize; ! unsigned int x_bsize; ! unsigned int x_bzsize; short int *x_data; ! char *x_hdata; // huffman coded data ! char *x_ddata; // decompressed data unsigned short *x_bdata; // previous data *************** *** 134,138 **** /* huffman decoding */ ! static int pdp_i_huffman(t_pdp_i *x, char *source, char *dest, t_int size, t_int *dsize) { char *pcount=source; --- 134,138 ---- /* huffman decoding */ ! static int pdp_i_huffman(t_pdp_i *x, char *source, char *dest, int size, int *dsize) { char *pcount=source; *************** *** 168,173 **** x->x_hsize = (x->x_vsize + (x->x_vsize>>1)); x->x_bsize = (x->x_vsize + (x->x_vsize>>1))*sizeof(unsigned short); ! x->x_ddata = (unsigned char*) getbytes(x->x_psize); ! x->x_hdata = (unsigned char*) getbytes(x->x_hsize); x->x_bdata = (unsigned short*) getbytes(x->x_bsize); if ( !x->x_ddata || !x->x_hdata ) --- 168,173 ---- x->x_hsize = (x->x_vsize + (x->x_vsize>>1)); x->x_bsize = (x->x_vsize + (x->x_vsize>>1))*sizeof(unsigned short); ! x->x_ddata = (char*) getbytes(x->x_psize); ! x->x_hdata = (char*) getbytes(x->x_hsize); x->x_bdata = (unsigned short*) getbytes(x->x_bsize); if ( !x->x_ddata || !x->x_hdata ) *************** *** 224,229 **** (int)sizeof(t_hpacket) + (int)ntohl(pheader->clength) ) { ! if ( ( x->x_vwidth != (t_int)ntohl(pheader->width) ) || ! ( x->x_vheight != (t_int)ntohl(pheader->height) ) ) { pdp_i_free_ressources(x); --- 224,229 ---- (int)sizeof(t_hpacket) + (int)ntohl(pheader->clength) ) { ! if ( ( x->x_vwidth != (int)ntohl(pheader->width) ) || ! ( x->x_vheight != (int)ntohl(pheader->height) ) ) { pdp_i_free_ressources(x); *************** *** 331,335 **** { struct sockaddr_in incomer_address; ! int sockaddrl = (int) sizeof( struct sockaddr ); int fd = accept(x->x_serversocket, (struct sockaddr*)&incomer_address, &sockaddrl ); --- 331,335 ---- { struct sockaddr_in incomer_address; ! unsigned int sockaddrl; int fd = accept(x->x_serversocket, (struct sockaddr*)&incomer_address, &sockaddrl ); Index: pdp_lumafilt.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_lumafilt.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_lumafilt.c 9 May 2007 04:54:14 -0000 1.3.2.1 --- pdp_lumafilt.c 10 May 2007 05:03:58 -0000 1.3.2.2 *************** *** 39,52 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_filter[MAX_LUMA]; // transform number } t_pdp_lumafilt; --- 39,52 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_filter[MAX_LUMA]; // transform number } t_pdp_lumafilt; *************** *** 75,79 **** static void pdp_lumafilt_mfilter(t_pdp_lumafilt *x, t_floatarg flumas, t_floatarg flumae, t_floatarg fonoff ) { ! t_int li; if ( ( (int)flumas >= 0 ) && ( (int)flumas < MAX_LUMA ) && --- 75,79 ---- static void pdp_lumafilt_mfilter(t_pdp_lumafilt *x, t_floatarg flumas, t_floatarg flumae, t_floatarg fonoff ) { ! int li; if ( ( (int)flumas >= 0 ) && ( (int)flumas < MAX_LUMA ) && *************** *** 97,101 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int px, py, luma; short int *pnY, *pnU, *pnV; --- 97,101 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int px, py, luma; short int *pnY, *pnU, *pnV; Index: pdp_lens.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_lens.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_lens.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_lens.c 10 May 2007 05:03:58 -0000 1.2.2.2 *************** *** 37,66 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; t_float x_zoom; // zoom factor ! t_int x_cx; // coordinates of lens center ! t_int x_cy; // coordinates of lens center ! t_int x_csize; // width of the lens ! t_int x_xd; ! t_int x_yd; ! t_int x_mode; ! t_int *x_lens; ! t_int x_init; } t_pdp_lens; ! static void pdp_lens_preset(t_pdp_lens *x, t_int oldsize, t_int newsize) { int px, py, r; ! if ( x->x_lens ) freebytes(x->x_lens, oldsize * oldsize * sizeof( t_int) ); ! x->x_lens = (t_int *) getbytes( newsize * newsize * sizeof( t_int ) ); r = x->x_csize / 2; --- 37,66 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; t_float x_zoom; // zoom factor ! int x_cx; // coordinates of lens center ! int x_cy; // coordinates of lens center ! int x_csize; // width of the lens ! int x_xd; ! int x_yd; ! int x_mode; ! int *x_lens; ! int x_init; } t_pdp_lens; ! static void pdp_lens_preset(t_pdp_lens *x, int oldsize, int newsize) { int px, py, r; ! if ( x->x_lens ) freebytes(x->x_lens, oldsize * oldsize * sizeof( int) ); ! x->x_lens = (int *) getbytes( newsize * newsize * sizeof( int ) ); r = x->x_csize / 2; Index: pdp_spigot.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_spigot.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_spigot.c 9 May 2007 04:54:14 -0000 1.3.2.1 --- pdp_spigot.c 10 May 2007 05:03:59 -0000 1.3.2.2 *************** *** 36,45 **** t_outlet *x_outlet0; t_outlet *x_outlet1; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_packet0; ! t_int x_toggle; } t_pdp_spigot; --- 36,45 ---- t_outlet *x_outlet0; t_outlet *x_outlet1; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_packet0; ! int x_toggle; } t_pdp_spigot; *************** *** 59,63 **** t_pdp *newheader = 0; short int *newdata = 0; ! t_int newpacket = -1, i; x->x_vwidth = header->info.image.width; --- 59,63 ---- t_pdp *newheader = 0; short int *newdata = 0; ! int newpacket = -1, i; x->x_vwidth = header->info.image.width; Index: pdp_ascii.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_ascii.c,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** pdp_ascii.c 9 May 2007 04:54:13 -0000 1.5.2.1 --- pdp_ascii.c 10 May 2007 05:03:57 -0000 1.5.2.2 *************** *** 39,59 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_color; // rendering color option ! t_int x_brightness; // added value for brightness t_float x_ratio; // character to pixel ratio ! t_int x_charwidth; // width of characters ! t_int x_charheight; // height of characters ! t_int x_nbchars; // number of characters in the map char* x_charmaps; // the table of characters --- 39,59 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_color; // rendering color option ! int x_brightness; // added value for brightness t_float x_ratio; // character to pixel ratio ! int x_charwidth; // width of characters ! int x_charheight; // height of characters ! int x_nbchars; // number of characters in the map char* x_charmaps; // the table of characters *************** *** 95,102 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i, pixsum; ! t_int px, py, ppx, ppy; ! t_int rank, value; ! t_int pwidth, pheight, offset; x->x_vwidth = header->info.image.width; --- 95,102 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i, pixsum; ! int px, py, ppx, ppy; ! int rank, value; ! int pwidth, pheight, offset; x->x_vwidth = header->info.image.width; *************** *** 244,249 **** char *word2 = (char*) getbytes( LINE_MAX_LENGTH ); char *word3 = (char*) getbytes( LINE_MAX_LENGTH ); ! t_int charwidth, charheight, nbchars, nblines; ! t_int nbexpdata; char *pdata; char charread; --- 244,249 ---- char *word2 = (char*) getbytes( LINE_MAX_LENGTH ); char *word3 = (char*) getbytes( LINE_MAX_LENGTH ); ! int charwidth, charheight, nbchars, nblines; ! int nbexpdata; char *pdata; char charread; Index: pdp_disintegration.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_disintegration.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_disintegration.c 9 May 2007 04:54:13 -0000 1.1.2.1 --- pdp_disintegration.c 10 May 2007 05:03:58 -0000 1.1.2.2 *************** *** 33,46 **** t_object x_obj; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_queue_id; ! t_int x_dropped; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_nbpasses; // number of passes ! t_int x_reductor; // fraction reductor short int *x_frame; // keep a copy of current frame for transformations --- 33,46 ---- t_object x_obj; ! int x_packet0; ! int x_packet1; ! int x_queue_id; ! int x_dropped; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_nbpasses; // number of passes ! int x_reductor; // fraction reductor short int *x_frame; // keep a copy of current frame for transformations *************** *** 53,57 **** if ( fpasses>=1.) { ! x->x_nbpasses = (t_int)fpasses; } } --- 53,57 ---- if ( fpasses>=1.) { ! x->x_nbpasses = (int)fpasses; } } *************** *** 61,65 **** if ( freductor>=1.) { ! x->x_reductor = (t_int)freductor; } } --- 61,65 ---- if ( freductor>=1.) { ! x->x_reductor = (int)freductor; } } *************** *** 87,95 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i; ! t_int px=0, py=0; short int *pfY, *pfU, *pfV; ! t_int ppx, ppy, ix, iy, pn; ! t_int nvalue; // allocate all ressources --- 87,95 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i; ! int px=0, py=0; short int *pfY, *pfU, *pfV; ! int ppx, ppy, ix, iy, pn; ! int nvalue; // allocate all ressources Index: pdp_fcqt.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_fcqt.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_fcqt.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_fcqt.c 10 May 2007 05:03:58 -0000 1.2.2.2 *************** *** 22,30 **** --- 22,36 ---- #include "pdp.h" + #include "pidip_config.h" #include "pdp_llconv.h" #include "time.h" #include "sys/time.h" + #ifdef QUICKTIME_NEWER + #include <lqt/lqt.h> + #include <lqt/colormodels.h> + #else #include <quicktime/lqt.h> #include <quicktime/colormodels.h> + #endif #include <bzlib.h> // bz2 compression routines *************** *** 42,53 **** bool initialized; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_fsize; // frames size ! t_int x_length; ! t_int x_current_frame; ! t_int x_cursec; ! t_int x_framescount; unsigned char * qt_rows[3]; --- 48,59 ---- bool initialized; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_fsize; // frames size ! int x_length; ! int x_current_frame; ! int x_cursec; ! int x_framescount; unsigned char * qt_rows[3]; *************** *** 58,62 **** unsigned int** x_frames; ! t_int* x_fsizes; } t_pdp_fcqt; --- 64,68 ---- unsigned int** x_frames; ! unsigned int* x_fsizes; } t_pdp_fcqt; *************** *** 66,70 **** static void pdp_fcqt_close(t_pdp_fcqt *x) { ! t_int fi; if (x->initialized){ --- 72,76 ---- static void pdp_fcqt_close(t_pdp_fcqt *x) { ! int fi; if (x->initialized){ *************** *** 83,87 **** static void pdp_fcqt_open(t_pdp_fcqt *x, t_symbol *name) { ! t_int fi, osize, ret; unsigned int *odata, *cdata; --- 89,93 ---- static void pdp_fcqt_open(t_pdp_fcqt *x, t_symbol *name) { ! int fi, osize, ret; unsigned int *odata, *cdata; *************** *** 132,136 **** x->x_current_frame = 0; x->x_frames = (unsigned int**) getbytes( x->x_length*sizeof(unsigned int*) ); ! x->x_fsizes = (t_int*) getbytes( x->x_length*sizeof(t_int) ); x->x_fsize = 0; if ( !x->x_frames ) --- 138,142 ---- x->x_current_frame = 0; x->x_frames = (unsigned int**) getbytes( x->x_length*sizeof(unsigned int*) ); ! x->x_fsizes = (unsigned int*) getbytes( x->x_length*sizeof(int) ); x->x_fsize = 0; if ( !x->x_frames ) *************** *** 206,210 **** static void pdp_fcqt_bang(t_pdp_fcqt *x) { ! t_int object, ret, dsize, psize; short int* data; t_pdp* header; --- 212,217 ---- static void pdp_fcqt_bang(t_pdp_fcqt *x) { ! int object, ret; ! unsigned int dsize, psize; short int* data; t_pdp* header; Index: pdp_yqt.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_yqt.c,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -C2 -d -r1.6.2.1 -r1.6.2.2 *** pdp_yqt.c 9 May 2007 04:54:15 -0000 1.6.2.1 --- pdp_yqt.c 10 May 2007 05:04:00 -0000 1.6.2.2 *************** *** 25,30 **** --- 25,36 ---- #include "time.h" #include "sys/time.h" + #include "pidip_config.h" + #ifdef QUICKTIME_NEWER + #include <lqt/lqt.h> + #include <lqt/colormodels.h> + #else #include <quicktime/lqt.h> #include <quicktime/colormodels.h> + #endif #define MIN_AUDIO_INPUT 1024 /* we must have at least n chunks to play a steady sound */ *************** *** 49,54 **** unsigned int x_vwidth; unsigned int x_vheight; ! t_int x_cursec; ! t_int x_framescount; bool loop; --- 55,60 ---- unsigned int x_vwidth; unsigned int x_vheight; ! int x_cursec; ! int x_framescount; bool loop; *************** *** 60,74 **** int qt_cmodel; ! t_int x_audio; /* indicates the existence of an audio track */ ! t_int x_audio_channels; /* number of audio channels of first track */ ! t_int x_mono; /* indicates a mono audio track */ ! t_int x_audio_rate; /* audio rate */ ! t_int x_resampling_factor; /* resampling factor */ t_float *x_outbuffer; /* buffer to store audio decoded data */ ! t_int x_outwriteposition; ! t_int x_outreadposition; ! t_int x_outunread; ! t_int x_outbuffersize; t_float *x_outl; t_float *x_outr; --- 66,80 ---- int qt_cmodel; ! int x_audio; /* indicates the existence of an audio track */ ! int x_audio_channels; /* number of audio channels of first track */ ! int x_mono; /* indicates a mono audio track */ ! int x_audio_rate; /* audio rate */ ! int x_resampling_factor; /* resampling factor */ t_float *x_outbuffer; /* buffer to store audio decoded data */ ! int x_outwriteposition; ! int x_outreadposition; ! int x_outunread; ! int x_outbuffersize; t_float *x_outl; t_float *x_outr; Index: pdp_fdiff.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_fdiff.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_fdiff.c 9 May 2007 04:54:14 -0000 1.1.2.1 --- pdp_fdiff.c 10 May 2007 05:03:58 -0000 1.1.2.2 *************** *** 33,44 **** t_outlet *x_diffu; t_outlet *x_diffv; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; unsigned int x_encoding; short int *x_pframe; --- 33,44 ---- t_outlet *x_diffu; t_outlet *x_diffv; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; unsigned int x_encoding; short int *x_pframe; *************** *** 46,50 **** } t_pdp_fdiff; ! static void pdp_fdiff_allocate(t_pdp_fdiff *x, t_int newsize) { int i; --- 46,50 ---- } t_pdp_fdiff; ! static void pdp_fdiff_allocate(t_pdp_fdiff *x, int newsize) { int i; *************** *** 64,73 **** int i; ! t_int px, py; short int *diff; short int *sy, *su, *sv, t; short int *sby, *sbu, *sbv; ! t_int Y=0, U=0, V=0; ! t_int maxdy=0, maxdu=0, maxdv=0, pdiff; /* allocate all ressources */ --- 64,73 ---- int i; ! int px, py; short int *diff; short int *sy, *su, *sv, t; short int *sby, *sbu, *sbv; ! int Y=0, U=0, V=0; ! int maxdy=0, maxdu=0, maxdv=0, pdiff; /* allocate all ressources */ Index: pdp_ffmpeg~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_ffmpeg~.c,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** pdp_ffmpeg~.c 9 May 2007 04:54:14 -0000 1.7.2.1 --- pdp_ffmpeg~.c 10 May 2007 05:03:58 -0000 1.7.2.2 *************** *** 43,53 **** t_float x_f; ! t_int x_packet0; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; t_outlet *x_outlet_streaming; // indicates the action of streaming --- 43,53 ---- t_float x_f; ! int x_packet0; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; t_outlet *x_outlet_streaming; // indicates the action of streaming *************** *** 57,67 **** char *x_feedname; ! t_int x_streaming; // streaming flag ! t_int x_nbframes; // number of frames emitted ! t_int x_nbframes_dropped; // number of frames dropped ! t_int x_nbvideostreams; // number of video streams ! t_int x_nbaudiostreams; // number of audio streams ! t_int x_cursec; // current second ! t_int *x_secondcount; // number of frames emitted in the current second ( per video stream ) /* AV data structures */ --- 57,67 ---- char *x_feedname; ! int x_streaming; // streaming flag ! int x_nbframes; // number of frames emitted ! int x_nbframes_dropped; // number of frames dropped ! int x_nbvideostreams; // number of video streams ! int x_nbaudiostreams; // number of audio streams ! int x_cursec; // current second ! int *x_secondcount; // number of frames emitted in the current second ( per video stream ) /* AV data structures */ *************** *** 82,87 **** short x_audio_enc_buf[2*MAX_AUDIO_PACKET_SIZE]; /* buffer for audio to be encoded */ uint8_t x_audio_out[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for encoded audio */ ! t_int x_audioin_position; // writing position for incoming audio ! t_int x_audio_per_frame; // number of audio samples to transmit for each frame ReSampleContext *x_audio_resample_ctx; // structures for audio resample FifoBuffer *x_audio_fifo; // audio fifos ( one per codec ) --- 82,87 ---- short x_audio_enc_buf[2*MAX_AUDIO_PACKET_SIZE]; /* buffer for audio to be encoded */ uint8_t x_audio_out[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for encoded audio */ ! int x_audioin_position; // writing position for incoming audio ! int x_audio_per_frame; // number of audio samples to transmit for each frame ReSampleContext *x_audio_resample_ctx; // structures for audio resample FifoBuffer *x_audio_fifo; // audio fifos ( one per codec ) *************** *** 159,164 **** if ( x->x_secondcount ) free( x->x_secondcount ); ! x->x_secondcount = (t_int*) malloc( x->x_nbvideostreams*sizeof(t_int) ); ! memset( x->x_secondcount, 0x00, x->x_nbvideostreams*sizeof(t_int) ); x->x_audio_fifo = (FifoBuffer*) malloc( x->x_nbaudiostreams*sizeof(FifoBuffer) ); for ( i=0; i<x->x_nbaudiostreams; i++) --- 159,164 ---- if ( x->x_secondcount ) free( x->x_secondcount ); ! x->x_secondcount = (int*) malloc( x->x_nbvideostreams*sizeof(int) ); ! memset( x->x_secondcount, 0x00, x->x_nbvideostreams*sizeof(int) ); x->x_audio_fifo = (FifoBuffer*) malloc( x->x_nbaudiostreams*sizeof(FifoBuffer) ); for ( i=0; i<x->x_nbaudiostreams; i++) *************** *** 174,178 **** static void pdp_ffmpeg_starve(t_pdp_ffmpeg *x) { ! t_int ret, i; if (!x->x_streaming) --- 174,178 ---- static void pdp_ffmpeg_starve(t_pdp_ffmpeg *x) { ! int ret, i; if (!x->x_streaming) *************** *** 224,228 **** static void pdp_ffmpeg_feed(t_pdp_ffmpeg *x, t_symbol *s) { ! t_int ret, i; if (x->x_streaming) --- 224,228 ---- static void pdp_ffmpeg_feed(t_pdp_ffmpeg *x, t_symbol *s) { ! int ret, i; if (x->x_streaming) *************** *** 347,362 **** t_pdp *newheader = 0; short int *newdata = 0; ! t_int newpacket = -1, i, j; short int *pY, *pU, *pV; uint8_t *pnY, *pnU, *pnV; ! t_int px, py; ! t_int svideoindex; ! t_int saudioindex; struct timeval etime; ! t_int sizeout, size, encsize; ! t_int framebytes; ! t_int owidth, oheight; short *pencbuf; ! t_int framerate, atime, ttime; /* allocate all ressources */ --- 347,362 ---- t_pdp *newheader = 0; short int *newdata = 0; ! int newpacket = -1, i, j; short int *pY, *pU, *pV; uint8_t *pnY, *pnU, *pnV; ! int px, py; ! int svideoindex; ! int saudioindex; struct timeval etime; ! int sizeout, size, encsize; ! int framebytes; ! int owidth, oheight; short *pencbuf; ! int framerate, atime, ttime; /* allocate all ressources */ *************** *** 413,417 **** if ( x->x_avcontext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO ) { ! t_int size; // check if the framerate has been exceeded --- 413,417 ---- if ( x->x_avcontext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO ) { ! int size; // check if the framerate has been exceeded *************** *** 522,526 **** AVPacket vpkt; #endif ! t_int fsize, ret; memset(&aframe, 0, sizeof(AVFrame)); --- 522,526 ---- AVPacket vpkt; #endif ! int fsize, ret; memset(&aframe, 0, sizeof(AVFrame)); *************** *** 644,648 **** if ( x->x_avcontext->streams[i]->codec.codec_type == CODEC_TYPE_VIDEO ) { ! t_int size; // check if the framerate has been exceeded --- 644,648 ---- if ( x->x_avcontext->streams[i]->codec.codec_type == CODEC_TYPE_VIDEO ) { ! int size; // check if the framerate has been exceeded *************** *** 753,757 **** AVPacket vpkt; #endif ! t_int fsize, ret; memset(&aframe, 0, sizeof(AVFrame)); --- 753,757 ---- AVPacket vpkt; #endif ! int fsize, ret; memset(&aframe, 0, sizeof(AVFrame)); *************** *** 890,894 **** int n = (int)(w[4]); // number of samples t_float fsample; ! t_int isample, i; // just fills the buffer --- 890,894 ---- int n = (int)(w[4]); // number of samples t_float fsample; ! int isample, i; // just fills the buffer Index: pdp_cycle.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_cycle.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_cycle.c 9 May 2007 04:54:13 -0000 1.2.2.1 --- pdp_cycle.c 10 May 2007 05:03:57 -0000 1.2.2.2 *************** *** 37,57 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_cycley; // flag to activate y cycling ! t_int x_cycleu; // flag to activate u cycling ! t_int x_cyclev; // flag to activate v cycling ! t_int x_yoffset; ! t_int x_uoffset; ! t_int x_voffset; } t_pdp_cycle; --- 37,57 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_cycley; // flag to activate y cycling ! int x_cycleu; // flag to activate u cycling ! int x_cyclev; // flag to activate v cycling ! int x_yoffset; ! int x_uoffset; ! int x_voffset; } t_pdp_cycle; *************** *** 87,92 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i; ! t_int px, py, y, u, v; x->x_vwidth = header->info.image.width; --- 87,92 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i; ! int px, py, y, u, v; x->x_vwidth = header->info.image.width; Index: pdp_fqt.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_fqt.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_fqt.c 9 May 2007 04:54:14 -0000 1.3.2.1 --- pdp_fqt.c 10 May 2007 05:03:58 -0000 1.3.2.2 *************** *** 22,30 **** --- 22,36 ---- #include "pdp.h" + #include "pidip_config.h" #include "pdp_llconv.h" #include "time.h" #include "sys/time.h" + #ifdef QUICKTIME_NEWER + #include <lqt/lqt.h> + #include <lqt/colormodels.h> + #else #include <quicktime/lqt.h> #include <quicktime/colormodels.h> + #endif typedef struct pdp_fqt_struct *************** *** 41,52 **** bool initialized; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_size; ! t_int x_fsize; // frames size ! t_int x_length; ! t_int x_current_frame; ! t_int x_cursec; ! t_int x_framescount; unsigned char *qt_rows[3]; --- 47,58 ---- bool initialized; ! int x_vwidth; ! int x_vheight; ! int x_size; ! int x_fsize; // frames size ! int x_length; ! int x_current_frame; ! int x_cursec; ! int x_framescount; unsigned char *qt_rows[3]; *************** *** 57,61 **** unsigned char **x_frames; ! t_int* x_fsizes; } t_pdp_fqt; --- 63,67 ---- unsigned char **x_frames; ! int* x_fsizes; } t_pdp_fqt; *************** *** 65,69 **** static void pdp_fqt_close(t_pdp_fqt *x) { ! t_int fi; if (x->initialized){ --- 71,75 ---- static void pdp_fqt_close(t_pdp_fqt *x) { ! int fi; if (x->initialized){ *************** *** 82,86 **** static void pdp_fqt_open(t_pdp_fqt *x, t_symbol *name) { ! t_int fi; post("pdp_fqt: opening %s", name->s_name); --- 88,92 ---- static void pdp_fqt_open(t_pdp_fqt *x, t_symbol *name) { ! int fi; post("pdp_fqt: opening %s", name->s_name); *************** *** 130,134 **** x->x_current_frame = 0; x->x_frames = (unsigned char**) getbytes( x->x_length*sizeof(unsigned char*) ); ! x->x_fsizes = (t_int*) getbytes( x->x_length*sizeof(t_int) ); x->x_fsize = 0; if ( !x->x_frames ) --- 136,140 ---- x->x_current_frame = 0; x->x_frames = (unsigned char**) getbytes( x->x_length*sizeof(unsigned char*) ); ! x->x_fsizes = (int*) getbytes( x->x_length*sizeof(int) ); x->x_fsize = 0; if ( !x->x_frames ) Index: pdp_vertigo.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_vertigo.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_vertigo.c 9 May 2007 04:54:14 -0000 1.3.2.1 --- pdp_vertigo.c 10 May 2007 05:04:00 -0000 1.3.2.2 *************** *** 37,55 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; short int *x_buffer; short int *x_current_buffer; short int *x_alt_buffer; ! t_int x_dx; ! t_int x_dy; ! t_int x_sx; ! t_int x_sy; double x_phase; double x_phase_increment; --- 37,55 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; short int *x_buffer; short int *x_current_buffer; short int *x_alt_buffer; ! int x_dx; ! int x_dy; ! int x_sx; ! int x_sy; double x_phase; double x_phase_increment; *************** *** 71,75 **** static void pdp_vertigo_allocate(t_pdp_vertigo *x, t_floatarg fnewsize ) { ! t_int nsize = (int) fnewsize; if ( x->x_buffer ) freebytes( x->x_buffer, 2*((x->x_vsize + (x->x_vsize>>1))<<1) ); --- 71,75 ---- static void pdp_vertigo_allocate(t_pdp_vertigo *x, t_floatarg fnewsize ) { ! int nsize = (int) fnewsize; if ( x->x_buffer ) freebytes( x->x_buffer, 2*((x->x_vsize + (x->x_vsize>>1))<<1) ); Index: pdp_transform.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_transform.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_transform.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_transform.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 39,56 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int **x_table_list; // mapping tables ! t_int **x_table_list_u; // mapping tables ! t_int x_table; // current table ! t_int x_t; --- 39,56 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int **x_table_list; // mapping tables ! int **x_table_list_u; // mapping tables ! int x_table; // current table ! int x_t; *************** *** 65,69 **** } ! static int pdp_transform_map_from_table(t_pdp_transform *x, t_int px, t_int py, t_int t) { int xd,yd; --- 65,69 ---- } ! static int pdp_transform_map_from_table(t_pdp_transform *x, int px, int py, int t) { int xd,yd; *************** *** 77,81 **** } ! static int pdp_transform_map_from_table_u(t_pdp_transform *x, t_int px, t_int py, t_int t) { int xd,yd; --- 77,81 ---- } ! static int pdp_transform_map_from_table_u(t_pdp_transform *x, int px, int py, int t) { int xd,yd; *************** *** 92,96 **** { const int size = 16; ! t_int px, py, tx, ty; for(py=0; py<x->x_vheight; py++) --- 92,96 ---- { const int size = 16; ! int px, py, tx, ty; for(py=0; py<x->x_vheight; py++) *************** *** 131,135 **** static void pdp_transform_init_tables(t_pdp_transform *x) { ! t_int px, py; for (py=0;py<x->x_vheight;py++) --- 131,135 ---- static void pdp_transform_init_tables(t_pdp_transform *x) { ! int px, py; for (py=0;py<x->x_vheight;py++) *************** *** 171,176 **** for(i=0;i<MAX_TABLES;i++) { ! x->x_table_list[i] = (t_int *) getbytes( x->x_vsize*sizeof(int) ); ! x->x_table_list_u[i] = (t_int *) getbytes( x->x_vsize*sizeof(int) ); } } --- 171,176 ---- for(i=0;i<MAX_TABLES;i++) { ! x->x_table_list[i] = (int *) getbytes( x->x_vsize*sizeof(int) ); ! x->x_table_list_u[i] = (int *) getbytes( x->x_vsize*sizeof(int) ); } } *************** *** 182,188 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i, iu; ! t_int px, py; ! t_int d, o, du=0, ou; short int *pY, *pU, *pV, *pnY, *pnU, *pnV; --- 182,188 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i, iu; ! int px, py; ! int d, o, du=0, ou; short int *pY, *pU, *pV, *pnY, *pnU, *pnV; *************** *** 328,333 **** x->x_queue_id = -1; ! x->x_table_list = (t_int **) getbytes(MAX_TABLES * sizeof(int *)); ! x->x_table_list_u = (t_int **) getbytes(MAX_TABLES * sizeof(int *)); x->x_t = 0; --- 328,333 ---- x->x_queue_id = -1; ! x->x_table_list = (int **) getbytes(MAX_TABLES * sizeof(int *)); ! x->x_table_list_u = (int **) getbytes(MAX_TABLES * sizeof(int *)); x->x_t = 0; Index: pdp_hitandmiss.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_hitandmiss.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_hitandmiss.c 9 May 2007 04:54:14 -0000 1.1.2.1 --- pdp_hitandmiss.c 10 May 2007 05:03:58 -0000 1.1.2.2 *************** *** 34,49 **** t_object x_obj; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_queue_id; ! t_int x_dropped; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_kernelw; // width of the (square) kernel ! t_int x_kernelh; // height of the square kernel char *x_kdata; // kernel data ! t_int x_nbpasses; // number of passes short int *x_frame; // keep a copy of current frame for transformations --- 34,49 ---- t_object x_obj; ! int x_packet0; ! int x_packet1; ! int x_queue_id; ! int x_dropped; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_kernelw; // width of the (square) kernel ! int x_kernelh; // height of the square kernel char *x_kdata; // kernel data ! int x_nbpasses; // number of passes short int *x_frame; // keep a copy of current frame for transformations *************** *** 56,60 **** if ( fpasses>=1.) { ! x->x_nbpasses = (t_int)fpasses; } } --- 56,60 ---- if ( fpasses>=1.) { ! x->x_nbpasses = (int)fpasses; } } *************** *** 62,66 **** static void pdp_hitandmiss_kernelw(t_pdp_hitandmiss *x, t_floatarg fkernelw ) { ! t_int oldw, minw; char *nkdata; --- 62,66 ---- static void pdp_hitandmiss_kernelw(t_pdp_hitandmiss *x, t_floatarg fkernelw ) { ! int oldw, minw; char *nkdata; *************** *** 68,72 **** { oldw = x->x_kernelw; ! x->x_kernelw = (t_int)fkernelw; nkdata= (char*) malloc( x->x_kernelw*x->x_kernelh ); --- 68,72 ---- { oldw = x->x_kernelw; ! x->x_kernelw = (int)fkernelw; nkdata= (char*) malloc( x->x_kernelw*x->x_kernelh ); *************** *** 86,90 **** static void pdp_hitandmiss_kernelh(t_pdp_hitandmiss *x, t_floatarg fkernelh ) { ! t_int oldh, minh; char *nkdata; --- 86,90 ---- static void pdp_hitandmiss_kernelh(t_pdp_hitandmiss *x, t_floatarg fkernelh ) { ! int oldh, minh; char *nkdata; *************** *** 92,96 **** { oldh = x->x_kernelh; ! x->x_kernelh = (t_int)fkernelh; nkdata= (char*) malloc( x->x_kernelw*x->x_kernelh ); --- 92,96 ---- { oldh = x->x_kernelh; ! x->x_kernelh = (int)fkernelh; nkdata= (char*) malloc( x->x_kernelw*x->x_kernelh ); *************** *** 109,113 **** static void pdp_hitandmiss_kdata(t_pdp_hitandmiss *x, t_symbol *s, int argc, t_atom *argv) { ! t_int nbvalues, ivalue, iv; if ( argc > x->x_kernelw*x->x_kernelh ) --- 109,113 ---- static void pdp_hitandmiss_kdata(t_pdp_hitandmiss *x, t_symbol *s, int argc, t_atom *argv) { ! int nbvalues, ivalue, iv; if ( argc > x->x_kernelw*x->x_kernelh ) *************** *** 140,144 **** else { ! ivalue = (t_int) argv[iv].a_w.w_float; if ( ( ivalue != 0 ) && ( ivalue != 1 ) && ( ivalue != -1 ) ) { --- 140,144 ---- else { ! ivalue = (int) argv[iv].a_w.w_float; if ( ( ivalue != 0 ) && ( ivalue != 1 ) && ( ivalue != -1 ) ) { *************** *** 175,182 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i; ! t_int px=0, py=0; short int *pfY, *pfU, *pfV; ! t_int ppx, ppy, ix, iy, pn, kx, ky; short int pvalue; --- 175,182 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i; ! int px=0, py=0; short int *pfY, *pfU, *pfV; ! int ppx, ppy, ix, iy, pn, kx, ky; short int pvalue; Index: pdp_puzzle.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_puzzle.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_puzzle.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_puzzle.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 42,69 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; /* puzzle parameters */ ! t_int *x_blockpos; ! t_int *x_blockoffset; ! t_int *x_ublockoffset; ! t_int *x_vblockoffset; ! t_int x_nbblocks; ! t_int x_blockwidth; ! t_int x_blockheight; ! t_int x_blockw; ! t_int x_blockh; ! t_int x_blocknum; ! t_int x_spacepos; ! t_int x_spacex; ! t_int x_spacey; } t_pdp_puzzle; --- 42,69 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; /* puzzle parameters */ ! int *x_blockpos; ! int *x_blockoffset; ! int *x_ublockoffset; ! int *x_vblockoffset; ! int x_nbblocks; ! int x_blockwidth; ! int x_blockheight; ! int x_blockw; ! int x_blockh; ! int x_blocknum; ! int x_spacepos; ! int x_spacex; ! int x_spacey; } t_pdp_puzzle; *************** *** 71,75 **** static void pdp_puzzle_init_tables(t_pdp_puzzle *x) { ! t_int i, a, b, c; for(i=0; i<x->x_blocknum; i++) --- 71,75 ---- static void pdp_puzzle_init_tables(t_pdp_puzzle *x) { ! int i, a, b, c; for(i=0; i<x->x_blocknum; i++) *************** *** 96,100 **** static void pdp_puzzle_up(t_pdp_puzzle *x ) { ! t_int tmp, nextpos=-1; if(x->x_spacey>0) --- 96,100 ---- static void pdp_puzzle_up(t_pdp_puzzle *x ) { ! int tmp, nextpos=-1; if(x->x_spacey>0) *************** *** 114,118 **** static void pdp_puzzle_down(t_pdp_puzzle *x ) { ! t_int tmp, nextpos=-1; if(x->x_spacey<x->x_blockh-1) --- 114,118 ---- static void pdp_puzzle_down(t_pdp_puzzle *x ) { ! int tmp, nextpos=-1; if(x->x_spacey<x->x_blockh-1) *************** *** 132,136 **** static void pdp_puzzle_left(t_pdp_puzzle *x ) { ! t_int tmp, nextpos=-1; if(x->x_spacex>0) --- 132,136 ---- static void pdp_puzzle_left(t_pdp_puzzle *x ) { ! int tmp, nextpos=-1; if(x->x_spacex>0) *************** *** 150,154 **** static void pdp_puzzle_right(t_pdp_puzzle *x ) { ! t_int tmp, nextpos=-1; if(x->x_spacex<x->x_blockw-1) --- 150,154 ---- static void pdp_puzzle_right(t_pdp_puzzle *x ) { ! int tmp, nextpos=-1; if(x->x_spacex<x->x_blockw-1) *************** *** 176,180 **** static void pdp_puzzle_allocate(t_pdp_puzzle *x) { ! t_int px, py; x->x_blockwidth = x->x_vwidth / x->x_nbblocks; --- 176,180 ---- static void pdp_puzzle_allocate(t_pdp_puzzle *x) { ! int px, py; x->x_blockwidth = x->x_vwidth / x->x_nbblocks; *************** *** 224,228 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int px, py, xx, yy, i; short int *pY, *qY, *pU, *pV, *qU, *qV; --- 224,228 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int px, py, xx, yy, i; short int *pY, *qY, *pU, *pV, *qU, *qV; Index: pdp_cache.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_cache.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_cache.c 9 May 2007 04:54:13 -0000 1.1.2.1 --- pdp_cache.c 10 May 2007 05:03:57 -0000 1.1.2.2 *************** *** 34,41 **** typedef struct _triangle { ! t_int used; ! t_int x1, y1; ! t_int x2, y2; ! t_int x3, y3; t_float a1, b1; t_float a2, b2; --- 34,41 ---- typedef struct _triangle { ! int used; ! int x1, y1; ! int x2, y2; ! int x3, y3; t_float a1, b1; t_float a2, b2; *************** *** 48,60 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; t_triangle x_hiddenzones[ MAX_ZONES ]; // hide these parts of the image --- 48,60 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; t_triangle x_hiddenzones[ MAX_ZONES ]; // hide these parts of the image *************** *** 63,69 **** } t_pdp_cache; ! static t_int pdp_cache_isinzone(t_pdp_cache *x, t_int px, t_int py, t_int index) { ! t_int c1=0, c2=0, c3=0; if ( !x->x_hiddenzones[index].used ) --- 63,69 ---- } t_pdp_cache; ! static int pdp_cache_isinzone(t_pdp_cache *x, int px, int py, int index) { ! int c1=0, c2=0, c3=0; if ( !x->x_hiddenzones[index].used ) *************** *** 188,194 **** } ! static t_int pdp_cache_ishidden(t_pdp_cache *x, t_int px, t_int py) { ! t_int ti; for ( ti=0; ti<MAX_ZONES; ti++ ) --- 188,194 ---- } ! static int pdp_cache_ishidden(t_pdp_cache *x, int px, int py) { ! int ti; for ( ti=0; ti<MAX_ZONES; ti++ ) *************** *** 220,224 **** static void pdp_cache_update_mask(t_pdp_cache *x ) { ! t_int px, py; for ( py=0; py<x->x_vheight; py++ ) --- 220,224 ---- static void pdp_cache_update_mask(t_pdp_cache *x ) { ! int px, py; for ( py=0; py<x->x_vheight; py++ ) *************** *** 233,237 **** static void pdp_cache_hide(t_pdp_cache *x, t_symbol *s, int argc, t_atom *argv) { ! t_int ti; t_float fx1, fy1, fx2, fy2, fx3, fy3; --- 233,237 ---- static void pdp_cache_hide(t_pdp_cache *x, t_symbol *s, int argc, t_atom *argv) { ! int ti; t_float fx1, fy1, fx2, fy2, fx3, fy3; *************** *** 428,432 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int px, py; t_float alpha, factor; unsigned char y, u, v; --- 428,432 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int px, py; t_float alpha, factor; unsigned char y, u, v; Index: pdp_ctrack.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_ctrack.c,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** pdp_ctrack.c 9 May 2007 04:54:13 -0000 1.4.2.1 --- pdp_ctrack.c 10 May 2007 05:03:57 -0000 1.4.2.2 *************** *** 60,82 **** t_float x_f; ! t_int x_packet0; ! t_int x_dropped; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_colorR; // RGB components of tracked color ! t_int x_colorG; ! t_int x_colorB; ! t_int x_colorY; // YUV components of tracked color ! t_int x_colorU; ! t_int x_colorV; ! t_int x_tolerance; // tolerance ! t_int x_luminosity; // use luminosity or not ! t_int x_steady; // steady mode : the zone is searched around the cursor ! t_int x_cursor; // show cursor or not ! t_int x_showframe; // show frame or not ! t_int x_cursX; // X coordinate of cursor ! t_int x_cursY; // Y coordinate of cursor short int *x_frame; // keep a copy of current frame for picking color --- 60,82 ---- t_float x_f; ! int x_packet0; ! int x_dropped; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_colorR; // RGB components of tracked color ! int x_colorG; ! int x_colorB; ! int x_colorY; // YUV components of tracked color ! int x_colorU; ! int x_colorV; ! int x_tolerance; // tolerance ! int x_luminosity; // use luminosity or not ! int x_steady; // steady mode : the zone is searched around the cursor ! int x_cursor; // show cursor or not ! int x_showframe; // show frame or not ! int x_cursX; // X coordinate of cursor ! int x_cursY; // Y coordinate of cursor short int *x_frame; // keep a copy of current frame for picking color *************** *** 96,100 **** static void pdp_ctrack_draw_color(t_pdp_ctrack *x) { ! t_int width, height; char color[32]; --- 96,100 ---- static void pdp_ctrack_draw_color(t_pdp_ctrack *x) { ! int width, height; char color[32]; *************** *** 215,219 **** static void pdp_ctrack_pick(t_pdp_ctrack *x) { ! t_int y,u,v; if ( x->x_frame && ( x->x_cursX > 0 ) && ( x->x_cursX < x->x_vwidth ) --- 215,219 ---- static void pdp_ctrack_pick(t_pdp_ctrack *x) { ! int y,u,v; if ( x->x_frame && ( x->x_cursX > 0 ) && ( x->x_cursX < x->x_vwidth ) *************** *** 257,267 **** t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); ! t_int i, cf; ! t_int px=0, py=0, ppx=0, ppy=0, found=0, xcell=0, ycell=0; ! t_int y=0, u=0, v=0; ! t_int x1=0, y1=0, x2=0, y2=0; ! t_int X1=0, Y1=0, X2=0, Y2=0; short int *pfY, *pfU, *pfV; ! t_int diff; /* allocate all ressources */ --- 257,267 ---- t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); ! int i, cf; ! int px=0, py=0, ppx=0, ppy=0, found=0, xcell=0, ycell=0; ! int y=0, u=0, v=0; ! int x1=0, y1=0, x2=0, y2=0; ! int X1=0, Y1=0, X2=0, Y2=0; short int *pfY, *pfU, *pfV; ! int diff; /* allocate all ressources */ Index: pdp_hue.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_hue.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_hue.c 9 May 2007 04:54:14 -0000 1.1.2.1 --- pdp_hue.c 10 May 2007 05:03:58 -0000 1.1.2.2 *************** *** 33,43 **** t_outlet *x_meanb; ! t_int x_packet0; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; unsigned int x_encoding; --- 33,43 ---- t_outlet *x_meanb; ! int x_packet0; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; unsigned int x_encoding; *************** *** 50,57 **** int i; ! t_int px, py; unsigned char *sr, *sg, *sb; double meanr=0, meang=0, meanb=0; ! t_int nbpixs=0; /* allocate all ressources */ --- 50,57 ---- int i; ! int px, py; unsigned char *sr, *sg, *sb; double meanr=0, meang=0, meanb=0; ! int nbpixs=0; /* allocate all ressources */ Index: pdp_qtext.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_qtext.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_qtext.c 9 May 2007 04:54:14 -0000 1.1.2.1 --- pdp_qtext.c 10 May 2007 05:03:59 -0000 1.1.2.2 *************** *** 66,97 **** typedef struct text_layer_struct { ! t_int l_xoffset; // x position ! t_int l_yoffset; // y position ! t_int l_r; // first color ! t_int l_g; ! t_int l_b; ! t_int l_a; ! t_int l_2r; // color for even lines of feed ! t_int l_2g; ! t_int l_2b; ! t_int l_2a; ! t_int l_borderr; // color for the border ! t_int l_borderg; ! t_int l_borderb; t_float l_angle; // angle ! t_int l_scroll; ! t_int l_alignment; // 0 - center; 1 - left; 2 - right; ! t_int l_marginh; // top margin ! t_int l_marginv; // bottom margin ! t_int l_active; // slot is active? ! t_int l_feed_turn; // even or odd turn ! t_int l_mode; // work mode: static, scroll, feed/chat, slow ! t_int l_scroll_speed; ! t_int l_upwards; // whether to put new elements at top or bottom of the queue TEXT_FRAME *l_texts; TEXT_FRAME *l_last_text; ! t_int l_ntexts; // number of texts in the chat queue Imlib_Font l_font; } TEXTLAYER; --- 66,97 ---- typedef struct text_layer_struct { ! int l_xoffset; // x position ! int l_yoffset; // y position ! int l_r; // first color ! int l_g; ! int l_b; ! int l_a; ! int l_2r; // color for even lines of feed ! int l_2g; ! int l_2b; ! int l_2a; ! int l_borderr; // color for the border ! int l_borderg; ! int l_borderb; t_float l_angle; // angle ! int l_scroll; ! int l_alignment; // 0 - center; 1 - left; 2 - right; ! int l_marginh; // top margin ! int l_marginv; // bottom margin ! int l_active; // slot is active? ! int l_feed_turn; // even or odd turn ! int l_mode; // work mode: static, scroll, feed/chat, slow ! int l_scroll_speed; ! int l_upwards; // whether to put new elements at top or bottom of the queue TEXT_FRAME *l_texts; TEXT_FRAME *l_last_text; ! int l_ntexts; // number of texts in the chat queue Imlib_Font l_font; } TEXTLAYER; *************** *** 102,118 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_nbtexts; ! t_int x_current; // currently selected layer ! t_int x_capacity; // maximum texts // text layers --- 102,118 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_nbtexts; ! int x_current; // currently selected layer ! int x_capacity; // maximum texts // text layers *************** *** 226,230 **** char *pname; char *pdname; ! t_int len; if ( argc < 3 ) --- 226,230 ---- char *pname; char *pdname; ! int len; if ( argc < 3 ) *************** *** 276,281 **** if ( (*pname=='%') && ( isdigit(*(pname+1)) || (*(pname+1)=='%') ) ) { ! t_int ivalue; ! t_int ndigits; char *piname; --- 276,281 ---- if ( (*pname=='%') && ( isdigit(*(pname+1)) || (*(pname+1)=='%') ) ) { ! int ivalue; ! int ndigits; char *piname; *************** *** 519,523 **** static void pdp_qtext_delete(t_pdp_qtext *x, t_floatarg fnum ) { ! t_int i; char *lostword; --- 519,523 ---- static void pdp_qtext_delete(t_pdp_qtext *x, t_floatarg fnum ) { ! int i; char *lostword; *************** *** 566,578 **** { char **text_array; ! t_int *xoffsets; ! t_int *yoffsets; ! t_int *r; ! t_int *g; ! t_int *b; t_float *angle; ! t_int *scroll; ! t_int i, csize; TEXTLAYER * layers; --- 566,578 ---- { char **text_array; ! int *xoffsets; ! int *yoffsets; ! int *r; ! int *g; ! int *b; t_float *angle; ! int *scroll; ! int i, csize; TEXTLAYER * layers; *************** *** 750,754 **** int linenumber; // lines of chat we have rendered in current message int feed_mes = 0; // messages rendered ! t_int tlayer; // draw all texts --- 750,754 ---- int linenumber; // lines of chat we have rendered in current message int feed_mes = 0; // messages rendered ! int tlayer; // draw all texts *************** *** 761,765 **** if (x->x_layers[tlayer].l_active) { ! t_int base=tlayer; linenumber = 0; int ti = feed_mes; --- 761,765 ---- if (x->x_layers[tlayer].l_active) { ! int base=tlayer; linenumber = 0; int ti = feed_mes; *************** *** 864,869 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int ti; ! t_int px, py; unsigned char y, u, v; DATA32 *imdata; --- 864,869 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int ti; ! int px, py; unsigned char y, u, v; DATA32 *imdata; Index: pdp_warhol.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_warhol.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_warhol.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_warhol.c 10 May 2007 05:04:00 -0000 1.2.2.2 *************** *** 30,34 **** #define NBCOLORS 9 ! static t_int colortable[NBCOLORS] = { 0x000080, 0x008045, 0x07f0e7, 0x0000f0, 0x00f07f, 0x037a10, --- 30,34 ---- #define NBCOLORS 9 ! static int colortable[NBCOLORS] = { 0x000080, 0x008045, 0x07f0e7, 0x0000f0, 0x00f07f, 0x037a10, *************** *** 44,58 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_dividerx; ! t_int x_dividery; ! t_int x_colorindex; } t_pdp_warhol; --- 44,58 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_dividerx; ! int x_dividery; ! int x_colorindex; } t_pdp_warhol; *************** *** 62,66 **** if ( ( fdivider > 1 ) && ( fdivider < x->x_vwidth ) ) { ! x->x_dividerx = (t_int) fdivider; } } --- 62,66 ---- if ( ( fdivider > 1 ) && ( fdivider < x->x_vwidth ) ) { ! x->x_dividerx = (int) fdivider; } } *************** *** 70,74 **** if ( ( fdivider > 1 ) && ( fdivider < x->x_vwidth ) ) { ! x->x_dividery = (t_int) fdivider; } } --- 70,74 ---- if ( ( fdivider > 1 ) && ( fdivider < x->x_vwidth ) ) { ! x->x_dividery = (int) fdivider; } } *************** *** 78,82 **** if ( ( findex >= 0 ) && ( findex < NBCOLORS ) ) { ! x->x_colorindex = (t_int) findex; } } --- 78,82 ---- if ( ( findex >= 0 ) && ( findex < NBCOLORS ) ) { ! x->x_colorindex = (int) findex; } } *************** *** 84,88 **** static void pdp_warhol_v(t_pdp_warhol *x, t_floatarg fv ) { ! t_int tc; if ( ( fv >= 0 ) && ( fv < 255 ) ) --- 84,88 ---- static void pdp_warhol_v(t_pdp_warhol *x, t_floatarg fv ) { ! int tc; if ( ( fv >= 0 ) && ( fv < 255 ) ) *************** *** 96,100 **** static void pdp_warhol_u(t_pdp_warhol *x, t_floatarg fu ) { ! t_int tc; if ( ( fu >= 0 ) && ( fu < 255 ) ) --- 96,100 ---- static void pdp_warhol_u(t_pdp_warhol *x, t_floatarg fu ) { ! int tc; if ( ( fu >= 0 ) && ( fu < 255 ) ) *************** *** 108,112 **** static void pdp_warhol_y(t_pdp_warhol *x, t_floatarg fy ) { ! t_int tc; if ( ( fy >= 0 ) && ( fy < 255 ) ) --- 108,112 ---- static void pdp_warhol_y(t_pdp_warhol *x, t_floatarg fy ) { ! int tc; if ( ( fy >= 0 ) && ( fy < 255 ) ) Index: pdp_nervous.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_nervous.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_nervous.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_nervous.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 45,65 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_mode; short int *x_buffer; short int **x_planetable; ! t_int x_planes; ! t_int x_plane; ! t_int x_stock; ! t_int x_timer; ! t_int x_stride; ! t_int x_readplane; } t_pdp_nervous; --- 45,65 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_mode; short int *x_buffer; short int **x_planetable; ! int x_planes; ! int x_plane; ! int x_stock; ! int x_timer; ! int x_stride; ! int x_readplane; } t_pdp_nervous; Index: pdp_segsnd~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_segsnd~.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_segsnd~.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_segsnd~.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 41,58 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_x1; // coordinates of fixed segment ! t_int x_y1; ! t_int x_x2; ! t_int x_y2; ! t_int x_random; short int *x_data; --- 41,58 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_x1; // coordinates of fixed segment ! int x_y1; ! int x_x2; ! int x_y2; ! int x_random; short int *x_data; *************** *** 128,133 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int ti; ! t_int px, py; unsigned char y, u, v; short int *pY, *pU, *pV; --- 128,133 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int ti; ! int px, py; unsigned char y, u, v; short int *pY, *pU, *pV; *************** *** 279,284 **** t_float *out = (t_float *)(w[1]); // audio generated sound t_pdp_segsnd *x = (t_pdp_segsnd *)(w[2]); ! t_int n = (int)(w[3]); ! t_int npoints, xi, px, py; t_float a=0; --- 279,284 ---- t_float *out = (t_float *)(w[1]); // audio generated sound t_pdp_segsnd *x = (t_pdp_segsnd *)(w[2]); ! int n = (int)(w[3]); ! int npoints, xi, px, py; t_float a=0; Index: pdp_dilate.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_dilate.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_dilate.c 9 May 2007 04:54:13 -0000 1.1.2.1 --- pdp_dilate.c 10 May 2007 05:03:58 -0000 1.1.2.2 *************** *** 33,47 **** t_object x_obj; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_queue_id; ! t_int x_dropped; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_kernelw; // width of the (square) kernel ! t_int x_kernelh; // height of the square kernel ! t_int x_nbpasses; // number of passes short int *x_frame; // keep a copy of current frame for transformations --- 33,47 ---- t_object x_obj; ! int x_packet0; ! int x_packet1; ! int x_queue_id; ! int x_dropped; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_kernelw; // width of the (square) kernel ! int x_kernelh; // height of the square kernel ! int x_nbpasses; // number of passes short int *x_frame; // keep a copy of current frame for transformations *************** *** 54,58 **** if ( fpasses>=1.) { ! x->x_nbpasses = (t_int)fpasses; } } --- 54,58 ---- if ( fpasses>=1.) { ! x->x_nbpasses = (int)fpasses; } } *************** *** 62,66 **** if ( fkernelw>=0.) { ! x->x_kernelw = (t_int)fkernelw; } } --- 62,66 ---- if ( fkernelw>=0.) { ! x->x_kernelw = (int)fkernelw; } } *************** *** 70,74 **** if ( fkernelh>=0.) { ! x->x_kernelh = (t_int)fkernelh; } } --- 70,74 ---- if ( fkernelh>=0.) { ! x->x_kernelh = (int)fkernelh; } } *************** *** 96,103 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i; ! t_int px=0, py=0; short int *pfY, *pfU, *pfV; ! t_int ppx, ppy, ix, iy, pn, kx, ky; // allocate all ressources --- 96,103 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i; ! int px=0, py=0; short int *pfY, *pfU, *pfV; ! int ppx, ppy, ix, iy, pn, kx, ky; // allocate all ressources Index: pdp_aa.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_aa.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_aa.c 9 May 2007 04:54:13 -0000 1.2.2.1 --- pdp_aa.c 10 May 2007 05:03:57 -0000 1.2.2.2 *************** *** 40,52 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; /* aalib structures */ --- 40,52 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; /* aalib structures */ *************** *** 54,61 **** aa_renderparams x_renderparams; // rendering parameters char* x_driver; // name of driver ! t_int x_render; // rendering option char **x_aa_options; // aa options passed as arguments ! t_int x_nb_options; // number of aa options } t_pdp_aa; --- 54,61 ---- aa_renderparams x_renderparams; // rendering parameters char* x_driver; // name of driver ! int x_render; // rendering option char **x_aa_options; // aa options passed as arguments ! int x_nb_options; // number of aa options } t_pdp_aa; *************** *** 136,142 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i, pixsum; ! t_int px, py, ppx, ppy; ! t_int hratio, wratio; if ( ( (int)header->info.image.width != x->x_vwidth ) || --- 136,142 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i, pixsum; ! int px, py, ppx, ppy; ! int hratio, wratio; if ( ( (int)header->info.image.width != x->x_vwidth ) || Index: pdp_baltan.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_baltan.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_baltan.c 9 May 2007 04:54:13 -0000 1.2.2.1 --- pdp_baltan.c 10 May 2007 05:03:57 -0000 1.2.2.2 *************** *** 40,52 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int *x_planebuf; ! t_int x_plane; ! t_int x_pixels; ! t_int x_dfts; /* the factor */ } t_pdp_baltan; --- 40,52 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int *x_planebuf; ! int x_plane; ! int x_pixels; ! int x_dfts; /* the factor */ } t_pdp_baltan; *************** *** 68,72 **** unsigned int totnbpixels = size + (size>>1); ! t_int i, cf; newheader->info.image.encoding = header->info.image.encoding; --- 68,72 ---- unsigned int totnbpixels = size + (size>>1); ! int i, cf; newheader->info.image.encoding = header->info.image.encoding; *************** *** 77,86 **** if ( ( x->x_planebuf == NULL ) || ( (int)size != x->x_pixels ) ) { ! if ( x->x_planebuf ) freebytes( x->x_planebuf, x->x_pixels*PLANES*sizeof(t_int) ); x->x_pixels = size; ! x->x_planebuf = (t_int*)getbytes(x->x_pixels*PLANES*sizeof(t_int)); ! post("pdp_baltan : allocated plane buffer (size=%d)", x->x_pixels*PLANES*sizeof(t_int) ); ! bzero(x->x_planebuf, x->x_pixels*PLANES*sizeof(t_int)); x->x_plane = 0; if ( !x->x_planebuf ) --- 77,86 ---- if ( ( x->x_planebuf == NULL ) || ( (int)size != x->x_pixels ) ) { ! if ( x->x_planebuf ) freebytes( x->x_planebuf, x->x_pixels*PLANES*sizeof(int) ); x->x_pixels = size; ! x->x_planebuf = (int*)getbytes(x->x_pixels*PLANES*sizeof(int)); ! post("pdp_baltan : allocated plane buffer (size=%d)", x->x_pixels*PLANES*sizeof(int) ); ! bzero(x->x_planebuf, x->x_pixels*PLANES*sizeof(int)); x->x_plane = 0; if ( !x->x_planebuf ) *************** *** 176,185 **** static void pdp_baltan_dfts(t_pdp_baltan *x, t_floatarg fdfts ) { ! x->x_dfts = (t_int)fdfts; } static void pdp_baltan_free(t_pdp_baltan *x) { ! if ( x->x_planebuf ) freebytes( x->x_planebuf, x->x_pixels*PLANES*sizeof(t_int) ); pdp_queue_finish(x->x_queue_id); pdp_packet_mark_unused(x->x_packet0); --- 176,185 ---- static void pdp_baltan_dfts(t_pdp_baltan *x, t_floatarg fdfts ) { ! x->x_dfts = (int)fdfts; } static void pdp_baltan_free(t_pdp_baltan *x) { ! if ( x->x_planebuf ) freebytes( x->x_planebuf, x->x_pixels*PLANES*sizeof(int) ); pdp_queue_finish(x->x_queue_id); pdp_packet_mark_unused(x->x_packet0); Index: pdp_ocanvas.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_ocanvas.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_ocanvas.c 9 May 2007 04:54:14 -0000 1.3.2.1 --- pdp_ocanvas.c 10 May 2007 05:03:59 -0000 1.3.2.2 *************** *** 38,64 **** t_outlet *x_outlet0; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_opacket; ! t_int x_current; t_float x_xmouse; t_float x_ymouse; ! t_int x_average; ! t_int *x_packets; ! t_int *x_widths; ! t_int *x_heights; t_float *x_xoffsets; t_float *x_yoffsets; t_float *x_alphas; ! t_int *x_sizes; ! t_int x_owidth; ! t_int x_oheight; ! t_int x_osize; ! t_int x_nbinputs; } t_pdp_ocanvas; --- 38,64 ---- t_outlet *x_outlet0; ! int x_dropped; ! int x_queue_id; ! int x_opacket; ! int x_current; t_float x_xmouse; t_float x_ymouse; ! int x_average; ! int *x_packets; ! int *x_widths; ! int *x_heights; t_float *x_xoffsets; t_float *x_yoffsets; t_float *x_alphas; ! int *x_sizes; ! int x_owidth; ! int x_oheight; ! int x_osize; ! int x_nbinputs; } t_pdp_ocanvas; *************** *** 66,70 **** static void pdp_ocanvas_process_yv12(t_pdp_ocanvas *x) { ! t_int px, py, ppx, ppy, ii, nbs; short int *pY, *pU, *pV; short int *piY, *piU, *piV; --- 66,70 ---- static void pdp_ocanvas_process_yv12(t_pdp_ocanvas *x) { ! int px, py, ppx, ppy, ii, nbs; short int *pY, *pU, *pV; short int *piY, *piU, *piV; *************** *** 139,143 **** } ! static void pdp_ocanvas_process(t_pdp_ocanvas *x, t_int ni) { int encoding; --- 139,143 ---- } ! static void pdp_ocanvas_process(t_pdp_ocanvas *x, int ni) { int encoding; *************** *** 194,198 **** static void pdp_ocanvas_select(t_pdp_ocanvas *x, t_floatarg X, t_floatarg Y) { ! t_int ii; x->x_current = -1; --- 194,198 ---- static void pdp_ocanvas_select(t_pdp_ocanvas *x, t_floatarg X, t_floatarg Y) { ! int ii; x->x_current = -1; *************** *** 243,247 **** } ! static void pdp_ocanvas_input(t_pdp_ocanvas *x, t_symbol *s, t_floatarg f, t_int ni) { t_pdp *header; --- 243,247 ---- } ! static void pdp_ocanvas_input(t_pdp_ocanvas *x, t_symbol *s, t_floatarg f, int ni) { t_pdp *header; *************** *** 327,331 **** static void pdp_ocanvas_free(t_pdp_ocanvas *x) { ! t_int ii; pdp_queue_finish(x->x_queue_id); --- 327,331 ---- static void pdp_ocanvas_free(t_pdp_ocanvas *x) { ! int ii; pdp_queue_finish(x->x_queue_id); *************** *** 335,342 **** } pdp_packet_mark_unused(x->x_opacket); ! if ( x->x_packets ) freebytes( x->x_packets, x->x_nbinputs*sizeof(t_int) ); ! if ( x->x_widths ) freebytes( x->x_widths, x->x_nbinputs*sizeof(t_int) ); ! if ( x->x_heights ) freebytes( x->x_heights, x->x_nbinputs*sizeof(t_int) ); ! if ( x->x_sizes ) freebytes( x->x_sizes, x->x_nbinputs*sizeof(t_int) ); if ( x->x_xoffsets ) freebytes( x->x_xoffsets, x->x_nbinputs*sizeof(t_float) ); if ( x->x_yoffsets ) freebytes( x->x_yoffsets, x->x_nbinputs*sizeof(t_float) ); --- 335,342 ---- } pdp_packet_mark_unused(x->x_opacket); ! if ( x->x_packets ) freebytes( x->x_packets, x->x_nbinputs*sizeof(int) ); ! if ( x->x_widths ) freebytes( x->x_widths, x->x_nbinputs*sizeof(int) ); ! if ( x->x_heights ) freebytes( x->x_heights, x->x_nbinputs*sizeof(int) ); ! if ( x->x_sizes ) freebytes( x->x_sizes, x->x_nbinputs*sizeof(int) ); if ( x->x_xoffsets ) freebytes( x->x_xoffsets, x->x_nbinputs*sizeof(t_float) ); if ( x->x_yoffsets ) freebytes( x->x_yoffsets, x->x_nbinputs*sizeof(t_float) ); *************** *** 349,353 **** { t_pdp_ocanvas *x = (t_pdp_ocanvas *)pd_new(pdp_ocanvas_class); ! t_int ii; char *imes[32]; --- 349,353 ---- { t_pdp_ocanvas *x = (t_pdp_ocanvas *)pd_new(pdp_ocanvas_class); ! int ii; char *imes[32]; *************** *** 393,400 **** post ( "pdp_ocanvas : new %dx%d canvas with %d inputs", x->x_owidth, x->x_oheight, x->x_nbinputs ); ! x->x_packets = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); ! x->x_widths = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); ! x->x_heights = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); ! x->x_sizes = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); x->x_xoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); x->x_yoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); --- 393,400 ---- post ( "pdp_ocanvas : new %dx%d canvas with %d inputs", x->x_owidth, x->x_oheight, x->x_nbinputs ); ! x->x_packets = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); ! x->x_widths = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); ! x->x_heights = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); ! x->x_sizes = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); x->x_xoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); x->x_yoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); Index: pdp_theorin~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_theorin~.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_theorin~.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_theorin~.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 64,75 **** t_float x_f; ! t_int x_packet0; ! t_int x_dropped; t_pdp *x_header; unsigned char *x_data; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; t_outlet *x_pdp_out; // output decoded pdp packets --- 64,75 ---- t_float x_f; ! int x_packet0; ! int x_dropped; t_pdp *x_header; unsigned char *x_data; ! int x_vwidth; ! int x_vheight; ! int x_vsize; t_outlet *x_pdp_out; // output decoded pdp packets *************** *** 84,112 **** pthread_mutex_t x_audiolock; // audio mutex pthread_mutex_t x_videolock; // video mutex ! t_int x_usethread; // flag to activate decoding in a thread ! t_int x_autoplay; // flag to autoplay the file ( default = true ) ! t_int x_nextimage; // flag to play next image in manual mode ! t_int x_priority; // priority of decoding thread char *x_filename; FILE *x_infile; // file descriptor ! t_int x_decoding; // decoding flag ! t_int x_theorainit; // flag for indicating that theora is initialized ! t_int x_videoready; // video ready flag ! t_int x_noframeshits; // number of tries without getting a frame ! t_int x_newpicture; // new picture flag ! t_int x_newpictureready;// new picture ready flag ! t_int x_notpackets; // number of theora packets decoded ! t_int x_novpackets; // number of vorbis packets decoded ! t_int x_endoffile; // end of the file reached ! t_int x_nbframes; // number of frames emitted ! t_int x_framerate; // framerate ! t_int x_samplerate; // audio sample rate ! t_int x_audiochannels; // audio channels ! t_int x_blocksize; // audio block size ! t_int x_audioon; // audio buffer filling flag ! t_int x_reading; // file reading flag ! t_int x_cursec; // current second ! t_int x_secondcount; // number of frames received in the current second struct timeval x_starttime; // reading starting time --- 84,112 ---- pthread_mutex_t x_audiolock; // audio mutex pthread_mutex_t x_videolock; // video mutex ! int x_usethread; // flag to activate decoding in a thread ! int x_autoplay; // flag to autoplay the file ( default = true ) ! int x_nextimage; // flag to play next image in manual mode ! int x_priority; // priority of decoding thread char *x_filename; FILE *x_infile; // file descriptor ! int x_decoding; // decoding flag ! int x_theorainit; // flag for indicating that theora is initialized ! int x_videoready; // video ready flag ! int x_noframeshits; // number of tries without getting a frame ! int x_newpicture; // new picture flag ! int x_newpictureready;// new picture ready flag ! int x_notpackets; // number of theora packets decoded ! int x_novpackets; // number of vorbis packets decoded ! int x_endoffile; // end of the file reached ! int x_nbframes; // number of frames emitted ! int x_framerate; // framerate ! int x_samplerate; // audio sample rate ! int x_audiochannels; // audio channels ! int x_blocksize; // audio block size ! int x_audioon; // audio buffer filling flag ! int x_reading; // file reading flag ! int x_cursec; // current second ! int x_secondcount; // number of frames received in the current second struct timeval x_starttime; // reading starting time *************** *** 127,134 **** /* audio structures */ ! t_int x_audio; // flag to activate the decoding of audio t_float x_audio_inl[4*MAX_AUDIO_PACKET_SIZE]; // left buffer for pd t_float x_audio_inr[4*MAX_AUDIO_PACKET_SIZE]; // right buffer for pd ! t_int x_audioin_position;// writing position for incoming audio t_float **x_pcm; // buffer for vorbis decoding --- 127,134 ---- /* audio structures */ ! int x_audio; // flag to activate the decoding of audio t_float x_audio_inl[4*MAX_AUDIO_PACKET_SIZE]; // left buffer for pd t_float x_audio_inr[4*MAX_AUDIO_PACKET_SIZE]; // right buffer for pd ! int x_audioin_position;// writing position for incoming audio t_float **x_pcm; // buffer for vorbis decoding *************** *** 177,184 **** } ! static t_int pdp_theorin_get_buffer_from_file(FILE *in, ogg_sync_state *oy) { char *buffer; ! t_int bytes; buffer=ogg_sync_buffer(oy,4096); --- 177,184 ---- } ! static int pdp_theorin_get_buffer_from_file(FILE *in, ogg_sync_state *oy) { char *buffer; ! int bytes; buffer=ogg_sync_buffer(oy,4096); *************** *** 188,192 **** } ! static t_int pdp_theorin_queue_page(t_pdp_theorin *x) { if(x->x_notpackets) ogg_stream_pagein(&x->x_statet, &x->x_ogg_page); --- 188,192 ---- } ! static int pdp_theorin_queue_page(t_pdp_theorin *x) { if(x->x_notpackets) ogg_stream_pagein(&x->x_statet, &x->x_ogg_page); *************** *** 195,199 **** } ! static t_int pdp_theorin_decode_packet(t_pdp_theorin *x) { int ret, count, maxsamples, samples, si=0, sj=0; --- 195,199 ---- } ! static int pdp_theorin_decode_packet(t_pdp_theorin *x) { int ret, count, maxsamples, samples, si=0, sj=0; *************** *** 205,209 **** unsigned char *psY, *psU, *psV; t_float **lpcm; ! t_int px, py; // post( "pdp_theorin~ : decode packet" ); --- 205,209 ---- unsigned char *psY, *psU, *psV; t_float **lpcm; ! int px, py; // post( "pdp_theorin~ : decode packet" ); *************** *** 398,402 **** t_pdp_theorin *x = (t_pdp_theorin*)tdata; struct sched_param schedprio; ! t_int pmin, pmax, p1; struct timespec twait; --- 398,402 ---- t_pdp_theorin *x = (t_pdp_theorin*)tdata; struct sched_param schedprio; ! int pmin, pmax, p1; struct timespec twait; *************** *** 436,440 **** static void pdp_theorin_close(t_pdp_theorin *x) { ! t_int ret, i, count=0; struct timespec twait; --- 436,440 ---- static void pdp_theorin_close(t_pdp_theorin *x) { ! int ret, i, count=0; struct timespec twait; *************** *** 499,503 **** static void pdp_theorin_open(t_pdp_theorin *x, t_symbol *s) { ! t_int ret, i; pthread_attr_t decode_child_attr; ogg_stream_state o_tempstate; --- 499,503 ---- static void pdp_theorin_open(t_pdp_theorin *x, t_symbol *s) { ! int ret, i; pthread_attr_t decode_child_attr; ogg_stream_state o_tempstate; *************** *** 633,637 **** { theora_decode_init(&x->x_theora_state, &x->x_theora_info); ! x->x_framerate = (t_int)x->x_theora_info.fps_numerator/x->x_theora_info.fps_denominator; // post("pdp_theorin~ : stream %x is theora %dx%d %d fps video.", // x->x_statet.serialno, --- 633,637 ---- { theora_decode_init(&x->x_theora_state, &x->x_theora_info); ! x->x_framerate = (int)x->x_theora_info.fps_numerator/x->x_theora_info.fps_denominator; // post("pdp_theorin~ : stream %x is theora %dx%d %d fps video.", // x->x_statet.serialno, *************** *** 769,773 **** int n = (int)(w[4]); // number of samples struct timeval etime; ! t_int sn; // decode a packet if not in thread mode --- 769,773 ---- int n = (int)(w[4]); // number of samples struct timeval etime; ! int sn; // decode a packet if not in thread mode Index: pdp_rev.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_rev.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_rev.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_rev.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 37,53 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_vgrabtime; ! t_int x_vgrab; ! t_int x_linespace; ! t_int x_vscale; ! t_int x_vcolor; } t_pdp_rev; --- 37,53 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_vgrabtime; ! int x_vgrab; ! int x_linespace; ! int x_vscale; ! int x_vcolor; } t_pdp_rev; Index: pdp_theorout~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_theorout~.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_theorout~.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_theorout~.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 67,89 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_tvwidth; /* theora 16 pixels aligned width value */ ! t_int x_vheight; ! t_int x_tvheight; /* theora 16 pixels aligned height value */ ! t_int x_vsize; FILE *x_tfile; ! t_int x_framerate; ! t_int x_newfile; ! t_int x_einit; ! t_int x_recflag; ! t_int x_enduprec;; ! t_int x_frameswritten; ! t_int x_frames; struct timeval x_tstart; struct timeval x_tzero; --- 67,89 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_tvwidth; /* theora 16 pixels aligned width value */ ! int x_vheight; ! int x_tvheight; /* theora 16 pixels aligned height value */ ! int x_vsize; FILE *x_tfile; ! int x_framerate; ! int x_newfile; ! int x_einit; ! int x_recflag; ! int x_enduprec;; ! int x_frameswritten; ! int x_frames; struct timeval x_tstart; struct timeval x_tzero; *************** *** 105,121 **** yuv_buffer x_yuvbuffer; // yuv buffer ! t_int x_akbps; // audio bit rate ! t_int x_vkbps; // video bit rate t_float x_aquality; // audio quality ! t_int x_vquality; // video quality ! t_int x_abytesout; // audio bytes written ! t_int x_vbytesout; // video bytes written /* audio structures */ t_float **x_audio_buf; /* buffer for incoming audio */ ! t_int x_audioin_position; // writing position for incoming audio ! t_int x_channels; // audio channels ! t_int x_samplerate; // audio sample rate ! t_int x_bits; // audio bits } t_pdp_theorout; --- 105,121 ---- yuv_buffer x_yuvbuffer; // yuv buffer ! int x_akbps; // audio bit rate ! int x_vkbps; // video bit rate t_float x_aquality; // audio quality ! int x_vquality; // video quality ! int x_abytesout; // audio bytes written ! int x_vbytesout; // video bytes written /* audio structures */ t_float **x_audio_buf; /* buffer for incoming audio */ ! int x_audioin_position; // writing position for incoming audio ! int x_channels; // audio channels ! int x_samplerate; // audio sample rate ! int x_bits; // audio bits } t_pdp_theorout; *************** *** 134,140 **** x->x_yuvbuffer.uv_stride=x->x_vwidth>>1; ! x->x_yuvbuffer.y = (char *)malloc( x->x_yuvbuffer.y_width * x->x_yuvbuffer.y_height ); ! x->x_yuvbuffer.u = (char *)malloc( x->x_yuvbuffer.uv_width * x->x_yuvbuffer.uv_height ); ! x->x_yuvbuffer.v = (char *)malloc( x->x_yuvbuffer.uv_width * x->x_yuvbuffer.uv_height ); } --- 134,140 ---- x->x_yuvbuffer.uv_stride=x->x_vwidth>>1; ! x->x_yuvbuffer.y = (unsigned char *)malloc( x->x_yuvbuffer.y_width * x->x_yuvbuffer.y_height ); ! x->x_yuvbuffer.u = (unsigned char *)malloc( x->x_yuvbuffer.uv_width * x->x_yuvbuffer.uv_height ); ! x->x_yuvbuffer.v = (unsigned char *)malloc( x->x_yuvbuffer.uv_width * x->x_yuvbuffer.uv_height ); } *************** *** 150,154 **** static void pdp_theorout_init_encoder(t_pdp_theorout *x) { ! t_int ret; x->x_einit=0; --- 150,154 ---- static void pdp_theorout_init_encoder(t_pdp_theorout *x) { ! int ret; x->x_einit=0; *************** *** 217,221 **** static void pdp_theorout_write_headers(t_pdp_theorout *x) { ! t_int ret; ogg_packet aheader, aheadercomm, aheadercode; --- 217,221 ---- static void pdp_theorout_write_headers(t_pdp_theorout *x) { ! int ret; ogg_packet aheader, aheadercomm, aheadercode; *************** *** 363,367 **** static void pdp_theorout_open(t_pdp_theorout *x, t_symbol *sfile) { ! t_int ret=0; // close previous video file if existing --- 363,367 ---- static void pdp_theorout_open(t_pdp_theorout *x, t_symbol *sfile) { ! int ret=0; // close previous video file if existing *************** *** 438,448 **** static void pdp_theorout_vbitrate(t_pdp_theorout *x, t_floatarg vbitrate ) { ! if ( ( (t_int) vbitrate < MIN_VIDEO_BITRATE ) || ( (t_int) vbitrate > MAX_VIDEO_BITRATE ) ) { post( "pdp_theorout~ : wrong video bitrate %d : should be in [%d,%d] kbps", ! (t_int) vbitrate, MIN_VIDEO_BITRATE, MAX_VIDEO_BITRATE ); return; } ! x->x_vkbps = (t_int) vbitrate; } --- 438,448 ---- static void pdp_theorout_vbitrate(t_pdp_theorout *x, t_floatarg vbitrate ) { ! if ( ( (int) vbitrate < MIN_VIDEO_BITRATE ) || ( (int) vbitrate > MAX_VIDEO_BITRATE ) ) { post( "pdp_theorout~ : wrong video bitrate %d : should be in [%d,%d] kbps", ! (int) vbitrate, MIN_VIDEO_BITRATE, MAX_VIDEO_BITRATE ); return; } ! x->x_vkbps = (int) vbitrate; } *************** *** 450,460 **** static void pdp_theorout_abitrate(t_pdp_theorout *x, t_floatarg abitrate ) { ! if ( ( (t_int) abitrate < MIN_AUDIO_BITRATE ) || ( (t_int) abitrate > MAX_AUDIO_BITRATE ) ) { post( "pdp_theorout~ : wrong audio bitrate %d : should be in [%d,%d] kbps", ! (t_int) abitrate, MIN_AUDIO_BITRATE, MAX_AUDIO_BITRATE ); return; } ! x->x_akbps = (t_int) abitrate; } --- 450,460 ---- static void pdp_theorout_abitrate(t_pdp_theorout *x, t_floatarg abitrate ) { ! if ( ( (int) abitrate < MIN_AUDIO_BITRATE ) || ( (int) abitrate > MAX_AUDIO_BITRATE ) ) { post( "pdp_theorout~ : wrong audio bitrate %d : should be in [%d,%d] kbps", ! (int) abitrate, MIN_AUDIO_BITRATE, MAX_AUDIO_BITRATE ); return; } ! x->x_akbps = (int) abitrate; } *************** *** 462,472 **** static void pdp_theorout_vquality(t_pdp_theorout *x, t_floatarg vquality ) { ! if ( ( (t_int) vquality < MIN_VIDEO_QUALITY ) || ( (t_int) vquality > MAX_VIDEO_QUALITY ) ) { post( "pdp_theorout~ : wrong video quality %d : should be in [%d,%d]", ! (t_int) vquality, MIN_VIDEO_QUALITY, MAX_VIDEO_QUALITY ); return; } ! x->x_vquality = (t_int) vquality; } --- 462,472 ---- static void pdp_theorout_vquality(t_pdp_theorout *x, t_floatarg vquality ) { ! if ( ( (int) vquality < MIN_VIDEO_QUALITY ) || ( (int) vquality > MAX_VIDEO_QUALITY ) ) { post( "pdp_theorout~ : wrong video quality %d : should be in [%d,%d]", ! (int) vquality, MIN_VIDEO_QUALITY, MAX_VIDEO_QUALITY ); return; } ! x->x_vquality = (int) vquality; } *************** *** 474,484 **** static void pdp_theorout_aquality(t_pdp_theorout *x, t_floatarg aquality ) { ! if ( ( (t_int) aquality < MIN_AUDIO_QUALITY ) || ( (t_int) aquality > MAX_AUDIO_QUALITY ) ) { post( "pdp_theorout~ : wrong audio quality %d : should be in [%d,%d]", ! (t_int) aquality, MIN_AUDIO_QUALITY, MAX_AUDIO_QUALITY ); return; } ! x->x_aquality = (t_int) aquality; } --- 474,484 ---- static void pdp_theorout_aquality(t_pdp_theorout *x, t_floatarg aquality ) { ! if ( ( (int) aquality < MIN_AUDIO_QUALITY ) || ( (int) aquality > MAX_AUDIO_QUALITY ) ) { post( "pdp_theorout~ : wrong audio quality %d : should be in [%d,%d]", ! (int) aquality, MIN_AUDIO_QUALITY, MAX_AUDIO_QUALITY ); return; } ! x->x_aquality = (int) aquality; } *************** *** 491,495 **** int n = (int)(w[4]); // number of samples t_float fsample; ! t_int isample, i; if ( x->x_recflag ) --- 491,495 ---- int n = (int)(w[4]); // number of samples t_float fsample; ! int isample, i; if ( x->x_recflag ) *************** *** 526,536 **** t_pdp *header = pdp_packet_header(x->x_packet0); unsigned char *data = (unsigned char *)pdp_packet_data(x->x_packet0); ! t_int i, ret; ! t_int px, py; ! char *pY, *pU, *pV; struct timeval trec; ! t_int nbaudiosamples, nbusecs, nbrecorded; t_float fframerate=0.0; ! t_int precflag; ogg_page apage; ogg_page vpage; --- 526,536 ---- t_pdp *header = pdp_packet_header(x->x_packet0); unsigned char *data = (unsigned char *)pdp_packet_data(x->x_packet0); ! int i, ret; ! int px, py; ! unsigned char *pY, *pU, *pV; struct timeval trec; ! int nbaudiosamples, nbusecs, nbrecorded; t_float fframerate=0.0; ! int precflag; ogg_page apage; ogg_page vpage; *************** *** 860,864 **** void *pdp_theorout_new(void) { ! t_int i; t_pdp_theorout *x = (t_pdp_theorout *)pd_new(pdp_theorout_class); --- 860,864 ---- void *pdp_theorout_new(void) { ! int i; t_pdp_theorout *x = (t_pdp_theorout *)pd_new(pdp_theorout_class); Index: pdp_pen.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_pen.c,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** pdp_pen.c 9 May 2007 04:54:14 -0000 1.4.2.1 --- pdp_pen.c 10 May 2007 05:03:59 -0000 1.4.2.2 *************** *** 31,35 **** static char *pdp_pen_version = "pdp_pen: version 0.1, free hand drawing object written by Yves Degoyon (ydegoyon(a)free.fr)"; ! static t_int nbits=0; // number of recursive calls typedef struct pdp_pen_struct --- 31,35 ---- static char *pdp_pen_version = "pdp_pen: version 0.1, free hand drawing object written by Yves Degoyon (ydegoyon(a)free.fr)"; ! static int nbits=0; // number of recursive calls typedef struct pdp_pen_struct *************** *** 39,60 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_red; ! t_int x_green; ! t_int x_blue; ! t_int x_xoffset; ! t_int x_yoffset; t_float x_alpha; ! t_int x_pwidth; ! t_int x_mode; // 0=draw ( default), 1=erase short int *x_bdata; --- 39,60 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_red; ! int x_green; ! int x_blue; ! int x_xoffset; ! int x_yoffset; t_float x_alpha; ! int x_pwidth; ! int x_mode; // 0=draw ( default), 1=erase short int *x_bdata; *************** *** 62,66 **** } t_pdp_pen; ! static void pdp_pen_allocate(t_pdp_pen *x, t_int newsize) { int i; --- 62,66 ---- } t_pdp_pen; ! static void pdp_pen_allocate(t_pdp_pen *x, int newsize) { int i; *************** *** 76,81 **** { short int *pbY, *pbU, *pbV; ! t_int mx, Mx, my, My; ! t_int px, py; if ( !x->x_bdata ) return; --- 76,81 ---- { short int *pbY, *pbU, *pbV; ! int mx, Mx, my, My; ! int px, py; if ( !x->x_bdata ) return; *************** *** 136,140 **** nbits++; ! // post( "pdp_pen_do_fill : X=%d, Y=%d stack=%d", (t_int)X, (t_int)Y, nbits ); pbY = x->x_bdata; --- 136,140 ---- nbits++; ! // post( "pdp_pen_do_fill : X=%d, Y=%d stack=%d", (int)X, (int)Y, nbits ); pbY = x->x_bdata; *************** *** 142,147 **** pbV = (x->x_bdata+x->x_vsize+(x->x_vsize>>2)); ! if ( ( (t_int)X < 0 ) || ( (t_int)X >= x->x_vwidth ) || ! ( (t_int)Y < 0 ) || ( (t_int)Y >= x->x_vheight ) ) { nbits--; --- 142,147 ---- pbV = (x->x_bdata+x->x_vsize+(x->x_vsize>>2)); ! if ( ( (int)X < 0 ) || ( (int)X >= x->x_vwidth ) || ! ( (int)Y < 0 ) || ( (int)Y >= x->x_vheight ) ) { nbits--; *************** *** 149,155 **** } ! nX = (t_int) X; ! nY = (t_int) Y; ! if ( *(pbY+(t_int)Y*x->x_vwidth+(t_int)X) != 0 ) { nbits--; --- 149,155 ---- } ! nX = (int) X; ! nY = (int) Y; ! if ( *(pbY+(int)Y*x->x_vwidth+(int)X) != 0 ) { nbits--; *************** *** 166,171 **** } ! nX = (t_int) X+1; ! nY = (t_int) Y; if ( (*(pbY+nY*x->x_vwidth+nX)) == 0 ) { --- 166,171 ---- } ! nX = (int) X+1; ! nY = (int) Y; if ( (*(pbY+nY*x->x_vwidth+nX)) == 0 ) { *************** *** 179,184 **** } ! nX = (t_int) X-1; ! nY = (t_int) Y; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { --- 179,184 ---- } ! nX = (int) X-1; ! nY = (int) Y; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { *************** *** 192,197 **** } ! nX = (t_int) X-1; ! nY = (t_int) Y-1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { --- 192,197 ---- } ! nX = (int) X-1; ! nY = (int) Y-1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { *************** *** 205,210 **** } ! nX = (t_int) X; ! nY = (t_int) Y-1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { --- 205,210 ---- } ! nX = (int) X; ! nY = (int) Y-1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { *************** *** 218,223 **** } ! nX = (t_int) X+1; ! nY = (t_int) Y-1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { --- 218,223 ---- } ! nX = (int) X+1; ! nY = (int) Y-1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { *************** *** 231,236 **** } ! nX = (t_int) X-1; ! nY = (t_int) Y+1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { --- 231,236 ---- } ! nX = (int) X-1; ! nY = (int) Y+1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { *************** *** 244,249 **** } ! nX = (t_int) X; ! nY = (t_int) Y+1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { --- 244,249 ---- } ! nX = (int) X; ! nY = (int) Y+1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { *************** *** 257,262 **** } ! nX = (t_int) X+1; ! nY = (t_int) Y+1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { --- 257,262 ---- } ! nX = (int) X+1; ! nY = (int) Y+1; if ( *(pbY+nY*x->x_vwidth+nX) == 0 ) { *************** *** 359,364 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i; ! t_int px, py; short int *pY, *pU, *pV; short int *pbY, *pbU, *pbV; --- 359,364 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i; ! int px, py; short int *pY, *pU, *pV; short int *pbY, *pbU, *pbV; *************** *** 366,371 **** /* allocate all ressources */ ! if ( ((t_int)header->info.image.width != x->x_vwidth ) || ! ((t_int)header->info.image.height != x->x_vheight ) ) { pdp_pen_allocate(x, header->info.image.width*header->info.image.height ); --- 366,371 ---- /* allocate all ressources */ ! if ( ((int)header->info.image.width != x->x_vwidth ) || ! ((int)header->info.image.height != x->x_vheight ) ) { pdp_pen_allocate(x, header->info.image.width*header->info.image.height ); Index: pdp_icedthe~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_icedthe~.c,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** pdp_icedthe~.c 9 May 2007 04:54:14 -0000 1.2.2.2 --- pdp_icedthe~.c 10 May 2007 05:03:58 -0000 1.2.2.3 *************** *** 75,86 **** t_float x_f; ! t_int x_packet0; ! t_int x_dropped; t_pdp *x_header; unsigned char *x_data; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; t_outlet *x_pdp_out; // output decoded pdp packets --- 75,86 ---- t_float x_f; ! int x_packet0; ! int x_dropped; t_pdp *x_header; unsigned char *x_data; ! int x_vwidth; ! int x_vheight; ! int x_vsize; t_outlet *x_pdp_out; // output decoded pdp packets *************** *** 97,129 **** pthread_mutex_t x_audiolock; // audio mutex pthread_mutex_t x_videolock; // video mutex ! t_int x_priority; // priority of decoding thread char *x_url; // url to connect to char *x_hostname; // hostname of the server ( or IP ) char *x_mountpoint; // mountpoint requested ! t_int x_bitrate; // bitrate of stream read at connection time char *x_name; // name of stream char *x_genre; // genre of stream ! t_int x_portnum; // port number ! t_int x_insock; // socket file descriptor ! t_int x_decoding; // decoding flag ! t_int x_theorainit; // flag for indicating that theora is initialized ! t_int x_videoready; // video ready flag ! t_int x_newpicture; // new picture flag ! t_int x_notpackets; // number of theora packets decoded ! t_int x_novpackets; // number of vorbis packets decoded ! t_int x_nbnostream; // number of cycles without a video stream ! t_int x_endofstream; // end of the stream reached ! t_int x_nbframes; // number of frames emitted t_float x_framerate; // framerate ! t_int x_forcedframerate;// the framerate we want to receive ! t_int x_samplerate; // audio sample rate ! t_int x_audiochannels; // audio channels ! t_int x_blocksize; // audio block size ! t_int x_audioon; // audio buffer filling flag ! t_int x_connected; // connection flag ! t_int x_pconnected; // previous state ! t_int x_cursec; // current second ! t_int x_secondcount; // number of frames received in the current second struct timeval x_starttime; // reading starting time char x_request[STRBUF_SIZE]; // string to be send to server --- 97,129 ---- pthread_mutex_t x_audiolock; // audio mutex pthread_mutex_t x_videolock; // video mutex ! int x_priority; // priority of decoding thread char *x_url; // url to connect to char *x_hostname; // hostname of the server ( or IP ) char *x_mountpoint; // mountpoint requested ! int x_bitrate; // bitrate of stream read at connection time char *x_name; // name of stream char *x_genre; // genre of stream ! int x_portnum; // port number ! int x_insock; // socket file descriptor ! int x_decoding; // decoding flag ! int x_theorainit; // flag for indicating that theora is initialized ! int x_videoready; // video ready flag ! int x_newpicture; // new picture flag ! int x_notpackets; // number of theora packets decoded ! int x_novpackets; // number of vorbis packets decoded ! int x_nbnostream; // number of cycles without a video stream ! int x_endofstream; // end of the stream reached ! int x_nbframes; // number of frames emitted t_float x_framerate; // framerate ! int x_forcedframerate;// the framerate we want to receive ! int x_samplerate; // audio sample rate ! int x_audiochannels; // audio channels ! int x_blocksize; // audio block size ! int x_audioon; // audio buffer filling flag ! int x_connected; // connection flag ! int x_pconnected; // previous state ! int x_cursec; // current second ! int x_secondcount; // number of frames received in the current second struct timeval x_starttime; // reading starting time char x_request[STRBUF_SIZE]; // string to be send to server *************** *** 149,156 **** /* audio structures */ ! t_int x_audio; // flag to activate the decoding of audio t_float x_audio_inl[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for float audio decoded from ogg */ t_float x_audio_inr[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for float audio decoded from ogg */ ! t_int x_audioin_position; // writing position for incoming audio } t_pdp_icedthe; --- 149,156 ---- /* audio structures */ ! int x_audio; // flag to activate the decoding of audio t_float x_audio_inl[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for float audio decoded from ogg */ t_float x_audio_inr[4*MAX_AUDIO_PACKET_SIZE]; /* buffer for float audio decoded from ogg */ ! int x_audioin_position; // writing position for incoming audio } t_pdp_icedthe; *************** *** 158,162 **** static void pdp_icedthe_priority(t_pdp_icedthe *x, t_floatarg fpriority ) { ! if ( ( (t_int)fpriority >= MIN_PRIORITY ) && ( (t_int)fpriority <= MAX_PRIORITY ) ) { x->x_priority = (int)fpriority; --- 158,162 ---- static void pdp_icedthe_priority(t_pdp_icedthe *x, t_floatarg fpriority ) { ! if ( ( (int)fpriority >= MIN_PRIORITY ) && ( (int)fpriority <= MAX_PRIORITY ) ) { x->x_priority = (int)fpriority; *************** *** 194,198 **** static void pdp_icedthe_disconnect(t_pdp_icedthe *x) { ! t_int ret, i, count=0; struct timespec twait; --- 194,198 ---- static void pdp_icedthe_disconnect(t_pdp_icedthe *x) { ! int ret, i, count=0; struct timespec twait; *************** *** 254,261 **** } ! static t_int pdp_icedthe_get_buffer_from_network(t_int socket, ogg_sync_state *oy) { char *buffer; ! t_int bytes; buffer=ogg_sync_buffer(oy, NET_BUFFER_SIZE); --- 254,261 ---- } ! static int pdp_icedthe_get_buffer_from_network(int socket, ogg_sync_state *oy) { char *buffer; ! int bytes; buffer=ogg_sync_buffer(oy, NET_BUFFER_SIZE); *************** *** 270,274 **** } ! static t_int pdp_icedthe_queue_page(t_pdp_icedthe *x) { --- 270,274 ---- } ! static int pdp_icedthe_queue_page(t_pdp_icedthe *x) { *************** *** 294,298 **** } ! static t_int pdp_icedthe_decode_stream(t_pdp_icedthe *x) { int ret, count, maxsamples, samples, si=0, sj=0; --- 294,298 ---- } ! static int pdp_icedthe_decode_stream(t_pdp_icedthe *x) { int ret, count, maxsamples, samples, si=0, sj=0; *************** *** 304,308 **** unsigned char *pY, *pU, *pV; unsigned char *psY, *psU, *psV; ! t_int px, py; // post( "pdp_icedthe~ : decode packet" ); --- 304,308 ---- unsigned char *pY, *pU, *pV; unsigned char *psY, *psU, *psV; ! int px, py; // post( "pdp_icedthe~ : decode packet" ); *************** *** 482,486 **** t_pdp_icedthe *x = (t_pdp_icedthe*)tdata; struct sched_param schedprio; ! t_int pmin, pmax, p1; struct timespec twait; --- 482,486 ---- t_pdp_icedthe *x = (t_pdp_icedthe*)tdata; struct sched_param schedprio; ! int pmin, pmax, p1; struct timespec twait; *************** *** 528,532 **** { char *hostptr = NULL, *p, *endhost = NULL, *pathptr = NULL; ! t_int length; /* strip http:// or ftp:// */ --- 528,532 ---- { char *hostptr = NULL, *p, *endhost = NULL, *pathptr = NULL; ! int length; /* strip http:// or ftp:// */ *************** *** 559,563 **** } ! length = (t_int)(endhost - hostptr); if ( x->x_hostname ) { --- 559,563 ---- } ! length = (int)(endhost - hostptr); if ( x->x_hostname ) { *************** *** 584,596 **** ogg_stream_state o_tempstate; t_pdp_icedthe *x = (t_pdp_icedthe*)tdata; ! t_int sockfd; struct sockaddr_in server; struct hostent *hp; fd_set fdset; struct timeval tv; ! t_int numrelocs = 0; ! t_int i, ret, rest, nanswers=0; char *cpoint = NULL; ! t_int offset = 0, endofheaders = 0, wpackets = 0; char *sptr = NULL; --- 584,596 ---- ogg_stream_state o_tempstate; t_pdp_icedthe *x = (t_pdp_icedthe*)tdata; ! int sockfd; struct sockaddr_in server; struct hostent *hp; fd_set fdset; struct timeval tv; ! int numrelocs = 0; ! int i, ret, rest, nanswers=0; char *cpoint = NULL; ! int offset = 0, endofheaders = 0, wpackets = 0; char *sptr = NULL; *************** *** 1120,1124 **** static void pdp_icedthe_connect(t_pdp_icedthe *x, t_symbol *s) { ! t_int ret, i; pthread_attr_t connect_child_attr; --- 1120,1124 ---- static void pdp_icedthe_connect(t_pdp_icedthe *x, t_symbol *s) { ! int ret, i; pthread_attr_t connect_child_attr; *************** *** 1175,1179 **** int n = (int)(w[4]); // number of samples struct timeval etime; ! t_int sn; x->x_blocksize = n; --- 1175,1179 ---- int n = (int)(w[4]); // number of samples struct timeval etime; ! int sn; x->x_blocksize = n; Index: pdp_mgrid.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_mgrid.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_mgrid.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_mgrid.c 10 May 2007 05:03:58 -0000 1.2.2.2 *************** *** 37,52 **** t_float x_f; ! t_int x_packet0; ! t_int x_dropped; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; short int *x_previous_frame; ! t_int x_xdim; ! t_int x_ydim; ! t_int x_threshold; short int x_color; ! t_int x_firstimage; t_outlet *x_pdp_output; // output packets --- 37,52 ---- t_float x_f; ! int x_packet0; ! int x_dropped; ! int x_vwidth; ! int x_vheight; ! int x_vsize; short int *x_previous_frame; ! int x_xdim; ! int x_ydim; ! int x_threshold; short int x_color; ! int x_firstimage; t_outlet *x_pdp_output; // output packets *************** *** 120,127 **** t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); ! t_int i, cf; ! t_int px=0, py=0, xcell=0, ycell=0; ! t_int celldiff=0, cellwidth=0, cellheight=0; ! t_int yindex=0, uindex=0, vindex=0; /* allocate all ressources */ --- 120,127 ---- t_pdp *header = pdp_packet_header(x->x_packet0); short int *data = (short int *)pdp_packet_data(x->x_packet0); ! int i, cf; ! int px=0, py=0, xcell=0, ycell=0; ! int celldiff=0, cellwidth=0, cellheight=0; ! int yindex=0, uindex=0, vindex=0; /* allocate all ressources */ Index: pdp_capture.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_capture.c,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** pdp_capture.c 9 May 2007 04:54:13 -0000 1.4.2.1 --- pdp_capture.c 10 May 2007 05:03:57 -0000 1.4.2.2 *************** *** 38,42 **** // trick to handle Image Magick compatibility ! #if MagickLibVersion >= 0x619 #include "../include/xwindow-private.h" #endif --- 38,42 ---- // trick to handle Image Magick compatibility ! #if MagickLibVersion >= 0x618 #include "../include/xwindow-private.h" #endif *************** *** 49,64 **** t_outlet *x_outlet0; ! t_int x_packet0; short int *x_data; t_pdp *x_header; ! t_int x_displayopen; char *x_display; ! t_int x_screen; ! t_int x_x; ! t_int x_y; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; Image *x_Ximage; --- 49,64 ---- t_outlet *x_outlet0; ! int x_packet0; short int *x_data; t_pdp *x_header; ! int x_displayopen; char *x_display; ! int x_screen; ! int x_x; ! int x_y; ! int x_vwidth; ! int x_vheight; ! int x_vsize; Image *x_Ximage; *************** *** 718,723 **** static void pdp_capture_x(t_pdp_capture *x, t_floatarg fx) { ! t_int width; ! t_int err; if (!x->x_displayopen) --- 718,723 ---- static void pdp_capture_x(t_pdp_capture *x, t_floatarg fx) { ! int width; ! int err; if (!x->x_displayopen) *************** *** 744,749 **** static void pdp_capture_y(t_pdp_capture *x, t_floatarg fy) { ! t_int height; ! t_int err; if (!x->x_displayopen) --- 744,749 ---- static void pdp_capture_y(t_pdp_capture *x, t_floatarg fy) { ! int height; ! int err; if (!x->x_displayopen) *************** *** 770,775 **** static void pdp_capture_width(t_pdp_capture *x, t_floatarg fwidth) { ! t_int width; ! t_int err; if (!x->x_displayopen) --- 770,775 ---- static void pdp_capture_width(t_pdp_capture *x, t_floatarg fwidth) { ! int width; ! int err; if (!x->x_displayopen) *************** *** 792,797 **** static void pdp_capture_height(t_pdp_capture *x, t_floatarg fheight) { ! t_int height; ! t_int err; if (!x->x_displayopen) --- 792,797 ---- static void pdp_capture_height(t_pdp_capture *x, t_floatarg fheight) { ! int height; ! int err; if (!x->x_displayopen) *************** *** 826,830 **** short int *pY, *pU, *pV; unsigned char y, u, v; ! t_int px, py, r, g, b; long number_pixels; --- 826,830 ---- short int *pY, *pU, *pV; unsigned char y, u, v; ! int px, py, r, g, b; long number_pixels; Index: pdp_intrusion.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_intrusion.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_intrusion.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_intrusion.c 10 May 2007 05:03:58 -0000 1.2.2.2 *************** *** 44,59 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; unsigned int x_noisepattern[256]; // noise pattern ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; unsigned int x_encoding; short int *x_images[NB_IMAGES]; ! t_int x_rtimage; short int *x_diff; short int *x_bdata; --- 44,59 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; unsigned int x_noisepattern[256]; // noise pattern ! int x_vwidth; ! int x_vheight; ! int x_vsize; unsigned int x_encoding; short int *x_images[NB_IMAGES]; ! int x_rtimage; short int *x_diff; short int *x_bdata; *************** *** 123,127 **** } ! static void pdp_intrusion_allocate(t_pdp_intrusion *x, t_int newsize) { int i; --- 123,127 ---- } ! static void pdp_intrusion_allocate(t_pdp_intrusion *x, int newsize) { int i; Index: pdp_imgsaver.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_imgsaver.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_imgsaver.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_imgsaver.c 10 May 2007 05:03:58 -0000 1.2.2.2 *************** *** 38,58 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_save_pending; /* imlib data */ Imlib_Image x_image; DATA32 *x_imdata; ! t_int x_iwidth; ! t_int x_iheight; t_symbol *x_filename; --- 38,58 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_save_pending; /* imlib data */ Imlib_Image x_image; DATA32 *x_imdata; ! int x_iwidth; ! int x_iheight; t_symbol *x_filename; *************** *** 67,71 **** Imlib_Load_Error imliberr; t_pdp_imgsaver *x = (t_pdp_imgsaver*) tdata; ! t_int px, py; short int *pY, *pU, *pV; unsigned char y, u, v; --- 67,71 ---- Imlib_Load_Error imliberr; t_pdp_imgsaver *x = (t_pdp_imgsaver*) tdata; ! int px, py; short int *pY, *pU, *pV; unsigned char y, u, v; *************** *** 196,200 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int px, py; t_float alpha, factor; unsigned char y, u, v; --- 196,200 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int px, py; t_float alpha, factor; unsigned char y, u, v; Index: pdp_transition.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_transition.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_transition.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_transition.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 38,72 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_packet; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth0; ! t_int x_vheight0; ! t_int x_vsize0; ! t_int x_vwidth1; ! t_int x_vheight1; ! t_int x_vsize1; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_transition_mode; // 1 : "circle" ! t_int x_transition_pending; ! t_int x_current_source; ! t_int x_target_source; ! t_int x_pos; // current position for transition ! t_int x_inc; // increment for various mode ! t_int x_rand;// randomizing argument } t_pdp_transition; ! static t_int pdp_transition_min( t_int a, t_int b ) { if ( a == 0 ) return b; --- 38,72 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_packet; ! int x_dropped; ! int x_queue_id; ! int x_vwidth0; ! int x_vheight0; ! int x_vsize0; ! int x_vwidth1; ! int x_vheight1; ! int x_vsize1; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_transition_mode; // 1 : "circle" ! int x_transition_pending; ! int x_current_source; ! int x_target_source; ! int x_pos; // current position for transition ! int x_inc; // increment for various mode ! int x_rand;// randomizing argument } t_pdp_transition; ! static int pdp_transition_min( int a, int b ) { if ( a == 0 ) return b; *************** *** 266,271 **** t_pdp *header; short int *data; ! t_int tsource, cx=0, cy=0; ! t_int px, py, rvalue=0, h1pos, h2pos, xcent, ycent; t_float factor, alpha; int i; --- 266,271 ---- t_pdp *header; short int *data; ! int tsource, cx=0, cy=0; ! int px, py, rvalue=0, h1pos, h2pos, xcent, ycent; t_float factor, alpha; int i; Index: pdp_quark.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_quark.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_quark.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_quark.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 45,61 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; short int *x_buffer; short int **x_planetable; ! t_int x_plane; ! t_int x_planes; ! t_int x_tolerance; } t_pdp_quark; --- 45,61 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; short int *x_buffer; short int **x_planetable; ! int x_plane; ! int x_planes; ! int x_tolerance; } t_pdp_quark; *************** *** 114,118 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i, cf, diff; /* allocate all ressources */ --- 114,118 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i, cf, diff; /* allocate all ressources */ Index: pdp_imgloader.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_imgloader.c,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** pdp_imgloader.c 9 May 2007 04:54:14 -0000 1.4.2.1 --- pdp_imgloader.c 10 May 2007 05:03:58 -0000 1.4.2.2 *************** *** 35,42 **** typedef struct _triangle { ! t_int used; ! t_int x1, y1; ! t_int x2, y2; ! t_int x3, y3; t_float a1, b1; t_float a2, b2; --- 35,42 ---- typedef struct _triangle { ! int used; ! int x1, y1; ! int x2, y2; ! int x3, y3; t_float a1, b1; t_float a2, b2; *************** *** 49,75 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_xoffset; // x offset of the image ! t_int x_yoffset; // y offset of the image /* imlib data */ Imlib_Image x_image; DATA32 *x_imdata; ! t_int x_iwidth; ! t_int x_iheight; ! t_int x_operation; ! t_int b_fit; t_float x_blend; ! t_int x_quality; // quality forces an additional yuv->rgb conversion in yuv mode t_triangle x_hiddenzones[ MAX_ZONES ]; // hide these parts of the image --- 49,75 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_xoffset; // x offset of the image ! int x_yoffset; // y offset of the image /* imlib data */ Imlib_Image x_image; DATA32 *x_imdata; ! int x_iwidth; ! int x_iheight; ! int x_operation; ! int b_fit; t_float x_blend; ! int x_quality; // quality forces an additional yuv->rgb conversion in yuv mode t_triangle x_hiddenzones[ MAX_ZONES ]; // hide these parts of the image *************** *** 151,157 **** else if (s == gensym("reshade")) x->x_operation = IMLIB_OP_RESHADE; } ! static t_int pdp_imgloader_isinzone(t_pdp_imgloader *x, t_int px, t_int py, t_int index) { ! t_int c1=0, c2=0, c3=0; if ( !x->x_hiddenzones[index].used ) --- 151,157 ---- else if (s == gensym("reshade")) x->x_operation = IMLIB_OP_RESHADE; } ! static int pdp_imgloader_isinzone(t_pdp_imgloader *x, int px, int py, int index) { ! int c1=0, c2=0, c3=0; if ( !x->x_hiddenzones[index].used ) *************** *** 276,282 **** } ! static t_int pdp_imgloader_ishidden(t_pdp_imgloader *x, t_int px, t_int py) { ! t_int ti; for ( ti=0; ti<MAX_ZONES; ti++ ) --- 276,282 ---- } ! static int pdp_imgloader_ishidden(t_pdp_imgloader *x, int px, int py) { ! int ti; for ( ti=0; ti<MAX_ZONES; ti++ ) *************** *** 295,299 **** static void pdp_imgloader_update_mask(t_pdp_imgloader *x ) { ! t_int px, py; for ( py=0; py<x->x_vheight; py++ ) --- 295,299 ---- static void pdp_imgloader_update_mask(t_pdp_imgloader *x ) { ! int px, py; for ( py=0; py<x->x_vheight; py++ ) *************** *** 308,312 **** static void pdp_imgloader_hide(t_pdp_imgloader *x, t_symbol *s, int argc, t_atom *argv) { ! t_int ti; t_float fx1, fy1, fx2, fy2, fx3, fy3; --- 308,312 ---- static void pdp_imgloader_hide(t_pdp_imgloader *x, t_symbol *s, int argc, t_atom *argv) { ! int ti; t_float fx1, fy1, fx2, fy2, fx3, fy3; *************** *** 571,575 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int px, py; t_float alpha, factor; unsigned char y, u, v; --- 571,575 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int px, py; t_float alpha, factor; unsigned char y, u, v; Index: pdp_ieee1394.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_ieee1394.c,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** pdp_ieee1394.c 30 Mar 2004 02:59:55 -0000 1.1 --- pdp_ieee1394.c 10 May 2007 05:03:58 -0000 1.1.2.1 *************** *** 59,63 **** bool x_auto_open; ! t_int x_packet; t_pdp* x_header; short int *x_data; --- 59,63 ---- bool x_auto_open; ! int x_packet; t_pdp* x_header; short int *x_data; *************** *** 72,76 **** unsigned int x_framerate; int x_frame_ready; ! t_int x_quality; SeqGrabComponent x_sg; --- 72,76 ---- unsigned int x_framerate; int x_frame_ready; ! int x_quality; SeqGrabComponent x_sg; *************** *** 200,211 **** static void pdp_ieee1394_quality(t_pdp_ieee1394 *x, t_floatarg fquality) { ! if ( ( (t_int)fquality < 0 ) || ( (t_int)fquality > 3 ) ) { ! post("pdp_ieee1394: wrong quality %d", (t_int)fquality ); return; } else { ! x->x_quality = (t_int)fquality; } } --- 200,211 ---- static void pdp_ieee1394_quality(t_pdp_ieee1394 *x, t_floatarg fquality) { ! if ( ( (int)fquality < 0 ) || ( (int)fquality > 3 ) ) { ! post("pdp_ieee1394: wrong quality %d", (int)fquality ); return; } else { ! x->x_quality = (int)fquality; } } *************** *** 216,220 **** } ! static t_int pdp_ieee1394_init_grabber(t_pdp_ieee1394 *x) { OSErr anErr; --- 216,220 ---- } ! static int pdp_ieee1394_init_grabber(t_pdp_ieee1394 *x) { OSErr anErr; *************** *** 358,362 **** unsigned char *pQ; short int *pY, *pU, *pV; ! t_int px, py; if (!(x->x_continue_thread)) --- 358,362 ---- unsigned char *pQ; short int *pY, *pU, *pV; ! int px, py; if (!(x->x_continue_thread)) *************** *** 395,401 **** pV = x->x_data+x->x_size; pU = x->x_data+x->x_size+(x->x_size>>2); ! for ( py=0; py<(t_int)x->x_height; py++ ) { ! for ( px=0; px<(t_int)x->x_width; px++ ) { *(pY+py*x->x_width+px) = (*(pQ+1+2*(py*x->x_width+px)))<<7; --- 395,401 ---- pV = x->x_data+x->x_size; pU = x->x_data+x->x_size+(x->x_size>>2); ! for ( py=0; py<(int)x->x_height; py++ ) { ! for ( px=0; px<(int)x->x_width; px++ ) { *(pY+py*x->x_width+px) = (*(pQ+1+2*(py*x->x_width+px)))<<7; Index: pdp_binary.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_binary.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_binary.c 9 May 2007 04:54:13 -0000 1.2.2.1 --- pdp_binary.c 10 May 2007 05:03:57 -0000 1.2.2.2 *************** *** 33,50 **** t_object x_obj; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_queue_id; ! t_int x_dropped; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_colorY; // YUV components of binary mask ! t_int x_colorU; ! t_int x_colorV; ! t_int x_cursX; // X position of the cursor ! t_int x_cursY; // Y position of the cursor ! t_int x_tolerance; // tolerance short int *x_frame; // keep a copy of current frame for picking color --- 33,50 ---- t_object x_obj; ! int x_packet0; ! int x_packet1; ! int x_queue_id; ! int x_dropped; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_colorY; // YUV components of binary mask ! int x_colorU; ! int x_colorV; ! int x_cursX; // X position of the cursor ! int x_cursY; // Y position of the cursor ! int x_tolerance; // tolerance short int *x_frame; // keep a copy of current frame for picking color *************** *** 69,73 **** if ( fy <= 255. ) { ! x->x_colorY = (t_int)fy; outlet_float( x->x_Y, x->x_colorY ); } --- 69,73 ---- if ( fy <= 255. ) { ! x->x_colorY = (int)fy; outlet_float( x->x_Y, x->x_colorY ); } *************** *** 78,82 **** if ( fu <= 255. ) { ! x->x_colorU = (t_int)fu; outlet_float( x->x_U, x->x_colorU ); } --- 78,82 ---- if ( fu <= 255. ) { ! x->x_colorU = (int)fu; outlet_float( x->x_U, x->x_colorU ); } *************** *** 87,91 **** if ( fv < 255 ) { ! x->x_colorV = (t_int)fv; outlet_float( x->x_V, x->x_colorV ); } --- 87,91 ---- if ( fv < 255 ) { ! x->x_colorV = (int)fv; outlet_float( x->x_V, x->x_colorV ); } *************** *** 156,164 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i; ! t_int px=0, py=0; ! t_int y=0, u=0, v=0; short int *pfY, *pfU, *pfV; ! t_int diff; /* allocate all ressources */ --- 156,164 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i; ! int px=0, py=0; ! int y=0, u=0, v=0; short int *pfY, *pfU, *pfV; ! int diff; /* allocate all ressources */ Index: pdp_canvas.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_canvas.c,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -C2 -d -r1.5.2.1 -r1.5.2.2 *** pdp_canvas.c 9 May 2007 04:54:13 -0000 1.5.2.1 --- pdp_canvas.c 10 May 2007 05:03:57 -0000 1.5.2.2 *************** *** 38,62 **** t_outlet *x_outlet0; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_opacket; ! t_int x_lastpacket; ! t_int x_current; t_float x_xmouse; t_float x_ymouse; ! t_int *x_packets; ! t_int *x_widths; ! t_int *x_heights; t_float *x_xoffsets; t_float *x_yoffsets; ! t_int *x_sizes; ! t_int x_owidth; ! t_int x_oheight; ! t_int x_osize; ! t_int x_nbinputs; } t_pdp_canvas; --- 38,62 ---- t_outlet *x_outlet0; ! int x_dropped; ! int x_queue_id; ! int x_opacket; ! int x_lastpacket; ! int x_current; t_float x_xmouse; t_float x_ymouse; ! int *x_packets; ! int *x_widths; ! int *x_heights; t_float *x_xoffsets; t_float *x_yoffsets; ! int *x_sizes; ! int x_owidth; ! int x_oheight; ! int x_osize; ! int x_nbinputs; } t_pdp_canvas; *************** *** 64,68 **** static void pdp_canvas_process_yv12(t_pdp_canvas *x) { ! t_int px, py, ppx, ppy, ii, nbs; short int *pY, *pU, *pV; short int *ppY, *ppU, *ppV; --- 64,68 ---- static void pdp_canvas_process_yv12(t_pdp_canvas *x) { ! int px, py, ppx, ppy, ii, nbs; short int *pY, *pU, *pV; short int *ppY, *ppU, *ppV; *************** *** 71,75 **** t_pdp *iheader; short int *idata; ! t_int mx, dx, my, dy; x->x_opacket = pdp_packet_new_image_YCrCb( x->x_owidth, x->x_oheight ); --- 71,75 ---- t_pdp *iheader; short int *idata; ! int mx, dx, my, dy; x->x_opacket = pdp_packet_new_image_YCrCb( x->x_owidth, x->x_oheight ); *************** *** 134,143 **** for ( py=x->x_yoffsets[ii]+my; py<x->x_yoffsets[ii]+dy; py++) { ! memcpy( pY+(py*x->x_owidth)+(t_int)x->x_xoffsets[ii]+mx, ! ppY+(py-(t_int)x->x_yoffsets[ii])*x->x_widths[ii]+mx, dx*sizeof(short int) ); ! memcpy( pU+((py>>1)*(x->x_owidth>>1))+((t_int)(x->x_xoffsets[ii]+mx)>>1), ! ppU+((py-(t_int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), dx ); ! memcpy( pV+((py>>1)*(x->x_owidth>>1))+((t_int)(x->x_xoffsets[ii]+mx)>>1), ! ppV+((py-(t_int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), dx ); } --- 134,143 ---- for ( py=x->x_yoffsets[ii]+my; py<x->x_yoffsets[ii]+dy; py++) { ! memcpy( pY+(py*x->x_owidth)+(int)x->x_xoffsets[ii]+mx, ! ppY+(py-(int)x->x_yoffsets[ii])*x->x_widths[ii]+mx, dx*sizeof(short int) ); ! memcpy( pU+((py>>1)*(x->x_owidth>>1))+((int)(x->x_xoffsets[ii]+mx)>>1), ! ppU+((py-(int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), dx ); ! memcpy( pV+((py>>1)*(x->x_owidth>>1))+((int)(x->x_xoffsets[ii]+mx)>>1), ! ppV+((py-(int)x->x_yoffsets[ii])>>1)*(x->x_widths[ii]>>1)+(mx>>1), dx ); } *************** *** 154,158 **** } ! static void pdp_canvas_process(t_pdp_canvas *x, t_int ni) { int encoding; --- 154,158 ---- } ! static void pdp_canvas_process(t_pdp_canvas *x, int ni) { int encoding; *************** *** 194,198 **** static void pdp_canvas_select(t_pdp_canvas *x, t_floatarg X, t_floatarg Y) { ! t_int ii; x->x_current = -1; --- 194,198 ---- static void pdp_canvas_select(t_pdp_canvas *x, t_floatarg X, t_floatarg Y) { ! int ii; x->x_current = -1; *************** *** 235,239 **** } ! static void pdp_canvas_input(t_pdp_canvas *x, t_symbol *s, t_floatarg f, t_int ni) { t_pdp *header; --- 235,239 ---- } ! static void pdp_canvas_input(t_pdp_canvas *x, t_symbol *s, t_floatarg f, int ni) { t_pdp *header; *************** *** 319,323 **** static void pdp_canvas_free(t_pdp_canvas *x) { ! t_int ii; pdp_queue_finish(x->x_queue_id); --- 319,323 ---- static void pdp_canvas_free(t_pdp_canvas *x) { ! int ii; pdp_queue_finish(x->x_queue_id); *************** *** 327,334 **** } pdp_packet_mark_unused(x->x_opacket); ! if ( x->x_packets ) freebytes( x->x_packets, x->x_nbinputs*sizeof(t_int) ); ! if ( x->x_widths ) freebytes( x->x_widths, x->x_nbinputs*sizeof(t_int) ); ! if ( x->x_heights ) freebytes( x->x_heights, x->x_nbinputs*sizeof(t_int) ); ! if ( x->x_sizes ) freebytes( x->x_sizes, x->x_nbinputs*sizeof(t_int) ); if ( x->x_xoffsets ) freebytes( x->x_xoffsets, x->x_nbinputs*sizeof(t_float) ); if ( x->x_yoffsets ) freebytes( x->x_yoffsets, x->x_nbinputs*sizeof(t_float) ); --- 327,334 ---- } pdp_packet_mark_unused(x->x_opacket); ! if ( x->x_packets ) freebytes( x->x_packets, x->x_nbinputs*sizeof(int) ); ! if ( x->x_widths ) freebytes( x->x_widths, x->x_nbinputs*sizeof(int) ); ! if ( x->x_heights ) freebytes( x->x_heights, x->x_nbinputs*sizeof(int) ); ! if ( x->x_sizes ) freebytes( x->x_sizes, x->x_nbinputs*sizeof(int) ); if ( x->x_xoffsets ) freebytes( x->x_xoffsets, x->x_nbinputs*sizeof(t_float) ); if ( x->x_yoffsets ) freebytes( x->x_yoffsets, x->x_nbinputs*sizeof(t_float) ); *************** *** 340,344 **** { t_pdp_canvas *x = (t_pdp_canvas *)pd_new(pdp_canvas_class); ! t_int ii; char *imes[32]; --- 340,344 ---- { t_pdp_canvas *x = (t_pdp_canvas *)pd_new(pdp_canvas_class); ! int ii; char *imes[32]; *************** *** 384,391 **** post ( "pdp_canvas : new %dx%d canvas with %d inputs", x->x_owidth, x->x_oheight, x->x_nbinputs ); ! x->x_packets = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); ! x->x_widths = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); ! x->x_heights = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); ! x->x_sizes = ( t_int* ) getbytes( x->x_nbinputs*sizeof(t_int) ); x->x_xoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); x->x_yoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); --- 384,391 ---- post ( "pdp_canvas : new %dx%d canvas with %d inputs", x->x_owidth, x->x_oheight, x->x_nbinputs ); ! x->x_packets = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); ! x->x_widths = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); ! x->x_heights = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); ! x->x_sizes = ( int* ) getbytes( x->x_nbinputs*sizeof(int) ); x->x_xoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); x->x_yoffsets = ( t_float* ) getbytes( x->x_nbinputs*sizeof(t_float) ); Index: pdp_shagadelic.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_shagadelic.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_shagadelic.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_shagadelic.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 39,51 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; /* shagadelic parameters */ --- 39,51 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; /* shagadelic parameters */ *************** *** 53,60 **** char *x_spiral; unsigned char x_phase; ! t_int x_rx, x_ry; ! t_int x_bx, x_by; ! t_int x_rvx, x_rvy; ! t_int x_bvx, x_bvy; short int x_mask; --- 53,60 ---- char *x_spiral; unsigned char x_phase; ! int x_rx, x_ry; ! int x_bx, x_by; ! int x_rvx, x_rvy; ! int x_bvx, x_bvy; short int x_mask; *************** *** 69,73 **** } ! static int pdp_shagadelic_map_from_table(t_pdp_shagadelic *x, t_int px, t_int py, t_int t) { int xd,yd; --- 69,73 ---- } ! static int pdp_shagadelic_map_from_table(t_pdp_shagadelic *x, int px, int py, int t) { int xd,yd; *************** *** 83,87 **** static void pdp_shagadelic_init_tables(t_pdp_shagadelic *x) { ! t_int px, py, i; double xx, yy; --- 83,87 ---- static void pdp_shagadelic_init_tables(t_pdp_shagadelic *x) { ! int px, py, i; double xx, yy; *************** *** 132,137 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i; ! t_int px, py; unsigned char y, u, v; char *p_y, *p_u, *p_v; --- 132,137 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i; ! int px, py; unsigned char y, u, v; char *p_y, *p_u, *p_v; Index: pdp_simura.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_simura.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_simura.c 9 May 2007 04:54:14 -0000 1.3.2.1 --- pdp_simura.c 10 May 2007 05:03:59 -0000 1.3.2.2 *************** *** 37,47 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; unsigned short int x_color; /* color for the mask */ ! t_int x_mode; /* mirror mode */ } t_pdp_simura; --- 37,47 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; unsigned short int x_color; /* color for the mask */ ! int x_mode; /* mirror mode */ } t_pdp_simura; Index: pdp_noquark.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_noquark.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_noquark.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_noquark.c 10 May 2007 05:03:59 -0000 1.2.2.2 *************** *** 46,62 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; short int *x_buffer; short int **x_planetable; ! t_int x_plane; ! t_int x_planes; ! t_int x_tolerance; } t_pdp_noquark; --- 46,62 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; short int *x_buffer; short int **x_planetable; ! int x_plane; ! int x_planes; ! int x_tolerance; } t_pdp_noquark; *************** *** 115,119 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int px, py, cf, diff, rx, ry; /* allocate all ressources */ --- 115,119 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int px, py, cf, diff, rx, ry; /* allocate all ressources */ Index: pdp_dice.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_dice.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_dice.c 9 May 2007 04:54:13 -0000 1.2.2.1 --- pdp_dice.c 10 May 2007 05:03:58 -0000 1.2.2.2 *************** *** 49,68 **** t_float x_f; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; t_outlet *x_outlet0; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; char *x_dicemap; ! t_int x_cube_bits; ! t_int x_cube_size; ! t_int x_map_height; ! t_int x_map_width; } t_pdp_dice; --- 49,68 ---- t_float x_f; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; t_outlet *x_outlet0; ! int x_vwidth; ! int x_vheight; ! int x_vsize; char *x_dicemap; ! int x_cube_bits; ! int x_cube_size; ! int x_map_height; ! int x_map_width; } t_pdp_dice; *************** *** 120,126 **** t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! t_int i, iuv; ! t_int mapx, mapy, mapi; ! t_int base, baseuv, dx, dy, di, diuv; /* allocate all ressources */ --- 120,126 ---- t_pdp *newheader = pdp_packet_header(x->x_packet1); short int *newdata = (short int *)pdp_packet_data(x->x_packet1); ! int i, iuv; ! int mapx, mapy, mapi; ! int base, baseuv, dx, dy, di, diuv; /* allocate all ressources */ Index: pdp_warp.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_warp.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** pdp_warp.c 9 May 2007 04:54:14 -0000 1.2.2.1 --- pdp_warp.c 10 May 2007 05:04:00 -0000 1.2.2.2 *************** *** 31,35 **** #define CTABLE_SIZE 1024 ! static t_int sintable[CTABLE_SIZE+256]; static char *pdp_warp_version = "pdp_warp: version 0.1, port of warp from effectv( Fukuchi Kentaro ) adapted by Yves Degoyon (ydegoyon(a)free.fr)"; --- 31,35 ---- #define CTABLE_SIZE 1024 ! static int sintable[CTABLE_SIZE+256]; static char *pdp_warp_version = "pdp_warp: version 0.1, port of warp from effectv( Fukuchi Kentaro ) adapted by Yves Degoyon (ydegoyon(a)free.fr)"; *************** *** 41,57 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_tval; ! t_int x_mode; ! t_int x_ctable[CTABLE_SIZE]; ! t_int *x_disttable; ! t_int *x_offstable; } t_pdp_warp; --- 41,57 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_tval; ! int x_mode; ! int x_ctable[CTABLE_SIZE]; ! int *x_disttable; ! int *x_offstable; } t_pdp_warp; *************** *** 72,76 **** static void pdp_warp_init_sin_table(void) { ! t_int *tptr, *tsinptr; double i; --- 72,76 ---- static void pdp_warp_init_sin_table(void) { ! int *tptr, *tsinptr; double i; *************** *** 99,103 **** static void pdp_warp_init_dist_table(t_pdp_warp *x) { ! t_int halfw, halfh, *distptr; double px,py,m; --- 99,103 ---- static void pdp_warp_init_dist_table(t_pdp_warp *x) { ! int halfw, halfh, *distptr; double px,py,m; *************** *** 121,126 **** static void pdp_warp_free_ressources(t_pdp_warp *x) { ! if ( x->x_offstable ) freebytes( x->x_offstable, x->x_vheight * sizeof (t_int) ); ! if ( x->x_disttable ) freebytes( x->x_disttable, x->x_vwidth * x->x_vheight * sizeof (t_int) ); } --- 121,126 ---- static void pdp_warp_free_ressources(t_pdp_warp *x) { ! if ( x->x_offstable ) freebytes( x->x_offstable, x->x_vheight * sizeof (int) ); ! if ( x->x_disttable ) freebytes( x->x_disttable, x->x_vwidth * x->x_vheight * sizeof (int) ); } *************** *** 129,134 **** int i; ! x->x_offstable = (t_int*) getbytes ( x->x_vheight * sizeof (t_int) ); ! x->x_disttable = (t_int*) getbytes ( x->x_vwidth * x->x_vheight * sizeof (t_int) ); pdp_warp_init_offs_table(x); pdp_warp_init_dist_table(x); --- 129,134 ---- int i; ! x->x_offstable = (int*) getbytes ( x->x_vheight * sizeof (int) ); ! x->x_disttable = (int*) getbytes ( x->x_vwidth * x->x_vheight * sizeof (int) ); pdp_warp_init_offs_table(x); pdp_warp_init_dist_table(x); *************** *** 138,143 **** void pdp_warp_do_warp(t_pdp_warp *x, short int* src, short int *dest, int xw, int yw, int cw) { ! t_int c, i, px, py, dx, dy, dxu, dyu, maxx, maxy; ! t_int width, height, skip, *ctptr, *distptr; short int *destptr, *destptru, *destptrv; --- 138,143 ---- void pdp_warp_do_warp(t_pdp_warp *x, short int* src, short int *dest, int xw, int yw, int cw) { ! int c, i, px, py, dx, dy, dxu, dyu, maxx, maxy; ! int width, height, skip, *ctptr, *distptr; short int *destptr, *destptru, *destptrv; *************** *** 208,212 **** int *p, *q, *r; signed char *vp; ! t_int xw, yw, cw; /* allocate all ressources */ --- 208,212 ---- int *p, *q, *r; signed char *vp; ! int xw, yw, cw; /* allocate all ressources */ Index: pdp_underwatch.c =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/modules/pdp_underwatch.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** pdp_underwatch.c 9 May 2007 04:54:14 -0000 1.3.2.1 --- pdp_underwatch.c 10 May 2007 05:04:00 -0000 1.3.2.2 *************** *** 38,56 **** t_outlet *x_outlet0; ! t_int x_packet0; ! t_int x_packet1; ! t_int x_dropped; ! t_int x_queue_id; ! t_int x_vwidth; ! t_int x_vheight; ! t_int x_vsize; ! t_int x_line; ! t_int x_sline; ! t_int x_sheight; ! t_int x_prevline; ! t_int x_prevsline; ! t_int x_prevsheight; ! t_int x_stripsize; } t_pdp_underwatch; --- 38,56 ---- t_outlet *x_outlet0; ! int x_packet0; ! int x_packet1; ! int x_dropped; ! int x_queue_id; ! int x_vwidth; ! int x_vheight; ! int x_vsize; ! int x_line; ! int x_sline; ! int x_sheight; ! int x_prevline; ! int x_prevsline; ! int x_prevsheight; ! int x_stripsize; } t_pdp_underwatch;

1 0

externals/pidip/doc pdp_colorgrid-help.pd, 1.1.2.1, 1.1.2.2
by Hans-Christoph Steiner 10 May '07

10 May '07

Update of /cvsroot/pure-data/externals/pidip/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32601/doc Modified Files: Tag: branch-v0-39-2-extended pdp_colorgrid-help.pd Log Message: imported recent changes from HEAD; quick kludge for absolute path to pdp_colorgrid background image; fixed object name in pdp_colorgrid help Index: pdp_colorgrid-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/doc/Attic/pdp_colorgrid-help.pd,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** pdp_colorgrid-help.pd 9 May 2007 04:54:10 -0000 1.1.2.1 --- pdp_colorgrid-help.pd 10 May 2007 05:03:57 -0000 1.1.2.2 *************** *** 28,32 **** #X text 330 108 Set position :; #X msg 339 159 goto \$1 \$2; ! #X obj 90 376 colorgrid colorgrid1 256 0 256 50 0 50 0 1 1 10 10 147 392.06; #X connect 2 0 4 0; --- 28,32 ---- #X text 330 108 Set position :; #X msg 339 159 goto \$1 \$2; ! #X obj 90 376 pdp_colorgrid colorgrid1 256 0 256 50 0 50 0 1 1 10 10 147 392.06; #X connect 2 0 4 0;

1 0

externals/pidip/include pdp_streaming.h, 1.2, 1.2.2.1 pidip_config.h.in, 1.1, 1.1.2.1
by Hans-Christoph Steiner 10 May '07

10 May '07

Update of /cvsroot/pure-data/externals/pidip/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32601/include Modified Files: Tag: branch-v0-39-2-extended pdp_streaming.h pidip_config.h.in Log Message: imported recent changes from HEAD; quick kludge for absolute path to pdp_colorgrid background image; fixed object name in pdp_colorgrid help Index: pdp_streaming.h =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/include/pdp_streaming.h,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** pdp_streaming.h 14 Nov 2004 22:52:21 -0000 1.2 --- pdp_streaming.h 10 May 2007 05:03:57 -0000 1.2.2.1 *************** *** 31,34 **** int height; struct timeval etime; // valid until 2038 ! int clength; } t_hpacket; --- 31,34 ---- int height; struct timeval etime; // valid until 2038 ! unsigned int clength; } t_hpacket; Index: pidip_config.h.in =================================================================== RCS file: /cvsroot/pure-data/externals/pidip/include/pidip_config.h.in,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** pidip_config.h.in 30 Mar 2004 03:06:25 -0000 1.1 --- pidip_config.h.in 10 May 2007 05:03:57 -0000 1.1.2.1 *************** *** 1,2 **** --- 1,8 ---- + /* quicktime library minor version */ + #undef QUICKTIME_NEWER + + /* Define to 1 if you have image magick */ + #undef HAVE_IMAGE_MAGICK + /* Define to 1 if you have ffmpeg source tree */ #undef HAVE_PIDIP_FFMPEG

1 0

← Newer
1
...
10
11
12
13
14
15
16
17
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs May 2007