Pd-cvs August 2004

pd-cvs@lists.iem.at

10 participants
171 discussions

externals/grill/pool/source main.cpp,1.4,1.5 pool.cpp,1.6,1.7 pool.h,1.5,1.6
by Thomas Grill 17 Aug '04

17 Aug '04

Update of /cvsroot/pure-data/externals/grill/pool/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1187/source Modified Files: main.cpp pool.cpp pool.h Log Message: "" Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/main.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** main.cpp 10 Aug 2004 20:23:28 -0000 1.4 --- main.cpp 17 Aug 2004 04:11:28 -0000 1.5 *************** *** 12,16 **** #include <string> ! #define POOL_VERSION "0.2.0" #define VCNT 64 --- 12,16 ---- #include <string> ! #define POOL_VERSION "0.2.1pre" #define VCNT 64 *************** *** 704,707 **** --- 704,708 ---- AtomList ndir(absdir?gldir:rdir); ndir.Append(*r[i]); + ++ret; if(how == get_norm) { Index: pool.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/pool.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pool.cpp 10 Aug 2004 20:23:28 -0000 1.6 --- pool.cpp 17 Aug 2004 04:11:28 -0000 1.7 *************** *** 368,372 **** const I cnt = CntSub(); lst = new const A *[cnt]; ! for(I i = 0,dix = 0; dix < dsize; ++dix) { pooldir *ix = dirs[dix].d; for(; ix; ix = ix->nxt) lst[i++] = &ix->dir; --- 368,372 ---- const I cnt = CntSub(); lst = new const A *[cnt]; ! for(I i = 0,dix = 0; i < cnt; ++dix) { pooldir *ix = dirs[dix].d; for(; ix; ix = ix->nxt) lst[i++] = &ix->dir; *************** *** 540,544 **** BL r = ReadAtoms(is,d,',') && ! ReadAtoms(is,k,',') && k.Count() == 1 && ReadAtoms(is,*v,'\n'); --- 540,544 ---- BL r = ReadAtoms(is,d,',') && ! ReadAtoms(is,k,',') && ReadAtoms(is,*v,'\n'); *************** *** 547,551 **** pooldir *nd = mkdir?AddDir(d):GetDir(d); if(nd) { ! nd->SetVal(k[0],v); v = NULL; } #ifdef FLEXT_DEBUG --- 547,555 ---- pooldir *nd = mkdir?AddDir(d):GetDir(d); if(nd) { ! if(k.Count() == 1) { ! nd->SetVal(k[0],v); v = NULL; ! } ! else if(k.Count() > 1) ! post("pool - file format invalid: key must be a single word"); } #ifdef FLEXT_DEBUG *************** *** 565,568 **** --- 569,573 ---- BL pooldir::SvDir(ostream &os,I depth,const AtomList &dir) { + I cnt = 0; for(I vi = 0; vi < vsize; ++vi) { for(poolval *ix = vals[vi].v; ix; ix = ix->nxt) { *************** *** 573,579 **** --- 578,591 ---- WriteAtoms(os,*ix->data); os << endl; + ++cnt; } } + if(!cnt) { + // no key/value pairs present -> force empty directory + WriteAtoms(os,dir); + os << " , ," << endl; + } if(depth) { + // save sub-directories I nd = depth > 0?depth-1:-1; for(I di = 0; di < dsize; ++di) { *************** *** 704,712 **** } ! BL pooldir::LdDirXML(istream &is,I depth,BL mkdir) { ! AtomList d,k,v; ! bool inpool = false,inval = false,inkey = false,indata = false; ! const t_symbol *empty = MakeSymbol(""); while(!is.eof()) { --- 716,724 ---- } ! BL pooldir::LdDirXMLRec(istream &is,I depth,BL mkdir,AtomList &d) { ! AtomList k,v; ! bool inval = false,inkey = false,indata = false; ! int cntval = 0; while(!is.eof()) { *************** *** 718,722 **** getvalue(is,s); ! if(s.length() && inpool && ( (!inval && inkey && d.Count()) || /* dir */ --- 730,734 ---- getvalue(is,s); ! if(s.length() && ( (!inval && inkey && d.Count()) || /* dir */ *************** *** 753,836 **** post("pool - error reading XML data"); } ! else if(tag == "pool") { ! if(tag.type == xmltag::t_end) break; ! else inpool = true; ! } ! else if(inpool) { ! if(tag == "dir") { ! if(tag.type == xmltag::t_start) { ! // warn if last directory key was not given ! if(d.Count() && GetSymbol(d[d.Count()-1]) == empty) ! post("pool - XML load: dir key must be given prior to subdirs, ignoring items"); ! // initialize dir key as empty ! t_atom at; SetSymbol(at,empty); ! d.Append(at); ! } ! else if(tag.type == xmltag::t_end) { ! if(d.Count()) ! d.Part(0,d.Count()-1); ! else ! post("pool - XML load: superfluous </dir> in XML data"); ! } } ! else if(tag == "value") { ! if(tag.type == xmltag::t_start) { ! inval = true; ! k.Clear(); v.Clear(); } - else if(tag.type == xmltag::t_end) { - if(depth < 0 || d.Count() <= depth) { - // NOW set value ! int fnd; ! for(fnd = d.Count()-1; fnd >= 0; --fnd) ! if(GetSymbol(d[fnd]) == empty) break; ! // look if last dir key has been given ! if(fnd >= 0) { ! if(fnd == d.Count()-1) ! post("pool - XML load: dir key must be given prior to values"); ! // else: one directoy level has been left unintialized, ignore items ! } ! else { ! // only use first word of key ! if(k.Count() == 1) { ! pooldir *nd = mkdir?AddDir(d):GetDir(d); ! if(nd) ! nd->SetVal(k[0],new AtomList(v)); ! else ! post("pool - XML load: value key must be exactly one word, value not stored"); ! } ! } } - inval = false; } } ! else if(tag == "key") { ! if(tag.type == xmltag::t_start) { ! inkey = true; ! } ! else if(tag.type == xmltag::t_end) { ! inkey = false; ! } } ! else if(tag == "data") { ! if(!inval) ! post("pool - XML tag <data> not within <value>"); ! if(tag.type == xmltag::t_start) { ! indata = true; ! } ! else if(tag.type == xmltag::t_end) { ! indata = false; ! } } ! #ifdef FLEXT_DEBUG ! else { ! post("pool - unknown XML tag '%s'",tag.tag.c_str()); } #endif } else if(tag == "!DOCTYPE") { --- 765,870 ---- post("pool - error reading XML data"); } ! else if(tag == "dir") { ! if(tag.type == xmltag::t_start) { ! // warn if last directory key was not given ! if(d.Count() && GetSymbol(d[d.Count()-1]) == sym__) ! post("pool - XML load: dir key must be given prior to subdirs, ignoring items"); ! AtomList dnext(d.Count()+1); ! // copy existing dir ! dnext.Set(d.Count(),d.Atoms(),0,false); ! // initialize current dir key as empty ! SetSymbol(dnext[d.Count()],sym__); ! ! // read next level ! LdDirXMLRec(is,depth,mkdir,dnext); } ! else if(tag.type == xmltag::t_end) { ! if(!cntval && mkdir) { ! // no values have been found in dir -> make empty dir ! AddDir(d); } ! // break tag loop ! break; ! } ! } ! else if(tag == "value") { ! if(tag.type == xmltag::t_start) { ! inval = true; ! ++cntval; ! k.Clear(); v.Clear(); ! } ! else if(tag.type == xmltag::t_end) { ! // set value after tag closing, but only if level <= depth ! if(depth < 0 || d.Count() <= depth) { ! int fnd; ! for(fnd = d.Count()-1; fnd >= 0; --fnd) ! if(GetSymbol(d[fnd]) == sym__) break; ! // look if last dir key has been given ! if(fnd >= 0) { ! if(fnd == d.Count()-1) ! post("pool - XML load: dir key must be given prior to values"); ! // else: one directoy level has been left unintialized, ignore items ! } ! else { ! // only use first word of key ! if(k.Count() == 1) { ! pooldir *nd = mkdir?AddDir(d):GetDir(d); ! if(nd) ! nd->SetVal(k[0],new AtomList(v)); ! else ! post("pool - XML load: value key must be exactly one word, value not stored"); ! } } } + inval = false; } ! } ! else if(tag == "key") { ! if(tag.type == xmltag::t_start) { ! inkey = true; } ! else if(tag.type == xmltag::t_end) { ! inkey = false; ! } ! } ! else if(tag == "data") { ! if(!inval) ! post("pool - XML tag <data> not within <value>"); ! if(tag.type == xmltag::t_start) { ! indata = true; } ! else if(tag.type == xmltag::t_end) { ! indata = false; } + } + else if(!d.Count() && tag == "pool" && tag.type == xmltag::t_end) { + // break tag loop + break; + } + #ifdef FLEXT_DEBUG + else { + post("pool - unknown XML tag '%s'",tag.tag.c_str()); + } #endif + } + return true; + } + + BL pooldir::LdDirXML(istream &is,I depth,BL mkdir) + { + while(!is.eof()) { + xmltag tag; + if(!gettag(is,tag)) break; + + if(tag == "pool") { + if(tag.type == xmltag::t_start) + LdDirXMLRec(is,depth,mkdir,AtomList()); + else + post("pool - pool not initialized yet"); } else if(tag == "!DOCTYPE") { Index: pool.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/pool.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pool.h 10 Aug 2004 20:23:28 -0000 1.5 --- pool.h 17 Aug 2004 04:11:28 -0000 1.6 *************** *** 112,115 **** --- 112,118 ---- valentry *vals; direntry *dirs; + + private: + BL LdDirXMLRec(istream &is,I depth,BL mkdir,AtomList &d); };

1 0

externals/grill/pool help-pool.pd,1.3,1.4 readme.txt,1.18,1.19
by Thomas Grill 17 Aug '04

17 Aug '04

Update of /cvsroot/pure-data/externals/grill/pool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1187 Modified Files: help-pool.pd readme.txt Log Message: "" Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/readme.txt,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** readme.txt 10 Aug 2004 20:23:27 -0000 1.18 --- readme.txt 17 Aug 2004 04:11:28 -0000 1.19 *************** *** 87,90 **** --- 87,94 ---- Version history: + 0.2.1: + - fixed "cntsub"... directories in current directory have been forgotten + - store/create also empty dirs with file I/O + 0.2.0: - attributes (pool,private,echodir,absdir) Index: help-pool.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/help-pool.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** help-pool.pd 10 Aug 2004 20:23:26 -0000 1.3 --- help-pool.pd 17 Aug 2004 04:11:28 -0000 1.4 *************** *** 1,266 **** ! #N canvas 132 22 958 714 12; ! #X msg 296 105 set 1 2 3; ! #X obj 238 631 print K; ! #X msg 607 211 getall; ! #X msg 296 134 set A k g; ! #X obj 189 660 print V; ! #X obj 287 605 print D; ! #X msg 296 164 set A l m; ! #X msg 299 193 set 2 34; ! #X msg 429 102 clr A; ! #X msg 429 165 get A; ! #X msg 429 190 get 2; ! #X msg 31 132 echodir \$1; ! #X obj 31 111 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X obj 31 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X msg 31 234 absdir \$1; ! #X text 428 82 clear value; ! #X text 425 143 get value; ! #X obj 336 576 print C; ! #X text 408 576 command; ! #X text 360 605 directory (abs or rel to current); ! #X text 264 661 data value; ! #X text 310 631 data key; ! #X msg 32 314 pool pool1; ! #X msg 33 343 pool; ! #X text 77 343 set to private; ! #X msg 33 405 reset; ! #X text 32 384 clear all pool data; ! #X msg 608 111 clrall; ! #X text 599 89 clear all values in dir; ! #X text 607 190 get all values in dir; ! #X text 175 500 pool name can be given as argument; ! #X text 598 136 clear all values and dirs; ! #X msg 606 158 clrrec; ! #X msg 605 258 getrec; ! #X text 605 236 get all values in dir and subdirs; ! #X text 670 289 bang at EOL; ! #X text 673 208 bang at EOL; ! #X text 670 257 depth may be given; ! #X text 34 291 set pool name; ! #X text 31 89 at each command; ! #X text 31 73 echo current dir; ! #X text 293 80 set values; ! #X text 26 194 (default on); ! #X text 18 178 report absolute dirs; ! #X msg 34 452 help; ! #X text 77 453 get some info; ! #X text 670 274 default=-1 (= infinite); ! #X msg 609 340 cntall; ! #X text 675 338 count all values in dir; ! #X msg 609 366 cntrec; ! #X text 677 364 ... and subdirs; ! #X text 673 378 (depth may be given); ! #X text 295 258 set but don't replace; ! #N canvas 472 45 420 631 dirs 0; ! #X msg 111 40 mkdir fld1; ! #X msg 113 135 chdir; ! #X msg 109 331 updir; ! #X msg 110 468 getsub -1; ! #X text 112 20 make absolute dir; ! #X text 111 64 make relative dir; ! #X msg 112 85 mksub fld2; ! #X text 111 117 change to absolute dir; ! #X msg 112 178 chsub fld2; ! #X text 110 159 change to relative dir; ! #X text 105 312 change to upper dir; ! #X text 106 364 remove absolute dir; ! #X msg 107 383 rmdir fld1; ! #X msg 109 422 rmsub fld2; ! #X text 108 403 remove relative dir; ! #X text 108 450 get subdirs; ! #X text 250 494 -1 ... infinite; ! #X text 166 327 depth may be given; ! #X text 167 343 default=1; ! #X text 208 463 depth may be given; ! #X text 206 479 default=1; ! #X text 107 491 count subdirs; ! #X msg 110 512 cntsub -1; ! #X msg 110 572 getdir; ! #X text 109 552 get current dir; ! #X text 175 572 always absolute; ! #X obj 13 252 s \$0-pool; ! #X msg 111 231 mkchdir fld1; ! #X text 112 211 make and change to absolute dir; ! #X msg 109 276 mkchsub fld2; ! #X text 110 256 make and change to relative dir; ! #X connect 0 0 26 0; ! #X connect 1 0 26 0; ! #X connect 2 0 26 0; ! #X connect 3 0 26 0; ! #X connect 6 0 26 0; ! #X connect 8 0 26 0; ! #X connect 12 0 26 0; ! #X connect 13 0 26 0; ! #X connect 22 0 26 0; ! #X connect 23 0 26 0; ! #X connect 27 0 26 0; ! #X connect 29 0 26 0; ! #X restore 716 496 pd dirs; ! #X text 713 470 directory operations; ! #N canvas 0 22 833 465 file 0; ! #X text 117 207 save dir and subdirs; ! #X text 117 165 save data in current dir; ! #X text 117 253 load data into current dir; ! #X text 115 300 load data into current dir and below; ! #X text 132 340 depth (default -1) and; ! #X text 134 356 mkdir flag (default 1) can be given; ! #X text 117 37 save all; ! #X text 117 81 load all (add to existing data); ! #X text 22 12 file operations; ! #X obj 22 188 s \$0-pool; ! #X text 473 209 save dir and subdirs; ! #X text 473 167 save data in current dir; ! #X text 473 255 load data into current dir; ! #X text 471 302 load data into current dir and below; ! #X text 488 342 depth (default -1) and; ! #X text 490 358 mkdir flag (default 1) can be given; ! #X text 473 39 save all; ! #X text 473 83 load all (add to existing data); ! #X obj 378 190 s \$0-pool; ! #X text 444 12 XML format; ! #X msg 120 54 save pool.dat; ! #X msg 118 100 load pool.dat; ! #X msg 117 184 svdir pool.dat; ! #X msg 117 226 svrec pool.dat; ! #X msg 116 272 lddir pool.dat; ! #X msg 116 319 ldrec pool.dat; ! #X msg 476 56 savex pool.xml; ! #X msg 474 102 loadx pool.xml; ! #X msg 473 186 svxdir pool.xml; ! #X msg 473 228 svxrec pool.xml; ! #X msg 472 274 ldxdir pool.xml; ! #X msg 472 321 ldxrec pool.xml; ! #X text 26 398 If the file name is given without a path specification ! the folder containing the current patcher will be used.; ! #X connect 20 0 9 0; ! #X connect 21 0 9 0; ! #X connect 22 0 9 0; ! #X connect 23 0 9 0; ! #X connect 24 0 9 0; ! #X connect 25 0 9 0; ! #X connect 26 0 18 0; ! #X connect 27 0 18 0; ! #X connect 28 0 18 0; ! #X connect 29 0 18 0; ! #X connect 30 0 18 0; ! #X connect 31 0 18 0; ! #X restore 717 551 pd file; ! #X text 715 528 file operations; ! #X text 715 585 clipboard operations; ! #N canvas 0 22 545 593 clip 0; ! #X text 97 56 copy value associated to key into clipboard; ! #X msg 100 77 copy A; ! #X msg 98 119 cut B; ! #X text 96 101 cut value associated to key into clipboard; ! #X msg 96 401 paste; ! #X msg 98 179 copyall; ! #X text 95 158 copy all values in current dir into clipboard; ! #X msg 97 221 cutall; ! #X text 95 201 cut all values in current dir into clipboard; ! #X text 94 263 copy all values in current dir into clipboard; ! #X text 94 306 cut all values in current dir into clipboard; ! #X msg 97 284 copyrec; ! #X text 194 285 depth may be given (default=-1); ! #X text 193 326 depth may be given (default=-1); ! #X msg 96 326 cutrec 1; ! #X text 194 345 1..only with first level subdirs; ! #X text 96 379 paste clipboard contents into current directory; ! #X text 167 397 depth (default -1) and; ! #X text 169 413 mkdir flag (default 1) can be given; ! #X text 183 448 depth (default -1) and; ! #X text 185 466 mkdir flag (default 1) can be given; ! #X msg 95 453 pasteadd; ! #X text 95 431 paste but don't replace; ! #X msg 94 521 clrclip; ! #X text 171 520 clear clipboard (free memory); ! #X text 22 12 clipboard operations (this is an internal clipboard...) ! ; ! #X obj 4 193 s \$0-pool; ! #X connect 1 0 26 0; ! #X connect 2 0 26 0; ! #X connect 4 0 26 0; ! #X connect 5 0 26 0; ! #X connect 7 0 26 0; ! #X connect 11 0 26 0; ! #X connect 14 0 26 0; ! #X connect 21 0 26 0; ! #X connect 23 0 26 0; ! #X restore 716 606 pd clip; ! #X text 715 439 more commands:; ! #X obj 298 389 r \$0-pool; ! #X text 174 517 data is shared among pool objects with the same name ! ; ! #X obj 26 10 cnv 15 850 40 empty empty pool 10 22 0 24 -260818 -1 0 ! ; ! #X text 272 33 http://www.parasitaere-kapazitaeten.net; ! #X obj 386 553 print A; ! #X text 458 552 attributes; ! #X msg 34 490 getattributes; ! #X msg 139 132 getechodir; ! #X msg 130 234 getabsdir; ! #X msg 141 314 getpool; ! #X msg 297 279 add 2 14; ! #X obj 260 478 pool @valcnt 10 @dircnt 5; ! #X text 330 437 expected value and directory counts; ! #X text 330 452 can be given for optimal performance; ! #X msg 429 215 get 3; ! #X msg 300 224 set 3 -1 1; ! #X msg 32 518 getmethods; ! #X text 328 466 (see attributes in properties dialog); ! #X text 715 638 console printout; ! #N canvas 0 22 612 291 print 0; ! #X obj 21 231 s \$0-pool; ! #X msg 109 80 printall; ! #X msg 109 132 printrec; ! #X text 110 60 print all values in dir; ! #X text 109 112 print values in dir and subdirs; ! #X text 190 133 (depth may be given); ! #X text 22 12 print-to-console operations; ! #X text 201 183 (depth may be given); ! #X msg 109 181 printroot; ! #X text 109 161 print values in dir and subdirs (starting from root) ! ; ! #X connect 1 0 0 0; ! #X connect 2 0 0 0; ! #X connect 8 0 0 0; ! #X restore 717 659 pd print; ! #X text 272 13 a hierarchical storage object \, (C)2002-2004 Thomas ! Grill; ! #X connect 0 0 71 0; ! #X connect 2 0 71 0; ! #X connect 3 0 71 0; ! #X connect 6 0 71 0; ! #X connect 7 0 71 0; ! #X connect 8 0 71 0; ! #X connect 9 0 71 0; ! #X connect 10 0 71 0; ! #X connect 11 0 71 0; ! #X connect 12 0 11 0; ! #X connect 13 0 14 0; ! #X connect 14 0 71 0; ! #X connect 22 0 71 0; ! #X connect 23 0 71 0; ! #X connect 25 0 71 0; ! #X connect 27 0 71 0; ! #X connect 32 0 71 0; ! #X connect 33 0 71 0; ! #X connect 44 0 71 0; ! #X connect 47 0 71 0; ! #X connect 49 0 71 0; ! #X connect 60 0 71 0; ! #X connect 66 0 71 0; ! #X connect 67 0 71 0; ! #X connect 68 0 71 0; ! #X connect 69 0 71 0; ! #X connect 70 0 71 0; ! #X connect 71 0 4 0; ! #X connect 71 1 1 0; ! #X connect 71 2 5 0; ! #X connect 71 3 17 0; ! #X connect 71 4 64 0; ! #X connect 74 0 71 0; ! #X connect 75 0 71 0; ! #X connect 76 0 71 0; --- 1,266 ---- ! #N canvas 4 3 927 697 12; ! #X msg 296 105 set 1 2 3; ! #X obj 238 631 print K; ! #X msg 607 211 getall; ! #X msg 296 134 set A k g; ! #X obj 189 660 print V; ! #X obj 287 605 print D; ! #X msg 296 164 set A l m; ! #X msg 299 193 set 2 34; ! #X msg 429 102 clr A; ! #X msg 429 165 get A; ! #X msg 429 190 get 2; ! #X msg 31 132 echodir \$1; ! #X obj 31 111 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X obj 31 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ! ; ! #X msg 31 234 absdir \$1; ! #X text 428 82 clear value; ! #X text 425 143 get value; ! #X obj 336 576 print C; ! #X text 408 576 command; ! #X text 360 605 directory (abs or rel to current); ! #X text 264 661 data value; ! #X text 310 631 data key; ! #X msg 32 314 pool pool1; ! #X msg 33 343 pool; ! #X text 77 343 set to private; ! #X msg 33 405 reset; ! #X text 32 384 clear all pool data; ! #X msg 608 111 clrall; ! #X text 599 89 clear all values in dir; ! #X text 607 190 get all values in dir; ! #X text 175 500 pool name can be given as argument; ! #X text 598 136 clear all values and dirs; ! #X msg 606 158 clrrec; ! #X msg 605 258 getrec; ! #X text 605 236 get all values in dir and subdirs; ! #X text 670 289 bang at EOL; ! #X text 673 208 bang at EOL; ! #X text 670 257 depth may be given; ! #X text 34 291 set pool name; ! #X text 31 89 at each command; ! #X text 31 73 echo current dir; ! #X text 293 80 set values; ! #X text 26 194 (default on); ! #X text 18 178 report absolute dirs; ! #X msg 34 452 help; ! #X text 77 453 get some info; ! #X text 670 274 default=-1 (= infinite); ! #X msg 609 340 cntall; ! #X text 675 338 count all values in dir; ! #X msg 609 366 cntrec; ! #X text 677 364 ... and subdirs; ! #X text 673 378 (depth may be given); ! #X text 295 258 set but don't replace; ! #N canvas 472 45 420 631 dirs 0; ! #X msg 111 40 mkdir fld1; ! #X msg 113 135 chdir; ! #X msg 109 331 updir; ! #X msg 110 468 getsub -1; ! #X text 112 20 make absolute dir; ! #X text 111 64 make relative dir; ! #X msg 112 85 mksub fld2; ! #X text 111 117 change to absolute dir; ! #X msg 112 178 chsub fld2; ! #X text 110 159 change to relative dir; ! #X text 105 312 change to upper dir; ! #X text 106 364 remove absolute dir; ! #X msg 107 383 rmdir fld1; ! #X msg 109 422 rmsub fld2; ! #X text 108 403 remove relative dir; ! #X text 108 450 get subdirs; ! #X text 250 494 -1 ... infinite; ! #X text 166 327 depth may be given; ! #X text 167 343 default=1; ! #X text 208 463 depth may be given; ! #X text 206 479 default=1; ! #X text 107 491 count subdirs; ! #X msg 110 512 cntsub -1; ! #X msg 110 572 getdir; ! #X text 109 552 get current dir; ! #X text 175 572 always absolute; ! #X obj 13 252 s \$0-pool; ! #X msg 111 231 mkchdir fld1; ! #X text 112 211 make and change to absolute dir; ! #X msg 109 276 mkchsub fld2; ! #X text 110 256 make and change to relative dir; ! #X connect 0 0 26 0; ! #X connect 1 0 26 0; ! #X connect 2 0 26 0; ! #X connect 3 0 26 0; ! #X connect 6 0 26 0; ! #X connect 8 0 26 0; ! #X connect 12 0 26 0; ! #X connect 13 0 26 0; ! #X connect 22 0 26 0; ! #X connect 23 0 26 0; ! #X connect 27 0 26 0; ! #X connect 29 0 26 0; ! #X restore 716 496 pd dirs; ! #X text 713 470 directory operations; ! #N canvas 0 22 833 465 file 0; ! #X text 117 207 save dir and subdirs; ! #X text 117 165 save data in current dir; ! #X text 117 253 load data into current dir; ! #X text 115 300 load data into current dir and below; ! #X text 132 340 depth (default -1) and; ! #X text 134 356 mkdir flag (default 1) can be given; ! #X text 117 37 save all; ! #X text 117 81 load all (add to existing data); ! #X text 22 12 file operations; ! #X obj 22 188 s \$0-pool; ! #X text 473 209 save dir and subdirs; ! #X text 473 167 save data in current dir; ! #X text 473 255 load data into current dir; ! #X text 471 302 load data into current dir and below; ! #X text 488 342 depth (default -1) and; ! #X text 490 358 mkdir flag (default 1) can be given; ! #X text 473 39 save all; ! #X text 473 83 load all (add to existing data); ! #X obj 378 190 s \$0-pool; ! #X text 444 12 XML format; ! #X msg 120 54 save pool.dat; ! #X msg 118 100 load pool.dat; ! #X msg 117 184 svdir pool.dat; ! #X msg 117 226 svrec pool.dat; ! #X msg 116 272 lddir pool.dat; ! #X msg 116 319 ldrec pool.dat; ! #X msg 476 56 savex pool.xml; ! #X msg 474 102 loadx pool.xml; ! #X msg 473 186 svxdir pool.xml; ! #X msg 473 228 svxrec pool.xml; ! #X msg 472 274 ldxdir pool.xml; ! #X msg 472 321 ldxrec pool.xml; ! #X text 26 398 If the file name is given without a path specification ! the folder containing the current patcher will be used.; ! #X connect 20 0 9 0; ! #X connect 21 0 9 0; ! #X connect 22 0 9 0; ! #X connect 23 0 9 0; ! #X connect 24 0 9 0; ! #X connect 25 0 9 0; ! #X connect 26 0 18 0; ! #X connect 27 0 18 0; ! #X connect 28 0 18 0; ! #X connect 29 0 18 0; ! #X connect 30 0 18 0; ! #X connect 31 0 18 0; ! #X restore 717 551 pd file; ! #X text 715 528 file operations; ! #X text 715 585 clipboard operations; ! #N canvas 0 22 545 593 clip 0; ! #X text 97 56 copy value associated to key into clipboard; ! #X msg 100 77 copy A; ! #X msg 98 119 cut B; ! #X text 96 101 cut value associated to key into clipboard; ! #X msg 96 401 paste; ! #X msg 98 179 copyall; ! #X text 95 158 copy all values in current dir into clipboard; ! #X msg 97 221 cutall; ! #X text 95 201 cut all values in current dir into clipboard; ! #X text 94 263 copy all values in current dir into clipboard; ! #X text 94 306 cut all values in current dir into clipboard; ! #X msg 97 284 copyrec; ! #X text 194 285 depth may be given (default=-1); ! #X text 193 326 depth may be given (default=-1); ! #X msg 96 326 cutrec 1; ! #X text 194 345 1..only with first level subdirs; ! #X text 96 379 paste clipboard contents into current directory; ! #X text 167 397 depth (default -1) and; ! #X text 169 413 mkdir flag (default 1) can be given; ! #X text 183 448 depth (default -1) and; ! #X text 185 466 mkdir flag (default 1) can be given; ! #X msg 95 453 pasteadd; ! #X text 95 431 paste but don't replace; ! #X msg 94 521 clrclip; ! #X text 171 520 clear clipboard (free memory); ! #X text 22 12 clipboard operations (this is an internal clipboard...) ! ; ! #X obj 4 193 s \$0-pool; ! #X connect 1 0 26 0; ! #X connect 2 0 26 0; ! #X connect 4 0 26 0; ! #X connect 5 0 26 0; ! #X connect 7 0 26 0; ! #X connect 11 0 26 0; ! #X connect 14 0 26 0; ! #X connect 21 0 26 0; ! #X connect 23 0 26 0; ! #X restore 716 606 pd clip; ! #X text 715 439 more commands:; ! #X obj 298 389 r \$0-pool; ! #X text 174 517 data is shared among pool objects with the same name ! ; ! #X obj 26 10 cnv 15 850 40 empty empty pool 10 22 0 24 -260818 -1 0 ! ; ! #X text 272 33 http://www.parasitaere-kapazitaeten.net; ! #X obj 386 553 print A; ! #X text 458 552 attributes; ! #X msg 34 490 getattributes; ! #X msg 139 132 getechodir; ! #X msg 130 234 getabsdir; ! #X msg 141 314 getpool; ! #X msg 297 279 add 2 14; ! #X obj 260 478 pool @valcnt 10 @dircnt 5; ! #X text 330 437 expected value and directory counts; ! #X text 330 452 can be given for optimal performance; ! #X msg 429 215 get 3; ! #X msg 300 224 set 3 -1 1; ! #X msg 32 518 getmethods; ! #X text 328 466 (see attributes in properties dialog); ! #X text 715 638 console printout; ! #N canvas 0 22 612 291 print 0; ! #X obj 21 231 s \$0-pool; ! #X msg 109 80 printall; ! #X msg 109 132 printrec; ! #X text 110 60 print all values in dir; ! #X text 109 112 print values in dir and subdirs; ! #X text 190 133 (depth may be given); ! #X text 22 12 print-to-console operations; ! #X text 201 183 (depth may be given); ! #X msg 109 181 printroot; ! #X text 109 161 print values in dir and subdirs (starting from root) ! ; ! #X connect 1 0 0 0; ! #X connect 2 0 0 0; ! #X connect 8 0 0 0; ! #X restore 717 659 pd print; ! #X text 272 13 a hierarchical storage object \, (C)2002-2004 Thomas ! Grill; ! #X connect 0 0 71 0; ! #X connect 2 0 71 0; ! #X connect 3 0 71 0; ! #X connect 6 0 71 0; ! #X connect 7 0 71 0; ! #X connect 8 0 71 0; ! #X connect 9 0 71 0; ! #X connect 10 0 71 0; ! #X connect 11 0 71 0; ! #X connect 12 0 11 0; ! #X connect 13 0 14 0; ! #X connect 14 0 71 0; ! #X connect 22 0 71 0; ! #X connect 23 0 71 0; ! #X connect 25 0 71 0; ! #X connect 27 0 71 0; ! #X connect 32 0 71 0; ! #X connect 33 0 71 0; ! #X connect 44 0 71 0; ! #X connect 47 0 71 0; ! #X connect 49 0 71 0; ! #X connect 60 0 71 0; ! #X connect 66 0 71 0; ! #X connect 67 0 71 0; ! #X connect 68 0 71 0; ! #X connect 69 0 71 0; ! #X connect 70 0 71 0; ! #X connect 71 0 4 0; ! #X connect 71 1 1 0; ! #X connect 71 2 5 0; ! #X connect 71 3 17 0; ! #X connect 71 4 64 0; ! #X connect 74 0 71 0; ! #X connect 75 0 71 0; ! #X connect 76 0 71 0;

1 0

packages/darwin_app AppMain.tcl,NONE,1.1 BUGS,NONE,1.1 Info.plist,NONE,1.1 Makefile,NONE,1.1 Pd.term,NONE,1.1 TODO,NONE,1.1 mkdmg,NONE,1.1 pd-file.icns,NONE,1.1 pd-unix.info,NONE,1.1 pd.icns,NONE,1.1
by Hans-Christoph Steiner 14 Aug '04

14 Aug '04

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29750 Added Files: AppMain.tcl BUGS Info.plist Makefile Pd.term TODO mkdmg pd-file.icns pd-unix.info pd.icns Log Message: first working version of Pd.app, released as a test release --- NEW FILE: Info.plist --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleDocumentTypes</key> <array> <dict> <key>CFBundleTypeExtensions</key> <array> <string>pd</string> </array> <key>CFBundleTypeIconFile</key> <string>pd-file.icns</string> <key>CFBundleTypeName</key> <string>Pure Data Patch</string> <key>CFBundleTypeRole</key> <string>Editor</string> </dict> </array> <key>CFBundleExecutable</key> <string>Pd</string> <key>CFBundleIdentifier</key> <string>org.puredata</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleIconFile</key> <string>pd.icns</string> <key>CFBundleVersion</key> <string>0.37-CVS</string> </dict> </plist> --- NEW FILE: mkdmg --- #!/bin/sh # # from: http://www.macosxhints.com/article.php?story=20020311215452999 # # # Creates a disk image (dmg) on Mac OS X from the command line # from a folder. FOLDER="$1" if [ -z "$FOLDER" ]; then echo echo "usage: $0 <folder>" echo exit 1 fi if [ ! -d "$FOLDER" ]; then echo $FOLDER does not exist exit 2 fi SIZE=`/usr/bin/du -s "$FOLDER" | awk '{ print $1 }'` # allow space for partition map and directory structure SIZE=`echo 1024 + $SIZE \* 1.1 / 1 | bc` NAME=`basename "$FOLDER"` FILE=$NAME.dmg TMP=${TMP:-/tmp} if [ $SIZE -lt 9216 ]; then SIZE=9216 fi if [ -e "$FILE" ] ; then echo $FILE already exists! exit 3 fi TMPFILE=$TMP/$$.dmg echo Creating $TMPFILE from $FOLDER, $SIZE sectors... hdiutil create $TMPFILE -sectors $SIZE -ov if [ $? -ne 0 ] ; then rm -f $TMPFILE exit 4 fi echo DEVICES=`hdid -nomount $TMPFILE` DEVMASTER=`echo $DEVICES| awk '{ print $1 }'` DEVHFS=`echo $DEVICES| awk '{ print $5 }'` echo Creating HFS partition $NAME on $TMPFILE at $DEVHFS newfs_hfs -v "$NAME" $DEVHFS if [ $? -ne 0 ] ; then rm -f $TMPFILE exit 5 fi hdiutil eject $DEVMASTER if [ $? -ne 0 ] ; then rm -f $TMPFILE exit 6 fi DEVICES=`hdid $TMPFILE` if [ $? -ne 0 ] ; then rm -f $TMPFILE exit 7 fi DEVMASTER=`echo $DEVICES| awk '{ print $1 }'` DEVHFS=`echo $DEVICES| awk '{ print $5 }'` echo Copying $FOLDER to /Volumes/$NAME on $DEVMASTER sudo ditto -rsrcFork "$FOLDER" "/Volumes/$NAME" if [ $? -ne 0 ]; then hdiutil eject $DEVMASTER rm -f $TMPFILE exit 8 fi hdiutil eject $DEVMASTER if [ $? -ne 0 ]; then #rm -f $TMPFILE exit 9 fi echo "Compressing $NAME to $FILE" #hdiutil convert $TMPFILE -format UDZO -o "$FILE" hdiutil convert $TMPFILE -format UDZO -imagekey zlib-level=9 -o "$FILE" if [ $? -ne 0 ]; then rm -f "$FILE" $TMPFILE exit 10 fi rm -f $TMPFILE # end --- NEW FILE: AppMain.tcl --- # from http://aspn.activestate.com/ASPN/Mail/Message/tcl-mac/2115298 # tk::mac::OpenDocument is called when docs are dropped # on the Dock icon with the filenames put into the var args proc tk::mac::OpenDocument {args} { foreach file $args { puts $file } } proc default_keybindings {} { return { exit CMD-q } } #console show # get the path to the Wish Shell so a relative path can be # used to launch Pd regsub -- "Wish Shell" [info nameofexecutable] "" wish_path exec open $wish_path/../Resources/Pd.term puts "wish_path $wish_path" #if {[string first "-psn" [lindex $argv 0]] == 0} { # set argv [lrange $argv 1 end] #} exit --- NEW FILE: pd-unix.info --- Title Pd-UNIX Version Pd.app Version Description UNIX Tools for Pd DefaultLocation /usr/local DeleteWarning ### Package Flags NeedsAuthorization YES Required NO Relocatable YES RequiresReboot NO UseUserMask YES OverwritePermissions NO InstallFat NO RootVolumeOnly NO --- NEW FILE: pd.icns --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Makefile --- current: darwin_app PD_APP_NAME = Pd DESTDIR = installroot PD_APP_CONTENTS = /Applications/$(PD_APP_NAME).app/Contents INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources PD_FILE_ROOT = $(DESTDIR)$(INSTALL_PREFIX)/lib/pd ABSTRACTIONS_DIR = $(PD_FILE_ROOT)/doc/abstractions EXTERNALS_DIR = $(PD_FILE_ROOT)/extra HELP_DIR = $(PD_FILE_ROOT)/doc PD_MAJOR_VERSION = $(shell /usr/bin/grep 'Pd version' ../../pd/src/s_main.c | /usr/bin/cut -d '\\' -f 1 | /usr/bin/cut -d ' ' -f 6 | /usr/bin/cut -d '.' -f 1) PD_MINOR_VERSION = $(shell /usr/bin/grep 'Pd version' ../../pd/src/s_main.c | /usr/bin/cut -d '\\' -f 1 | /usr/bin/cut -d ' ' -f 6 | /usr/bin/cut -d '.' -f 2) PD_BUGFIX_VERSION = $(shell /usr/bin/grep 'Pd version' ../../pd/src/s_main.c | /usr/bin/cut -d '\\' -f 1 | /usr/bin/cut -d ' ' -f 6 | /usr/bin/cut -d '.' -f 3) PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) PACKAGE_NAME = pd-$(PD_VERSION) DMG_NAME = $(PACKAGE_NAME) UNIX_PACKAGE_NAME = $(PD_APP_NAME)-UNIX-$(PD_VERSION) UNIX_prefix = /usr/local UNIX_DESTDIR = pd-unix-root WELCOME_FILE = Welcome.html README_FILE = ReadMe.html LICENSE_FILE = License.html CYCLONE_MAJOR_VERSION = $(shell grep CYCLONE_VERSION ../../externals/miXed/cyclone/build_counter | cut -d ' ' -f 3 | cut -d '"' -f 2) CYCLONE_RELEASE = $(shell grep CYCLONE_RELEASE ../../externals/miXed/cyclone/build_counter | cut -d ' ' -f 3 | cut -d '"' -f 2) CYCLONE_BUILD = $(shell grep CYCLONE_BUILD ../../externals/miXed/cyclone/build_counter | cut -d ' ' -f 3 | cut -d '"' -f 2) CYCLONE_VERSION = $(CYCLONE_MAJOR_VERSION) $(CYCLONE_RELEASE) $(CYCLONE_BUILD) FLEXT_VERSION = $(shell grep PROJECT_NUMBER ../../externals/grill/flext/flext.doxy | cut -d '"' -f2 | cut -d ' ' -f2) GEM_VERSION = $(shell grep "GEM_VERSION" ../../Gem/src/Base/GemVersion.h | cut -d '"' -f 2) MAXLIB_VERSION = $(shell grep "#define VERSION" ../../externals/maxlib/maxlib.c | cut -d '"' -f 2) OSC_VERSION = $(shell grep "#define VERSION" ../../externals/OSCx/OSC.c | cut -d '"' -f 2) PDP_VERSION = $(shell grep PDP_VERSION= ../../externals/pdp/configure | cut -d '=' -f 2) PMPD_VERSION = $(shell grep "#define VERSION" ../../externals/pmpd/src/pmpd.c | cut -d '"' -f 2) TOXY_MAJOR_VERSION = $(shell grep TOXY_VERSION ../../externals/miXed/toxy/build_counter | cut -d ' ' -f 3 | cut -d '"' -f 2) TOXY_RELEASE = $(shell grep TOXY_RELEASE ../../externals/miXed/toxy/build_counter | cut -d ' ' -f 3 | cut -d '"' -f 2) TOXY_BUILD = $(shell grep TOXY_BUILD ../../externals/miXed/toxy/build_counter | cut -d ' ' -f 3 | cut -d '"' -f 2) TOXY_VERSION = $(TOXY_MAJOR_VERSION) $(TOXY_RELEASE) $(TOXY_BUILD) ZEXY_VERSION = $(shell grep VERSION ../../externals/zexy/src/zexy.h | cut -d ' ' -f 3 | cut -d '"' -f 2) darwin_app: darwin_app_wrapper darwin_app_core darwin_unix_pkg darwin_app_externals \ darwin_app_docs darwin_app_abstractions darwin_app_license: # generate HTML version of License echo "<HTML><BODY>" > $(LICENSE_FILE) echo "<H3>(Parts of this package can be used under the Pd/BSD license)</H3>" >> $(LICENSE_FILE) echo "<FONT SIZE=\"-1\">" >> $(LICENSE_FILE) cat ../../externals/creb/COPYING | sed -e 's/^$$/\<P\>/g' >> $(LICENSE_FILE) echo "</FONT></BODY></HTML>" >> $(LICENSE_FILE) darwin_app_readme: echo $(CYCLONE_RELEASE) -rm $(README_FILE) echo "<html>" > $(README_FILE) echo "<head>" >> $(README_FILE) echo "<meta http-equiv=\"Content-Type\" content=\"text/html;charset=iso-8859-1\" />" >> $(README_FILE) echo "</head>" >> $(README_FILE) echo "<body>" >> $(README_FILE) echo "<h2><IMG SRC=\"pd-16.png\"> Pure Data $(PD_VERSION)-$(PACKAGE_VERSION)</h2>" >> $(README_FILE) echo "<p>Pd is a free real-time computer music software package resembling Max. It provides a patchable environment for audio analysis, synthesis, and processing, with a rich set of multimedia capabilities. You can get Pd for Linux, Windows, MacOS X, BSD, or IRIX.</p>" >> $(README_FILE) echo "<p>For more information, go to: http://www.puredata.org</p>" >> $(README_FILE) echo "<h3>Installation</h3>" >> $(README_FILE) echo "<p>To install Pd, drag the Pd.app to your /Applications folder. Currently, this app will only work in this location, nowhere else.</p>" >> $(README_FILE) echo "<h3>Pure Data CVS Developers</h3>" >> $(README_FILE) # this may seem whack, but it generates the list of developers from the SourceForge site: wget -q -O - 'http://sourceforge.net/project/memberlist.php?group_id=55736' | grep -e '<td>' | sed -e :a -e 's/<[^>]*>//g;/</N;//ba' | grep -v '^$$' | sed -e 's/\t*/ - /' >> $(README_FILE) echo "</p>" >> $(README_FILE) echo "<p>" >> $(README_FILE) echo "Many others not listed have contributed their time and effort, this is just a list of the current developers in the SourceForge project. But really, every Pd user is a developer and is encouraged to contribute to the CVS repository." >> $(README_FILE) echo "</p>" >> $(README_FILE) echo "<h3>License</h3>" >> $(README_FILE) echo "<p>" >> $(README_FILE) echo "The Pd core is licensed under a BSD license, almost every other part of this package is available under the GNU GPL. A couple packages have BSD-style licenses too." >> $(README_FILE) echo "</p>" >> $(README_FILE) echo "<h3>Included Versions</h3>" >> $(README_FILE) echo "<p>These externals are all included from the Pd CVS repository:</p>" >> $(README_FILE) echo "<ul>" >> $(README_FILE) echo "<li>pure data: $(PD_VERSION) " >> $(README_FILE) echo "<li>cyclone: $(CYCLONE_VERSION)" >> $(README_FILE) echo "<li>flext: $(FLEXT_VERSION)" >> $(README_FILE) echo "<li>gem: $(GEM_VERSION)" >> $(README_FILE) echo "<li>iemlib: `date +20%y.%m.%d`" >> $(README_FILE) # # these cause this error: # Makefile:308: *** unterminated call to function `shell': missing `)'. Stop. # # echo "<li>maxlib: $(MAXLIB_VERSION)" >> $(README_FILE) # echo "<li>osc: $(OSC_VERSION)" >> $(README_FILE) # echo "<li>pmpd: $(PMPD_VERSION)" >> $(README_FILE) echo "<li>pd-abstractions: `date +20%y.%m.%d`" >> $(README_FILE) echo "<li>pd-doc: `date +20%y.%m.%d`" >> $(README_FILE) echo "<li>pd-externals: `date +20%y.%m.%d`" >> $(README_FILE) echo "<li>pddp: `date +20%y.%m.%d`" >> $(README_FILE) echo "<li>pdp: $(PDP_VERSION)" >> $(README_FILE) echo "<li>toxy: $(TOXY_VERSION)" >> $(README_FILE) echo "<li>unauthorized: `date +20%y.%m.%d`" >> $(README_FILE) echo "<li>zexy: $(ZEXY_VERSION)" >> $(README_FILE) echo "</ul>" >> $(README_FILE) echo "(this package was built on `date`) <BR>" >> $(README_FILE) echo "</body></html>" >> $(README_FILE) darwin_app_wrapper: # copy Wish Shell.app from default install location install -d "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS" install -m0755 -p \ /Applications/Utilities/Wish\ Shell.app/Contents/MacOS/Wish\ Shell \ "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS" install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Resources" install -m0644 -p \ /Applications/Utilities/Wish\ Shell.app/Contents/Resources/Wish\ Shell.rsrc \ "$(DESTDIR)$(PD_APP_CONTENTS)/Resources" # set up app wrapper install -d "$(DESTDIR)$(PD_APP_CONTENTS)/Resources/Scripts" install -m0644 -p Info.plist "$(DESTDIR)$(PD_APP_CONTENTS)" install -m0644 -p Pd.term "$(DESTDIR)$(PD_APP_CONTENTS)/Resources" install -m0644 -p *.icns "$(DESTDIR)$(PD_APP_CONTENTS)/Resources" # using the shell script hack until AppMain.tcl works # install -m0644 -p AppMain.tcl "$(DESTDIR)$(PD_APP_CONTENTS)/Resources/Scripts" install -m0755 -p Pd "$(DESTDIR)$(PD_APP_CONTENTS)/MacOS" # INSTALL_PREFIX=$(INSTALL_PREFIX) is for pd-MSP 0.37.1 # prefix=$(INSTALL_PREFIX) is for pd-CVS 0.37 darwin_app_core: # pd core cd ../../pd/src/ && ./configure && \ make install \ DESTDIR=../../packages/darwin_app/$(DESTDIR) \ INSTALL_PREFIX=$(INSTALL_PREFIX) darwin_app_docs: #---------------------------------------------------------------------------- # DOC install -d $(HELP_DIR)/5.reference install -d $(HELP_DIR)/7.stuff cp -Rp ../../doc/tutorials $(HELP_DIR) cp -Rp ../../doc/additional/pd-msg $(HELP_DIR)/7.stuff/ #---------------------------------------------------------------------------- # PDDP install -m644 --group=staff ../../doc/pddp/*.pd $(HELP_DIR)/5.reference darwin_app_abstractions: #---------------------------------------------------------------------------- # ABSTRACTIONS install -d $(ABSTRACTIONS_DIR) install -p -m0644 ../../externals/creb/abs/*.pd $(ABSTRACTIONS_DIR) cd $(ABSTRACTIONS_DIR) && rm count.pd install -d $(ABSTRACTIONS_DIR)/creb install -p -m0444 ../../externals/creb/doc/examples/*.* $(ABSTRACTIONS_DIR)/creb # cp -Rf footils timestretch vadsr~ $(ABSTRACTIONS_DIR) darwin_app_externals: darwin_app_externals_flext darwin_app_externals_standard darwin_app_externals_c++ darwin_app_externals_flext: #---------------------------------------------------------------------------- # FLEXT install -d $(PD_FILE_ROOT)/flext cd ../../externals/grill/build/darwin && make install -d $(HELP_DIR)/tutorials cp -rp ../../externals/grill/flext/tutorial $(HELP_DIR)/tutorials/flext install -d $(HELP_DIR)/flext install -p -m0444 ../../externals/grill/flext/gpl.txt \ ../../externals/grill/flext/readme.txt \ ../../externals/grill/flext/license.txt \ $(HELP_DIR)/flext # FLEXTERNALS # dyn # install -p -m0444 ../../externals/grill/dyn/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/dyn/pd/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/dyn install -p -m0444 ../../externals/grill/dyn/gpl.txt \ ../../externals/grill/dyn/readme.txt \ ../../externals/grill/dyn/license.txt \ $(HELP_DIR)/dyn # fftease # install -p -m0444 ../../externals/grill/fftease/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/fftease/pd/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/fftease install -p -m0444 ../../externals/grill/fftease/gpl.txt \ ../../externals/grill/fftease/readme.txt \ ../../externals/grill/fftease/license.txt $(HELP_DIR)/fftease cp -rp ../../externals/grill/fftease/media $(HELP_DIR)/fftease # idelay # install -p -m0444 ../../externals/grill/idelay/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/idelay/pd/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/idelay install -p -m0444 ../../externals/grill/idelay/gpl.txt \ ../../externals/grill/idelay/license.txt \ $(HELP_DIR)/idelay # pool install -p -m0444 ../../externals/grill/pool/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/pool/help-pool.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/pool install -p -m0444 ../../externals/grill/pool/gpl.txt \ ../../externals/grill/pool/readme.txt \ ../../externals/grill/pool/license.txt \ $(HELP_DIR)/pool # py/pyext # install -p -m0444 ../../externals/grill/py/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -d $(HELP_DIR)/py/examples install -d $(HELP_DIR)/py/scripts install -p -m0444 ../../externals/grill/py/pd/*.pd $(HELP_DIR)/py/examples install -p -m0444 ../../externals/grill/py/scripts/*.py $(HELP_DIR)/py/scripts install -p -m0444 ../../externals/grill/py/gpl.txt \ ../../externals/grill/py/readme.txt ../../externals/grill/py/license.txt \ $(HELP_DIR)/py # install -d $(INSTALL_PREFIX)/Library/Frameworks # cp -R /Library/Frameworks/Python.framework $(INSTALL_PREFIX)/Library/Frameworks # vasp # fails without the dir # test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin # install -p -m0444 ../../externals/grill/vasp/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/vasp/pd-help/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/vasp install -p -m0444 ../../externals/grill/vasp/gpl.txt \ ../../externals/grill/vasp/readme.txt \ ../../externals/grill/vasp/license.txt \ ../../externals/grill/vasp/changes.txt \ ../../externals/grill/vasp/todo.txt \ $(HELP_DIR)/vasp cp -rp ../../externals/grill/vasp/pd-ex $(HELP_DIR)/vasp # vst # install -p -m0444 ../../externals/grill/vst/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/vst/pd/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/vst install -p -m0444 ../../externals/grill/vst/gpl.txt \ ../../externals/grill/vst/readme.txt \ ../../externals/grill/vst/license.txt \ $(HELP_DIR)/vst # xsample install -p -m0444 ../../externals/grill/xsample/pd-darwin/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/grill/xsample/pd/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/xsample install -p -m0444 ../../externals/grill/xsample/gpl.txt \ ../../externals/grill/xsample/readme.txt \ ../../externals/grill/xsample/license.txt \ $(HELP_DIR)/xsample darwin_app_externals_standard: #---------------------------------------------------------------------------- # PD-EXTERNALS cd ../../externals/build/darwin && make install -d $(EXTERNALS_DIR) install -p -m0644 ../../externals/build/darwin/*.pd_darwin $(EXTERNALS_DIR) #---------------------------------------------------------------------------- # GEM install -p -m0444 ../../Gem/help/*.* $(HELP_DIR)/5.reference install -d $(HELP_DIR)/Gem/doc install -p -m0444 ../../Gem/doc/*.* $(HELP_DIR)/gem install -d $(HELP_DIR)/Gem/00.manual install -p -m0444 ../../Gem/manual/*.* $(HELP_DIR)/gem/00.manual cp -Rfp ../../Gem/examples/*.* ../../Gem/examples/data $(HELP_DIR)/gem #---------------------------------------------------------------------------- # miXed cd ../../externals/miXed/toxy && make cd ../../externals/miXed/cyclone && make install -p -m444 ../../externals/miXed/bin/*.pd_darwin $(EXTERNALS_DIR) sudo install -p -m555 ../../externals/miXed/bin/cyclist $(UNIX_DESTDIR)$(UNIX_prefix)/bin install -p -m0444 ../../externals/miXed/test/*/*.* \ ../../externals/miXed/doc/*/*/*.* \ $(HELP_DIR)/5.reference #---------------------------------------------------------------------------- # OSC cd ../../externals/OSCx && ./configure && make install -d $(UNIX_DESTDIR)/$(UNIX_prefix)/bin sudo install -p -m0755 ../../externals/OSCx/send+dump/????OSC $(UNIX_DESTDIR)$(UNIX_prefix)/bin install -p -m0444 ../../externals/OSCx/doc/*.* $(HELP_DIR)/5.reference install -p -m0444 ../../externals/OSCx/src/*.pd_darwin $(EXTERNALS_DIR) #---------------------------------------------------------------------------- # PDP cd ../../externals/pdp && ./configure && make install -p -m0444 ../../externals/pdp/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/pdp/doc/objects/*.* $(HELP_DIR)/5.reference install -d $(HELP_DIR)/pdp/introduction install -p -m0444 ../../externals/pdp/doc/introduction/*.* $(HELP_DIR)/pdp/introduction install -d $(HELP_DIR)/pdp/examples install -p -m0444 ../../externals/pdp/doc/examples/*.* $(HELP_DIR)/pdp/examples install -p -m0444 ../../externals/pdp/doc/reference.txt $(HELP_DIR)/pdp #---------------------------------------------------------------------------- # PMPD cd ../../externals/pmpd/src && make pd_darwin install -p -m0444 ../../externals/pmpd/src/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/pmpd/help/*.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/pmpd install -p -m0444 ../../externals/pmpd/exemples/*.pd $(HELP_DIR)/pmpd #---------------------------------------------------------------------------- # unauthorized cd ../../externals/unauthorized && make install -p -m0444 ../../externals/unauthorized/*/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/unauthorized/*/*.pd $(HELP_DIR)/5.reference install -p -m0444 ../../externals/unauthorized/*/*.txt $(HELP_DIR)/5.reference install -p -m0444 ../../externals/unauthorized/*/*.pls $(HELP_DIR)/5.reference cp -Rfp ../../externals/unauthorized/blinkenlights/blm $(HELP_DIR)/5.reference #---------------------------------------------------------------------------- # zexy cd ../../externals/zexy/src && make -f makefile.darwin install -p -m0444 ../../externals/zexy/src/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/zexy/zexy.pd $(HELP_DIR)/5.reference install -d $(HELP_DIR)/help-zexy install -p -m0444 ../../externals/zexy/examples/*.* $(HELP_DIR)/help-zexy darwin_app_externals_c++: #---------------------------------------------------------------------------- # CREB # cd ../../externals/creb && autoconf && ./configure && cd modules++ && make # install -p -m0644 ../../externals/creb/modules++/*.pd_darwin $(EXTERNALS_DIR) #---------------------------------------------------------------------------- # gem2pdp # cd ../../externals/gem2pdp && make -f Makefile.darwin # install -p -m0444 ../../externals/gem2pdp/*.pd_darwin $(EXTERNALS_DIR) install -p -m0444 ../../externals/gem2pdp/*.pd $(HELP_DIR)/5.reference #---------------------------------------------------------------------------- # GridFlow # cd ../../gridflow && ./configure && make darwin_unix_pkg: darwin_app_readme darwin_unix_pkg_welcome darwin_app_license # mk the unix dir install -d $(UNIX_DESTDIR)$(UNIX_prefix) # copy stuff to UNIX dirs cp -Rp $(DESTDIR)$(INSTALL_PREFIX)/bin \ $(DESTDIR)$(INSTALL_PREFIX)/include \ $(DESTDIR)$(INSTALL_PREFIX)/man \ $(UNIX_DESTDIR)$(UNIX_prefix) cd .. && install -p darwin_app/pd-unix.info $(UNIX_PACKAGE_NAME).info # # the "package" script is deprecated, got to find out the new way... # # delete cruft -find $(UNIX_DESTDIR) -name .DS_Store -delete -rm -f 1 # set proper permissions sudo chown -R root:staff $(UNIX_DESTDIR)/$(UNIX_prefix) # /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker \ # -build \ # -p $(UNIX_PACKAGE_NAME).pkg \ # -f $(UNIX_DESTDIR) \ # -r . # cd .. && sudo package pd-unix-root $(UNIX_PACKAGE_NAME).info -d . -ignoreDSStore # install pkg docs # sudo install -m 644 $(LICENSE_FILE) ../$(UNIX_PACKAGE_NAME).pkg/Contents/Resources # sudo chown -R root:staff ../$(UNIX_PACKAGE_NAME).pkg/Contents/Resources darwin_unix_pkg_welcome: echo "<html><body><p><p>" > $(WELCOME_FILE) echo "<CENTER><IMG SRC=\"logo.jpg\">" >> $(WELCOME_FILE) echo "<h2>Version $(PD_VERSION)</h2>" >> $(WELCOME_FILE) echo "<p>written by Miller S. Puckette</p></CENTER>" >> $(WELCOME_FILE) echo "<FONT SIZE=\"-1\">" >> $(WELCOME_FILE) echo "<p>`grep -A9 ACKNOWLEDG ../../pd/README.txt`</p>" >> $(WELCOME_FILE) echo "</FONT>" >> $(WELCOME_FILE) echo "</body></html>" >> $(WELCOME_FILE) dmg: install -d "$(DMG_NAME)" # mv $(UNIX_PACKAGE_NAME).pkg "$(DMG_NAME)" cd $(DESTDIR)/Applications && mv $(PD_APP_NAME).app "../../$(DMG_NAME)" install -p -m0444 ../../pd/LICENSE.txt "$(DMG_NAME)/PD LICENSE.txt" install -p -m0444 pd-16.png $(LICENSE_FILE) $(README_FILE) \ $(WELCOME_FILE) $(LICENSE_FILE) \ "$(DMG_NAME)" /bin/sh mkdmg "$(DMG_NAME)" clean: darwin_app_clean darwin_app_clean: -sudo rm -Rf $(DESTDIR) $(UNIX_DESTDIR) "$(DMG_NAME)" $(UNIX_PACKAGE_NAME) -rm -f *~ 1 $(README_FILE) $(WELCOME_FILE) $(LICENSE_FILE) \ $(UNIX_PACKAGE_NAME).pkg "$(DMG_NAME).dmg" --- NEW FILE: pd-file.icns --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Pd.term --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>WindowSettings</key> <array> <dict> <key>AutoFocus</key> <string>YES</string> <key>Autowrap</key> <string>YES</string> <key>Backwrap</key> <string>YES</string> <key>Bell</key> <string>YES</string> <key>BlinkCursor</key> <string>NO</string> <key>CleanCommands</key> <string>rlogin;telnet;ssh;slogin</string> <key>Columns</key> <string>80</string> <key>CursorShape</key> <string>2</string> <key>CustomTitle</key> <string>pure data</string> <key>DeleteKeySendsBackspace</key> <string>NO</string> <key>DisableAnsiColors</key> <string>NO</string> <key>DoubleBold</key> <string>YES</string> <key>DoubleColumnsForDoubleWide</key> <string>NO</string> <key>DoubleWideChars</key> <string>YES</string> <key>ExecutionString</key> <string>/Applications/Pd.app/Contents/Resources/bin/pd; exit</string> <key>FontAntialiasing</key> <string>YES</string> <key>FontHeightSpacing</key> <string>0.8</string> <key>FontWidthSpacing</key> <string>1</string> <key>IsMiniaturized</key> <string>NO</string> <key>MacTermFunctionKeys</key> <string>NO</string> <key>Meta</key> <string>27</string> <key>NSFixedPitchFont</key> <string>Courier</string> <key>NSFixedPitchFontSize</key> <real>12</real> <key>Rows</key> <string>24</string> <key>SaveLines</key> <string>-1</string> <key>ScrollRegionCompat</key> <string>NO</string> <key>ScrollRows</key> <string>0</string> <key>Scrollback</key> <string>YES</string> <key>Shell</key> <string>/bin/sh</string> <key>ShellExitAction</key> <string>1</string> <key>StrictEmulation</key> <string>NO</string> <key>StringEncoding</key> <string>5</string> <key>TerminalOpaqueness</key> <real>1</real> <key>TextColors</key> <string>0.000 0.000 0.000 1.000 1.000 1.000 1.000 0.797 0.000 1.000 0.797 0.000 1.000 1.000 1.000 0.000 0.000 0.000 0.000 0.084 1.000 0.383 1.000 1.000 </string> <key>TitleBits</key> <string>104</string> <key>Translate</key> <string>YES</string> <key>UseCtrlVEscapes</key> <string>NO</string> <key>VisualBell</key> <string>YES</string> <key>WinLocULY</key> <string>629</string> <key>WinLocX</key> <string>5</string> <key>WinLocY</key> <string>0</string> <key>WindowCloseAction</key> <string>0</string> </dict> </array> </dict> </plist> --- NEW FILE: TODO --- - change s_inter.c to use /Applications/Pd.app/Contents/MacOS/Wish\ Shell - AppMain.tcl: http://www.wordtech-software.com/tcl-bundle-tutorial.html http://wiki.tcl.tk/tclhttpd/3214 check WaveSurfer - include auto-.pdrc script in package somewhere... - convert from -DMACOSX to -D__APPLE__ where ever possible (check out __gnu_linux__) while I am at it - make a web page that has stuff that can't be included due to license issues: (percolate, OSC?) - add m_pd.h to /usr/local/include to Pd-UNIX.pkg - add externals/OSCx/send+dump/ dumpOSC and sendOSC to Pd-UNIX.pkg --- NEW FILE: BUGS --- - Help->Documentation doesn't work, MacOS X hides it... arg!!!!! - the readme makefile target is broken

1 0

pd/src g_all_guis.c,1.1.1.4.2.4.2.42,1.1.1.4.2.4.2.43 g_all_guis.h,1.1.1.4.2.2.2.36,1.1.1.4.2.2.2.37 g_bang.c,1.1.1.3.2.2.2.32,1.1.1.3.2.2.2.33 g_dropper.c,1.1.2.22,1.1.2.23 g_toggle.c,1.1.1.3.2.2.2.28,1.1.1.3.2.2.2.29 g_mycanvas.c,1.1.1.3.2.2.2.19,1.1.1.3.2.2.2.20
by Mathieu Bouchard 14 Aug '04

14 Aug '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7723 Modified Files: Tag: impd_0_37 g_all_guis.c g_all_guis.h g_bang.c g_dropper.c g_toggle.c g_mycanvas.c Log Message: removing redundant getrect() in [bng] [tgl] [cnv] [dropper] Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.28 retrieving revision 1.1.1.3.2.2.2.29 diff -C2 -d -r1.1.1.3.2.2.2.28 -r1.1.1.3.2.2.2.29 *** g_toggle.c 13 Aug 2004 16:58:50 -0000 1.1.1.3.2.2.2.28 --- g_toggle.c 14 Aug 2004 03:38:19 -0000 1.1.1.3.2.2.2.29 *************** *** 19,33 **** static t_class *toggle_class; - /* ------------------------ tgl widgetbehaviour----------------------------- */ - - static void toggle_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) - { - t_toggle *x = (t_toggle *)z; - *xp1 = text_xpix((t_text *)x, glist); - *yp1 = text_ypix((t_text *)x, glist); - *xp2 = *xp1 + x->x_gui.x_w; - *yp2 = *yp1 + x->x_gui.x_h; - } - static void toggle_action(t_toggle *x) { t_iemgui *y = (t_iemgui *)x; --- 19,22 ---- *************** *** 127,131 **** class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0); class_addmethod(c, (t_method)toggle_nonzero, gensym("nonzero"), A_FLOAT, 0); ! wb.w_getrectfn = toggle_getrect; wb.w_displacefn = iemgui_displace; wb.w_selectfn = iemgui_select; --- 116,120 ---- class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0); class_addmethod(c, (t_method)toggle_nonzero, gensym("nonzero"), A_FLOAT, 0); ! wb.w_getrectfn = iemgui_getrect; wb.w_displacefn = iemgui_displace; wb.w_selectfn = iemgui_select; Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.42 retrieving revision 1.1.1.4.2.4.2.43 diff -C2 -d -r1.1.1.4.2.4.2.42 -r1.1.1.4.2.4.2.43 *** g_all_guis.c 13 Aug 2004 18:22:15 -0000 1.1.1.4.2.4.2.42 --- g_all_guis.c 14 Aug 2004 03:38:19 -0000 1.1.1.4.2.4.2.43 *************** *** 426,427 **** --- 426,437 ---- self->x_draw(self,self->x_glist, 0); } + + EXTERN void iemgui_getrect(t_gobj *z, t_glist *glist, + int *xp1, int *yp1, int *xp2, int *yp2) + { + t_iemgui* x = (t_iemgui*)z; + *xp1 = text_xpix((t_text *)x,glist); + *yp1 = text_ypix((t_text *)x,glist); + *xp2 = *xp1+x->x_w; + *yp2 = *yp1+x->x_h; + } Index: g_mycanvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_mycanvas.c,v retrieving revision 1.1.1.3.2.2.2.19 retrieving revision 1.1.1.3.2.2.2.20 diff -C2 -d -r1.1.1.3.2.2.2.19 -r1.1.1.3.2.2.2.20 *** g_mycanvas.c 13 Aug 2004 16:41:47 -0000 1.1.1.3.2.2.2.19 --- g_mycanvas.c 14 Aug 2004 03:38:19 -0000 1.1.1.3.2.2.2.20 *************** *** 17,31 **** static t_class *cnv_class; - /* ------------------------ cnv widgetbehaviour----------------------------- */ - - static void cnv_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) - { - t_cnv *x = (t_cnv *)z; - *xp1 = text_xpix(&x->x_gui.x_obj, glist); - *yp1 = text_ypix(&x->x_gui.x_obj, glist); - *xp2 = *xp1 + x->x_gui.x_w; - *yp2 = *yp1 + x->x_gui.x_h; - } - static void cnv_get_pos(t_cnv *x) { --- 17,20 ---- *************** *** 103,107 **** class_addmethod(c, (t_method)cnv_get_pos, gensym("get_pos"), 0); iemgui_subclass(c); ! wb.w_getrectfn = cnv_getrect; wb.w_displacefn = iemgui_displace; wb.w_selectfn = iemgui_select; --- 92,96 ---- class_addmethod(c, (t_method)cnv_get_pos, gensym("get_pos"), 0); iemgui_subclass(c); ! wb.w_getrectfn = iemgui_getrect; wb.w_displacefn = iemgui_displace; wb.w_selectfn = iemgui_select; Index: g_dropper.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/g_dropper.c,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -C2 -d -r1.1.2.22 -r1.1.2.23 *** g_dropper.c 13 May 2004 14:37:20 -0000 1.1.2.22 --- g_dropper.c 14 Aug 2004 03:38:19 -0000 1.1.2.23 *************** *** 23,37 **** static t_class *dropper_class; - /* ------------------------ dropper widgetbehaviour----------------------------- */ - - static void dropper_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) - { - t_dropper *x = (t_dropper *)z; - *xp1 = text_xpix(&x->x_gui.x_obj, glist); - *yp1 = text_ypix(&x->x_gui.x_obj, glist); - *xp2 = *xp1 + x->x_gui.x_w; - *yp2 = *yp1 + x->x_gui.x_h; - } - static void dropper_bang(t_dropper *x) { --- 23,26 ---- *************** *** 84,88 **** class_addsymbol(c, dropper_symbol); class_addmethod(c, (t_method)dropper_reload, gensym("reload"), A_GIMME, 0); ! wb.w_getrectfn = dropper_getrect; wb.w_displacefn = iemgui_displace; wb.w_selectfn = iemgui_select; --- 73,77 ---- class_addsymbol(c, dropper_symbol); class_addmethod(c, (t_method)dropper_reload, gensym("reload"), A_GIMME, 0); ! wb.w_getrectfn = iemgui_getrect; wb.w_displacefn = iemgui_displace; wb.w_selectfn = iemgui_select; Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.32 retrieving revision 1.1.1.3.2.2.2.33 diff -C2 -d -r1.1.1.3.2.2.2.32 -r1.1.1.3.2.2.2.33 *** g_bang.c 13 Aug 2004 16:58:50 -0000 1.1.1.3.2.2.2.32 --- g_bang.c 14 Aug 2004 03:38:19 -0000 1.1.1.3.2.2.2.33 *************** *** 19,33 **** static t_class *bng_class; - /* ------------------------ bng widgetbehaviour----------------------------- */ - - static void bng_getrect(t_gobj *z, t_glist *glist, int *xp1, int *yp1, int *xp2, int *yp2) - { - t_bng *x = (t_bng *)z; - *xp1 = text_xpix(&x->x_gui.x_obj, glist); - *yp1 = text_ypix(&x->x_gui.x_obj, glist); - *xp2 = *xp1 + x->x_gui.x_w; - *yp2 = *yp1 + x->x_gui.x_h; - } - static void bng_check_minmax(t_bng *x) { if(x->x_ftbreak > x->x_fthold) { --- 19,22 ---- *************** *** 155,159 **** class_addmethod(c, (t_method)bng_flashtime, gensym("flashtime"), A_GIMME, 0); class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0); ! wb.w_getrectfn = bng_getrect; wb.w_displacefn = iemgui_displace; wb.w_selectfn = iemgui_select; --- 144,148 ---- class_addmethod(c, (t_method)bng_flashtime, gensym("flashtime"), A_GIMME, 0); class_addmethod(c, (t_method)iemgui_init, gensym("init"), A_FLOAT, 0); ! wb.w_getrectfn = iemgui_getrect; wb.w_displacefn = iemgui_displace; wb.w_selectfn = iemgui_select; Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2.2.36 retrieving revision 1.1.1.4.2.2.2.37 diff -C2 -d -r1.1.1.4.2.2.2.36 -r1.1.1.4.2.2.2.37 *** g_all_guis.h 13 Aug 2004 16:56:26 -0000 1.1.1.4.2.2.2.36 --- g_all_guis.h 14 Aug 2004 03:38:19 -0000 1.1.1.4.2.2.2.37 *************** *** 147,148 **** --- 147,150 ---- EXTERN int pd_saveargs(t_binbuf *b, char *fmt, ...); EXTERN int pd_savehead(t_binbuf *b, t_iemgui *x, char *name); + EXTERN void iemgui_getrect(t_gobj *z, t_glist *glist, + int *xp1, int *yp1, int *xp2, int *yp2);

1 0

externals/unauthorized/cooled~ cooled~.c,1.7,1.8
by Hans-Christoph Steiner 14 Aug '04

14 Aug '04

Update of /cvsroot/pure-data/externals/unauthorized/cooled~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31585/cooled~ Modified Files: cooled~.c Log Message: added #ifdef __APPLE__ around malloc.h to make compile on MacOS X Index: cooled~.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/cooled~/cooled~.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cooled~.c 30 May 2004 05:19:59 -0000 1.7 --- cooled~.c 14 Aug 2004 02:30:50 -0000 1.8 *************** *** 37,41 **** --- 37,47 ---- #include <fcntl.h> #include <sys/stat.h> + + #ifdef __APPLE__ + #include <sys/malloc.h> + #else #include <malloc.h> + #endif + #include <ctype.h> #include <pthread.h>

1 0

externals/unauthorized/sonogram~ sonogram~.c,1.7,1.8
by Hans-Christoph Steiner 14 Aug '04

14 Aug '04

Update of /cvsroot/pure-data/externals/unauthorized/sonogram~ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31585/sonogram~ Modified Files: sonogram~.c Log Message: added #ifdef __APPLE__ around malloc.h to make compile on MacOS X Index: sonogram~.c =================================================================== RCS file: /cvsroot/pure-data/externals/unauthorized/sonogram~/sonogram~.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** sonogram~.c 30 May 2004 05:20:01 -0000 1.7 --- sonogram~.c 14 Aug 2004 02:30:50 -0000 1.8 *************** *** 38,42 **** --- 38,48 ---- #include <fcntl.h> #include <sys/stat.h> + + #ifdef __APPLE__ + #include <sys/malloc.h> + #else #include <malloc.h> + #endif + #include <ctype.h> #include <pthread.h>

1 0

pd/src u_object.tk,1.1.2.43,1.1.2.44
by Mathieu Bouchard 13 Aug '04

13 Aug '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17629 Modified Files: Tag: impd_0_37 u_object.tk Log Message: . Index: u_object.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/u_object.tk,v retrieving revision 1.1.2.43 retrieving revision 1.1.2.44 diff -C2 -d -r1.1.2.43 -r1.1.2.44 *** u_object.tk 12 May 2004 10:00:27 -0000 1.1.2.43 --- u_object.tk 13 Aug 2004 18:24:40 -0000 1.1.2.44 *************** *** 22,26 **** proc parse_color {c} { - #puts "parse_color: $c" regsub {;$} $c {} c if {$c<0} { --- 22,25 ---- *************** *** 68,71 **** --- 67,71 ---- set fields(hdl) $fields(hradio) set fields(vdl) $fields(hradio) + #set fields(msg) set classinfo(obj) {Object object} *************** *** 94,98 **** set d [string trimright $d "\n"] set d [string trimright $d ";"] ! set class [lindex $d 4] if {![info exists fields($class)]} {set class obj} #puts "${class} $x = $d" --- 94,100 ---- set d [string trimright $d "\n"] set d [string trimright $d ";"] ! set i 1 ! set class [lindex $d $i] ! switch -- $class { obj { set i 4; set class [lindex $d $i] }} if {![info exists fields($class)]} {set class obj} #puts "${class} $x = $d" *************** *** 399,402 **** --- 401,405 ---- if {[canvas_isselected $canvas $self]} {set frcol $look(objectframe4)} {set frcol $look(objectframe3)} $canvas itemconfigure ${self}BASE -outline $frcol + puts "/numbox_draw $self $canvas" } *************** *** 405,409 **** set f $_($self:val) set is_exp 0 - puts "numbox_ftoa $_($self:buf)" if {[string length $_($self:buf)]>0} {return $_($self:buf)} set buf [format %g $f] --- 408,411 ----

1 0

pd/src g_all_guis.c,1.1.1.4.2.4.2.41,1.1.1.4.2.4.2.42 g_numbox.c,1.1.1.4.2.2.2.29,1.1.1.4.2.2.2.30
by Mathieu Bouchard 13 Aug '04

13 Aug '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17174 Modified Files: Tag: impd_0_37 g_all_guis.c g_numbox.c Log Message: . Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.29 retrieving revision 1.1.1.4.2.2.2.30 diff -C2 -d -r1.1.1.4.2.2.2.29 -r1.1.1.4.2.2.2.30 *** g_numbox.c 13 Aug 2004 16:58:50 -0000 1.1.1.4.2.2.2.29 --- g_numbox.c 13 Aug 2004 18:22:15 -0000 1.1.1.4.2.2.2.30 *************** *** 36,39 **** --- 36,40 ---- int w = x->x_gui.x_fontsize * f * x->x_gui.x_w / 36; x->x_numwidth = w + 4 + x->x_gui.x_h/2; + post("nbx calc_fontwidth: f=%d w=%d numwidth=%d",f,w,x->x_numwidth); } *************** *** 167,170 **** --- 168,172 ---- outlet_new((t_text *)x, &s_float); nbx_reload(x,0,argc,argv); + nbx_calc_fontwidth(x); return x; } Index: g_all_guis.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.c,v retrieving revision 1.1.1.4.2.4.2.41 retrieving revision 1.1.1.4.2.4.2.42 diff -C2 -d -r1.1.1.4.2.4.2.41 -r1.1.1.4.2.4.2.42 *** g_all_guis.c 13 Aug 2004 16:23:33 -0000 1.1.1.4.2.4.2.41 --- g_all_guis.c 13 Aug 2004 18:22:15 -0000 1.1.1.4.2.4.2.42 *************** *** 298,308 **** canvas_savecontainerto((t_canvas *)c,buf); } - // binbuf_gettext(buf,&s,&n); - // post("%.*s",n,s); binbuf_gettext(buf,&s,&n); sys_vgui("update_object %x {%.*s}\n", /*c->c_wb==&text_widgetbehavior ? rtext_gettag(glist_findrtext(can,(t_text *)self)) :*/ ! (unsigned)self,n-1,s); binbuf_free(buf); free(s); --- 298,306 ---- canvas_savecontainerto((t_canvas *)c,buf); } binbuf_gettext(buf,&s,&n); sys_vgui("update_object %x {%.*s}\n", /*c->c_wb==&text_widgetbehavior ? rtext_gettag(glist_findrtext(can,(t_text *)self)) :*/ ! (unsigned)self,n,s); binbuf_free(buf); free(s); *************** *** 377,384 **** EXTERN void iemgui_draw(t_iemgui *self, t_glist *glist, int mode) { //fprintf(stderr,"self=%08x, self->te_binbuf=%08x\n",self,self->x_obj.te_binbuf); ! if (!self->x_obj.te_binbuf) { pd_error(self,"trying to upload without binbuf"); return; } pd_upload((t_gobj *)self,glist); //if (!glist_isvisible(glist_getcanvas(glist))) return; /* <-- doesn't really work */ --- 375,383 ---- EXTERN void iemgui_draw(t_iemgui *self, t_glist *glist, int mode) { //fprintf(stderr,"self=%08x, self->te_binbuf=%08x\n",self,self->x_obj.te_binbuf); ! /* if (!self->x_obj.te_binbuf) { pd_error(self,"trying to upload without binbuf"); return; } + */ pd_upload((t_gobj *)self,glist); //if (!glist_isvisible(glist_getcanvas(glist))) return; /* <-- doesn't really work */

1 0

pd/src m_pd.h,1.1.1.4.2.10.2.9,1.1.1.4.2.10.2.10 g_toggle.c,1.1.1.3.2.2.2.27,1.1.1.3.2.2.2.28 g_bang.c,1.1.1.3.2.2.2.31,1.1.1.3.2.2.2.32 g_numbox.c,1.1.1.4.2.2.2.28,1.1.1.4.2.2.2.29 g_editor.c,1.1.1.4.2.3.2.21,1.1.1.4.2.3.2.22
by Mathieu Bouchard 13 Aug '04

13 Aug '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv960 Modified Files: Tag: impd_0_37 m_pd.h g_toggle.c g_bang.c g_numbox.c g_editor.c Log Message: . Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.1.1.4.2.10.2.9 retrieving revision 1.1.1.4.2.10.2.10 diff -C2 -d -r1.1.1.4.2.10.2.9 -r1.1.1.4.2.10.2.10 *** m_pd.h 10 May 2004 16:04:15 -0000 1.1.1.4.2.10.2.9 --- m_pd.h 13 Aug 2004 16:58:50 -0000 1.1.1.4.2.10.2.10 *************** *** 312,315 **** --- 312,316 ---- EXTERN void pd_list(t_pd *x, t_symbol *s, int argc, t_atom *argv); EXTERN void pd_anything(t_pd *x, t_symbol *s, int argc, t_atom *argv); + EXTERN void pd_changed(/*t_gobj*/ void *x); /*IMPD*/ #define pd_class(x) (*(x)) Index: g_toggle.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_toggle.c,v retrieving revision 1.1.1.3.2.2.2.27 retrieving revision 1.1.1.3.2.2.2.28 diff -C2 -d -r1.1.1.3.2.2.2.27 -r1.1.1.3.2.2.2.28 *** g_toggle.c 13 Aug 2004 16:23:33 -0000 1.1.1.3.2.2.2.27 --- g_toggle.c 13 Aug 2004 16:58:50 -0000 1.1.1.3.2.2.2.28 *************** *** 71,75 **** t_iemgui *y = (t_iemgui *)x; if (!b) return; - binbuf_clear(b); pd_savehead(b, y, "tgl"); pd_saveargs(b,"iiaaaiiiiccci;?", --- 71,74 ---- Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.1.1.4.2.3.2.21 retrieving revision 1.1.1.4.2.3.2.22 diff -C2 -d -r1.1.1.4.2.3.2.21 -r1.1.1.4.2.3.2.22 *** g_editor.c 3 May 2004 02:57:27 -0000 1.1.1.4.2.3.2.21 --- g_editor.c 13 Aug 2004 16:58:50 -0000 1.1.1.4.2.3.2.22 *************** *** 692,696 **** char *text; t_object *ob; ! sscanf(o->s_name,"x%x",(int*)&ob); if (!sys_tooltips) return; if (ob->ob_pd->c_firstin) closest--; --- 692,699 ---- char *text; t_object *ob; ! if (!sscanf(o->s_name,"x%x",(int*)&ob)) { ! bug("invalid object code"); ! return; ! } if (!sys_tooltips) return; if (ob->ob_pd->c_firstin) closest--; Index: g_bang.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_bang.c,v retrieving revision 1.1.1.3.2.2.2.31 retrieving revision 1.1.1.3.2.2.2.32 diff -C2 -d -r1.1.1.3.2.2.2.31 -r1.1.1.3.2.2.2.32 *** g_bang.c 13 Aug 2004 16:23:33 -0000 1.1.1.3.2.2.2.31 --- g_bang.c 13 Aug 2004 16:58:50 -0000 1.1.1.3.2.2.2.32 *************** *** 90,94 **** t_iemgui *y = (t_iemgui *)x; if (!b) return; - binbuf_clear(b); pd_savehead(b, y, "bng"); pd_saveargs(b, "iiiiaaaiiiiccc", --- 90,93 ---- Index: g_numbox.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v retrieving revision 1.1.1.4.2.2.2.28 retrieving revision 1.1.1.4.2.2.2.29 diff -C2 -d -r1.1.1.4.2.2.2.28 -r1.1.1.4.2.2.2.29 *** g_numbox.c 13 Aug 2004 16:41:49 -0000 1.1.1.4.2.2.2.28 --- g_numbox.c 13 Aug 2004 16:58:50 -0000 1.1.1.4.2.2.2.29 *************** *** 124,128 **** t_iemgui *y = (t_iemgui *)x; if (!b) return; - binbuf_clear(b); pd_savehead(b, y, "nbx"); pd_saveargs(b,"iiddbiaaaiiiicccd;i", --- 124,127 ----

1 0

pd/src g_all_guis.h,1.1.1.4.2.2.2.35,1.1.1.4.2.2.2.36 g_vumeter.c,1.1.1.3.2.2.2.23,1.1.1.3.2.2.2.24
by Mathieu Bouchard 13 Aug '04

13 Aug '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv563 Modified Files: Tag: impd_0_37 g_all_guis.h g_vumeter.c Log Message: [vu] bugfix Index: g_all_guis.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_all_guis.h,v retrieving revision 1.1.1.4.2.2.2.35 retrieving revision 1.1.1.4.2.2.2.36 diff -C2 -d -r1.1.1.4.2.2.2.35 -r1.1.1.4.2.2.2.36 *** g_all_guis.h 13 Aug 2004 16:12:53 -0000 1.1.1.4.2.2.2.35 --- g_all_guis.h 13 Aug 2004 16:56:26 -0000 1.1.1.4.2.2.2.36 *************** *** 74,78 **** int x_vis_w; int x_vis_h; ! } t_my_canvas; typedef struct _dropper --- 74,78 ---- int x_vis_w; int x_vis_h; ! } t_my_canvas, t_cnv; typedef struct _dropper *************** *** 96,100 **** } t_vu; ! typedef struct _my_numbox { t_iemgui x_gui; --- 96,100 ---- } t_vu; ! typedef struct _nbx /* Number2 */ { t_iemgui x_gui; *************** *** 111,115 **** int x_change; int x_is_log; ! } t_my_numbox; EXTERN int sys_noloadbang; --- 111,115 ---- int x_change; int x_is_log; ! } t_my_numbox, t_nbx; EXTERN int sys_noloadbang; Index: g_vumeter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_vumeter.c,v retrieving revision 1.1.1.3.2.2.2.23 retrieving revision 1.1.1.3.2.2.2.24 diff -C2 -d -r1.1.1.3.2.2.2.23 -r1.1.1.3.2.2.2.24 *** g_vumeter.c 13 May 2004 14:37:20 -0000 1.1.1.3.2.2.2.23 --- g_vumeter.c 13 Aug 2004 16:56:26 -0000 1.1.1.3.2.2.2.24 *************** *** 91,94 **** --- 91,103 ---- } + static void vu_save(t_vu *x, t_binbuf *b) { + t_iemgui *y = (t_iemgui *)x; + if (!b) return; + pd_savehead(b, y, "vu"); + pd_saveargs(b,"iiaaiiiiccb;i", + &y->x_w,&y->x_h,&y->x_rcv,&y->x_lab,&y->x_ldx,&y->x_ldy,&y->x_font_style,&y->x_fontsize, + &y->x_bcol,&y->x_lcol,&x->x_scale,&y->x_isa); + } + static void vu_reload(t_vu *x, t_symbol *s, int argc, t_atom *argv) { *************** *** 145,148 **** --- 154,158 ---- wb.w_clickfn = NULL; class_setwidget(c,&wb); + class_setsavefn(c,vu_save); class_sethelpsymbol(c, gensym("vu")); }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs August 2004