Pd-cvs May 2004

pd-cvs@lists.iem.at

9 participants
169 discussions

externals/build/src ff.c,NONE,1.1
by Hans-Christoph Steiner 26 May '04

26 May '04

Update of /cvsroot/pure-data/externals/build/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3962 Added Files: ff.c Log Message: added ff library. Its a lib, but it builds without dependencies on GNU/Linux --- NEW FILE: ff.c --- #ifdef __gnu_linux__ #include "../../ff/ff.c" #endif

1 0

externals/ff ff-constant-help.pd,1.2,1.3 ff-periodic-help.pd,1.3,1.4 ff-spring-help.pd,1.3,1.4
by Hans-Christoph Steiner 26 May '04

26 May '04

Update of /cvsroot/pure-data/externals/ff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3614 Modified Files: ff-constant-help.pd ff-periodic-help.pd ff-spring-help.pd Log Message: updated [load( and [unload( messages Index: ff-constant-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/ff/ff-constant-help.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ff-constant-help.pd 23 May 2004 16:13:11 -0000 1.2 --- ff-constant-help.pd 26 May 2004 04:42:10 -0000 1.3 *************** *** 13,22 **** #X msg 232 329 envelope 0 100 0 100; #X obj 218 555 ff-constant 0 0 500 0.5; ! #X obj 476 502 hsl 190 17 -1 1 0 0 empty empty level 5 9 1 9 -261689 ! -1 -1 0 0; ! #X obj 367 418 hsl 175 17 0 360 0 1 empty empty direction 5 9 1 9 -262131 ! -1 -1 1900 0; ! #X obj 418 458 hsl 235 17 0 5000 0 0 empty empty duration 5 9 1 9 -261681 ! -1 -1 0 0; #X text 385 336 levels are in the range [-1 \, 1]; #X obj 35 49 hsl 290 17 1 5000 0 1 empty empty interval 25 9 1 12 -225271 --- 13,22 ---- #X msg 232 329 envelope 0 100 0 100; #X obj 218 555 ff-constant 0 0 500 0.5; ! #X obj 476 502 hsl 190 17 -1 1 0 0 empty empty level 25 9 1 12 -261689 ! -1 -1 18900 0; ! #X obj 367 418 hsl 175 17 0 360 0 1 empty empty direction 25 9 1 12 ! -262131 -1 -1 17400 0; ! #X obj 418 458 hsl 235 17 0 5000 0 0 empty empty duration 25 9 1 12 ! -261681 -1 -1 17800 0; #X text 385 336 levels are in the range [-1 \, 1]; #X obj 35 49 hsl 290 17 1 5000 0 1 empty empty interval 25 9 1 12 -225271 *************** *** 31,39 **** -1; #X obj 364 438 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 ! -233017 -1 -1 39.3103 256; #X obj 415 480 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 ! -233017 -1 -1 0 256; #X obj 473 524 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 ! -233017 -1 -1 0 256; #X obj 143 138 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 250 256; --- 31,39 ---- -1; #X obj 364 438 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 ! -233017 -1 -1 360 256; #X obj 415 480 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 ! -233017 -1 -1 3803.42 256; #X obj 473 524 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 ! -233017 -1 -1 1 256; #X obj 143 138 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 250 256; *************** *** 50,64 **** #X obj 218 286 pack float float float float; #X obj 345 269 nbx 3 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 129 10 -233017 -1 -1 0 256; #X obj 281 269 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 129 10 -233017 -1 -1 0 256; #X obj 409 269 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 129 10 -233017 -1 -1 0 256; #X obj 284 207 hsl 235 17 5 5000 1 0 empty empty attack_duration 25 9 1 12 -261681 -1 -1 0 0; #X obj 412 249 hsl 235 17 5 5000 1 0 empty empty decay_duration 25 9 1 12 -261681 -1 -1 0 0; ! #X obj 198 269 bng 15 250 50 0 empty pack_bang_env empty 0 -6 64 8 ! -262144 -1 -1; #X obj 3 3 cnv 15 850 30 empty empty [ff-constant] 15 15 1 18 -262131 -1 0; --- 50,64 ---- #X obj 218 286 pack float float float float; #X obj 345 269 nbx 3 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 1 10 -233017 -1 -1 0 256; #X obj 281 269 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 1 10 -233017 -1 -1 0 256; #X obj 409 269 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 1 10 -233017 -1 -1 0 256; #X obj 284 207 hsl 235 17 5 5000 1 0 empty empty attack_duration 25 9 1 12 -261681 -1 -1 0 0; #X obj 412 249 hsl 235 17 5 5000 1 0 empty empty decay_duration 25 9 1 12 -261681 -1 -1 0 0; ! #X obj 198 269 bng 15 250 50 0 empty pack_bang_env empty 0 -6 0 8 -262144 ! -1 -1; #X obj 3 3 cnv 15 850 30 empty empty [ff-constant] 15 15 1 18 -262131 -1 0; Index: ff-spring-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/ff/ff-spring-help.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ff-spring-help.pd 23 May 2004 16:25:29 -0000 1.3 --- ff-spring-help.pd 26 May 2004 04:42:10 -0000 1.4 *************** *** 3,14 **** #X text 334 207 the effect increases in that direction; #X text 334 218 range = [-1 \, 1]; ! #X text 349 301 width of the dead-zone \, where there is no effect ; ! #X text 349 326 range is (like the joystick output) [-32768 \, 32767] ; ! #X text 350 312 one for each axis; ! #X text 356 424 position of the dead-zone in the joystick range; ! #X text 356 436 one for each axis; ! #X text 356 448 range is also [-32768 \, 32767]; #X text 366 526 duration in ms \, 0 is infinite; #X text 531 555 levels \, range = [0 \, 1]; --- 3,14 ---- #X text 334 207 the effect increases in that direction; #X text 334 218 range = [-1 \, 1]; ! #X text 386 301 width of the dead-zone \, where there is no effect ; ! #X text 386 326 range is (like the joystick output) [-32768 \, 32767] ; ! #X text 387 312 one for each axis; ! #X text 393 424 position of the dead-zone in the joystick range; ! #X text 393 436 one for each axis; ! #X text 393 448 range is also [-32768 \, 32767]; #X text 366 526 duration in ms \, 0 is infinite; #X text 531 555 levels \, range = [0 \, 1]; *************** *** 23,37 **** #X obj 313 556 hsl 40 15 0 1 0 0 empty empty right 5 8 1 11 -261689 -1 -1 0 0; ! #X msg 260 483 center-y \$1; ! #X msg 255 429 center-x \$1; ! #X obj 263 450 hsl 75 15 -32767 32767 0 1 empty empty center-x 5 8 1 11 -228992 -1 -1 5958 0; ! #X obj 258 396 hsl 75 15 -32767 32767 0 1 empty empty center-x 5 8 1 11 -228992 -1 -1 3700 0; ! #X obj 248 340 hsl 75 15 -32767 32767 0 1 empty empty deadband-y 5 8 1 11 -225280 -1 -1 3734 0; ! #X msg 245 373 deadband-y \$1; ! #X msg 242 317 deadband-x \$1; ! #X obj 245 284 hsl 75 15 -32767 32767 0 1 empty empty deadband-x 5 8 1 11 -225280 -1 -1 3836 0; #X msg 226 258 down-coeff \$1; --- 23,37 ---- #X obj 313 556 hsl 40 15 0 1 0 0 empty empty right 5 8 1 11 -261689 -1 -1 0 0; ! #X msg 297 483 center-y \$1; ! #X msg 292 429 center-x \$1; ! #X obj 300 450 hsl 75 15 -32767 32767 0 1 empty empty center-x 5 8 1 11 -228992 -1 -1 5958 0; ! #X obj 295 396 hsl 75 15 -32767 32767 0 1 empty empty center-x 5 8 1 11 -228992 -1 -1 3700 0; ! #X obj 285 340 hsl 75 15 -32767 32767 0 1 empty empty deadband-y 5 8 1 11 -225280 -1 -1 3734 0; ! #X msg 282 373 deadband-y \$1; ! #X msg 279 317 deadband-x \$1; ! #X obj 282 284 hsl 75 15 -32767 32767 0 1 empty empty deadband-x 5 8 1 11 -225280 -1 -1 3836 0; #X msg 226 258 down-coeff \$1; *************** *** 41,45 **** -1 -1 1335 0; #X obj 120 225 hsl 90 15 -1 1 0 0 empty empty left-coeff 5 7 1 11 -257472 ! -1 -1 8900 0; #X obj 103 170 hsl 90 15 -1 1 0 1 empty empty right-coeff 5 7 1 10 -257472 -1 -1 8900 0; --- 41,45 ---- -1 -1 1335 0; #X obj 120 225 hsl 90 15 -1 1 0 0 empty empty left-coeff 5 7 1 11 -257472 ! -1 -1 0 0; #X obj 103 170 hsl 90 15 -1 1 0 1 empty empty right-coeff 5 7 1 10 -257472 -1 -1 8900 0; *************** *** 84,99 **** -233017 -1 -1 1 256; #X obj 117 242 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 ! -233017 -1 -1 1 256; #X obj 226 242 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 -1 256; #X obj 220 187 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 -0.7 256; ! #X obj 242 301 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 1204.41 256; ! #X obj 245 357 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 301.102 256; ! #X obj 255 413 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 0 256; ! #X obj 260 467 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 19996.7 256; #X obj 3 3 cnv 15 850 30 empty empty [ff-spring] 15 15 1 18 -257472 --- 84,99 ---- -233017 -1 -1 1 256; #X obj 117 242 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 ! -233017 -1 -1 0 256; #X obj 226 242 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 -1 256; #X obj 220 187 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 -0.7 256; ! #X obj 279 301 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 1204.41 256; ! #X obj 282 357 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 301.102 256; ! #X obj 292 413 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 0 256; ! #X obj 297 467 nbx 6 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 19996.7 256; #X obj 3 3 cnv 15 850 30 empty empty [ff-spring] 15 15 1 18 -257472 *************** *** 108,111 **** --- 108,114 ---- #X text 397 58 [ff-spring] is a "conditional effect".; #X text 396 110 [ff-friction] has the same methods; + #X msg 36 387 load; + #X msg 73 387 unload; + #X text 9 369 load/unload effect; #X connect 12 0 32 0; #X connect 13 0 33 0; *************** *** 153,154 **** --- 156,159 ---- #X connect 60 0 17 0; #X connect 61 0 16 0; + #X connect 70 0 39 0; + #X connect 71 0 39 0; Index: ff-periodic-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/ff/ff-periodic-help.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ff-periodic-help.pd 23 May 2004 16:25:29 -0000 1.3 --- ff-periodic-help.pd 26 May 2004 04:42:10 -0000 1.4 *************** *** 1,8 **** ! #N canvas 289 81 857 641 10; #X msg 65 474 bang; #X msg 66 556 stop; ! #X msg 459 386 envelope 0 100 0 100; #X text 85 71 period time in ms (defaults 1000 ms); ! #X text 477 407 startlevel attack-duration endlevel decay-duration ; #X text 188 204 waveform phase in degrees; --- 1,8 ---- ! #N canvas 360 67 857 641 10; #X msg 65 474 bang; #X msg 66 556 stop; ! #X msg 453 340 envelope 0 100 0 100; #X text 85 71 period time in ms (defaults 1000 ms); ! #X text 471 361 startlevel attack-duration endlevel decay-duration ; #X text 188 204 waveform phase in degrees; *************** *** 65,88 **** #X text 8 244 waveform shape; #X symbolatom 85 408 9 0 0 0 current: - -; ! #X msg 459 354 envelope \$1 \$2 \$3 \$4; ! #X obj 589 275 hsl 150 17 0 1 0 0 empty empty end_level 25 8 1 12 -261689 -1 -1 0 0; ! #X obj 462 233 hsl 150 17 0 1 0 0 empty empty start_level 25 8 1 12 -261689 -1 -1 0 0; ! #X obj 459 316 nbx 3 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 0 256; ! #X obj 459 333 pack float float float float; ! #X obj 586 316 nbx 3 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 129 10 -233017 -1 -1 0 256; ! #X obj 522 316 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 129 10 -233017 -1 -1 1027.59 256; ! #X obj 650 316 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 129 10 -233017 -1 -1 101.445 256; ! #X obj 525 254 hsl 180 17 5 5000 1 1 empty empty attack_duration 25 9 1 12 -261681 -1 -1 13800 0; ! #X obj 653 296 hsl 180 17 5 5000 1 1 empty empty decay_duration 25 9 1 12 -261681 -1 -1 7800 0; ! #X obj 440 316 bng 15 250 50 0 empty pack_bang_env empty 0 -6 64 8 ! -262144 -1 -1; #X obj 3 2 cnv 15 850 30 empty empty [ff-periodic] 15 15 1 18 -261681 -1 0; --- 65,88 ---- #X text 8 244 waveform shape; #X symbolatom 85 408 9 0 0 0 current: - -; ! #X msg 453 308 envelope \$1 \$2 \$3 \$4; ! #X obj 583 229 hsl 150 17 0 1 0 0 empty empty end_level 25 8 1 12 -261689 -1 -1 0 0; ! #X obj 456 187 hsl 150 17 0 1 0 0 empty empty start_level 25 8 1 12 -261689 -1 -1 0 0; ! #X obj 453 270 nbx 3 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 1 10 -233017 -1 -1 0 256; ! #X obj 453 287 pack float float float float; ! #X obj 580 270 nbx 3 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 1 10 -233017 -1 -1 0 256; ! #X obj 516 270 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 1 10 -233017 -1 -1 1027.59 256; ! #X obj 644 270 nbx 6 14 -1e+37 1e+37 0 0 pack_bang_env empty empty ! 0 -6 1 10 -233017 -1 -1 101.445 256; ! #X obj 519 208 hsl 180 17 5 5000 1 1 empty empty attack_duration 25 9 1 12 -261681 -1 -1 13800 0; ! #X obj 647 250 hsl 180 17 5 5000 1 1 empty empty decay_duration 25 9 1 12 -261681 -1 -1 7800 0; ! #X obj 434 270 bng 15 250 50 0 empty pack_bang_env empty 0 -6 0 8 -262144 ! -1 -1; #X obj 3 2 cnv 15 850 30 empty empty [ff-periodic] 15 15 1 18 -261681 -1 0; *************** *** 101,104 **** --- 101,108 ---- #X text 145 139 waveform offset from center [-1 \, 1]; #X text 199 155 (defaults 0=centered); + #X msg 441 392 load; + #X msg 441 416 unload; + #X text 492 391 a load message \, uploads an effect to the stick; + #X text 491 416 an unload message \, removes it; #X connect 0 0 8 0; #X connect 1 0 8 0; *************** *** 147,148 **** --- 151,154 ---- #X connect 55 0 53 0; #X connect 56 0 50 0; + #X connect 68 0 8 0; + #X connect 69 0 8 0;

1 0

pd/src s_inter.c,1.1.1.3.2.13,1.1.1.3.2.14
by Tim Blechmann 25 May '04

25 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29204 Modified Files: Tag: devel_0_37 s_inter.c Log Message: adapted yves' threaded gui to pass gcc's compiler warnings Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.13 retrieving revision 1.1.1.3.2.14 diff -C2 -d -r1.1.1.3.2.13 -r1.1.1.3.2.14 *** s_inter.c 6 May 2004 08:49:29 -0000 1.1.1.3.2.13 --- s_inter.c 25 May 2004 10:08:21 -0000 1.1.1.3.2.14 *************** *** 478,482 **** if ( ( sys_message_counter != 0 ) && ( sys_message_counter % 1000 == 0 ) ) { ! fprintf(stderr, "messages pending : %d : size : %d\n", sys_message_counter, sys_message_size); } --- 478,482 ---- if ( ( sys_message_counter != 0 ) && ( sys_message_counter % 1000 == 0 ) ) { ! fprintf(stderr, "messages pending : %d : size : %d\n", (int) sys_message_counter, (int) sys_message_size); } *************** *** 517,521 **** if ( ( sys_message_counter != 0 ) && ( sys_message_counter % 1000 == 0 ) ) { ! fprintf(stderr, "messages pending : %d : size : %d\n", sys_message_counter, sys_message_size); } --- 517,521 ---- if ( ( sys_message_counter != 0 ) && ( sys_message_counter % 1000 == 0 ) ) { ! fprintf(stderr, "messages pending : %d : size : %d\n", (int) sys_message_counter, (int) sys_message_size); }

1 0

externals/ff ff.c,1.1.1.1,1.2 makefile,1.1.1.1,1.2
by Hans-Christoph Steiner 25 May '04

25 May '04

Update of /cvsroot/pure-data/externals/ff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8232 Modified Files: ff.c makefile Log Message: added compiler warnings and fixed most warnings Index: ff.c =================================================================== RCS file: /cvsroot/pure-data/externals/ff/ff.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ff.c 18 Oct 2003 13:37:19 -0000 1.1.1.1 --- ff.c 25 May 2004 04:42:16 -0000 1.2 *************** *** 55,58 **** --- 55,60 ---- #include <fcntl.h> #include <sys/ioctl.h> + #include <string.h> + #include <stdio.h> #include "input.h" *************** *** 456,460 **** { if (x->ff_fd < 0) return; ! unsigned short shortwave; int n = 0; --- 458,462 ---- { if (x->ff_fd < 0) return; ! unsigned short shortwave = 0; int n = 0; Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/ff/makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** makefile 18 Oct 2003 13:37:19 -0000 1.1.1.1 --- makefile 25 May 2004 04:42:16 -0000 1.2 *************** *** 1,4 **** ff: ff.c ! gcc $(CFLAGS) $(LINUXCFLAGS) $(LINUXINCLUDE) -o ff.o -c ff.c ld -export_dynamic -shared -o ff.pd_linux ff.o -lc -lm strip --strip-unneeded ff.pd_linux --- 1,9 ---- + + CFLAGS = -O2 -W -Wall + + all: ff + ff: ff.c ! $(CC) $(CFLAGS) $(LINUXCFLAGS) $(LINUXINCLUDE) -o ff.o -c ff.c ld -export_dynamic -shared -o ff.pd_linux ff.o -lc -lm strip --strip-unneeded ff.pd_linux *************** *** 6,7 **** --- 11,14 ---- + clean: + rm -f *~ *.pd_* *.dll *.o

1 0

pd/src m_atom.c,1.1.1.2.2.3.2.1,1.1.1.2.2.3.2.2
by carmen rocco 25 May '04

25 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3109 Modified Files: Tag: impd_0_37 m_atom.c Log Message: removing devel "space hack" . Index: m_atom.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_atom.c,v retrieving revision 1.1.1.2.2.3.2.1 retrieving revision 1.1.1.2.2.3.2.2 diff -C2 -d -r1.1.1.2.2.3.2.1 -r1.1.1.2.2.3.2.2 *** m_atom.c 1 May 2004 01:43:59 -0000 1.1.1.2.2.3.2.1 --- m_atom.c 24 May 2004 22:20:18 -0000 1.1.1.2.2.3.2.2 *************** *** 87,91 **** int quote; for (sp = a->a_w.w_symbol->s_name, len = 0, quote = 0; *sp; sp++, len++) ! if (*sp == ' ' || *sp == ';' || *sp == ',' || *sp == '\\' || /* GG: quoting for whitespace */ (*sp == '$' && sp == a->a_w.w_symbol->s_name && sp[1] >= '0' && sp[1] <= '9')) --- 87,91 ---- int quote; for (sp = a->a_w.w_symbol->s_name, len = 0, quote = 0; *sp; sp++, len++) ! if (*sp == ';' || *sp == ',' || *sp == '\\' || (*sp == '$' && sp == a->a_w.w_symbol->s_name && sp[1] >= '0' && sp[1] <= '9')) *************** *** 97,101 **** while (bp < ep && *sp) { ! if (*sp == ' ' || *sp == ';' || *sp == ',' || *sp == '\\' || /* GG: quoting for whitespace */ (*sp == '$' && bp == buf && sp[1] >= '0' && sp[1] <= '9')) *bp++ = '\\'; --- 97,101 ---- while (bp < ep && *sp) { ! if (*sp == ';' || *sp == ',' || *sp == '\\' || (*sp == '$' && bp == buf && sp[1] >= '0' && sp[1] <= '9')) *bp++ = '\\';

1 0

pd/src configure.in,1.1.1.4.2.16,1.1.1.4.2.17 configure,1.1.1.4.2.16,1.1.1.4.2.17 g_array.c,1.1.1.3.2.4,1.1.1.3.2.5
by Tim Blechmann 23 May '04

23 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26217 Modified Files: Tag: devel_0_37 configure.in configure g_array.c Log Message: minor changes Index: g_array.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_array.c,v retrieving revision 1.1.1.3.2.4 retrieving revision 1.1.1.3.2.5 diff -C2 -d -r1.1.1.3.2.4 -r1.1.1.3.2.5 *** g_array.c 23 May 2004 18:53:32 -0000 1.1.1.3.2.4 --- g_array.c 23 May 2004 19:15:53 -0000 1.1.1.3.2.5 *************** *** 13,21 **** //#define GARRAY_THREAD_LOCK #ifdef GARRAY_THREAD_LOCK - - #ifdef __linux__ - #define __USE_GNU /* we need that for linux threads */ - #endif - #include <pthread.h> #endif /* GARRAY_THREAD_LOCK */ --- 13,16 ---- Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure,v retrieving revision 1.1.1.4.2.16 retrieving revision 1.1.1.4.2.17 diff -C2 -d -r1.1.1.4.2.16 -r1.1.1.4.2.17 *** configure 23 May 2004 18:57:37 -0000 1.1.1.4.2.16 --- configure 23 May 2004 19:15:52 -0000 1.1.1.4.2.17 *************** *** 2812,2818 **** fi ! if test "$threadedsf" == "yes"; then ! MORECFLAGS=$MORECFLAGS" -DGARRAY_THREAD_LOCK" fi --- 2812,2818 ---- fi ! if test "$gathreadlocks" == "yes"; then ! MORECFLAGS=$MORECFLAGS" -DGARRAY_THREAD_LOCK -D_GNU_SOURCE" fi Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.1.1.4.2.16 retrieving revision 1.1.1.4.2.17 diff -C2 -d -r1.1.1.4.2.16 -r1.1.1.4.2.17 *** configure.in 23 May 2004 18:57:37 -0000 1.1.1.4.2.16 --- configure.in 23 May 2004 19:15:52 -0000 1.1.1.4.2.17 *************** *** 193,199 **** fi ! if test "$threadedsf" == "yes"; then ! MORECFLAGS=$MORECFLAGS" -DGARRAY_THREAD_LOCK" fi --- 193,199 ---- fi ! if test "$gathreadlocks" == "yes"; then ! MORECFLAGS=$MORECFLAGS" -DGARRAY_THREAD_LOCK -D_GNU_SOURCE" fi

1 0

pd/src configure.in,1.1.1.4.2.15,1.1.1.4.2.16 configure,1.1.1.4.2.15,1.1.1.4.2.16
by Tim Blechmann 23 May '04

23 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22548 Modified Files: Tag: devel_0_37 configure.in configure Log Message: t_garray thread locks Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure,v retrieving revision 1.1.1.4.2.15 retrieving revision 1.1.1.4.2.16 diff -C2 -d -r1.1.1.4.2.15 -r1.1.1.4.2.16 *** configure 10 May 2004 18:15:56 -0000 1.1.1.4.2.15 --- configure 23 May 2004 18:57:37 -0000 1.1.1.4.2.16 *************** *** 33,36 **** --- 33,38 ---- --enable-threadedsf use threaded soundfiler (EXPERIMENTAL)" ac_help="$ac_help + --enable-gathreadlocks t_garray threadlocks (EXPERIMENTAL)" + ac_help="$ac_help --with-x use the X Window System" *************** *** 630,633 **** --- 632,641 ---- [...1556 lines suppressed...] ! if { (eval echo configure:2740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 2745,2749 ---- ; return 0; } EOF ! if { (eval echo configure:2748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 2804,2807 **** --- 2812,2819 ---- fi + if test "$threadedsf" == "yes"; + then + MORECFLAGS=$MORECFLAGS" -DGARRAY_THREAD_LOCK" + fi if test x$alsa == "xyes"; Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.1.1.4.2.15 retrieving revision 1.1.1.4.2.16 diff -C2 -d -r1.1.1.4.2.15 -r1.1.1.4.2.16 *** configure.in 10 May 2004 18:14:23 -0000 1.1.1.4.2.15 --- configure.in 23 May 2004 18:57:37 -0000 1.1.1.4.2.16 *************** *** 39,42 **** --- 39,43 ---- AC_ARG_ENABLE(threadedgui, [ --enable-threadedgui use yves degoyon's threaded gui patch],threadedgui=$enableval) AC_ARG_ENABLE(threadedsf, [ --enable-threadedsf use threaded soundfiler (EXPERIMENTAL)],threadedsf=$enableval) + AC_ARG_ENABLE(gathreadlocks, [ --enable-gathreadlocks t_garray threadlocks (EXPERIMENTAL)],gathreadlocks=$enableval) dnl Checks for programs. *************** *** 192,195 **** --- 193,200 ---- fi + if test "$threadedsf" == "yes"; + then + MORECFLAGS=$MORECFLAGS" -DGARRAY_THREAD_LOCK" + fi if test x$alsa == "xyes";

1 0

pd/src m_pd.h,1.1.1.4.2.13,1.1.1.4.2.14
by Tim Blechmann 23 May '04

23 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22071 Modified Files: Tag: devel_0_37 m_pd.h Log Message: t_garray thread locks Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.1.1.4.2.13 retrieving revision 1.1.1.4.2.14 diff -C2 -d -r1.1.1.4.2.13 -r1.1.1.4.2.14 *** m_pd.h 16 May 2004 21:21:04 -0000 1.1.1.4.2.13 --- m_pd.h 23 May 2004 18:54:59 -0000 1.1.1.4.2.14 *************** *** 601,604 **** --- 601,608 ---- EXTERN void garray_usedindsp(t_garray *x); EXTERN void garray_setsaveit(t_garray *x, int saveit); + EXTERN void garray_lock(t_garray *x); /* TB: array locking */ + EXTERN void garray_unlock(t_garray *x); + EXTERN int garray_trylock(t_garray *x); + EXTERN t_class *scalar_class;

1 0

pd/src g_array.c,1.1.1.3.2.3,1.1.1.3.2.4
by Tim Blechmann 23 May '04

23 May '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21646 Modified Files: Tag: devel_0_37 g_array.c Log Message: t_garray thread locks Index: g_array.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_array.c,v retrieving revision 1.1.1.3.2.3 retrieving revision 1.1.1.3.2.4 diff -C2 -d -r1.1.1.3.2.3 -r1.1.1.3.2.4 *** g_array.c 6 May 2004 08:28:12 -0000 1.1.1.3.2.3 --- g_array.c 23 May 2004 18:53:32 -0000 1.1.1.3.2.4 *************** *** 10,13 **** --- 10,24 ---- #include <math.h> + /* Tim Blechmann: garray thread locks: */ + //#define GARRAY_THREAD_LOCK + #ifdef GARRAY_THREAD_LOCK + + #ifdef __linux__ + #define __USE_GNU /* we need that for linux threads */ + #endif + + #include <pthread.h> + #endif /* GARRAY_THREAD_LOCK */ + /* see also the "plot" object in g_scalar.c which deals with graphing arrays which are fields in scalars. Someday we should unify the *************** *** 116,120 **** char x_usedindsp; /* true if some DSP routine is using this */ char x_saveit; /* true if we should save this with parent */ ! double x_lastupdate; /* T.Grill - clock_getlogicaltime() of last array update */ }; --- 127,134 ---- char x_usedindsp; /* true if some DSP routine is using this */ char x_saveit; /* true if we should save this with parent */ ! double x_lastupdate; /* T.Grill - clock_getlogicaltime() of last array update */ ! #ifdef GARRAY_THREAD_LOCK ! pthread_mutex_t * x_mutex; /* TB: mutex */ ! #endif }; *************** *** 125,133 **** #define x_templatesym x_array.a_templatesym /* T.Grill - set update time */ static void garray_update(t_garray *x) { ! x->x_lastupdate = clock_getlogicaltime(); } --- 139,180 ---- #define x_templatesym x_array.a_templatesym + /* TB: array thread locks */ + #ifdef GARRAY_THREAD_LOCK + void garray_lock(t_garray *x) + { + // post("locking array"); + pthread_mutex_lock(x->x_mutex); + } + + void garray_unlock(t_garray *x) + { + // post("unlocking array"); + pthread_mutex_unlock(x->x_mutex); + } + + int garray_trylock(t_garray *x) + { + // post("trying to lock array"); + return pthread_mutex_trylock(x->x_mutex); + } + #else + void garray_lock(t_garray *x) + { + } + + void garray_unlock(t_garray *x) + { + } + + int garray_trylock(t_garray *x) + { + return 0; + } + #endif /* GARRAY_THREAD_LOCK */ /* T.Grill - set update time */ static void garray_update(t_garray *x) { ! x->x_lastupdate = clock_getlogicaltime(); } *************** *** 189,195 **** x->x_usedindsp = 0; x->x_saveit = (saveit != 0); if (x2 = pd_findbyclass(gensym("#A"), garray_class)) pd_unbind(x2, gensym("#A")); - pd_bind(&x->x_gobj.g_pd, gensym("#A")); --- 236,254 ---- x->x_usedindsp = 0; x->x_saveit = (saveit != 0); + + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + x->x_mutex=getbytes(sizeof(pthread_mutex_t)); + #ifdef __linux__ + *(x->x_mutex)=(pthread_mutex_t) PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; + #else + pthread_mutexattr_t mutex_attr; + pthread_mutexattr_init (&mutex_attr); + pthread_mutexattr_settype(&mutex_attr,PTHREAD_MUTEX_RECURSIVE); + pthread_mutex_init(x->x_mutex, &mutex_attr); + #endif + #endif /* GARRAY_THREAD_LOCK */ + if (x2 = pd_findbyclass(gensym("#A"), garray_class)) pd_unbind(x2, gensym("#A")); pd_bind(&x->x_gobj.g_pd, gensym("#A")); *************** *** 242,245 **** --- 301,307 ---- t_floatarg saveit, t_floatarg deleteit) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif if (deleteit != 0) { *************** *** 265,272 **** --- 327,342 ---- garray_redraw(x); } + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } static void garray_free(t_garray *x) { + #ifdef GARRAY_THREAD_LOCK + garray_lock(x);/* TB: thread lock */ + pthread_mutex_destroy(x->x_mutex); + freebytes(x->x_mutex,sizeof(pthread_mutex_t)); + #endif t_pd *x2; gfxstub_deleteforkey(x); *************** *** 402,407 **** glist_redrawitem(array_motion_glist, array_motion_gobj); ! /* T.Grill - don't know if the array has really changed.... should be enhanced */ ! garray_update((t_garray *)array_motion_gobj); } --- 472,477 ---- glist_redrawitem(array_motion_glist, array_motion_gobj); ! /* T.Grill - don't know if the array has really changed.... should be enhanced */ ! garray_update((t_garray *)array_motion_gobj); } *************** *** 754,762 **** --- 824,842 ---- void garray_usedindsp(t_garray *x) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif x->x_usedindsp = 1; + #ifdef GARRAY_THREAD_LOCK + garray_unlock(x); /* TB: array lock */ + #endif } void garray_redraw(t_garray *x) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + if (glist_isvisible(x->x_glist)) { *************** *** 765,770 **** } ! /* T.Grill - last update time */ ! garray_update(x); } --- 845,854 ---- } ! /* T.Grill - last update time */ ! garray_update(x); ! ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_unlock(x); ! #endif } *************** *** 772,776 **** double garray_updatetime(t_garray *x) { ! return x->x_lastupdate; } --- 856,866 ---- double garray_updatetime(t_garray *x) { ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_lock(x); ! #endif ! return x->x_lastupdate; ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_unlock(x); ! #endif } *************** *** 781,785 **** --- 871,881 ---- t_template *garray_template(t_garray *x) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif t_template *template = template_findbyname(x->x_templatesym); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif if (!template) bug("garray_template"); *************** *** 789,798 **** int garray_npoints(t_garray *x) /* get the length */ { ! return (x->x_n); } char *garray_vec(t_garray *x) /* get the contents */ { ! return ((char *)(x->x_vec)); } --- 885,908 ---- int garray_npoints(t_garray *x) /* get the length */ { ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_lock(x); ! #endif ! int ret = (x->x_n); ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_unlock(x); ! #endif ! return ret; } char *garray_vec(t_garray *x) /* get the contents */ { ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_lock(x); ! #endif ! char * ret =((char *)(x->x_vec)); ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_unlock(x); ! #endif ! return ret; } *************** *** 802,805 **** --- 912,918 ---- int garray_getfloatarray(t_garray *x, int *size, t_float **vec) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif t_template *template = garray_template(x); int yonset, type; *************** *** 815,820 **** --- 928,939 ---- *size = garray_npoints(x); *vec = (float *)garray_vec(x); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return (1); } + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return (0); } *************** *** 823,826 **** --- 942,948 ---- float garray_get(t_garray *x, t_symbol *s, t_int indx) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif t_template *template = garray_template(x); int yonset, type; *************** *** 835,839 **** if (indx < 0) indx = 0; else if (indx >= x->x_n) indx = x->x_n - 1; ! return (*(float *)((x->x_vec + sizeof(t_word) * indx) + yonset)); } --- 957,966 ---- if (indx < 0) indx = 0; else if (indx >= x->x_n) indx = x->x_n - 1; ! float ret = (*(float *)((x->x_vec + sizeof(t_word) * indx) + yonset)); ! ! #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ ! garray_unlock(x); ! #endif ! return ret; } *************** *** 841,853 **** --- 968,990 ---- void garray_setsaveit(t_garray *x, int saveit) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif if (x->x_saveit && !saveit) post("warning: array %s: clearing save-in-patch flag", x->x_name->s_name); x->x_saveit = saveit; + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } + /*------------------- Pd messages ------------------------ */ static void garray_const(t_garray *x, t_floatarg g) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif t_template *template = garray_template(x); int yonset, type, i; *************** *** 860,863 **** --- 997,1003 ---- *(float *)(((char *)x->x_vec + sizeof(t_word) * i) + yonset) = g; garray_redraw(x); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } *************** *** 866,869 **** --- 1006,1012 ---- int nsin, t_float *vsin, int sineflag) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif t_template *template = garray_template(x); int yonset, type, i, j; *************** *** 895,902 **** --- 1038,1052 ---- } garray_redraw(x); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif + } static void garray_sinesum(t_garray *x, t_symbol *s, int argc, t_atom *argv) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif t_template *template = garray_template(x); *************** *** 920,927 **** --- 1070,1083 ---- garray_dofo(x, npoints, 0, argc, svec, 1); t_freebytes(svec, sizeof(t_float) * argc); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } static void garray_cosinesum(t_garray *x, t_symbol *s, int argc, t_atom *argv) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif t_template *template = garray_template(x); *************** *** 945,952 **** --- 1101,1115 ---- garray_dofo(x, npoints, 0, argc, svec, 0); t_freebytes(svec, sizeof(t_float) * argc); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif + } static void garray_normalize(t_garray *x, t_float f) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif t_template *template = garray_template(x); int yonset, type, npoints, i; *************** *** 981,984 **** --- 1144,1151 ---- } garray_redraw(x); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif + } *************** *** 987,990 **** --- 1154,1161 ---- static void garray_list(t_garray *x, t_symbol *s, int argc, t_atom *argv) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + t_template *template = garray_template(x); int yonset, type, i; *************** *** 1018,1021 **** --- 1189,1195 ---- } garray_redraw(x); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } *************** *** 1024,1028 **** --- 1198,1208 ---- t_floatarg x2, t_floatarg y2) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif vmess(&x->x_glist->gl_pd, gensym("bounds"), "ffff", x1, y1, x2, y2); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } *************** *** 1031,1035 **** --- 1211,1221 ---- t_floatarg point, t_floatarg inc, t_floatarg f) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif vmess(&x->x_glist->gl_pd, gensym("xticks"), "fff", point, inc, f); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } *************** *** 1037,1062 **** --- 1223,1277 ---- t_floatarg point, t_floatarg inc, t_floatarg f) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif vmess(&x->x_glist->gl_pd, gensym("yticks"), "fff", point, inc, f); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } + static void garray_xlabel(t_garray *x, t_symbol *s, int argc, t_atom *argv) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif typedmess(&x->x_glist->gl_pd, s, argc, argv); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } static void garray_ylabel(t_garray *x, t_symbol *s, int argc, t_atom *argv) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif typedmess(&x->x_glist->gl_pd, s, argc, argv); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } + /* change the name of a garray. */ static void garray_rename(t_garray *x, t_symbol *s) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif pd_unbind(&x->x_gobj.g_pd, x->x_realname); pd_bind(&x->x_gobj.g_pd, x->x_realname = x->x_name = s); garray_redraw(x); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } static void garray_read(t_garray *x, t_symbol *filename) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif int nelem = x->x_n, filedesc; FILE *fd; *************** *** 1069,1072 **** --- 1284,1290 ---- { error("%s: needs floating-point 'y' field", x->x_templatesym->s_name); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return; } *************** *** 1077,1080 **** --- 1295,1301 ---- { error("%s: can't open", filename->s_name); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return; } *************** *** 1093,1096 **** --- 1314,1320 ---- fclose(fd); garray_redraw(x); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } *************** *** 1109,1112 **** --- 1333,1340 ---- t_symbol *endian, t_floatarg fskip) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + int skip = fskip, filedesc; int i, nelem; *************** *** 1133,1136 **** --- 1361,1367 ---- { error("%s: not a float array", x->x_templatesym->s_name); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return; } *************** *** 1141,1144 **** --- 1372,1378 ---- { error("%s: can't open", filename->s_name); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return; } *************** *** 1150,1153 **** --- 1384,1390 ---- error("%s: can't seek to byte %d", buf, skip); fclose(fd); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return; } *************** *** 1168,1175 **** --- 1405,1419 ---- fclose(fd); garray_redraw(x); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } static void garray_write(t_garray *x, t_symbol *filename) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + FILE *fd; char buf[MAXPDSTRING]; *************** *** 1181,1184 **** --- 1425,1431 ---- { error("%s: needs floating-point 'y' field", x->x_templatesym->s_name); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return; } *************** *** 1189,1192 **** --- 1436,1442 ---- { error("%s: can't create", buf); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return; } *************** *** 1200,1203 **** --- 1450,1456 ---- } } + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif fclose(fd); } *************** *** 1222,1225 **** --- 1475,1482 ---- static void garray_write16(t_garray *x, t_symbol *filename, t_symbol *format) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif + t_template *template = garray_template(x); int yonset, type, i; *************** *** 1247,1250 **** --- 1504,1510 ---- { error("%s: needs floating-point 'y' field", x->x_templatesym->s_name); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return; } *************** *** 1255,1258 **** --- 1515,1521 ---- { error("%s: can't create", buf2); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return; } *************** *** 1297,1300 **** --- 1560,1566 ---- } closeit: + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif fclose(fd); } *************** *** 1302,1305 **** --- 1568,1574 ---- void garray_resize(t_garray *x, t_floatarg f) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif int was = x->x_n, elemsize; t_glist *gl; *************** *** 1314,1317 **** --- 1583,1589 ---- { pd_error(x, "array resize failed: out of memory"); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif return; } *************** *** 1335,1344 **** --- 1607,1625 ---- else garray_redraw(x); if (x->x_usedindsp) canvas_update_dsp(); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif } static void garray_print(t_garray *x) { + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_lock(x); + #endif post("garray %s: template %s, length %d", x->x_name->s_name, x->x_templatesym->s_name, x->x_n); + #ifdef GARRAY_THREAD_LOCK /* TB: array lock */ + garray_unlock(x); + #endif }

1 0

externals/ff ff-friction-help.pd,1.1,1.2 ff-periodic-help.pd,1.2,1.3 ff-spring-help.pd,1.2,1.3
by Hans-Christoph Steiner 23 May '04

23 May '04

Update of /cvsroot/pure-data/externals/ff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21117 Modified Files: ff-friction-help.pd ff-periodic-help.pd ff-spring-help.pd Log Message: updated all to use device 0 Index: ff-spring-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/ff/ff-spring-help.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ff-spring-help.pd 23 May 2004 16:13:11 -0000 1.2 --- ff-spring-help.pd 23 May 2004 16:25:29 -0000 1.3 *************** *** 60,64 **** -233017 -1 -1 0 256; #X text 213 14 -- control force-feedback spring effect; ! #X obj 195 599 ff-spring 1 2000 0.5 0.5 0 0.1; #X msg 93 503 bang; #X msg 84 582 stop; --- 60,64 ---- -233017 -1 -1 0 256; #X text 213 14 -- control force-feedback spring effect; ! #X obj 195 599 ff-spring 0 2000 0.5 0.5 0 0.1; #X msg 93 503 bang; #X msg 84 582 stop; Index: ff-friction-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/ff/ff-friction-help.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ff-friction-help.pd 23 May 2004 16:13:11 -0000 1.1 --- ff-friction-help.pd 23 May 2004 16:25:29 -0000 1.2 *************** *** 60,64 **** -233017 -1 -1 0 256; #X text 213 14 -- control force-feedback friction effect; ! #X obj 195 599 ff-friction 1 2000 0.5 0.5 0 0.1; #X msg 93 503 bang; #X msg 84 582 stop; --- 60,64 ---- -233017 -1 -1 0 256; #X text 213 14 -- control force-feedback friction effect; ! #X obj 195 599 ff-friction 0 2000 0.5 0.5 0 0.1; #X msg 93 503 bang; #X msg 84 582 stop; Index: ff-periodic-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/ff/ff-periodic-help.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ff-periodic-help.pd 23 May 2004 16:13:11 -0000 1.2 --- ff-periodic-help.pd 23 May 2004 16:25:29 -0000 1.3 *************** *** 9,13 **** #X text 10 458 start the effect; #X text 15 474 with a; ! #X obj 319 573 ff-periodic 1 0 0 0.5; #X text 505 473 direction in degrees; #X text 547 511 duration in ms \, 0 is infinite; --- 9,13 ---- #X text 10 458 start the effect; #X text 15 474 with a; ! #X obj 319 573 ff-periodic 0 0 0 0.5; #X text 505 473 direction in degrees; #X text 547 511 duration in ms \, 0 is infinite;

1 0

← Newer
1
2
3
4
5
6
7
8
...
17
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 2004