Pd-cvs November 2005

pd-cvs@lists.iem.at

17 participants
497 discussions

externals/tb/sndfiler/src sndfiler.c,1.1,1.2
by Georg Holzmann 28 Nov '05

28 Nov '05

Update of /cvsroot/pure-data/externals/tb/sndfiler/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2331/src Modified Files: sndfiler.c Log Message: new flags: -resize and -skip Index: sndfiler.c =================================================================== RCS file: /cvsroot/pure-data/externals/tb/sndfiler/src/sndfiler.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** sndfiler.c 20 Nov 2005 21:54:41 -0000 1.1 --- sndfiler.c 28 Nov 2005 22:27:20 -0000 1.2 *************** *** 237,240 **** --- 237,242 ---- int channel_count; t_float** helper_arrays; + int resize = 0; + int seek = 0, arraysize = 0, writesize; t_symbol* file; *************** *** 243,252 **** SNDFILE* sndfile; SF_INFO info; ! ! if (argc < 2) { ! pd_error(x, "usage: read soundfile array1 array2 ..."); ! return; } file = atom_getsymbolarg(0, argc, argv); --- 245,271 ---- SNDFILE* sndfile; SF_INFO info; ! ! // parse flags ! while (argc > 0 && argv->a_type == A_SYMBOL && ! *argv->a_w.w_symbol->s_name == '-') { ! char *flag = argv->a_w.w_symbol->s_name + 1; ! if (!strcmp(flag, "resize")) ! { ! resize = 1; ! argc -= 1; argv += 1; ! } ! else if (!strcmp(flag, "skip")) ! { ! if (argc < 2 || argv[1].a_type != A_FLOAT || ! ((seek = argv[1].a_w.w_float) == 0)) ! goto usage; ! argc -= 2; argv += 2; ! } ! else goto usage; } + + if (argc < 2) + goto usage; file = atom_getsymbolarg(0, argc, argv); *************** *** 258,279 **** for (i = 0; i != channel_count; ++i) { ! t_garray * array = (t_garray *)pd_findbyclass(atom_getsymbolarg(i+1, ! argc, argv), garray_class); ! ! if (array) ! arrays[i] = array; ! else ! { ! pd_error(x, "%s: no such array", atom_getsymbolarg(i+1, argc, argv)->s_name); ! return; ! } } - post("sndfiler: loading file ..."); - sndfile = sf_open(file->s_name, SFM_READ, &info); if (sndfile) { int maxchannels = (channel_count < info.channels) ? channel_count : info.channels; --- 277,314 ---- for (i = 0; i != channel_count; ++i) { ! t_float *dummy; ! int size; ! t_garray *array; ! ! if(!(array = (t_garray *)pd_findbyclass( ! atom_getsymbolarg(i+1, argc, argv), garray_class))) ! { ! pd_error(x, "%s: no such array", atom_getsymbolarg(i+1, ! argc, argv)->s_name); ! return; ! } ! ! if(garray_getfloatarray(array, &size, &dummy)) ! arrays[i] = array; ! else ! { ! pd_error(x, "%s: bad template for sndfiler", atom_getsymbolarg(i+1, ! argc, argv)->s_name); ! return; ! } ! ! // in multichannel mode: check if arrays have different length ! if (arraysize && arraysize != size && !resize) ! { ! post("sndfiler: arrays have different lengths, resizing to last one ..."); ! } ! arraysize = size; } sndfile = sf_open(file->s_name, SFM_READ, &info); if (sndfile) { + int pos = 0; int maxchannels = (channel_count < info.channels) ? channel_count : info.channels; *************** *** 282,286 **** --- 317,347 ---- t_int ** syncdata = getbytes(sizeof(t_int*) * 5); + + // negative seek: offset from the end of the file + if(seek<0) + { + pos = sf_seek(sndfile, seek, SEEK_END); + } + if(seek>0) + { + pos = sf_seek(sndfile, seek, SEEK_SET); + } + if(pos == -1) + { + pd_error(x, "invalid seek in soundfile"); + return; + } + + if(resize) + { + writesize = (info.frames-pos); + arraysize = writesize; + } + else + writesize = (arraysize>(info.frames-pos)) ? + info.frames-pos : arraysize; + post("sndfiler: loading file ..."); + #if (_POSIX_MEMLOCK - 0) >= 200112L munlockall(); *************** *** 289,296 **** for (i = 0; i != channel_count; ++i) { ! helper_arrays[i] = getalignedbytes(info.frames * sizeof(t_float)); } ! for (i = 0; i != info.frames; ++i) { sf_read_float(sndfile, item, info.channels); --- 350,357 ---- for (i = 0; i != channel_count; ++i) { ! helper_arrays[i] = getalignedbytes(arraysize * sizeof(t_float)); } ! for (i = 0; i != writesize; ++i) { sf_read_float(sndfile, item, info.channels); *************** *** 304,307 **** --- 365,383 ---- } } + + // fill remaining elements with zero + if(!resize && (arraysize>(info.frames-pos))) + { + for (i = writesize; i != arraysize; ++i) + { + for (j = 0; j != info.channels; ++j) + { + if (j < channel_count) + { + helper_arrays[j][i] = 0; + } + } + } + } #if (_POSIX_MEMLOCK - 0) >= 200112L *************** *** 314,324 **** syncdata[1] = (t_int*)helper_arrays; syncdata[2] = (t_int*)channel_count; ! syncdata[3] = (t_int*)(long)info.frames; syncdata[4] = (t_int*)x; sys_callback(sndfiler_synchonize, (t_int*)syncdata, 5); } else pd_error(x, "Error opening file"); } --- 390,408 ---- syncdata[1] = (t_int*)helper_arrays; syncdata[2] = (t_int*)channel_count; ! syncdata[3] = (t_int*)arraysize; syncdata[4] = (t_int*)x; sys_callback(sndfiler_synchonize, (t_int*)syncdata, 5); + return; } else + { pd_error(x, "Error opening file"); + return; + } + + usage: + pd_error(x, "usage: read [flags] filename array1 array2 ..."); + post("flags: -skip <n> -resize "); }

1 0

externals/zexy/src makesource.sh,1.3,1.4
by IOhannes m zmölnig 28 Nov '05

28 Nov '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25277 Modified Files: makesource.sh Log Message: don't create Make.source Index: makesource.sh =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/makesource.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makesource.sh 19 May 2005 09:42:55 -0000 1.3 --- makesource.sh 28 Nov 2005 21:40:03 -0000 1.4 *************** *** 3,7 **** ZEXY_H=z_zexy.h ZEXY_C=z_zexy.c - ZEXY_S=Make.source --- 3,6 ---- *************** *** 45,58 **** } - function head_s() { - echo "SOURCES = \\" - } - - function foot_s() { - echo " zexy.c" - echo - } - - ################################## ## body --- 44,47 ---- *************** *** 60,64 **** head_h > $ZEXY_H head_c > $ZEXY_C - head_s > $ZEXY_S for i in `ls *.c | grep -v zexy.c` --- 49,52 ---- *************** *** 69,73 **** ## e.g. "multiplex~.c" -> "z_multiplex__setup()" SETUPNAME=z_`echo ${i%.c} | sed -e 's/[^[:alnum:]]/_/g'`_setup - echo " $i \\" >> $ZEXY_S echo "void ${SETUPNAME}(void); /* $i */" >> $ZEXY_H echo " ${SETUPNAME}(); /* $i */" >> $ZEXY_C --- 57,60 ---- *************** *** 76,79 **** foot_h >> $ZEXY_H foot_c >> $ZEXY_C - foot_s >> $ZEXY_S --- 63,65 ----

1 0

externals/smlib/source SMLib.c, 1.1.1.1, 1.2 defines.h, 1.1.1.1, 1.2
by Hans-Christoph Steiner 28 Nov '05

28 Nov '05

Update of /cvsroot/pure-data/externals/smlib/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15397/source Modified Files: SMLib.c defines.h Log Message: fixed up files to compile on Darwin and fit into the standards Index: defines.h =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/source/defines.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** defines.h 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- defines.h 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! //#include <m_pd.h> #include "m_imp.h" #include <math.h> --- 1,3 ---- ! #include <m_pd.h> #include "m_imp.h" #include <math.h> *************** *** 6,10 **** /* NT and OSX don't appear to have single-precision ANSI math */ ! #if defined(WIN32) || defined(MACOSX) #define sinf sin #define cosf cos --- 6,10 ---- /* NT and OSX don't appear to have single-precision ANSI math */ ! #if defined(WIN32) || defined(__APPLE__) #define sinf sin #define cosf cos Index: SMLib.c =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/source/SMLib.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SMLib.c 28 Nov 2005 16:53:25 -0000 1.1.1.1 --- SMLib.c 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 168,172 **** --- 168,176 ---- } + #ifdef WIN32 __declspec(dllexport) void __cdecl SMLib_setup( void) + #else + void SMLib_setup( void) + #endif { // dummy object for help-system

1 0

externals/smlib/examples beattracker.pd, 1.1.1.1, 1.2 normalizer.pd, 1.1.1.1, 1.2 resonate-beat.pd, 1.1.1.1, 1.2
by Hans-Christoph Steiner 28 Nov '05

28 Nov '05

Update of /cvsroot/pure-data/externals/smlib/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15397/examples Modified Files: beattracker.pd normalizer.pd resonate-beat.pd Log Message: fixed up files to compile on Darwin and fit into the standards Index: beattracker.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/examples/beattracker.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** beattracker.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- beattracker.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 145 39 541 656 12; #X obj 28 22 adc~; #X obj 20 330 vmin; --- 1,3 ---- ! #N canvas 145 39 541 656 10; #X obj 28 22 adc~; #X obj 20 330 vmin; Index: normalizer.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/examples/normalizer.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** normalizer.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- normalizer.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,4 **** ! #N canvas 161 407 512 338 12; ! #X obj 410 270 SMLib; #X obj -14 54 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; --- 1,4 ---- ! #N canvas 161 407 512 338 10; ! #X obj 410 270 smlib/SMLib-help; #X obj -14 54 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 ; Index: resonate-beat.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/examples/resonate-beat.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** resonate-beat.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- resonate-beat.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 35 57 1126 761 12; #X floatatom 35 282 5 0 0; #X obj 35 259 float; --- 1,3 ---- ! #N canvas 35 57 1126 761 10; #X floatatom 35 282 5 0 0; #X obj 35 259 float;

1 0

28 Nov '05

Update of /cvsroot/pure-data/externals/smlib/help In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15397/help Modified Files: SMLib-help.pd bp-help.pd deltas-help.pd hip-help.pd hist-help.pd itov-help.pd lavg-help.pd lhist-help.pd lhisti-help.pd linspace-help.pd lmax-help.pd lmin-help.pd lrange-help.pd prevl-help.pd threshold-help.pd vabs-help.pd vclip-help.pd vcog-help.pd vdbtorms-help.pd vdelta-help.pd vfmod-help.pd vftom-help.pd vlavg-help.pd vlmax-help.pd vlmin-help.pd vmax-help.pd vmin-help.pd vmtof-help.pd vpow-help.pd vrms-help.pd vrmstodb-help.pd vstd-help.pd vsum-help.pd vv+-help.pd vv--help.pd vvconv-help.pd Log Message: fixed up files to compile on Darwin and fit into the standards Index: bp-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/bp-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** bp-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- bp-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 114 43 428 284 12; #X floatatom 12 141 5 0 0; #X obj 12 118 float; --- 1,3 ---- ! #N canvas 114 43 428 284 10; #X floatatom 12 141 5 0 0; #X obj 12 118 float; *************** *** 9,13 **** -1 -1 12700 1; #X text 349 255 j#|@2002; ! #X obj 367 233 SMLib; #X text 13 7 bp: bandpass filter on float stream; #X floatatom 138 133 0 0 0; --- 9,13 ---- -1 -1 12700 1; #X text 349 255 j#|@2002; ! #X obj 367 233 SMLib-help; #X text 13 7 bp: bandpass filter on float stream; #X floatatom 138 133 0 0 0; Index: vstd-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vstd-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vstd-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vstd-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,8 **** ! #N canvas 381 509 394 125 12; #X msg 17 39 1 2 3 4; #X floatatom 51 95 5 0 0; #X msg 84 40 3 4 5; #X text 315 100 j#|@2002; ! #X obj 337 78 SMLib; #X msg 134 40 1 1 1 1; #X obj 51 70 vstd; --- 1,8 ---- ! #N canvas 381 509 394 125 10; #X msg 17 39 1 2 3 4; #X floatatom 51 95 5 0 0; #X msg 84 40 3 4 5; #X text 315 100 j#|@2002; ! #X obj 337 78 SMLib-help; #X msg 134 40 1 1 1 1; #X obj 51 70 vstd; Index: linspace-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/linspace-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** linspace-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- linspace-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 488 507 396 195 12; #X text 303 159 j#|@2002; ! #X obj 325 139 SMLib; #X obj 29 147 print linspace; #X floatatom 136 101 5 0 0; --- 1,5 ---- ! #N canvas 488 507 396 195 10; #X text 303 159 j#|@2002; ! #X obj 325 139 SMLib-help; #X obj 29 147 print linspace; #X floatatom 136 101 5 0 0; Index: hist-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/hist-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** hist-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- hist-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 678 207 414 422 12; #X text 331 381 j#|@2002; ! #X text 351 362 SMLib; #X text 14 7 hist: histograms; #X obj 2 354 print; --- 1,5 ---- ! #N canvas 678 207 414 422 10; #X text 331 381 j#|@2002; ! #X text 351 362 SMLib-help; #X text 14 7 hist: histograms; #X obj 2 354 print; Index: lrange-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/lrange-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** lrange-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- lrange-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 553 310 441 199 12; #X text 352 168 j#|@2002; ! #X obj 374 146 SMLib; #X floatatom 54 72 5 0 0; #X obj 10 55 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --- 1,5 ---- ! #N canvas 553 310 441 199 10; #X text 352 168 j#|@2002; ! #X obj 374 146 SMLib-help; #X floatatom 54 72 5 0 0; #X obj 10 55 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 Index: vvconv-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vvconv-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vvconv-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vvconv-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 482 447 441 276 12; #X msg 132 78 1 2 1; #X msg 132 53 1 0 1; --- 1,3 ---- ! #N canvas 482 447 441 276 10; #X msg 132 78 1 2 1; #X msg 132 53 1 0 1; *************** *** 14,18 **** #X msg 31 90 1 0 1 0 0 1; #X text 177 178 arguments: convolution kernel; ! #X obj 377 225 SMLib; #X obj 48 154 print vvconv; #X obj 247 156 print vvconv; --- 14,18 ---- #X msg 31 90 1 0 1 0 0 1; #X text 177 178 arguments: convolution kernel; ! #X obj 377 225 SMLib-help; #X obj 48 154 print vvconv; #X obj 247 156 print vvconv; Index: vclip-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vclip-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vclip-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vclip-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 588 327 324 246 12; #X obj 11 141 vclip -1 1; #X obj 11 196 print; --- 1,3 ---- ! #N canvas 588 327 324 246 10; #X obj 11 141 vclip -1 1; #X obj 11 196 print; *************** *** 11,15 **** #X text 121 120 upper bound; #X text 252 220 j#|@2002; ! #X obj 274 200 SMLib; #X connect 0 0 1 0; #X connect 2 0 0 0; --- 11,15 ---- #X text 121 120 upper bound; #X text 252 220 j#|@2002; ! #X obj 274 200 SMLib-help; #X connect 0 0 1 0; #X connect 2 0 0 0; Index: vmin-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vmin-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vmin-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vmin-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,6 **** ! #N canvas 480 472 473 127 12; #X floatatom 35 104 5 0 0; #X text 387 99 j#|@2002; ! #X obj 409 77 SMLib; #X msg 133 47 0; #X msg 168 47 0 1 0 1; --- 1,6 ---- ! #N canvas 480 472 473 127 10; #X floatatom 35 104 5 0 0; #X text 387 99 j#|@2002; ! #X obj 409 77 SMLib-help; #X msg 133 47 0; #X msg 168 47 0 1 0 1; Index: vv+-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vv+-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vv+-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vv+-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 561 440 313 218 12; #X obj 40 115 vv+; #X msg 16 81 1 2 3; --- 1,3 ---- ! #N canvas 561 440 313 218 10; #X obj 40 115 vv+; #X msg 16 81 1 2 3; *************** *** 11,15 **** #X text 17 25 or a float to a list of floats; #X msg 73 60 3 2 1; ! #X obj 252 159 SMLib; #X text 230 184 j#|@2002; #X obj 40 139 print vv+; --- 11,15 ---- #X text 17 25 or a float to a list of floats; #X msg 73 60 3 2 1; ! #X obj 252 159 SMLib-help; #X text 230 184 j#|@2002; #X obj 40 139 print vv+; Index: vfmod-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vfmod-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vfmod-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vfmod-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 163 334 442 175 12; #X text 364 147 j#|@2002; ! #X obj 386 127 SMLib; #X text 10 6 vfmod computes the modulo of each element in a vector ; --- 1,5 ---- ! #N canvas 163 334 442 175 10; #X text 364 147 j#|@2002; ! #X obj 386 127 SMLib-help; #X text 10 6 vfmod computes the modulo of each element in a vector ; Index: lmax-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/lmax-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** lmax-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- lmax-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 553 310 441 199 12; #X text 353 169 j#|@2002; ! #X obj 375 147 SMLib; #X floatatom 55 73 5 0 0; #X obj 11 56 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 --- 1,5 ---- ! #N canvas 553 310 441 199 10; #X text 353 169 j#|@2002; ! #X obj 375 147 SMLib-help; #X floatatom 55 73 5 0 0; #X obj 11 56 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 Index: lmin-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/lmin-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** lmin-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- lmin-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 553 310 444 200 12; #X text 351 168 j#|@2002; ! #X obj 373 146 SMLib; #X floatatom 53 72 5 0 0; #X obj 9 55 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1 --- 1,5 ---- ! #N canvas 553 310 444 200 10; #X text 351 168 j#|@2002; ! #X obj 373 146 SMLib-help; #X floatatom 53 72 5 0 0; #X obj 9 55 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1 Index: lavg-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/lavg-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** lavg-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- lavg-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 553 310 441 199 12; #X text 351 171 j#|@2002; ! #X obj 373 149 SMLib; #X floatatom 53 75 5 0 0; #X obj 9 58 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1 --- 1,5 ---- ! #N canvas 553 310 441 199 10; #X text 351 171 j#|@2002; ! #X obj 373 149 SMLib-help; #X floatatom 53 75 5 0 0; #X obj 9 58 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1 Index: lhisti-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/lhisti-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** lhisti-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- lhisti-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 645 245 441 405 12; #X text 360 376 j#|@2002; ! #X text 380 357 SMLib; #X obj 51 362 print; #X obj 11 193 random 10; --- 1,5 ---- ! #N canvas 645 245 441 405 10; #X text 360 376 j#|@2002; ! #X text 380 357 SMLib-help; #X obj 51 362 print; #X obj 11 193 random 10; Index: vrms-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vrms-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vrms-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vrms-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,8 **** ! #N canvas 381 509 392 123 12; #X msg 17 39 1 2 3 4; #X floatatom 50 96 5 0 0; #X msg 84 40 3 4 5; #X text 315 100 j#|@2002; ! #X obj 337 78 SMLib; #X obj 52 69 vrms; #X text 16 14 vrms computes the root-mean-square of a vector; --- 1,8 ---- ! #N canvas 381 509 392 123 10; #X msg 17 39 1 2 3 4; #X floatatom 50 96 5 0 0; #X msg 84 40 3 4 5; #X text 315 100 j#|@2002; ! #X obj 337 78 SMLib-help; #X obj 52 69 vrms; #X text 16 14 vrms computes the root-mean-square of a vector; Index: vlmax-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vlmax-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vlmax-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vlmax-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 448 299 466 316 12; #X obj 8 249 prepend 0; #N canvas 0 0 450 300 graph1 0; --- 1,3 ---- ! #N canvas 448 299 466 316 10; #X obj 8 249 prepend 0; #N canvas 0 0 450 300 graph1 0; *************** *** 14,18 **** #X text 8 22 the argument is the half-decay expressed in number of activations; ! #X obj 397 264 SMLib; #X obj 8 224 vlmax 6; #X obj 8 275 s array_vlmax; --- 14,18 ---- #X text 8 22 the argument is the half-decay expressed in number of activations; ! #X obj 397 264 SMLib-help; #X obj 8 224 vlmax 6; #X obj 8 275 s array_vlmax; Index: vsum-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vsum-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vsum-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vsum-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 468 275 355 125 12; #X text 16 14 vsum computes the sum of a list of floats; #X msg 17 39 1 2 3 4; --- 1,3 ---- ! #N canvas 468 275 355 125 10; #X text 16 14 vsum computes the sum of a list of floats; #X msg 17 39 1 2 3 4; *************** *** 6,10 **** #X msg 84 40 3 4 5; #X text 275 102 j#|@2002; ! #X obj 297 80 SMLib; #X msg 136 40 0; #X connect 1 0 2 0; --- 6,10 ---- #X msg 84 40 3 4 5; #X text 275 102 j#|@2002; ! #X obj 297 80 SMLib-help; #X msg 136 40 0; #X connect 1 0 2 0; Index: vpow-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vpow-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vpow-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vpow-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 163 334 444 177 12; #X text 364 147 j#|@2002; ! #X obj 386 127 SMLib; #X obj 15 127 print; #X floatatom 66 81 5 0 0 0 - - -; --- 1,5 ---- ! #N canvas 163 334 444 177 10; #X text 364 147 j#|@2002; ! #X obj 386 127 SMLib-help; #X obj 15 127 print; #X floatatom 66 81 5 0 0 0 - - -; Index: vrmstodb-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vrmstodb-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vrmstodb-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vrmstodb-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 606 355 283 118 12; #X text 194 88 j#|@2002; ! #X obj 216 68 SMLib; #X text 10 6 frequency to midi on a vector; #X obj 15 56 vrmstodb; --- 1,5 ---- ! #N canvas 606 355 283 118 10; #X text 194 88 j#|@2002; ! #X obj 216 68 SMLib-help; #X text 10 6 frequency to midi on a vector; #X obj 15 56 vrmstodb; Index: hip-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/hip-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** hip-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- hip-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 114 43 430 286 12; #X floatatom 12 141 5 0 0; #X obj 12 118 float; --- 1,3 ---- ! #N canvas 114 43 430 286 10; #X floatatom 12 141 5 0 0; #X obj 12 118 float; *************** *** 9,13 **** -1 -1 12700 1; #X text 349 255 j#|@2002; ! #X obj 367 233 SMLib; #X floatatom 138 133 0 0 0; #X msg 106 110 clear; --- 9,13 ---- -1 -1 12700 1; #X text 349 255 j#|@2002; ! #X obj 367 233 SMLib-help; #X floatatom 138 133 0 0 0; #X msg 106 110 clear; Index: vcog-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vcog-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vcog-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vcog-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,8 **** ! #N canvas 480 472 471 125 12; #X msg 18 40 1 2 3 4; #X floatatom 50 96 5 0 0; #X msg 84 40 3 4 5; #X text 387 99 j#|@2002; ! #X obj 409 77 SMLib; #X obj 52 69 vcog; #X text 16 14 vcog computes the center of gravity of a list of floats --- 1,8 ---- ! #N canvas 480 472 471 125 10; #X msg 18 40 1 2 3 4; #X floatatom 50 96 5 0 0; #X msg 84 40 3 4 5; #X text 387 99 j#|@2002; ! #X obj 409 77 SMLib-help; #X obj 52 69 vcog; #X text 16 14 vcog computes the center of gravity of a list of floats Index: vftom-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vftom-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vftom-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vftom-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 606 355 281 116 12; #X text 194 88 j#|@2002; ! #X obj 216 68 SMLib; #X text 10 6 frequency to midi on a vector; #X msg 15 33 440 446.164 880; --- 1,5 ---- ! #N canvas 606 355 281 116 10; #X text 194 88 j#|@2002; ! #X obj 216 68 SMLib-help; #X text 10 6 frequency to midi on a vector; #X msg 15 33 440 446.164 880; Index: itov-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/itov-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** itov-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- itov-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 436 204 416 478 12; #X text 327 442 j#|@2002; ! #X text 347 423 SMLib; #X msg 275 239 clear; #X text 277 219 reinit; --- 1,5 ---- ! #N canvas 436 204 416 478 10; #X text 327 442 j#|@2002; ! #X text 347 423 SMLib-help; #X msg 275 239 clear; #X text 277 219 reinit; Index: deltas-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/deltas-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** deltas-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- deltas-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 553 310 489 262 12; #X text 390 239 j#|@2002; ! #X obj 412 217 SMLib; #X floatatom 14 74 5 0 0; #X obj 12 165 print deltas; --- 1,5 ---- ! #N canvas 553 310 489 262 10; #X text 390 239 j#|@2002; ! #X obj 412 217 SMLib-help; #X floatatom 14 74 5 0 0; #X obj 12 165 print deltas; Index: vmtof-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vmtof-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vmtof-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vmtof-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 606 355 279 114 12; #X text 192 79 j#|@2002; ! #X obj 214 59 SMLib; #X obj 15 57 vmtof; #X text 10 6 midi to frequency on a vector; --- 1,5 ---- ! #N canvas 606 355 279 114 10; #X text 192 79 j#|@2002; ! #X obj 214 59 SMLib-help; #X obj 15 57 vmtof; #X text 10 6 midi to frequency on a vector; Index: vmax-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vmax-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vmax-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vmax-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,6 **** ! #N canvas 480 472 473 127 12; #X floatatom 35 104 5 0 0; #X text 387 99 j#|@2002; ! #X obj 409 77 SMLib; #X msg 133 47 0; #X msg 168 47 0 1 0 1; --- 1,6 ---- ! #N canvas 480 472 473 127 10; #X floatatom 35 104 5 0 0; #X text 387 99 j#|@2002; ! #X obj 409 77 SMLib-help; #X msg 133 47 0; #X msg 168 47 0 1 0 1; Index: vlavg-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vlavg-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vlavg-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vlavg-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 448 299 464 314 12; #X obj 8 249 prepend 0; #N canvas 0 0 450 300 graph1 0; --- 1,3 ---- ! #N canvas 448 299 464 314 10; #X obj 8 249 prepend 0; #N canvas 0 0 450 300 graph1 0; *************** *** 17,21 **** activations; #X obj 8 275 s array_vlavg; ! #X obj 397 264 SMLib; #X msg 27 201 decay 20; #X connect 0 0 12 0; --- 17,21 ---- activations; #X obj 8 275 s array_vlavg; ! #X obj 397 264 SMLib-help; #X msg 27 201 decay 20; #X connect 0 0 12 0; Index: prevl-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/prevl-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** prevl-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- prevl-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 410 463 489 262 12; #X text 364 181 j#|@2002; ! #X obj 386 159 SMLib; #X floatatom -12 16 5 0 0; #X floatatom 42 50 5 0 0; --- 1,5 ---- ! #N canvas 410 463 489 262 10; #X text 364 181 j#|@2002; ! #X obj 386 159 SMLib-help; #X floatatom -12 16 5 0 0; #X floatatom 42 50 5 0 0; Index: vv--help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vv--help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vv--help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vv--help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 561 440 326 219 12; #X msg 25 90 1 2 3; #X msg 82 94 4 5 6; --- 1,3 ---- ! #N canvas 561 440 326 219 10; #X msg 25 90 1 2 3; #X msg 82 94 4 5 6; *************** *** 11,15 **** #X obj 49 124 vv-; #X obj 189 125 vv- 0; ! #X obj 268 170 SMLib; #X obj 49 148 print vv-; #X obj 189 149 print vv-; --- 11,15 ---- #X obj 49 124 vv-; #X obj 189 125 vv- 0; ! #X obj 268 170 SMLib-help; #X obj 49 148 print vv-; #X obj 189 149 print vv-; Index: vdbtorms-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vdbtorms-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vdbtorms-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vdbtorms-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 606 355 283 118 12; #X text 194 88 j#|@2002; ! #X obj 216 68 SMLib; #X msg 15 33 100 97 94; #X text 10 6 db to rms on a vector; --- 1,5 ---- ! #N canvas 606 355 283 118 10; #X text 194 88 j#|@2002; ! #X obj 216 68 SMLib-help; #X msg 15 33 100 97 94; #X text 10 6 db to rms on a vector; Index: vdelta-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vdelta-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vdelta-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vdelta-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 619 449 433 228 12; #X msg 5 30 1 1 1 1 1 1 1 1 1 1; #X msg 5 52 1 0 1 0 1 0 1 0 1 0; --- 1,3 ---- ! #N canvas 619 449 433 228 10; #X msg 5 30 1 1 1 1 1 1 1 1 1 1; #X msg 5 52 1 0 1 0 1 0 1 0 1 0; *************** *** 7,11 **** #X msg 5 140 0 0 0 0 0 1 1 1 1 1; #X text 352 205 j#|@2002; ! #X obj 373 184 SMLib; #X text 7 3 vdelta: difference between consecutive vectors; #X obj 5 193 print vdelta; --- 7,11 ---- #X msg 5 140 0 0 0 0 0 1 1 1 1 1; #X text 352 205 j#|@2002; ! #X obj 373 184 SMLib-help; #X text 7 3 vdelta: difference between consecutive vectors; #X obj 5 193 print vdelta; Index: vabs-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vabs-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vabs-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vabs-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 490 308 452 302 12; #X obj 106 129 vabs; #X msg 105 95 1 2 3 -4 -5 -6; --- 1,3 ---- ! #N canvas 490 308 452 302 10; #X obj 106 129 vabs; #X msg 105 95 1 2 3 -4 -5 -6; Index: vlmin-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/vlmin-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** vlmin-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- vlmin-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 448 299 466 316 12; #X obj 8 249 prepend 0; #N canvas 0 0 450 300 graph1 0; --- 1,3 ---- ! #N canvas 448 299 466 316 10; #X obj 8 249 prepend 0; #N canvas 0 0 450 300 graph1 0; *************** *** 14,18 **** #X text 8 22 the argument is the half-decay expressed in number of activations; ! #X obj 397 264 SMLib; #X obj 8 275 s array_vlmax; #X msg 27 201 decay 20; --- 14,18 ---- #X text 8 22 the argument is the half-decay expressed in number of activations; ! #X obj 397 264 SMLib-help; #X obj 8 275 s array_vlmax; #X msg 27 201 decay 20; Index: lhist-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/lhist-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** lhist-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- lhist-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,5 **** ! #N canvas 133 245 443 412 12; #X text 360 376 j#|@2002; ! #X text 380 357 SMLib; #X obj 51 362 print; #X obj 11 193 random 10; --- 1,5 ---- ! #N canvas 133 245 443 412 10; #X text 360 376 j#|@2002; ! #X text 380 357 SMLib-help; #X obj 51 362 print; #X obj 11 193 random 10; Index: SMLib-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/SMLib-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** SMLib-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- SMLib-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 97 25 525 422 12; #X obj 31 188 lmax; #X obj 31 211 lmin; --- 1,3 ---- ! #N canvas 97 25 525 422 10; #X obj 31 188 lmax; #X obj 31 211 lmin; *************** *** 91,95 **** #X text 88 467 leaky histogram without clipping input; #X text 88 546 difference between current input and past inputs; ! #X obj 455 1243 SMLib; #X obj 472 1224 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; --- 91,95 ---- #X text 88 467 leaky histogram without clipping input; #X text 88 546 difference between current input and past inputs; ! #X obj 455 1243 SMLib-help; #X obj 472 1224 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; Index: threshold-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/smlib/help/threshold-help.pd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** threshold-help.pd 28 Nov 2005 16:53:16 -0000 1.1.1.1 --- threshold-help.pd 28 Nov 2005 20:53:10 -0000 1.2 *************** *** 1,3 **** ! #N canvas 114 43 708 422 12; #X text 221 309 Arguments:; #X text 310 310 1 trigger threshold; --- 1,3 ---- ! #N canvas 114 43 708 422 10; #X text 221 309 Arguments:; #X text 310 310 1 trigger threshold; *************** *** 36,40 **** #X obj 20 332 threshold 70 10 30 10; #X text 620 398 j#|@2002; ! #X obj 638 376 SMLib; #X connect 2 0 25 0; #X connect 15 0 2 0; --- 36,40 ---- #X obj 20 332 threshold 70 10 30 10; #X text 620 398 j#|@2002; ! #X obj 638 376 SMLib-help; #X connect 2 0 25 0; #X connect 15 0 2 0;

1 0

packages/patches extended-help-menu.patch,1.2,1.3
by Hans-Christoph Steiner 28 Nov '05

28 Nov '05

Update of /cvsroot/pure-data/packages/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9112 Modified Files: extended-help-menu.patch Log Message: linux/win menu fixes, discovered during linux RC5 build Index: extended-help-menu.patch =================================================================== RCS file: /cvsroot/pure-data/packages/patches/extended-help-menu.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** extended-help-menu.patch 26 Nov 2005 01:51:35 -0000 1.2 --- extended-help-menu.patch 28 Nov 2005 15:37:28 -0000 1.3 *************** *** 5,9 **** diff -u -w -r1.7.2.4 u_main.tk --- u_main.tk 21 Feb 2005 04:20:20 -0000 1.7.2.4 ! +++ u_main.tk 25 Nov 2005 22:47:06 -0000 @@ -24,6 +24,14 @@ # Tearoff is set to true by default: --- 5,9 ---- diff -u -w -r1.7.2.4 u_main.tk --- u_main.tk 21 Feb 2005 04:20:20 -0000 1.7.2.4 ! +++ u_main.tk 28 Nov 2005 15:27:03 -0000 @@ -24,6 +24,14 @@ # Tearoff is set to true by default: *************** *** 70,74 **** + # one "docs" <hans(a)at.or.at> + set help_menu_name "docs" ! + # tk::mac::OpenDocument is called with the filenames put into the --- 70,74 ---- + # one "docs" <hans(a)at.or.at> + set help_menu_name "docs" ! + # tk::mac::OpenDocument is called with the filenames put into the *************** *** 84,91 **** puts stderr {setting pd_guidir to '.'} set pd_guidir . - + set help_top_directory $pd_guidir/doc - + # init last help directory browsed - + set help_directory $help_top_directory } } --- 84,91 ---- puts stderr {setting pd_guidir to '.'} set pd_guidir . } + + set help_top_directory $pd_guidir/doc + + # init last help directory browsed + + set help_directory $help_top_directory } *************** *** 141,149 **** - exec rm -rf /tmp/pd-documentation - exec cp -pr $pd_guidir/doc /tmp/pd-documentation ! - set filename [tk_getOpenFile -defaultextension .pd \ - -filetypes { {{documentation} {.pd .txt .htm}} } \ - -initialdir /tmp/pd-documentation] - } else { ! set filename [tk_getOpenFile -defaultextension .pd \ - -filetypes { {{documentation} {.pd .txt .htm}} } \ + -filetypes { {{documentation} {.pd .txt .htm .html}} } \ --- 141,149 ---- - exec rm -rf /tmp/pd-documentation - exec cp -pr $pd_guidir/doc /tmp/pd-documentation ! set filename [tk_getOpenFile -defaultextension .pd \ - -filetypes { {{documentation} {.pd .txt .htm}} } \ - -initialdir /tmp/pd-documentation] - } else { ! - set filename [tk_getOpenFile -defaultextension .pd \ - -filetypes { {{documentation} {.pd .txt .htm}} } \ + -filetypes { {{documentation} {.pd .txt .htm .html}} } \ *************** *** 181,185 **** - global help_top_directory pd_tearoff +################## menu_doc_submenu ######################### ! + +# this is a recursive function to generation a nested menu in the help menu +# which shows the complete contents of the doc directory <hans(a)at.or.at> --- 181,186 ---- - global help_top_directory pd_tearoff +################## menu_doc_submenu ######################### ! ! - set menudir $help_top_directory/$subdir +# this is a recursive function to generation a nested menu in the help menu +# which shows the complete contents of the doc directory <hans(a)at.or.at> *************** *** 187,192 **** + global pd_tearoff + global help_top_directory ! ! - set menudir $help_top_directory/$subdir + set menu_dir $help_top_directory/$base_dir/$sub_dir --- 188,192 ---- + global pd_tearoff + global help_top_directory ! + + set menu_dir $help_top_directory/$base_dir/$sub_dir *************** *** 239,246 **** $mbar.audio add command -label {audio ON} -accelerator [accel_munge "Ctrl+/"] \ -command {menu_audio 1} ! @@ -494,30 +554,15 @@ ! ! ! # the "Help" menu - if {$pd_nt != 2} { -# a menu on the main menubar named "$whatever.help" while be treated --- 239,250 ---- $mbar.audio add command -label {audio ON} -accelerator [accel_munge "Ctrl+/"] \ -command {menu_audio 1} ! @@ -490,34 +550,17 @@ ! -command {pd pd audio-properties \;} ! $mbar.apple.preferences add command -label "MIDI settings..." \ ! -command {pd pd midi-properties \;} ! - } ! - ! - ! -# the "Help" menu - if {$pd_nt != 2} { -# a menu on the main menubar named "$whatever.help" while be treated *************** *** 250,267 **** - -command {menu_doc_open doc/1.manual 1.introduction.txt} - $mbar.help add command -label {Pure Documentation...} \ ! + puts stderr "Starting Menu crap" ! + $mbar.$help_menu_name add command -label {Browse Documentation...} \ ! -command {menu_documentation} - # add menu items for each section instead of using Pd patches - $mbar.help add separator - set helpmenuname help ! - } else { -# Apple doesn't allow cascading menus in their Help so I had to call this -# one "docs" <hans(a)at.or.at> - set helpmenuname docs ! - } ! - - $mbar.$helpmenuname add command -label {1 manual...} \ ! + # the help menu only really works well on Mac OS X <hans(a)at.or.at> + $mbar.$help_menu_name add command -label {Pd HTML Manual...} \ -command {menu_doc_open doc/1.manual index.htm} --- 254,272 ---- - -command {menu_doc_open doc/1.manual 1.introduction.txt} - $mbar.help add command -label {Pure Documentation...} \ ! - -command {menu_documentation} - # add menu items for each section instead of using Pd patches - $mbar.help add separator - set helpmenuname help ! } else { -# Apple doesn't allow cascading menus in their Help so I had to call this -# one "docs" <hans(a)at.or.at> - set helpmenuname docs ! + $mbar.$help_menu_name add command -label "About Pd..." -command \ ! + {menu_doc_open doc/1.manual 1.introduction.txt} ! } ! - $mbar.$helpmenuname add command -label {1 manual...} \ ! + $mbar.$help_menu_name add command -label {Browse Documentation...} \ ! + -command {menu_documentation} + $mbar.$help_menu_name add command -label {Pd HTML Manual...} \ -command {menu_doc_open doc/1.manual index.htm} *************** *** 273,281 **** + $mbar.$help_menu_name add separator + menu_doc_submenu $mbar.$help_menu_name "." "." - + puts stderr "Finishing Menu crap" } #################### the "File" menu for the Pd window ############## ! @@ -820,6 +865,7 @@ global pd_opendir global pd_tearoff --- 278,285 ---- + $mbar.$help_menu_name add separator + menu_doc_submenu $mbar.$help_menu_name "." "." } #################### the "File" menu for the Pd window ############## ! @@ -820,6 +863,7 @@ global pd_opendir global pd_tearoff *************** *** 285,289 **** toplevel $name -menu $name.m # puts stderr [concat geometry: $geometry] ! @@ -1078,13 +1124,11 @@ # as a special menu with specific behaviors on different platforms. # See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm --- 289,293 ---- toplevel $name -menu $name.m # puts stderr [concat geometry: $geometry] ! @@ -1078,13 +1122,11 @@ # as a special menu with specific behaviors on different platforms. # See SPECIAL MENUS IN MENUBARS http://www.tcl.tk/man/tcl8.4/TkCmd/menu.htm

1 0

externals Makefile,1.9,1.10 Makefile.buildlayout,1.7,1.8
by Hans-Christoph Steiner 28 Nov '05

28 Nov '05

Update of /cvsroot/pure-data/externals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1941 Modified Files: Makefile Makefile.buildlayout Log Message: - finally got a Linux Pd-extended release out, RC5 - built a tar.bz2 package maker with a generated Makefile for installing and uninstalling - switched all Makefiles to follow GNU $(DESTDIR)/$(prefix) standards Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 27 Nov 2005 05:02:15 -0000 1.9 --- Makefile 28 Nov 2005 06:54:19 -0000 1.10 *************** *** 13,17 **** # these are setup to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/.. ! prefix = $(CWD)/build BUILDLAYOUT_DIR = $(CWD) --- 13,17 ---- # these are setup to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/.. ! DESTDIR = $(CWD)/build/ BUILDLAYOUT_DIR = $(CWD) *************** *** 29,32 **** --- 29,33 ---- DEST_PATHS = BUILDLAYOUT_DIR=$(BUILDLAYOUT_DIR) \ cvs_root_dir=$(cvs_root_dir) \ + DESTDIR=$(DESTDIR) \ prefix=$(prefix) Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/externals/Makefile.buildlayout,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.buildlayout 26 Nov 2005 04:20:39 -0000 1.7 --- Makefile.buildlayout 28 Nov 2005 06:54:19 -0000 1.8 *************** *** 41,44 **** --- 41,45 ---- OS_NAME = linux EXTENSION = pd_linux + prefix = /usr/local else ifeq ($(UNAME),Darwin) *************** *** 76,86 **** # destinations examplesdir = $(pddocdir)/examples - bindir = $(prefix)/bin - pddocdir = $(prefix)/doc - includedir = $(prefix)/include - libdir = $(prefix)/lib - mandir = $(prefix)/man - objectsdir = $(prefix)/extra helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals --- 77,99 ---- # destinations + bindir = $(DESTDIR)$(prefix)/bin + includedir = $(DESTDIR)$(prefix)/include + libdir = $(DESTDIR)$(prefix)/lib + mandir = $(DESTDIR)$(prefix)/man + + ifeq ($(OS_NAME),darwin) + objectsdir = $(DESTDIR)$(prefix)/extra + pddocdir = $(DESTDIR)$(prefix)/doc + else + ifeq ($(OS_NAME),win) + objectsdir = $(DESTDIR)$(prefix)/extra + pddocdir = $(DESTDIR)$(prefix)/doc + else + objectsdir = $(libdir)/pd/extra + pddocdir = $(libdir)/pd/doc + endif + endif + examplesdir = $(pddocdir)/examples helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals *************** *** 94,115 **** # first make sure that the directory structure is setup ! $(prefix): ! install -d $(prefix) ! $(examplesdir): $(prefix) install -d $(examplesdir) ! $(pddocdir): $(prefix) install -d $(pddocdir) ! $(helpdir): $(prefix) install -d $(helpdir) ! $(manualsdir): $(prefix) install -d $(manualsdir) ! $(objectsdir): $(prefix) install -d $(objectsdir) #==============================================================================# --- 107,135 ---- # first make sure that the directory structure is setup ! $(DESTDIR): ! install -d $(DESTDIR) ! $(bindir): $(DESTDIR) ! install -d $(bindir) ! ! $(examplesdir): $(DESTDIR) install -d $(examplesdir) ! $(includedir): $(DESTDIR) ! install -d $(includedir) ! ! $(pddocdir): $(DESTDIR) install -d $(pddocdir) ! $(helpdir): $(DESTDIR) install -d $(helpdir) ! $(manualsdir): $(DESTDIR) install -d $(manualsdir) ! $(objectsdir): $(DESTDIR) install -d $(objectsdir) + installdirs: $(DESTDIR) $(bindir) $(examplesdir) $(pddocdir) $(includedir) $(helpdir) $(manualsdir) $(objectsdir) #==============================================================================# *************** *** 121,129 **** PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version $[0-9]$\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*\\n";/\1/') PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.$[0-9]*$[. TES-]*$[0-9]*$[0-9extndRC.-]*\\n";/\1/') PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*$[0-9]*$[0-9extndRC.-]*\\n";/\1/') # the separators [.-] need to be the same as in s_main.c or the regexps break PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) --- 141,149 ---- PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version $[0-9]$\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*.n";/\1/') PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.$[0-9]*$[. TES-]*$[0-9]*$[0-9extndRC.-]*.n";/\1/') PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*$[0-9]*$[0-9extndRC.-]*.n";/\1/') # the separators [.-] need to be the same as in s_main.c or the regexps break PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) *************** *** 185,191 **** install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(prefix) @echo " " ! @echo "Build destination cleaned: $(prefix)" --- 205,212 ---- install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(DESTDIR)$(prefix) ! -rmdir $(DESTDIR) @echo " " ! @echo "Build destination cleaned: $(DESTDIR)"

1 0

extensions Makefile,1.1,1.2 Makefile.buildlayout,1.2,1.3
by Hans-Christoph Steiner 28 Nov '05

28 Nov '05

Update of /cvsroot/pure-data/extensions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1847 Modified Files: Makefile Makefile.buildlayout Log Message: - finally got a Linux Pd-extended release out, RC5 - built a tar.bz2 package maker with a generated Makefile for installing and uninstalling - switched all Makefiles to follow GNU $(DESTDIR)/$(prefix) standards Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/extensions/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 28 Nov 2005 02:32:31 -0000 1.1 --- Makefile 28 Nov 2005 06:53:50 -0000 1.2 *************** *** 12,16 **** # these are designed to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/.. ! prefix = build BUILDLAYOUT_DIR = $(CWD) --- 12,16 ---- # these are designed to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/.. ! DESTDIR = $(CWD)/build/ BUILDLAYOUT_DIR = $(CWD) Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/extensions/Makefile.buildlayout,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.buildlayout 28 Nov 2005 02:32:31 -0000 1.2 --- Makefile.buildlayout 28 Nov 2005 06:53:50 -0000 1.3 *************** *** 41,44 **** --- 41,45 ---- OS_NAME = linux EXTENSION = pd_linux + prefix = /usr/local else ifeq ($(UNAME),Darwin) *************** *** 76,86 **** # destinations examplesdir = $(pddocdir)/examples - bindir = $(prefix)/bin - pddocdir = $(prefix)/doc - includedir = $(prefix)/include - libdir = $(prefix)/lib - mandir = $(prefix)/man - objectsdir = $(prefix)/extra helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals --- 77,99 ---- # destinations + bindir = $(DESTDIR)$(prefix)/bin + includedir = $(DESTDIR)$(prefix)/include + libdir = $(DESTDIR)$(prefix)/lib + mandir = $(DESTDIR)$(prefix)/man + + ifeq ($(OS_NAME),darwin) + objectsdir = $(DESTDIR)$(prefix)/extra + pddocdir = $(DESTDIR)$(prefix)/doc + else + ifeq ($(OS_NAME),win) + objectsdir = $(DESTDIR)$(prefix)/extra + pddocdir = $(DESTDIR)$(prefix)/doc + else + objectsdir = $(libdir)/pd/extra + pddocdir = $(libdir)/pd/doc + endif + endif + examplesdir = $(pddocdir)/examples helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals *************** *** 94,115 **** # first make sure that the directory structure is setup ! $(prefix): ! install -d $(prefix) ! $(examplesdir): $(prefix) install -d $(examplesdir) ! $(pddocdir): $(prefix) install -d $(pddocdir) ! $(helpdir): $(prefix) install -d $(helpdir) ! $(manualsdir): $(prefix) install -d $(manualsdir) ! $(objectsdir): $(prefix) install -d $(objectsdir) #==============================================================================# --- 107,135 ---- # first make sure that the directory structure is setup ! $(DESTDIR): ! install -d $(DESTDIR) ! $(bindir): $(DESTDIR) ! install -d $(bindir) ! ! $(examplesdir): $(DESTDIR) install -d $(examplesdir) ! $(includedir): $(DESTDIR) ! install -d $(includedir) ! ! $(pddocdir): $(DESTDIR) install -d $(pddocdir) ! $(helpdir): $(DESTDIR) install -d $(helpdir) ! $(manualsdir): $(DESTDIR) install -d $(manualsdir) ! $(objectsdir): $(DESTDIR) install -d $(objectsdir) + installdirs: $(DESTDIR) $(bindir) $(examplesdir) $(pddocdir) $(includedir) $(helpdir) $(manualsdir) $(objectsdir) #==============================================================================# *************** *** 131,135 **** # release version for this distro ! PACKAGE_VERSION = extended-RC6 PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION) --- 151,155 ---- # release version for this distro ! PACKAGE_VERSION = extended-RC5 PACKAGE_NAME = Pd-$(PD_VERSION)-$(PACKAGE_VERSION) *************** *** 185,191 **** install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(prefix) @echo " " ! @echo "Build destination cleaned: $(prefix)" --- 205,212 ---- install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(DESTDIR)$(prefix) ! -rmdir $(DESTDIR) @echo " " ! @echo "Build destination cleaned: $(DESTDIR)"

1 0

doc Makefile,1.11,1.12 Makefile.buildlayout,1.5,1.6
by Hans-Christoph Steiner 28 Nov '05

28 Nov '05

Update of /cvsroot/pure-data/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1792 Modified Files: Makefile Makefile.buildlayout Log Message: - finally got a Linux Pd-extended release out, RC5 - built a tar.bz2 package maker with a generated Makefile for installing and uninstalling - switched all Makefiles to follow GNU $(DESTDIR)/$(prefix) standards Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/doc/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 27 Nov 2005 04:56:31 -0000 1.11 --- Makefile 28 Nov 2005 06:53:35 -0000 1.12 *************** *** 12,16 **** # these are designed to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/.. ! prefix = build BUILDLAYOUT_DIR = $(CWD) --- 12,16 ---- # these are designed to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/.. ! DESTDIR = $(CWD)/build/ BUILDLAYOUT_DIR = $(CWD) Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/doc/Makefile.buildlayout,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.buildlayout 26 Nov 2005 04:19:27 -0000 1.5 --- Makefile.buildlayout 28 Nov 2005 06:53:35 -0000 1.6 *************** *** 41,44 **** --- 41,45 ---- OS_NAME = linux EXTENSION = pd_linux + prefix = /usr/local else ifeq ($(UNAME),Darwin) *************** *** 76,86 **** # destinations examplesdir = $(pddocdir)/examples - bindir = $(prefix)/bin - pddocdir = $(prefix)/doc - includedir = $(prefix)/include - libdir = $(prefix)/lib - mandir = $(prefix)/man - objectsdir = $(prefix)/extra helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals --- 77,99 ---- # destinations + bindir = $(DESTDIR)$(prefix)/bin + includedir = $(DESTDIR)$(prefix)/include + libdir = $(DESTDIR)$(prefix)/lib + mandir = $(DESTDIR)$(prefix)/man + + ifeq ($(OS_NAME),darwin) + objectsdir = $(DESTDIR)$(prefix)/extra + pddocdir = $(DESTDIR)$(prefix)/doc + else + ifeq ($(OS_NAME),win) + objectsdir = $(DESTDIR)$(prefix)/extra + pddocdir = $(DESTDIR)$(prefix)/doc + else + objectsdir = $(libdir)/pd/extra + pddocdir = $(libdir)/pd/doc + endif + endif + examplesdir = $(pddocdir)/examples helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals *************** *** 94,115 **** # first make sure that the directory structure is setup ! $(prefix): ! install -d $(prefix) ! $(examplesdir): $(prefix) install -d $(examplesdir) ! $(pddocdir): $(prefix) install -d $(pddocdir) ! $(helpdir): $(prefix) install -d $(helpdir) ! $(manualsdir): $(prefix) install -d $(manualsdir) ! $(objectsdir): $(prefix) install -d $(objectsdir) #==============================================================================# --- 107,135 ---- # first make sure that the directory structure is setup ! $(DESTDIR): ! install -d $(DESTDIR) ! $(bindir): $(DESTDIR) ! install -d $(bindir) ! ! $(examplesdir): $(DESTDIR) install -d $(examplesdir) ! $(includedir): $(DESTDIR) ! install -d $(includedir) ! ! $(pddocdir): $(DESTDIR) install -d $(pddocdir) ! $(helpdir): $(DESTDIR) install -d $(helpdir) ! $(manualsdir): $(DESTDIR) install -d $(manualsdir) ! $(objectsdir): $(DESTDIR) install -d $(objectsdir) + installdirs: $(DESTDIR) $(bindir) $(examplesdir) $(pddocdir) $(includedir) $(helpdir) $(manualsdir) $(objectsdir) #==============================================================================# *************** *** 121,129 **** PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version $[0-9]$\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*\\n";/\1/') PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.$[0-9]*$[. TES-]*$[0-9]*$[0-9extndRC.-]*\\n";/\1/') PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*$[0-9]*$[0-9extndRC.-]*\\n";/\1/') # the separators [.-] need to be the same as in s_main.c or the regexps break PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) --- 141,149 ---- PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version $[0-9]$\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*.n";/\1/') PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.$[0-9]*$[. TES-]*$[0-9]*$[0-9extndRC.-]*.n";/\1/') PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*$[0-9]*$[0-9extndRC.-]*.n";/\1/') # the separators [.-] need to be the same as in s_main.c or the regexps break PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) *************** *** 185,191 **** install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(prefix) @echo " " ! @echo "Build destination cleaned: $(prefix)" --- 205,212 ---- install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(DESTDIR)$(prefix) ! -rmdir $(DESTDIR) @echo " " ! @echo "Build destination cleaned: $(DESTDIR)"

1 0

[PD-cvs] abstractions Makefile, 1.15, 1.16 Makefile.buildlayout, 1.7, 1.8
by Hans-Christoph Steiner 28 Nov '05

28 Nov '05

Update of /cvsroot/pure-data/abstractions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1748 Modified Files: Makefile Makefile.buildlayout Log Message: - finally got a Linux Pd-extended release out, RC5 - built a tar.bz2 package maker with a generated Makefile for installing and uninstalling - switched all Makefiles to follow GNU $(DESTDIR)/$(prefix) standards Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/abstractions/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile 27 Nov 2005 04:51:57 -0000 1.15 --- Makefile 28 Nov 2005 06:53:19 -0000 1.16 *************** *** 12,16 **** # these are designed to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/.. ! prefix = build BUILDLAYOUT_DIR = $(CWD) --- 12,16 ---- # these are designed to be overridden by the packages/Makefile cvs_root_dir = $(CWD)/.. ! DESTDIR = $(CWD)/build/ BUILDLAYOUT_DIR = $(CWD) *************** *** 28,32 **** # clean up after everything is installed final_setup: ! chmod -R ugo-w $(prefix) install: all $(objectsdir) $(helpdir) $(manualsdir) $(examplesdir) \ --- 28,32 ---- # clean up after everything is installed final_setup: ! chmod -R ugo-w $(pddocdir) install: all $(objectsdir) $(helpdir) $(manualsdir) $(examplesdir) \ *************** *** 210,217 **** --description "objects for creating visuals in a live performance setting" install -d $(helpdir)/$(PIXELTANGO_NAME) ! install -p $(abstractions_src)/pixeltango/help/*.* \ $(helpdir)/$(PIXELTANGO_NAME) install -d $(examplesdir)/$(PIXELTANGO_NAME) ! install -p $(abstractions_src)/pixeltango/Example-Patches/*.* \ $(examplesdir)/$(PIXELTANGO_NAME) install -d $(manualsdir)/$(PIXELTANGO_NAME) --- 210,217 ---- --description "objects for creating visuals in a live performance setting" install -d $(helpdir)/$(PIXELTANGO_NAME) ! install -p $(abstractions_src)/pixelTANGO/help/*.* \ $(helpdir)/$(PIXELTANGO_NAME) install -d $(examplesdir)/$(PIXELTANGO_NAME) ! install -p $(abstractions_src)/pixelTANGO/Example-Patches/*.* \ $(examplesdir)/$(PIXELTANGO_NAME) install -d $(manualsdir)/$(PIXELTANGO_NAME) Index: Makefile.buildlayout =================================================================== RCS file: /cvsroot/pure-data/abstractions/Makefile.buildlayout,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Makefile.buildlayout 26 Nov 2005 04:19:12 -0000 1.7 --- Makefile.buildlayout 28 Nov 2005 06:53:19 -0000 1.8 *************** *** 41,44 **** --- 41,45 ---- OS_NAME = linux EXTENSION = pd_linux + prefix = /usr/local else ifeq ($(UNAME),Darwin) *************** *** 76,86 **** # destinations examplesdir = $(pddocdir)/examples - bindir = $(prefix)/bin - pddocdir = $(prefix)/doc - includedir = $(prefix)/include - libdir = $(prefix)/lib - mandir = $(prefix)/man - objectsdir = $(prefix)/extra helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals --- 77,99 ---- # destinations + bindir = $(DESTDIR)$(prefix)/bin + includedir = $(DESTDIR)$(prefix)/include + libdir = $(DESTDIR)$(prefix)/lib + mandir = $(DESTDIR)$(prefix)/man + + ifeq ($(OS_NAME),darwin) + objectsdir = $(DESTDIR)$(prefix)/extra + pddocdir = $(DESTDIR)$(prefix)/doc + else + ifeq ($(OS_NAME),win) + objectsdir = $(DESTDIR)$(prefix)/extra + pddocdir = $(DESTDIR)$(prefix)/doc + else + objectsdir = $(libdir)/pd/extra + pddocdir = $(libdir)/pd/doc + endif + endif + examplesdir = $(pddocdir)/examples helpdir = $(pddocdir)/5.reference manualsdir = $(pddocdir)/manuals *************** *** 94,115 **** # first make sure that the directory structure is setup ! $(prefix): ! install -d $(prefix) ! $(examplesdir): $(prefix) install -d $(examplesdir) ! $(pddocdir): $(prefix) install -d $(pddocdir) ! $(helpdir): $(prefix) install -d $(helpdir) ! $(manualsdir): $(prefix) install -d $(manualsdir) ! $(objectsdir): $(prefix) install -d $(objectsdir) #==============================================================================# --- 107,135 ---- # first make sure that the directory structure is setup ! $(DESTDIR): ! install -d $(DESTDIR) ! $(bindir): $(DESTDIR) ! install -d $(bindir) ! ! $(examplesdir): $(DESTDIR) install -d $(examplesdir) ! $(includedir): $(DESTDIR) ! install -d $(includedir) ! ! $(pddocdir): $(DESTDIR) install -d $(pddocdir) ! $(helpdir): $(DESTDIR) install -d $(helpdir) ! $(manualsdir): $(DESTDIR) install -d $(manualsdir) ! $(objectsdir): $(DESTDIR) install -d $(objectsdir) + installdirs: $(DESTDIR) $(bindir) $(examplesdir) $(pddocdir) $(includedir) $(helpdir) $(manualsdir) $(objectsdir) #==============================================================================# *************** *** 121,129 **** PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version $[0-9]$\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*\\n";/\1/') PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.$[0-9]*$[. TES-]*$[0-9]*$[0-9extndRC.-]*\\n";/\1/') PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*$[0-9]*$[0-9extndRC.-]*\\n";/\1/') # the separators [.-] need to be the same as in s_main.c or the regexps break PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) --- 141,149 ---- PD_MAJOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version $[0-9]$\.[0-9]*[. TES-]*[0-9]*[0-9extndRC.-]*.n";/\1/') PD_MINOR_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.$[0-9]*$[. TES-]*$[0-9]*$[0-9extndRC.-]*.n";/\1/') PD_BUGFIX_VERSION := $(shell grep 'Pd version' $(pd_src)/src/s_main.c | \ ! sed 's/char pd_version\[\] = "Pd version [0-9]\.[0-9]*[. TES-]*$[0-9]*$[0-9extndRC.-]*.n";/\1/') # the separators [.-] need to be the same as in s_main.c or the regexps break PD_VERSION = $(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION) *************** *** 185,191 **** install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(prefix) @echo " " ! @echo "Build destination cleaned: $(prefix)" --- 205,212 ---- install_clean: applications_clean help_clean manuals_clean objects_clean -rmdir $(pddocdir) ! -rmdir $(DESTDIR)$(prefix) ! -rmdir $(DESTDIR) @echo " " ! @echo "Build destination cleaned: $(DESTDIR)"

1 0

← Newer
1
2
3
4
5
6
7
...
50
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 November 2005