Pd-cvs May 2005

pd-cvs@lists.iem.at

14 participants
407 discussions

extensions/gui/ix mat.wid,1.1,1.2
by carmen rocco 16 May '05

16 May '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29982 Modified Files: mat.wid Log Message: swizzle Index: mat.wid =================================================================== RCS file: /cvsroot/pure-data/extensions/gui/ix/mat.wid,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** mat.wid 16 May 2005 12:23:50 -0000 1.1 --- mat.wid 16 May 2005 14:15:02 -0000 1.2 *************** *** 7,18 **** variable _ ! proc mat_click {what p t x y} { variable _ ! switch $what { motion { foreach xy {x y} { set mv [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] ! foreach ab {a b} { ! set _($t:${xy}$ab) [expr $_($t:${xy}$ab) - $mv] } mat_gridlines $p $t --- 7,38 ---- variable _ ! proc mat_click {button action p t x y} { variable _ ! switch $action { motion { foreach xy {x y} { set mv [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] ! switch $button { ! 1 { ! foreach ab {a b} { ! set _($t:${xy}$ab) [expr $_($t:${xy}$ab) - $mv] ! } ! foreach item [$p.m find withtag item] { ! set m [$p.m itemcget $item -matrix] ! switch $xy { ! y { ! set m [list [lindex $m 0] [lindex $m 1] [list [lindex [lindex $m 2] 0] [expr [lindex [lindex $m 2] 1] + $mv]]] ! } ! x { ! set m [list [lindex $m 0] [lindex $m 1] [list [expr [lindex [lindex $m 2] 0] + $mv] [expr [lindex [lindex $m 2] 1]]]] ! } ! } ! $p.m itemconfigure $item -matrix $m ! } ! } ! 2 { ! set _($t:${xy}a) [expr $_($t:${xy}a) - $mv] ! set _($t:${xy}b) [expr $_($t:${xy}b) + $mv] ! } } mat_gridlines $p $t *************** *** 22,25 **** --- 42,63 ---- foreach xy {x y} {set _($t:c$xy) [set $xy]} } + proc mat_draw {action p t x y} { + variable _ + switch $action { + motion { + $p.m coords drawing [::tkpath::coords rect $_($t:cx) $_($t:cy) [expr $x - $_($t:cx)] [expr $y - $_($t:cy)] -rx 3 -ry 3] + } + first { + foreach xy {x y} {set _($t:c$xy) [set $xy]} + $p.m create path [::tkpath::coords rect $_($t:cx) $_($t:cy) 0 0 -rx 3 -ry 3] -tags drawing -fill green + $p.m bind drawing <1> + } + release { + $p.m itemconfigure drawing -tags [list item item$_($t:i)] -matrix {{1.0 0.0} {0.0 1.0} {0.0 0.0}} + incr _($t:i) + } + } + + } proc mat_tr {p t d inv v} { variable _ *************** *** 31,36 **** --- 69,84 ---- } } + proc mat_zoomReset {p t} { + variable _ + puts "resetting zoom" + set _($t:ya) $_($t:yao) + set _($t:yb) $_($t:ybo) + set _($t:xa) $_($t:xao) + set _($t:xb) $_($t:xbo) + mat_gridlines $p $t + } proc mat_new {path target w h bg ln Xa Xb Ya Yb qXv qYv} { variable _ + set _($target:i) 0 set _($target:ln) $ln set _($target:qxv) $qXv *************** *** 40,49 **** set _($target:yb) $Yb set _($target:xb) $Xb if {[winfo exists $path.m] != 1} { canvas $path.m -bg $bg -width $w -height $h pack $path.m -side left ! bind $path.m <1> "::ix::mat_click first $path $target %x %y" ! bind $path.m <B1-Motion> "::ix::mat_click motion $path $target %x %y" ! bind $path.m <ButtonRelease-1> "::ix::mat_click release $path $target %x %y" mat_gridlines $path $target set bd [expr {[$path cget -bd] * 2}] --- 88,109 ---- set _($target:yb) $Yb set _($target:xb) $Xb + set _($target:yao) $Ya + set _($target:xao) $Xa + set _($target:ybo) $Yb + set _($target:xbo) $Xb if {[winfo exists $path.m] != 1} { canvas $path.m -bg $bg -width $w -height $h pack $path.m -side left ! bind $path.m <1> "::ix::mat_click 1 first $path $target %x %y" ! bind $path.m <B1-Motion> "::ix::mat_click 1 motion $path $target %x %y" ! bind $path.m <ButtonRelease-1> "::ix::mat_click 1 release $path $target %x %y" ! bind $path.m <2> "::ix::mat_click 2 first $path $target %x %y" ! bind $path.m <Double-2> "::ix::mat_zoomReset $path $target" ! bind $path.m <B2-Motion> "::ix::mat_click 2 motion $path $target %x %y" ! bind $path.m <ButtonRelease-2> "::ix::mat_click 2 release $path $target %x %y" ! bind $path.m <Control-1> "::ix::mat_draw first $path $target %x %y" ! bind $path.m <Control-B1-Motion> "::ix::mat_draw motion $path $target %x %y" ! bind $path.m <Control-ButtonRelease-1> "::ix::mat_draw release $path $target %x %y" ! mat_gridlines $path $target set bd [expr {[$path cget -bd] * 2}]

1 0

externals/nusmuk/msd2D/editor gem_masses.pd, 1.6, 1.7 morelinks.pd, 1.5, 1.6 msd-editor.pd, 1.1, 1.2
by Frank Barknecht 16 May '05

16 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25331 Modified Files: gem_masses.pd morelinks.pd msd-editor.pd Log Message: Mostly cosmetic changes. Index: gem_masses.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/gem_masses.pd,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gem_masses.pd 11 May 2005 09:13:06 -0000 1.6 --- gem_masses.pd 16 May 2005 13:51:17 -0000 1.7 *************** *** 46,50 **** #X connect 5 0 4 0; #X connect 5 1 1 1; - #X connect 6 0 16 0; #X connect 7 0 6 0; #X connect 8 1 5 0; --- 46,49 ---- Index: morelinks.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/morelinks.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** morelinks.pd 8 May 2005 13:19:05 -0000 1.5 --- morelinks.pd 16 May 2005 13:51:17 -0000 1.6 *************** *** 87,98 **** #X connect 15 0 5 0; #X restore 143 95 pd one-to-many; ! #X obj 10 76 tgl 15 0 empty empty one2many-Ends 20 8 0 8 -262131 -1 -1 0 1; #X obj 10 31 bng 15 250 50 0 empty empty all_selected 20 8 0 8 -241291 -1 -1; ! #X obj 107 30 tgl 15 0 empty empty Key:L -3 -6 0 8 -24198 -1 -1 0 1 ; #X obj 211 6 keyup; - #X obj 211 48 select 108; #X obj 211 27 spigot; #X obj 2 101 cnv 15 130 80 empty empty Link_Params 10 10 0 10 -195568 --- 87,97 ---- #X connect 15 0 5 0; #X restore 143 95 pd one-to-many; ! #X obj 10 76 tgl 15 0 empty empty one2many-Start 20 8 0 8 -262131 -1 -1 0 1; #X obj 10 31 bng 15 250 50 0 empty empty all_selected 20 8 0 8 -241291 -1 -1; ! #X obj 109 30 tgl 15 0 empty empty Keys -3 -6 0 8 -24198 -1 -1 0 1 ; #X obj 211 6 keyup; #X obj 211 27 spigot; #X obj 2 101 cnv 15 130 80 empty empty Link_Params 10 10 0 10 -195568 *************** *** 181,191 **** #X connect 11 0 0 0; #X restore 137 46 pd ilinker; #X connect 2 0 0 0; #X connect 3 0 4 0; #X connect 4 0 3 0; ! #X connect 5 0 15 0; ! #X connect 6 0 9 1; ! #X connect 7 0 9 0; #X connect 8 0 15 0; ! #X connect 9 0 8 0; #X coords 0 0 1 1 132 180 1; --- 180,192 ---- #X connect 11 0 0 0; #X restore 137 46 pd ilinker; + #X obj 210 47 select 108 114; #X connect 2 0 0 0; #X connect 3 0 4 0; #X connect 4 0 3 0; ! #X connect 5 0 14 0; ! #X connect 6 0 8 1; ! #X connect 7 0 8 0; #X connect 8 0 15 0; ! #X connect 15 0 14 0; ! #X connect 15 1 0 0; #X coords 0 0 1 1 132 180 1; Index: msd-editor.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/msd-editor.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** msd-editor.pd 11 May 2005 09:09:47 -0000 1.1 --- msd-editor.pd 16 May 2005 13:51:17 -0000 1.2 *************** *** 1,40 **** ! #N canvas 33 84 866 562 10; ! #N canvas 0 64 1222 870 data 0; ! #X restore 719 42 pd data; ! #X obj 24 523 structures; ! #X obj 30 314 bng 24 250 50 0 empty \$0-generate generate 0 -6 0 8 ! -24198 -1 -1; ! #X text 25 499 Data Struct Definitions; ! #N canvas 460 399 104 45 save 0; ! #X obj 2 3 cnv 15 100 40 empty empty empty 20 12 0 14 -228992 -66577 0; ! #X obj 4 17 bng 20 250 50 0 empty empty load 0 -6 0 8 -258699 -1 -1 ! ; ! #X obj 34 17 bng 20 250 50 0 empty empty saveas 0 -6 0 8 -24198 -1 ! -1; ! #X obj 101 60 savepanel; ! #X obj 50 168 s pd-data; ! #X msg 101 115 write \$1; ! #X obj 20 91 openpanel; ! #X msg 20 115 read \$1; ! #X obj 20 138 t b a; ! #X obj 20 195 s \$0-generate; ! #X obj 79 17 bng 20 250 50 0 empty empty save 0 -6 0 8 -241291 -1 -1 ! ; ! #X obj 100 91 symbol; ! #X connect 1 0 6 0; ! #X connect 2 0 3 0; ! #X connect 3 0 11 0; ! #X connect 5 0 4 0; ! #X connect 6 0 7 0; ! #X connect 6 0 11 1; ! #X connect 7 0 8 0; ! #X connect 8 0 9 0; ! #X connect 8 1 4 0; ! #X connect 10 0 11 0; ! #X connect 11 0 5 0; ! #X coords 0 0 1 1 102 44 1; ! #X restore 703 139 pd save; ! #X text 712 17 Edit here:; #N canvas 257 131 781 748 generator 0; #N canvas 311 93 877 551 getter 0; --- 1,14 ---- ! #N canvas 32 40 419 640 10; ! #X obj 9 50 cnv 15 400 200 empty empty EDIT 20 12 1 14 -233017 -66577 0; ! #X obj 9 256 cnv 15 400 60 empty empty CREATE 20 12 1 14 -195568 -66577 ! 0; ! #X obj 10 321 cnv 15 400 140 empty empty CONTROL 20 12 1 14 -233017 ! -66577 0; ! #N canvas 0 64 1222 870 data 0; ! #X restore 21 191 pd data; ! #X obj 21 219 structures; ! #X obj 221 276 bng 24 250 50 0 \$0-generate \$0-generate generate 0 ! -6 0 8 -24198 -1 -1; #N canvas 257 131 781 748 generator 0; #N canvas 311 93 877 551 getter 0; *************** *** 338,342 **** #X restore 112 428 pd make-setters; #X obj 181 344 r pointer2msd; - #X obj 112 91 inlet; #X msg 131 324 link ml \$1 \$2 \$3 \$4 \$5; #X msg 189 275 mass id \$4 \$5 \$1 \$2; --- 312,315 ---- *************** *** 432,453 **** #X obj 240 219 r MSD-TYPE; #X msg 341 275 mass id \$4 \$5 \$1 \$2 0; ! #X connect 0 0 8 0; ! #X connect 0 1 14 0; #X connect 2 0 3 0; ! #X connect 4 0 12 0; #X connect 4 1 0 0; #X connect 4 3 2 0; ! #X connect 5 0 10 0; #X connect 6 0 1 0; ! #X connect 7 0 4 0; #X connect 8 0 1 0; ! #X connect 9 0 1 0; #X connect 12 0 5 0; ! #X connect 13 0 5 0; ! #X connect 14 0 9 0; ! #X connect 14 1 16 0; ! #X connect 15 0 14 1; ! #X connect 16 0 1 0; ! #X restore 30 343 pd generator; #N canvas 0 0 718 819 activate 0; #X obj 233 238 r \$0-msd; --- 405,427 ---- #X obj 240 219 r MSD-TYPE; #X msg 341 275 mass id \$4 \$5 \$1 \$2 0; ! #X obj 112 93 r \$0-generate; ! #X connect 0 0 7 0; ! #X connect 0 1 13 0; #X connect 2 0 3 0; ! #X connect 4 0 11 0; #X connect 4 1 0 0; #X connect 4 3 2 0; ! #X connect 5 0 9 0; #X connect 6 0 1 0; ! #X connect 7 0 1 0; #X connect 8 0 1 0; ! #X connect 11 0 5 0; #X connect 12 0 5 0; ! #X connect 13 0 8 0; ! #X connect 13 1 15 0; ! #X connect 14 0 13 1; ! #X connect 15 0 1 0; ! #X connect 16 0 4 0; ! #X restore 287 276 pd generator; #N canvas 0 0 718 819 activate 0; #X obj 233 238 r \$0-msd; *************** *** 457,462 **** #X obj 177 125 gemhead; #X obj 233 396 route massesPos linksPos; ! #X obj 97 670 gemwin; ! #X msg 97 643 0 \, destroy; #X obj 249 354 s \$0-msd-out; #X obj 97 597 select 1 0; --- 431,436 ---- #X obj 177 125 gemhead; #X obj 233 396 route massesPos linksPos; ! #X obj 97 710 gemwin; ! #X msg 97 683 0 \, destroy; #X obj 249 354 s \$0-msd-out; #X obj 97 597 select 1 0; *************** *** 589,595 **** #X connect 10 1 6 0; #X restore 233 308 pd msd; - #X msg 97 619 reset \, lighting 1 \, create \, 1; #X obj 357 676 gemhead; #X obj 357 699 world_light; #X connect 0 0 43 0; #X connect 0 0 44 0; --- 563,572 ---- #X connect 10 1 6 0; #X restore 233 308 pd msd; #X obj 357 676 gemhead; #X obj 357 699 world_light; + #X obj 147 617 r \$0-fullscreen; + #X obj 97 634 f 0; + #X msg 97 659 reset \, lighting 1 \, fullscreen \$1 \, create \, 1 + ; #X connect 0 0 43 0; #X connect 0 0 44 0; *************** *** 601,605 **** #X connect 5 1 40 0; #X connect 7 0 6 0; ! #X connect 9 0 45 0; #X connect 9 1 7 0; #X connect 10 0 9 0; --- 578,582 ---- #X connect 5 1 40 0; #X connect 7 0 6 0; ! #X connect 9 0 48 0; #X connect 9 1 7 0; #X connect 10 0 9 0; *************** *** 640,813 **** #X connect 44 0 5 0; #X connect 44 1 11 0; ! #X connect 45 0 6 0; ! #X connect 46 0 47 0; ! #X restore 29 420 pd activate; ! #X obj 29 384 tgl 24 0 empty empty GEM 0 -6 0 8 -233017 -1 -1 0 1; ! #X obj 65 384 tgl 24 0 empty empty Graphical_Datastructures 0 -6 0 ! 8 -1 -262144 -1 0 1; ! #N canvas 334 329 751 433 ignore 0; ! #X obj 46 264 print ToMSD; ! #X obj 46 234 spigot; ! #X obj 83 181 tgl 15 0 empty empty debug_ToMSD 0 -6 0 8 -262144 -1 ! -1 0 1; ! #X obj 46 207 r \$0-msd; ! #X obj 147 237 spigot; ! #X obj 184 184 tgl 15 0 empty empty debug_FromMSD 0 -6 0 8 -262144 ! -1 -1 0 1; ! #X obj 147 265 print FromMSD; ! #X obj 147 210 r \$0-msd-out; ! #N canvas 0 0 578 686 setter 0; ! #X restore 521 67 pd setter; ! #N canvas 0 0 822 675 lsetter 0; ! #X restore 520 90 pd lsetter; ! #X text 504 43 Automatic scripting targets; ! #X text 23 46 You can ignore this stuff here \, unless something goes ! wrong.; ! #X obj 269 233 spigot; ! #X obj 306 180 tgl 15 0 empty empty debug_AttrMSD 0 -6 0 8 -262144 ! -1 -1 0 1; ! #X obj 269 206 r \$0-msd-attr; ! #X obj 269 264 print AttrMSD; ! #X obj 532 270 s \$0-msd; ! #X msg 544 247 infosL; ! #X obj 143 363 spigot; ! #X obj 180 310 tgl 15 0 empty empty global-send 0 -6 0 8 -262144 -1 -1 0 1; ! #X obj 143 336 r \$0-msd-out; ! #X obj 143 391 s MSD-OUT-GLOBAL; ! #X msg 532 223 massesPosL; ! #X obj 532 199 metro 40; ! #X obj 532 177 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X floatatom 585 178 5 0 0 0 - - -; ! #X obj 280 365 spigot; ! #X obj 317 312 tgl 15 0 empty empty global-receive 0 -6 0 8 -262144 ! -1 -1 1 1; ! #X obj 280 338 r MSD-IN-GLOBAL; ! #X obj 280 393 s \$0-msd; ! #X obj 630 201 metro 40; ! #X obj 630 179 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X floatatom 683 180 5 0 0 0 - - -; ! #X obj 630 273 s \$0-msd; ! #X obj 531 322 metro 40; ! #X obj 531 300 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X floatatom 584 301 5 0 0 0 - - -; ! #X obj 531 394 s \$0-msd; ! #X msg 625 70 clear; ! #X obj 625 97 s pd-setter; ! #X obj 625 117 s pd-lsetter; ! #X msg 531 346 massesForcesL; ! #X msg 630 225 massesPosYL; ! #N canvas 0 0 450 300 msd-type 0; ! #X obj 94 78 r MSD-TYPE; ! #X obj 89 201 s \$0-MSD-TYPE; ! #X obj 98 136 select 0; ! #X msg 89 168 label 2-D; ! #X msg 185 170 label 3-D; ! #X connect 0 0 2 0; ! #X connect 2 0 3 0; ! #X connect 2 1 4 0; ! #X connect 3 0 1 0; ! #X connect 4 0 1 0; ! #X restore 524 126 pd msd-type; ! #N canvas 244 458 450 300 camera 0; ! #X obj 183 185 camera; ! #X obj 179 45 gemhead; ! #X obj 162 82 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X obj 185 63 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X obj 234 108 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X obj 260 86 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X msg 234 124 left \$1; ! #X msg 260 102 right \$1; ! #X obj 75 120 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X obj 101 98 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X msg 101 114 up \$1; ! #X msg 75 136 down \$1; ! #X msg 267 58 reset; ! #X msg 185 80 forward \$1; ! #X msg 162 98 reverse \$1; ! #X msg 66 252 speed \$1; ! #X floatatom 66 234 5 0 0 0 - - -; ! #X floatatom 67 195 5 0 0 0 - - -; ! #X msg 379 150 lookX \$1; ! #X msg 379 187 lookY \$1; ! #X msg 379 223 lookZ \$1; ! #X floatatom 379 134 5 0 0 0 - - -; ! #X floatatom 379 207 5 0 0 0 - - -; ! #X floatatom 379 170 5 0 0 0 - - -; ! #X msg 67 213 distance \$1; ! #X connect 1 0 0 0; ! #X connect 2 0 14 0; ! #X connect 3 0 13 0; ! #X connect 4 0 6 0; ! #X connect 5 0 7 0; ! #X connect 6 0 0 0; ! #X connect 7 0 0 0; ! #X connect 8 0 11 0; ! #X connect 9 0 10 0; ! #X connect 10 0 0 0; ! #X connect 11 0 0 0; ! #X connect 12 0 0 0; ! #X connect 13 0 0 0; ! #X connect 14 0 0 0; ! #X connect 15 0 0 0; ! #X connect 16 0 15 0; ! #X connect 17 0 24 0; ! #X connect 18 0 0 0; ! #X connect 19 0 0 0; ! #X connect 20 0 0 0; ! #X connect 21 0 18 0; ! #X connect 22 0 20 0; ! #X connect 23 0 19 0; ! #X connect 24 0 0 0; ! #X restore 416 83 pd camera; ! #X connect 1 0 0 0; ! #X connect 2 0 1 1; ! #X connect 3 0 1 0; ! #X connect 4 0 6 0; ! #X connect 5 0 4 1; ! #X connect 7 0 4 0; ! #X connect 12 0 15 0; ! #X connect 13 0 12 1; ! #X connect 14 0 12 0; ! #X connect 17 0 16 0; ! #X connect 18 0 21 0; ! #X connect 19 0 18 1; ! #X connect 20 0 18 0; ! #X connect 22 0 16 0; ! #X connect 23 0 22 0; ! #X connect 24 0 23 0; ! #X connect 25 0 23 1; ! #X connect 26 0 29 0; ! #X connect 27 0 26 1; ! #X connect 28 0 26 0; ! #X connect 30 0 42 0; ! #X connect 31 0 30 0; ! #X connect 32 0 30 1; ! #X connect 34 0 41 0; ! #X connect 35 0 34 0; ! #X connect 36 0 34 1; ! #X connect 38 0 39 0; ! #X connect 38 0 40 0; ! #X connect 41 0 37 0; ! #X connect 42 0 33 0; ! #X restore 117 523 pd ignore this; ! #X floatatom 101 391 5 10 1000 1 frequency - -; ! #X text 240 370 Visualization is done using either a GEM OpenGL window ! \, or just animate the data structure alone. Better don't use both ! at the same time. In GDS-mode you can set the frequency of the internal ! metro \, to accelerate or slow down the simulation.; ! #X text 241 116 Links are created by selecting at least two masses ! in edit mode \, then press "L" to connect those with a link. If you ! select more than two masses \, then all possible links between those ! masses will get created. Use this to mass-connect masses. :); #N canvas 405 181 584 687 forces 0; #X obj 295 415 s \$0-msd; --- 617,629 ---- #X connect 44 0 5 0; #X connect 44 1 11 0; ! #X connect 45 0 46 0; ! #X connect 47 0 48 1; ! #X connect 48 0 49 0; ! #X connect 49 0 6 0; ! #X restore 31 397 pd activate; ! #X obj 31 362 tgl 24 0 empty empty GEM 0 -6 0 8 -195568 -1 -1 0 1; ! #X obj 67 362 tgl 24 0 empty empty Datastructures 0 -6 0 8 -1 -262144 -1 0 1; ! #X floatatom 103 377 5 10 1000 2 frequency - -; #N canvas 405 181 584 687 forces 0; #X obj 295 415 s \$0-msd; *************** *** 815,819 **** -1 -1 6350 1; #X obj 295 230 vsl 24 128 -5 5 0 1 empty empty empty 0 -8 0 8 -262144 ! -1 -1 6650 1; #X msg 295 388 forceY id \$1; #X msg 391 388 forceX id \$1; --- 631,635 ---- -1 -1 6350 1; #X obj 295 230 vsl 24 128 -5 5 0 1 empty empty empty 0 -8 0 8 -262144 ! -1 -1 4350 1; #X msg 295 388 forceY id \$1; #X msg 391 388 forceX id \$1; *************** *** 881,922 **** #X connect 32 0 31 0; #X connect 34 0 33 0; ! #X restore 28 463 pd forces; ! #X obj 254 524 tgl 15 0 \$0-gem-masses-on empty gem_m 0 -6 0 8 -225280 ! -1 -1 0 1; ! #X obj 296 524 tgl 15 0 \$0-gem-links-on empty gem_l 0 -6 0 8 -225271 ! -1 -1 0 1; #N canvas 113 581 450 300 props 0; ! #X obj 117 204 s \$0-msd; ! #X obj 117 46 vsl 15 64 0 10 0 0 empty empty D 0 -8 0 8 -262144 -1 ! -1 3000 1; ! #X obj 141 46 vsl 15 64 0 10 0 0 empty empty D2 0 -8 0 8 -262144 -1 ! -1 3800 1; ! #X obj 90 46 vsl 15 64 0 100 0 0 empty empty K 0 -8 0 8 -262144 -1 ! -1 1000 1; ! #X msg 90 175 setK ml \$1; ! #X msg 117 151 setD ml \$1; ! #X msg 141 122 setD2 ml \$1; ! #X text 192 47 Edit properties of Links.; ! #X connect 1 0 5 0; ! #X connect 2 0 6 0; ! #X connect 3 0 4 0; ! #X connect 4 0 0 0; ! #X connect 5 0 0 0; ! #X connect 6 0 0 0; ! #X restore 102 464 pd props; ! #X text 337 521 Toggle display of masses and links in GEM.; ! #X text 241 451 In edit mode and while visualization is active \, you ! can move around the masses. The red masses will not receive any other ! forces from the model. Use the "forces" and "props" subpatches to change ! parameters of links and send forces.; ! #X text 685 122 Save network to disk:; ! #X obj 24 120 morelinks; ! #X text 242 29 First create structure inside [pd data] using msd_append. ! Add mobile masses with black bang \, add fixed masses with the red ! bang. Set weight of mass with the "M" number box.; ! #X obj 120 92 s pd-data; ! #X msg 120 52 clear; ! #X msg 120 72 sort; ! #X text 118 27 Clear or sort:; #N canvas 702 626 136 139 minmax 0; #X obj 2 15 cnv 15 130 120 empty empty Min/Max 10 10 0 10 -195568 -1 --- 697,721 ---- #X connect 32 0 31 0; #X connect 34 0 33 0; ! #X restore 176 429 pd forces; #N canvas 113 581 450 300 props 0; ! #X obj 121 232 s \$0-msd; ! #X msg 94 203 setK ml \$1; ! #X msg 121 179 setD ml \$1; ! #X msg 145 150 setD2 ml \$1; ! #X text 244 59 Edit properties of Links.; ! #X obj 77 36 inlet; ! #X obj 123 36 inlet; ! #X obj 169 36 inlet; ! #X connect 1 0 0 0; ! #X connect 2 0 0 0; ! #X connect 3 0 0 0; ! #X connect 5 0 1 0; ! #X connect 6 0 2 0; ! #X connect 7 0 3 0; ! #X restore 294 431 pd props; ! #X obj 115 57 morelinks; ! #X obj 261 231 s pd-data; ! #X msg 297 203 clear; ! #X msg 261 203 sort; #N canvas 702 626 136 139 minmax 0; #X obj 2 15 cnv 15 130 120 empty empty Min/Max 10 10 0 10 -195568 -1 *************** *** 951,996 **** #X restore 82 19 pd l; #X coords 0 0 1 1 132 135 1; ! #X restore 703 259 pd minmax; ! #X text 696 409 Data structs and; ! #X text 696 423 GEM like different; ! #X text 696 437 coordinate systems.; ! #X text 696 461 Set the mapping; ! #X text 696 475 between both here.; ! #X text 238 187 The keyboard shortcut "L" is only active \, if the ! green toggle "Key:L" is set to on. Otherwise use the yellow "link" ! bang.; ! #X text 239 235 More ways to create links: left-to-right connects masses ! from left to right. one2many will connect one mass to many others. ! First select the first mass \, then set the toggle to 1 \, after that ! select the other masses and set toggle to 0; ! #X obj 707 97 tgl 15 0 \$0-poll-ds \$0-poll-ds poll-ds 0 -6 0 8 -225280 -1 -1 0 1; ! #X obj 765 97 tgl 15 0 \$0-set-ds \$0-set-ds set-ds 0 -6 0 8 -225271 -1 -1 0 1; ! #X text 669 66 Data struct anim ON/OFF:; ! #N canvas 504 489 531 315 TODO 0; ! #X text 146 11 TODO :: IDEAS; ! #X text 41 92 Make symbolic ids of new masses/links editable. For this ! I need to add new fields \, probably called "sym" \, to masses and ! links. They have to be floats for now (symbols in DS don't work yet). ! Then [makefilename] symbolic ids of this.; ! #X text 41 48 Save/load of MSD messages: Route [r \$0-msd] to a [textfile] ! or [qlist]; ! #X text 41 164 Related to that the props and forces subpatches should ! be dynamic as well \, so that users can send messages to groups of ! masses/links using the different symbolic names.; ! #X text 42 232 msd3D-editor: edit both kinds of mass/spring networks. ; ! #X restore 777 529 pd TODO; ! #N canvas 307 452 509 305 NEWS 0; ! #X text 32 24 RecentChanges; ! #X text 39 90 Geos: Now it's possible to add masses in geometric formations: ! rectangles (2d-networks) and circles (set center point \, radius and ! number of masses).; ! #X text 43 51 I think I now really have fixed the "stack overflows" ! when creating lots of masses.; ! #X restore 777 508 pd NEWS; #N canvas 0 0 84 49 save 0; ! #X obj 2 3 cnv 15 75 40 empty empty empty 20 12 0 14 -257472 -66577 0; #X obj 37 18 bng 20 250 50 0 empty empty saveas 0 -6 0 8 -24198 -1 --- 750,804 ---- #X restore 82 19 pd l; #X coords 0 0 1 1 132 135 1; ! #X restore 261 57 pd minmax; ! #X obj 178 276 tgl 24 0 MSD-TYPE \$0-MSD-TYPE 2-D 0 -6 0 8 -233017 -1 -1 0 1; ! #X obj 21 80 msd_append; ! #X obj 10 547 cnv 15 400 80 empty empty DOC 20 12 1 14 -233017 -66577 ! 0; ! #X obj 182 362 tgl 15 0 \$0-gem-masses-on empty gem_m 0 -6 0 8 -225280 ! -1 -1 1 1; ! #X obj 218 362 tgl 15 0 \$0-gem-links-on empty gem_l 0 -6 0 8 -225271 -1 -1 0 1; ! #X obj 182 397 tgl 15 0 \$0-poll-ds \$0-poll-ds poll-ds -10 -6 0 8 ! -225280 -1 -1 0 1; ! #X obj 218 397 tgl 15 0 \$0-set-ds \$0-set-ds set-ds 0 -6 0 8 -225271 ! -1 -1 0 1; ! #X text 29 286 MSD-TYPE (2D or 3D):; ! #X obj 9 9 cnv 15 400 30 empty empty MSD-EDITOR 20 14 1 14 -128992 ! -262144 0; ! #X obj 10 466 cnv 15 400 75 empty empty PERSIST 20 12 1 14 -195568 ! -66577 0; ! #N canvas 460 399 104 45 save 0; ! #X obj 2 3 cnv 15 100 40 empty empty empty 20 12 0 14 -233017 -66577 ! 0; ! #X obj 4 17 bng 20 250 50 0 empty empty load 0 -6 0 8 -258699 -1 -1 ; ! #X obj 34 17 bng 20 250 50 0 empty empty saveas 0 -6 0 8 -24198 -1 ! -1; ! #X obj 101 60 savepanel; ! #X obj 50 168 s pd-data; ! #X msg 101 115 write \$1; ! #X obj 20 91 openpanel; ! #X msg 20 115 read \$1; ! #X obj 20 138 t b a; ! #X obj 20 195 s \$0-generate; ! #X obj 79 17 bng 20 250 50 0 empty empty save 0 -6 0 8 -241291 -1 -1 ! ; ! #X obj 100 91 symbol; ! #X connect 1 0 6 0; ! #X connect 2 0 3 0; ! #X connect 3 0 11 0; ! #X connect 5 0 4 0; ! #X connect 6 0 7 0; ! #X connect 6 0 11 1; ! #X connect 7 0 8 0; ! #X connect 8 0 9 0; ! #X connect 8 1 4 0; ! #X connect 10 0 11 0; ! #X connect 11 0 5 0; ! #X coords 0 0 1 1 102 44 1; ! #X restore 124 470 pd save; #N canvas 0 0 84 49 save 0; ! #X obj 2 3 cnv 15 75 40 empty empty empty 20 12 0 14 -233017 -66577 0; #X obj 37 18 bng 20 250 50 0 empty empty saveas 0 -6 0 8 -24198 -1 *************** *** 1045,1064 **** #X connect 22 1 2 0; #X coords 0 0 1 1 77 44 1; ! #X restore 703 208 pd save; ! #X text 683 188 Save MSD messages:; ! #X obj 92 315 tgl 24 0 MSD-TYPE \$0-MSD-TYPE 3-D 0 -6 0 8 -233017 -1 -1 1 1; ! #X text 120 320 MSD-TYPE; ! #X obj 25 14 msd_append; ! #X text 240 304 Press "generate" to generate messages to the msd object and create the physical model inside. You can select which type of msd* to use as well: msd2D or msd3D. With 3-D \, the Z-coordinate will default to a value of zero.; ! #X connect 2 0 6 0; #X connect 7 0 8 0; #X connect 7 1 9 0; #X connect 8 0 7 0; #X connect 9 0 7 1; ! #X connect 11 0 7 2; ! #X connect 24 0 23 0; ! #X connect 25 0 23 0; --- 853,1104 ---- #X connect 22 1 2 0; #X coords 0 0 1 1 77 44 1; ! #X restore 266 470 pd save; ! #X text 124 524 Save DS to disk; ! #X text 266 524 Save MSD messages; ! #X obj 319 353 vsl 15 64 0 10 0 0 empty empty D 0 -8 0 8 -195568 -1 ! -1 300 1; ! #X obj 345 353 vsl 15 64 0 10 0 0 empty empty D2 0 -8 0 8 -195568 -1 ! -1 0 1; ! #X obj 294 353 vsl 15 64 0 100 0 0 empty empty K 0 -8 0 8 -195568 -1 ! -1 300 1; ! #N canvas 504 489 531 315 TODO 0; ! #X text 146 11 TODO :: IDEAS; ! #X text 39 50 Make symbolic ids of new masses/links editable. For this ! I need to add new fields \, probably called "sym" \, to masses and ! links. They have to be floats for now (symbols in DS don't work yet). ! Then [makefilename] symbolic ids of this.; ! #X text 39 122 Related to that the props and forces subpatches should ! be dynamic as well \, so that users can send messages to groups of ! masses/links using the different symbolic names.; ! #X text 42 178 Prepare for retirement of D2; ! #X restore 178 582 pd TODO; ! #N canvas 307 452 509 305 NEWS 0; ! #X text 32 24 RecentChanges; ! #X text 43 51 msd-editor now also can be used for msd3D objects.; ! #X text 41 77 Cosmetic overhaul; ! #X restore 117 582 pd NEWS; ! #N canvas 334 329 751 433 ignore 0; ! #X obj 46 264 print ToMSD; ! #X obj 46 234 spigot; ! #X obj 83 181 tgl 15 0 empty empty debug_ToMSD 0 -6 0 8 -262144 -1 ! -1 0 1; ! #X obj 46 207 r \$0-msd; ! #X obj 147 237 spigot; ! #X obj 184 184 tgl 15 0 empty empty debug_FromMSD 0 -6 0 8 -262144 ! -1 -1 0 1; ! #X obj 147 265 print FromMSD; ! #X obj 147 210 r \$0-msd-out; ! #N canvas 0 0 578 686 setter 0; ! #X restore 521 67 pd setter; ! #N canvas 0 0 822 675 lsetter 0; ! #X restore 520 90 pd lsetter; ! #X text 504 43 Automatic scripting targets; ! #X text 23 46 You can ignore this stuff here \, unless something goes ! wrong.; ! #X obj 269 233 spigot; ! #X obj 306 180 tgl 15 0 empty empty debug_AttrMSD 0 -6 0 8 -262144 ! -1 -1 0 1; ! #X obj 269 206 r \$0-msd-attr; ! #X obj 269 264 print AttrMSD; ! #X obj 532 270 s \$0-msd; ! #X msg 544 247 infosL; ! #X obj 143 363 spigot; ! #X obj 180 310 tgl 15 0 empty empty global-send 0 -6 0 8 -262144 -1 -1 1 1; ! #X obj 143 336 r \$0-msd-out; ! #X obj 143 391 s MSD-OUT-GLOBAL; ! #X msg 532 223 massesPosL; ! #X obj 532 199 metro 40; ! #X obj 532 177 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X floatatom 585 178 5 0 0 0 - - -; ! #X obj 280 365 spigot; ! #X obj 317 312 tgl 15 0 empty empty global-receive 0 -6 0 8 -262144 ! -1 -1 1 1; ! #X obj 280 338 r MSD-IN-GLOBAL; ! #X obj 280 393 s \$0-msd; ! #X obj 630 201 metro 40; ! #X obj 630 179 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X floatatom 683 180 5 0 0 0 - - -; ! #X obj 630 273 s \$0-msd; ! #X obj 531 322 metro 40; ! #X obj 531 300 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X floatatom 584 301 5 0 0 0 - - -; ! #X obj 531 394 s \$0-msd; ! #X msg 625 70 clear; ! #X obj 625 97 s pd-setter; ! #X obj 625 117 s pd-lsetter; ! #X msg 531 346 massesForcesL; ! #X msg 630 225 massesPosYL; ! #N canvas 0 0 450 300 msd-type 0; ! #X obj 94 78 r MSD-TYPE; ! #X obj 89 201 s \$0-MSD-TYPE; ! #X obj 98 136 select 0; ! #X msg 89 168 label 2-D; ! #X msg 185 170 label 3-D; ! #X connect 0 0 2 0; ! #X connect 2 0 3 0; ! #X connect 2 1 4 0; ! #X connect 3 0 1 0; ! #X connect 4 0 1 0; ! #X restore 524 126 pd msd-type; ! #N canvas 673 282 553 343 camera 0; ! #X obj 183 185 camera; ! #X obj 179 45 gemhead; ! #X obj 162 82 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X obj 185 63 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X obj 234 108 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 ! 1; ! #X obj 260 86 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ! ; ! #X msg 234 124 left \$1; ! #X msg 260 102 right \$1; ! #X obj 75 120 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X obj 101 98 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X msg 101 114 up \$1; ! #X msg 75 136 down \$1; ! #X msg 267 58 reset; ! #X msg 185 80 forward \$1; ! #X msg 162 98 reverse \$1; ! #X msg 66 252 speed \$1; ! #X floatatom 66 232 5 0 0 0 - - -; ! #X floatatom 67 195 5 0 0 0 - - -; ! #X msg 379 150 lookX \$1; ! #X msg 379 187 lookY \$1; ! #X msg 379 223 lookZ \$1; ! #X floatatom 379 134 5 0 0 0 - - -; ! #X floatatom 379 207 5 0 0 0 - - -; ! #X floatatom 379 170 5 0 0 0 - - -; ! #X msg 67 213 distance \$1; ! #X obj 114 182 f 4; ! #X obj 181 237 +; ! #X connect 1 0 0 0; ! #X connect 2 0 14 0; ! #X connect 3 0 13 0; ! #X connect 4 0 6 0; ! #X connect 5 0 7 0; ! #X connect 6 0 0 0; ! #X connect 7 0 0 0; ! #X connect 8 0 11 0; ! #X connect 9 0 10 0; ! #X connect 10 0 0 0; ! #X connect 11 0 0 0; ! #X connect 12 0 0 0; ! #X connect 13 0 0 0; ! #X connect 14 0 0 0; ! #X connect 15 0 0 0; ! #X connect 16 0 15 0; ! #X connect 17 0 24 0; ! #X connect 18 0 0 0; ! #X connect 19 0 0 0; ! #X connect 20 0 0 0; ! #X connect 21 0 18 0; ! #X connect 22 0 20 0; ! #X connect 23 0 19 0; ! #X connect 24 0 0 0; ! #X connect 25 0 24 0; ! #X restore 416 83 pd camera; ! #X connect 1 0 0 0; ! #X connect 2 0 1 1; ! #X connect 3 0 1 0; ! #X connect 4 0 6 0; ! #X connect 5 0 4 1; ! #X connect 7 0 4 0; ! #X connect 12 0 15 0; ! #X connect 13 0 12 1; ! #X connect 14 0 12 0; ! #X connect 17 0 16 0; ! #X connect 18 0 21 0; ! #X connect 19 0 18 1; ! #X connect 20 0 18 0; ! #X connect 22 0 16 0; ! #X connect 23 0 22 0; ! #X connect 24 0 23 0; ! #X connect 25 0 23 1; ! #X connect 26 0 29 0; ! #X connect 27 0 26 1; ! #X connect 28 0 26 0; ! #X connect 30 0 42 0; ! #X connect 31 0 30 0; ! #X connect 32 0 30 1; ! #X connect 34 0 41 0; ! #X connect 35 0 34 0; ! #X connect 36 0 34 1; ! #X connect 38 0 39 0; ! #X connect 38 0 40 0; ! #X connect 41 0 37 0; ! #X connect 42 0 33 0; ! #X restore 241 582 pd ignore this; ! #N canvas 0 0 489 250 help 0; ! #N canvas 0 0 450 300 visualize? 0; ! #X text 18 91 Visualization is done using either a GEM OpenGL window ! \, or just animate the data structure alone. Better don't use both ! at the same time. In GDS-mode you can set the frequency of the internal ! metro \, to accelerate or slow down the simulation.; ! #X text 19 172 In edit mode and while visualization is active \, you ! can move around the masses. The red masses will not receive any other ! forces from the model. Use the "forces" and "props" subpatches to change ! parameters of links and send forces.; ! #X text 56 39 Help on Visualization; ! #X restore 301 169 pd visualize?; ! #N canvas 0 0 450 300 append? 0; ! #X text 36 72 First create structure inside [pd data] using msd_append. ! Add mobile masses with black bang \, add fixed masses with the red ! bang. Set weight of mass with the "M" number box.; ! #X text 29 29 Help on Mass creation; ! #X text 34 122 Use the greenish "geos" bang to open a subwindow for ! creating masses in geometric formations: circles and rectangles.; ! #X restore 303 70 pd append?; ! #N canvas 0 0 537 336 links? 0; ! #X text 47 77 Links are created by selecting at least two masses in ! edit mode \, then press "L" to connect those with a link. If you select ! more than two masses \, then all possible links between those masses ! will get created. Use this to mass-connect masses. :); ! #X text 32 26 Help on Link Creation; ! #X text 44 148 The keyboard shortcut "L" is only active \, if the green ! toggle "Keys" is set to on. Otherwise use the yellow "link" bang.; ! #X text 45 196 More ways to create links: left-to-right connects masses ! from left to right. The keyboard shortcut for this is "R" (for "Right" ! \, as "L" is for "Links"). one2many will connect one mass to many others ! and has no shortcuts. First select the first mass \, then set the toggle ! to 1 \, after that select the other masses and set toggle to 0; ! #X restore 302 94 pd links?; ! #N canvas 0 0 450 300 generate? 0; ! #X text 19 98 Press "generate" to generate messages to the msd object and create the physical model inside. You can select which type of msd* to use as well: msd2D or msd3D. With 3-D \, the Z-coordinate will default to a value of zero.; ! #X text 31 38 Help on MSD generation; ! #X restore 302 144 pd generate?; ! #N canvas 0 0 215 157 minmax? 0; ! #X text 38 35 Data structs and; ! #X text 38 49 GEM like different; ! #X text 38 63 coordinate systems.; ! #X text 38 87 Set the mapping; ! #X text 38 101 between both here.; ! #X restore 302 118 pd minmax?; ! #X text 39 18 HELP / USAGE; ! #X text 143 71 How to create masses:; ! #X text 143 94 How to create links:; ! #X text 102 118 Coordinates in MSD-Editor:; ! #X text 109 146 Generate the MSD-Network:; ! #X text 17 170 Visualize the network using GEM or DS:; ! #X restore 53 582 pd help; ! #X obj 32 431 tgl 16 0 \$0-fullscreen \$0-fullscreen fullscreen 0 -6 ! 0 8 -195568 -1 -1 0 1; #X connect 7 0 8 0; #X connect 7 1 9 0; #X connect 8 0 7 0; #X connect 9 0 7 1; ! #X connect 10 0 7 2; ! #X connect 15 0 14 0; ! #X connect 16 0 14 0; ! #X connect 32 0 12 1; ! #X connect 33 0 12 2; ! #X connect 34 0 12 0;

1 0

pd/src s_audio_pablio.c,1.1.4.1,1.1.4.2
by Thomas Grill 16 May '05

16 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21800/src Modified Files: Tag: devel_0_38 s_audio_pablio.c Log Message: check for unavailable device Index: s_audio_pablio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_pablio.c,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** s_audio_pablio.c 5 Nov 2004 14:27:47 -0000 1.1.4.1 --- s_audio_pablio.c 16 May 2005 13:36:23 -0000 1.1.4.2 *************** *** 241,245 **** indeviceno = Pa_GetDefaultInputDeviceID(); #endif ! fprintf(stderr, "using default input device number: %d\n", indeviceno); } if (outdeviceno < 0) --- 241,247 ---- indeviceno = Pa_GetDefaultInputDeviceID(); #endif ! if(indeviceno == paNoDevice) inchannels = 0; ! ! fprintf(stderr, "using default input device number: %d\n", indeviceno); } if (outdeviceno < 0) *************** *** 250,254 **** outdeviceno = Pa_GetDefaultOutputDeviceID(); #endif ! fprintf(stderr, "using default output device number: %d\n", outdeviceno); } /* fprintf(stderr, "nchan %d, flags %d, bufs %d, framesperbuf %d\n", --- 252,258 ---- outdeviceno = Pa_GetDefaultOutputDeviceID(); #endif ! if(outdeviceno == paNoDevice) outchannels = 0; ! ! fprintf(stderr, "using default output device number: %d\n", outdeviceno); } /* fprintf(stderr, "nchan %d, flags %d, bufs %d, framesperbuf %d\n",

1 0

pd/src s_midi_pm.c,1.4,1.4.4.1
by Thomas Grill 16 May '05

16 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15340/src Modified Files: Tag: devel_0_38 s_midi_pm.c Log Message: fix for newer portmidi versions Index: s_midi_pm.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi_pm.c,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** s_midi_pm.c 6 Sep 2004 20:20:36 -0000 1.4 --- s_midi_pm.c 16 May 2005 13:07:25 -0000 1.4.4.1 *************** *** 61,65 **** { err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev], ! j, NULL, 100, NULL, NULL, NULL); if (err) post("could not open midi input %d (%s): %s", --- 61,65 ---- { err = Pm_OpenInput(&mac_midiindevlist[mac_nmidiindev], ! j, NULL, 100, NULL, NULL /*, NULL*/); if (err) post("could not open midi input %d (%s): %s",

1 0

pd/src s_audio_pa.c,1.4.4.6,1.4.4.7
by Tim Blechmann 16 May '05

16 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12674 Modified Files: Tag: devel_0_38 s_audio_pa.c Log Message: fix for missing devices Index: s_audio_pa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v retrieving revision 1.4.4.6 retrieving revision 1.4.4.7 diff -C2 -d -r1.4.4.6 -r1.4.4.7 *** s_audio_pa.c 15 May 2005 19:03:37 -0000 1.4.4.6 --- s_audio_pa.c 16 May 2005 12:57:08 -0000 1.4.4.7 *************** *** 56,60 **** { PaError err; ! int j, devno, pa_indev = 0, pa_outdev = 0; if (schedmode == 1) --- 56,60 ---- { PaError err; ! int j, devno, pa_indev = -1, pa_outdev = -1; if (schedmode == 1) *************** *** 94,101 **** { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! if (info->maxInputChannels > 0) { if (devno == indeviceno) { pa_indev = j; break; --- 94,104 ---- { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = info->maxInputChannels; ! if (maxchans > 0) { if (devno == indeviceno) { + if (maxchans < inchans) + inchans = maxchans; pa_indev = j; break; *************** *** 111,118 **** { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! if (info->maxOutputChannels > 0) { if (devno == outdeviceno) { pa_outdev = j; break; --- 114,124 ---- { const PaDeviceInfo *info = Pa_GetDeviceInfo(j); ! int maxchans = info->maxOutputChannels; ! if (maxchans > 0) { if (devno == outdeviceno) { + if (maxchans < outchans) + outchans = maxchans; pa_outdev = j; break; *************** *** 152,157 **** /* report to portaudio */ ! err = Pa_OpenStream(&pa_stream, (pa_indev ? &inputParameters : 0), ! (pa_outdev ? &outputParameters : 0), rate, sys_dacblocksize, --- 158,164 ---- /* report to portaudio */ ! err = Pa_OpenStream(&pa_stream, ! ( (pa_indev != -1) ? &inputParameters : 0), ! ( (pa_outdev != -1) ? &outputParameters : 0), rate, sys_dacblocksize, *************** *** 319,323 **** } ! if ((timenow = sys_getrealtime()) - timebefore > sys_sleepgrain * 1e-6) { return SENDDACS_SLEPT; --- 326,330 ---- } ! if (sys_getrealtime() > timebefore + sys_sleepgrain * 1e-6) { return SENDDACS_SLEPT;

1 0

extensions/gui/ix mat-demo.pd,NONE,1.1 mat.wid,NONE,1.1
by carmen rocco 16 May '05

16 May '05

Update of /cvsroot/pure-data/extensions/gui/ix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5747 Added Files: mat-demo.pd mat.wid Log Message: mat (not done) ---------------------------------------------------------------------- --- NEW FILE: mat.wid --- package require tkpath namespace eval ::ix { proc random_int {} {return [expr "int(floor(rand()*16))"]} proc random_clr {} { return [format "\#%1X%1X%1X%1X%1X%1X" [random_int] [random_int] [random_int] [random_int] [random_int] [random_int]] } variable _ proc mat_click {what p t x y} { variable _ switch $what { motion { foreach xy {x y} { set mv [mat_tr $p $t $xy d [expr $$xy - $_($t:c$xy)]] foreach ab {a b} { set _($t:${xy}$ab) [expr $_($t:${xy}$ab) - $mv] } mat_gridlines $p $t } } } foreach xy {x y} {set _($t:c$xy) [set $xy]} } proc mat_tr {p t d inv v} { variable _ array set dm {x width y height} switch $inv { t {return [expr ($v - $_($t:${d}a)) / ($_($t:${d}b) - $_($t:${d}a) + 0.0) * [winfo $dm($d) $p.m]]} i {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0) + $_($t:${d}a)]} d {return [expr ($_($t:${d}b) - $_($t:${d}a)) * $v /([winfo $dm($d) $p.m] + 0.0)]} } } proc mat_new {path target w h bg ln Xa Xb Ya Yb qXv qYv} { variable _ set _($target:ln) $ln set _($target:qxv) $qXv set _($target:qyv) $qYv set _($target:ya) $Ya set _($target:xa) $Xa set _($target:yb) $Yb set _($target:xb) $Xb if {[winfo exists $path.m] != 1} { canvas $path.m -bg $bg -width $w -height $h pack $path.m -side left bind $path.m <1> "::ix::mat_click first $path $target %x %y" bind $path.m <B1-Motion> "::ix::mat_click motion $path $target %x %y" bind $path.m <ButtonRelease-1> "::ix::mat_click release $path $target %x %y" mat_gridlines $path $target set bd [expr {[$path cget -bd] * 2}] $path configure -bg gray -width [expr [winfo width $path.m] + $bd] \ -height [expr [winfo height $path.m] + $bd]}} proc mat_gridlines {path target} { variable _ # puts gridlines set w $path.m $w delete gridlines set gh [winfo height $w] set gw [winfo width $w] foreach item [$path.m find withtag gridline] {$path.m delete $item} foreach xy {x y} { array set ta {x n y w} array set tj {x center y left} array set igx {y width x height} for {set x [expr int($_($target:${xy}a) / ($_($target:q${xy}v) + 0.0) + 1)*($_($target:q${xy}v) + 0.0)]} {$x <= $_($target:${xy}b)} {set x [expr $x + $_($target:q${xy}v)]} { set og [mat_tr $path $target $xy t $x] set invgeo [winfo $igx($xy) $path.m] switch $xy {y {set coords [concat M 0 $og L $invgeo $og]} x {set coords [concat M $og 0 L $og $invgeo]}} $w create path $coords -stroke $_($target:ln) -strokedasharray 2 -tags gridline -strokewidth 1 $w create text [lrange $coords 1 2] -font {{Bitstream Vera Sans} 8} \ -fill green -anchor $ta($xy) -text $x -justify $tj($xy) -tags gridline}} } } #> mat frame #. -bd 3 #w 384 #h 144 #bg white #ln purple #. #Xa 123 #Xb 2000 #Ya 0 #Yb 127 #qXv 125 #qYv 1 #. @list ::ix::mat_add .- .| {.#1} .#2 .#3 .#4 #. @add ::ix::mat_add .- .| {.#1} .#2 .#3 .#4 puts "mat .- .|" ::ix::mat_new .- .| .#w .#h .#bg .#ln .#Xa .#Xb .#Ya .#Yb .#qXv .#qYv --- NEW FILE: mat-demo.pd --- #N canvas 25 203 920 777 12; #X obj 30 0 widget mat n1 #w 881 #bg white #divX 8 #divY 5 #h 740 #Yb 7; #X msg 1080 -23 -height 26 -width 26 -bg gray95; #X msg 32 -22 redefine; #X msg 242 -21 #w \$1; #X msg 206 -22 #h \$1; #X floatatom 172 -23 5 0 0 0 - - -; #X floatatom 140 -21 5 0 0 0 - - -; #X msg 329 -20 #Yb \$1; #X floatatom 380 -18 5 0 0 0 - - -; #X connect 2 0 0 0; #X connect 3 0 0 0; #X connect 4 0 0 0; #X connect 5 0 3 0; #X connect 6 0 4 0; #X connect 7 0 0 0; #X connect 8 0 7 0;

1 0

pd/src m_sched.c,1.5.4.33,1.5.4.34
by Tim Blechmann 15 May '05

15 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2805 Modified Files: Tag: devel_0_38 m_sched.c Log Message: rewrote sys_timedlock to work on osx, too Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.33 retrieving revision 1.5.4.34 diff -C2 -d -r1.5.4.33 -r1.5.4.34 *** m_sched.c 15 May 2005 18:51:15 -0000 1.5.4.33 --- m_sched.c 15 May 2005 21:10:12 -0000 1.5.4.34 *************** *** 545,548 **** --- 545,549 ---- #ifdef THREAD_LOCKING static pthread_mutex_t sys_mutex = PTHREAD_MUTEX_INITIALIZER; + static pthread_cond_t sys_cond = PTHREAD_COND_INITIALIZER; void sys_lock(void) *************** *** 554,557 **** --- 555,559 ---- { pthread_mutex_unlock(&sys_mutex); + pthread_cond_signal(&sys_cond); } *************** *** 577,580 **** --- 579,616 ---- #endif + + #if 0 + /* osx doesn't define a pthread_mutex_timedlock ... maybe someday + it will ... */ + int sys_timedlock(int microsec) + { + struct timespec timeout; + int ret; + struct timeval now; + + /* timedlock seems to have a resolution of 1ms */ + if (microsec < 1e3) + microsec = 1e3; + + gettimeofday(&now,0); + + timeout.tv_sec = now.tv_sec; + timeout.tv_nsec = (now.tv_usec + microsec) * 1000; + + while (timeout.tv_nsec > 1e9) + { + timeout.tv_sec += 1; + timeout.tv_nsec -= 1e9; + } + + ret = pthread_mutex_timedlock(&sys_mutex, &timeout); + + if (ret) + post("timeout, %d", ret); + + return ret; + } + #else + int sys_timedlock(int microsec) { *************** *** 582,592 **** int ret; struct timeval now; ! ! /* timedlock seems to have a resolution of 1ms */ if (microsec < 1e3) microsec = 1e3; - gettimeofday(&now,0); - timeout.tv_sec = now.tv_sec; timeout.tv_nsec = (now.tv_usec + microsec) * 1000; --- 618,630 ---- int ret; struct timeval now; ! ! if (sys_trylock() == 0) ! return 0; ! if (microsec < 1e3) microsec = 1e3; + + gettimeofday(&now,0); timeout.tv_sec = now.tv_sec; timeout.tv_nsec = (now.tv_usec + microsec) * 1000; *************** *** 597,608 **** timeout.tv_nsec -= 1e9; } - - ret = pthread_mutex_timedlock(&sys_mutex, &timeout); ! if (ret) ! post("timeout"); return ret; } /* tb } */ --- 635,650 ---- timeout.tv_nsec -= 1e9; } ! ! /* in case the lock has been released during the system call, try ! again before waiting for the signal */ ! if (sys_trylock() == 0) ! return 0; ! ! ret = pthread_cond_timedwait(&sys_cond, &sys_mutex, &timeout); return ret; } + #endif /* tb } */

1 0

[PD-cvs] pd/src s_audio.c, 1.5.4.15, 1.5.4.16 s_audio_pa.c, 1.4.4.5, 1.4.4.6 s_stuff.h, 1.5.4.9, 1.5.4.10
by Tim Blechmann 15 May '05

15 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12341 Modified Files: Tag: devel_0_38 s_audio.c s_audio_pa.c s_stuff.h Log Message: small api change ... Index: s_audio_pa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v retrieving revision 1.4.4.5 retrieving revision 1.4.4.6 diff -C2 -d -r1.4.4.5 -r1.4.4.6 *** s_audio_pa.c 15 May 2005 15:50:20 -0000 1.4.4.5 --- s_audio_pa.c 15 May 2005 19:03:37 -0000 1.4.4.6 *************** *** 52,57 **** PaStreamCallbackFlags statusFlags, void *userData); ! int pa_open_audio(int inchans, int outchans, int rate, t_sample *soundin, ! t_sample *soundout, int advance, int indeviceno, int outdeviceno, int schedmode) { --- 52,56 ---- PaStreamCallbackFlags statusFlags, void *userData); ! int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode) { *************** *** 159,162 **** --- 158,168 ---- paClipOff, /* tb: we should be faster ;-) */ pa_callback, NULL); + + if (err == paNoError) + { + const PaStreamInfo * streaminfo = Pa_GetStreamInfo (pa_stream); + sys_schedadvance = 1e6 * streaminfo->outputLatency; + } + #ifndef PABLOCKING } Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.15 retrieving revision 1.5.4.16 diff -C2 -d -r1.5.4.15 -r1.5.4.16 *** s_audio.c 15 May 2005 18:51:15 -0000 1.5.4.15 --- s_audio.c 15 May 2005 19:03:37 -0000 1.5.4.16 *************** *** 331,336 **** { int blksize = (sys_blocksize ? sys_blocksize : 64); ! pa_open_audio(inchans, outchans, rate, sys_soundin, sys_soundout, ! advance, (naudiooutdev > 0 ? audioindev[0] : 0), (naudiooutdev > 0 ? audiooutdev[0] : 0), --- 331,335 ---- { int blksize = (sys_blocksize ? sys_blocksize : 64); ! pa_open_audio(inchans, outchans, rate, advance, (naudiooutdev > 0 ? audioindev[0] : 0), (naudiooutdev > 0 ? audiooutdev[0] : 0), Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.9 retrieving revision 1.5.4.10 diff -C2 -d -r1.5.4.9 -r1.5.4.10 *** s_stuff.h 15 May 2005 18:51:15 -0000 1.5.4.9 --- s_stuff.h 15 May 2005 19:03:37 -0000 1.5.4.10 *************** *** 207,212 **** #endif ! int pa_open_audio(int inchans, int outchans, int rate, t_sample *soundin, ! t_sample *soundout, int advance, int indeviceno, int outdeviceno, int schedmode); void pa_close_audio(void); --- 207,211 ---- #endif ! int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode); void pa_close_audio(void);

1 0

pd/src m_sched.c, 1.5.4.32, 1.5.4.33 s_stuff.h, 1.5.4.8, 1.5.4.9 s_audio.c, 1.5.4.14, 1.5.4.15
by Tim Blechmann 15 May '05

15 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9904 Modified Files: Tag: devel_0_38 m_sched.c s_stuff.h s_audio.c Log Message: - sleepgrain cleanup - improved sys_timedlock Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.14 retrieving revision 1.5.4.15 diff -C2 -d -r1.5.4.14 -r1.5.4.15 *** s_audio.c 13 May 2005 16:45:43 -0000 1.5.4.14 --- s_audio.c 15 May 2005 18:51:15 -0000 1.5.4.15 *************** *** 393,405 **** sched_set_using_dacs(enable); ! /* tb { ! * cut'n'paste from m_scheduler to adapt the sleepgrain with the latency */ ! sys_sleepgrain = sys_schedadvance/4; ! if (sys_sleepgrain < 100) ! sys_sleepgrain = 100; ! else ! if (sys_sleepgrain > 5000) ! sys_sleepgrain = 5000; ! /* } tb */ } --- 393,397 ---- sched_set_using_dacs(enable); ! sys_update_sleepgrain(); } *************** *** 1204,1206 **** --- 1196,1211 ---- rate, dacblocksize, advance, scheduler, 1); } + + + /* some general helper functions */ + void sys_update_sleepgrain(void) + { + sys_sleepgrain = sys_schedadvance/4; + if (sys_sleepgrain < 100) + sys_sleepgrain = 100; + else + if (sys_sleepgrain > 5000) + sys_sleepgrain = 5000; + } + /* tb } */ Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.32 retrieving revision 1.5.4.33 diff -C2 -d -r1.5.4.32 -r1.5.4.33 *** m_sched.c 13 May 2005 15:55:30 -0000 1.5.4.32 --- m_sched.c 15 May 2005 18:51:15 -0000 1.5.4.33 *************** *** 8,11 **** --- 8,21 ---- #include "m_imp.h" #include "s_stuff.h" + #include "m_fifo.h" + + /* for timeval */ + #ifdef UNISTD + #include "sys/time.h" + #endif + #ifdef MSW + #include "winsock.h" + #endif + /* LATER consider making this variable. It's now the LCM of all sample *************** *** 27,31 **** int sys_callbackscheduler = 0; /* if 1: change scheduler to callback based dsp */ - #include "m_fifo.h" static void run_idle_callbacks(int microsec); --- 37,40 ---- *************** *** 408,412 **** sys_time_per_dsp_tick = (TIMEUNITPERSEC) * ((double)sys_schedblocksize) / sys_dacsr; ! /* T.Grill - lock mutex */ sys_lock(); --- 417,421 ---- sys_time_per_dsp_tick = (TIMEUNITPERSEC) * ((double)sys_schedblocksize) / sys_dacsr; ! /* T.Grill - lock mutex */ sys_lock(); *************** *** 415,424 **** /* tb: adapt sleepgrain with advance */ ! if (sys_schedadvance < 20000) ! sys_sleepgrain = sys_schedadvance/4; ! if (sys_sleepgrain < 100) ! sys_sleepgrain = 100; ! else if (sys_sleepgrain > 5000) ! sys_sleepgrain = 5000; sys_initmidiqueue(); --- 424,429 ---- /* tb: adapt sleepgrain with advance */ ! sys_update_sleepgrain(); ! sys_initmidiqueue(); *************** *** 558,577 **** /* tb { */ #include <errno.h> int sys_timedlock(int microsec) { - #if 0 /* pthread_mutex_timedlock is broken :-( */ struct timespec timeout; int ret; ! timeout.tv_sec = 0; ! timeout.tv_nsec = microsec * 1000; ret = pthread_mutex_timedlock(&sys_mutex, &timeout); return ret; - #else - /* todo: find a clean solution */ - sys_lock(); - return 0; - #endif } /* tb } */ --- 563,607 ---- /* tb { */ #include <errno.h> + + #ifdef MSW + /* gettimeofday isn't available on windoze ... */ + int gettimeofday (struct timeval *tv, void* tz) + { + __int64 now; /* time since 1 Jan 1601 in 100ns */ + + GetSystemTimeAsFileTime ((LPFILETIME*) &now); + tv->tv_usec = (long) ((now / 10LL) % 1000000LL); + tv->tv_sec = (long) ((now - 116444736000000000LL) / 10000000LL); + return (0); + } + #endif + int sys_timedlock(int microsec) { struct timespec timeout; int ret; ! struct timeval now; ! ! /* timedlock seems to have a resolution of 1ms */ ! if (microsec < 1e3) ! microsec = 1e3; ! ! gettimeofday(&now,0); ! ! timeout.tv_sec = now.tv_sec; ! timeout.tv_nsec = (now.tv_usec + microsec) * 1000; ! ! while (timeout.tv_nsec > 1e9) ! { ! timeout.tv_sec += 1; ! timeout.tv_nsec -= 1e9; ! } ret = pthread_mutex_timedlock(&sys_mutex, &timeout); + + if (ret) + post("timeout"); return ret; } /* tb } */ *************** *** 603,608 **** * { */ - #include "m_fifo.h" - /* linked list of callbacks * callback will be freed after returning 0 */ --- 633,636 ---- Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.8 retrieving revision 1.5.4.9 diff -C2 -d -r1.5.4.8 -r1.5.4.9 *** s_stuff.h 13 May 2005 17:01:48 -0000 1.5.4.8 --- s_stuff.h 15 May 2005 18:51:15 -0000 1.5.4.9 *************** *** 94,97 **** --- 94,101 ---- void sys_setblocksize(int n); + /* tb { */ + void sys_update_sleepgrain(void); + /* } */ + /* s_midi.c */ #define MAXMIDIINDEV 16 /* max. number of input ports */

1 0

pd/src s_audio_pa.c,1.4.4.4,1.4.4.5
by Tim Blechmann 15 May '05

15 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7922 Modified Files: Tag: devel_0_38 s_audio_pa.c Log Message: - we are able to use blocking io again ... - fix for missing pa_device Index: s_audio_pa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v retrieving revision 1.4.4.4 retrieving revision 1.4.4.5 diff -C2 -d -r1.4.4.4 -r1.4.4.5 *** s_audio_pa.c 11 May 2005 16:41:16 -0000 1.4.4.4 --- s_audio_pa.c 15 May 2005 15:50:20 -0000 1.4.4.5 *************** *** 17,20 **** --- 17,32 ---- #include <errno.h> + + #ifdef MSW + /* jmz thinks that we have to include: + * on Windows: <malloc.h> (probably this is already included?) + * on linux: <alloca.h> (might be true for osX too, no way to check right now...) + */ + # include <malloc.h> + #else + # include <alloca.h> + #endif + + #ifdef MSW #include "pthread.h" /* for ETIMEDOUT */ *************** *** 23,34 **** #define MAX_PA_CHANS 32 - #define PA19 /* portaudio's blocking api is not working, yet: */ /* #define PABLOCKING */ static int pa_inchans, pa_outchans; - static float *pa_soundin[MAX_PA_CHANS], *pa_soundout[MAX_PA_CHANS]; static PaStream *pa_stream; static PaStreamCallback *pa_callback = NULL; --- 35,49 ---- #define MAX_PA_CHANS 32 /* portaudio's blocking api is not working, yet: */ /* #define PABLOCKING */ + #ifndef PABLOCKING + #include "s_audio_pablio.h" + #endif + static int pa_inchans, pa_outchans; static PaStream *pa_stream; + static PABLIO_Stream *pablio_stream; static PaStreamCallback *pa_callback = NULL; *************** *** 44,56 **** int j, devno, pa_indev = 0, pa_outdev = 0; - #ifndef PABLOCKING - schedmode = 1; - #endif - if (schedmode == 1) pa_callback = process; else pa_callback = NULL; ! sys_keepsched = 0; sys_callbackscheduler = schedmode; --- 59,67 ---- int j, devno, pa_indev = 0, pa_outdev = 0; if (schedmode == 1) pa_callback = process; else pa_callback = NULL; ! sys_keepsched = 0; sys_callbackscheduler = schedmode; *************** *** 121,147 **** if (inchans || outchans) { ! PaStreamParameters inputParameters, outputParameters; ! ! /* initialize input */ ! inputParameters.device = pa_indev ; ! inputParameters.channelCount = inchans; ! inputParameters.sampleFormat = paFloat32 | paNonInterleaved; ! inputParameters.suggestedLatency = advance * 0.001; ! inputParameters.hostApiSpecificStreamInfo = NULL; ! /* initialize output */ ! outputParameters.device = pa_outdev; ! outputParameters.channelCount = outchans; ! outputParameters.sampleFormat = paFloat32 | paNonInterleaved; ! outputParameters.suggestedLatency = advance * 0.001; ! outputParameters.hostApiSpecificStreamInfo = NULL; ! /* report to portaudio */ ! err = Pa_OpenStream(&pa_stream, (inchans ? &inputParameters : 0), ! (outchans ? &outputParameters : 0), ! rate, ! sys_dacblocksize, ! paClipOff, /* tb: we should be faster ;-) */ ! pa_callback, NULL); } else --- 132,172 ---- if (inchans || outchans) { ! #ifndef PABLOCKING ! if (schedmode == 1) ! { ! #endif ! PaStreamParameters inputParameters, outputParameters; ! /* initialize input */ ! inputParameters.device = pa_indev ; ! inputParameters.channelCount = inchans; ! inputParameters.sampleFormat = paFloat32 | paNonInterleaved; ! inputParameters.suggestedLatency = advance * 0.001; ! inputParameters.hostApiSpecificStreamInfo = NULL; ! /* initialize output */ ! outputParameters.device = pa_outdev; ! outputParameters.channelCount = outchans; ! outputParameters.sampleFormat = paFloat32 | paNonInterleaved; ! outputParameters.suggestedLatency = advance * 0.001; ! outputParameters.hostApiSpecificStreamInfo = NULL; ! ! /* report to portaudio */ ! err = Pa_OpenStream(&pa_stream, (pa_indev ? &inputParameters : 0), ! (pa_outdev ? &outputParameters : 0), ! rate, ! sys_dacblocksize, ! paClipOff, /* tb: we should be faster ;-) */ ! pa_callback, NULL); ! #ifndef PABLOCKING ! } ! else ! { ! int nbuffers = sys_advance_samples / sys_dacblocksize; ! err = OpenAudioStream( &pablio_stream, rate, paFloat32, ! inchans, outchans, sys_dacblocksize, ! nbuffers, pa_indev, pa_outdev); ! } ! #endif } else *************** *** 162,166 **** pa_outchans = outchans; ! err = Pa_StartStream(pa_stream); if ( err != paNoError ) { --- 187,195 ---- pa_outchans = outchans; ! #ifndef PABLOCKING ! if (schedmode) ! #endif ! err = Pa_StartStream(pa_stream); ! if ( err != paNoError ) { *************** *** 175,191 **** post("successfully started"); - for (j = 0; j != MAX_PA_CHANS; ++j) - { - if (j < inchans) - pa_soundin[j] = sys_soundin + j * sys_dacblocksize; - else - pa_soundin[j] = 0; - - if (j < outchans) - pa_soundout[j] = sys_soundout + j * sys_dacblocksize; - else - pa_soundout[j] = 0; - } - return (0); } --- 204,207 ---- *************** *** 204,237 **** if (sys_timedlock(timeout) == ETIMEDOUT) /* we're late */ - return 0; - - #if 0 - for (i = 0; i < frameCount / sys_dacblocksize; ++i) { ! for (j = 0; j < sys_inchannels; j++) ! { ! t_sample * in = ((t_sample**)input)[j]; ! copyvec(sys_soundin + j * sys_dacblocksize, ! in + i * sys_dacblocksize, ! sys_dacblocksize); ! } ! ! sched_tick(sys_time + sys_time_per_dsp_tick); ! ! for (j = 0; j < sys_outchannels; j++) ! { ! t_sample * out = ((t_sample**)output)[j]; ! copyvec(out + i * sys_dacblocksize, ! sys_soundout + j * sys_dacblocksize, ! sys_dacblocksize); ! } ! /* update peak meters */ ! if (sys_meters) ! sys_peakmeters(); ! ! /* clear the output buffer */ ! zerovec_simd(sys_soundout, pa_outchans * sys_dacblocksize); } - #else for (j = 0; j < sys_inchannels; j++) { --- 220,228 ---- if (sys_timedlock(timeout) == ETIMEDOUT) /* we're late */ { ! post("timeout %d", timeout); ! sys_log_error(ERR_SYSLOCK); ! return 0; } for (j = 0; j < sys_inchannels; j++) { *************** *** 256,266 **** /* clear the output buffer */ ! zerovec_simd(sys_soundout, pa_outchans * sys_dacblocksize); ! ! #endif sys_unlock(); - - return 0; } --- 247,255 ---- /* clear the output buffer */ ! zerovec(sys_soundout, pa_outchans * sys_dacblocksize); ! sys_unlock(); + return 0; } *************** *** 270,275 **** if (pa_inchans || pa_outchans) { ! Pa_StopStream(pa_stream); ! Pa_CloseStream(pa_stream); } post("portaudio closed"); --- 259,273 ---- if (pa_inchans || pa_outchans) { ! if (pa_stream) ! { ! Pa_StopStream(pa_stream); ! Pa_CloseStream(pa_stream); ! pa_stream = NULL; ! } ! if (pablio_stream) ! { ! CloseAudioStream(pablio_stream); ! pablio_stream = NULL; ! } } post("portaudio closed"); *************** *** 296,302 **** if (pa_outchans) ! Pa_WriteStream(pa_stream, pa_soundout, sys_dacblocksize); if (pa_inchans) ! Pa_ReadStream(pa_stream, pa_soundin, sys_dacblocksize); zerovec(sys_soundout, pa_inchans * sys_dacblocksize); --- 294,300 ---- if (pa_outchans) ! Pa_WriteStream(pa_stream, &sys_soundout, sys_dacblocksize); if (pa_inchans) ! Pa_ReadStream(pa_stream, &sys_soundin, sys_dacblocksize); zerovec(sys_soundout, pa_inchans * sys_dacblocksize); *************** *** 307,313 **** { if (pa_outchans) ! Pa_WriteStream(pa_stream, pa_soundout, sys_dacblocksize); if (pa_inchans) ! Pa_ReadStream(pa_stream, pa_soundin, sys_dacblocksize); zerovec(sys_soundout, pa_inchans * sys_dacblocksize); --- 305,311 ---- { if (pa_outchans) ! Pa_WriteStream(pa_stream, &sys_soundout, sys_dacblocksize); if (pa_inchans) ! Pa_ReadStream(pa_stream, &sys_soundin, sys_dacblocksize); zerovec(sys_soundout, pa_inchans * sys_dacblocksize); *************** *** 321,327 **** else return SENDDACS_YES; ! #else ! /* we should never reach this point */ ! return 0; #endif } --- 319,389 ---- else return SENDDACS_YES; ! ! #else /* for now we're using pablio */ ! ! float *samples, *fp1, *fp2; ! int i, j; ! double timebefore; ! ! samples=(float*)alloca(sizeof(float) * MAX_PA_CHANS * sys_dacblocksize); ! ! timebefore = sys_getrealtime(); ! if ((pa_inchans && GetAudioStreamReadable(pablio_stream) < sys_dacblocksize) || ! (pa_outchans && GetAudioStreamWriteable(pablio_stream) < sys_dacblocksize)) ! { ! if (pa_inchans && pa_outchans) ! { ! int synced = 0; ! while (GetAudioStreamWriteable(pablio_stream) > 2*sys_dacblocksize) ! { ! for (j = 0; j < pa_outchans; j++) ! for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++, ! fp2 += pa_outchans) ! { ! *fp2 = 0; ! } ! synced = 1; ! WriteAudioStream(pablio_stream, samples, sys_dacblocksize); ! } ! while (GetAudioStreamReadable(pablio_stream) > 2*sys_dacblocksize) ! { ! synced = 1; ! ReadAudioStream(pablio_stream, samples, sys_dacblocksize); ! } ! /* if (synced) */ ! /* post("sync"); */ ! } ! return (SENDDACS_NO); ! } ! if (pa_inchans) ! { ! ReadAudioStream(pablio_stream, samples, sys_dacblocksize); ! for (j = 0, fp1 = sys_soundin; j < pa_inchans; j++, fp1 += sys_dacblocksize) ! for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++, ! fp2 += pa_inchans) ! { ! fp1[i] = *fp2; ! } ! } ! if (pa_outchans) ! { ! for (j = 0, fp1 = sys_soundout; j < pa_outchans; j++, ! fp1 += sys_dacblocksize) ! for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++, ! fp2 += pa_outchans) ! { ! *fp2 = fp1[i]; ! fp1[i] = 0; ! } ! WriteAudioStream(pablio_stream, samples, sys_dacblocksize); ! } ! ! if (sys_getrealtime() > timebefore + sys_sleepgrain * 1e-6) ! { ! /* post("slept"); */ ! return (SENDDACS_SLEPT); ! } ! else return (SENDDACS_YES); ! #endif }

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
41
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 2005