Pd-cvs April 2004

pd-cvs@lists.iem.at

10 participants
178 discussions

externals/miXed/test/cyclone Table-test.pd,NONE,1.1
by Krzysztof Czaja 23 Apr '04

23 Apr '04

Update of /cvsroot/pure-data/externals/miXed/test/cyclone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15390/test/cyclone Added Files: Table-test.pd Log Message: --- NEW FILE: Table-test.pd --- #N canvas 278 182 656 317 12; #X msg 25 72 load; #X obj 97 102 Uzi; #X msg 97 72 100; #X msg 29 222 size 100; #X obj 119 256 print; #X msg 157 102 next; #X msg 159 137 prev; #X msg 148 72 goto \$1; #X floatatom 148 41 5 0 0 0 - - -; #X msg 313 72 fquantile \$1; #X floatatom 313 45 5 0 0 0 - - -; #X msg 441 72 quantile \$1; #X floatatom 441 45 5 0 0 0 - - -; #X obj 508 222 r test; #X obj 508 256 print test; #X msg 295 223 send test \$1; #X floatatom 295 196 5 0 0 0 - - -; #X obj 119 222 Table t; #C restore; #X obj 295 253 Table t; #C restore; #X obj 313 137 print; #X obj 313 107 Table t; #C restore; #X msg 261 72 bang; #X msg 360 196 symbol length; #X msg 25 102 normal; #X floatatom 159 184 5 0 0 0 - - -; #X connect 0 0 17 0; #X connect 1 2 17 0; #X connect 2 0 1 0; #X connect 3 0 17 0; #X connect 5 0 17 0; #X connect 6 0 17 0; #X connect 7 0 17 0; #X connect 8 0 7 0; #X connect 9 0 20 0; #X connect 10 0 9 0; #X connect 11 0 20 0; #X connect 12 0 11 0; #X connect 13 0 14 0; #X connect 15 0 18 0; #X connect 16 0 15 0; #X connect 17 0 4 0; #X connect 20 0 19 0; #X connect 21 0 20 0; #X connect 22 0 15 0; #X connect 23 0 17 0; #X connect 24 0 17 0;

1 0

externals/miXed/shared/common port.c,1.11,1.12
by Krzysztof Czaja 23 Apr '04

23 Apr '04

Update of /cvsroot/pure-data/externals/miXed/shared/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15191/shared/common Modified Files: port.c Log Message: Index: port.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/shared/common/port.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** port.c 21 Apr 2004 14:47:34 -0000 1.11 --- port.c 23 Apr 2004 11:25:53 -0000 1.12 *************** *** 90,93 **** --- 90,94 ---- static t_symbol *portps_coll; static t_symbol *portps_funbuff; + static t_symbol *portps_prob; static t_symbol *portps_picture; *************** *** 510,513 **** --- 511,520 ---- } + static int imaction_N1_prob(t_port *x, char *arg) + { + import_emstart(x, portps_prob, &s_, 0); + return (PORT_NEXT); + } + static int imaction_N1_picture(t_port *x, char *arg) { *************** *** 584,587 **** --- 591,604 ---- } + static int imaction_P6_prob(t_port *x, char *arg) + { + binbuf_addv(x->x_outbb, "ssffs;", + gensym("#X"), gensym("obj"), + port_getx(x, 2), port_gety(x, 3), portps_prob); + import_emflush(x, portps_prob, &s_); + x->x_nobj++; + return (PORT_NEXT); + } + /* LATER use hammer replacements */ static int imaction_P6_pack(t_port *x, char *arg) *************** *** 756,760 **** static int imaction_T1_int(t_port *x, char *arg) { ! import_emcopy(x, portps_coll); return (PORT_NEXT); } --- 773,782 ---- static int imaction_T1_int(t_port *x, char *arg) { ! if (x->x_emstate == portps_coll) ! import_emcopy(x, portps_coll); ! else if (x->x_emstate == portps_prob) ! import_emcopy(x, portps_prob); ! else ! import_unexpected(x); return (PORT_NEXT); } *************** *** 768,781 **** static int imaction_T1_set(t_port *x, char *arg) { ! /* FIXME funbuff */ ! if (import_emcopy(x, portps_vtable)) { ! int count = port_getint(x, 2); ! if (count != x->x_emcount) ! loud_warning(0, "import", ! "[%d] bad vtable chunk index %d (%d already taken)", ! x->x_messcount, count, x->x_emcount); ! x->x_emcount += x->x_inatoms - 3; } return (PORT_NEXT); } --- 790,821 ---- static int imaction_T1_set(t_port *x, char *arg) { ! if (x->x_emstate == portps_vtable) { ! if (import_emcopy(x, portps_vtable)) ! { ! int count = port_getint(x, 2); ! if (count != x->x_emcount) ! loud_warning(0, "import", ! "[%d] bad vtable chunk index %d (%d already taken)", ! x->x_messcount, count, x->x_emcount); ! x->x_emcount += x->x_inatoms - 3; ! } } + else if (x->x_emstate == portps_funbuff) + import_emcopy(x, portps_funbuff); + else + import_unexpected(x); + return (PORT_NEXT); + } + + static int imaction_T1_reset(t_port *x, char *arg) + { + import_emcopy(x, portps_prob); + return (PORT_NEXT); + } + + static int imaction_T1_embed(t_port *x, char *arg) + { + import_emcopy(x, portps_prob); return (PORT_NEXT); } *************** *** 862,865 **** --- 902,906 ---- { "coll", imaction_N1_coll, 0, 0, 0 }, { "funbuff", imaction_N1_funbuff, 0, 0, 0 }, + { "prob", imaction_N1_prob, 0, 0, 0 }, { "picture", imaction_N1_picture, 0, 0, 0 } }; *************** *** 872,876 **** { "table", imaction_P6_table, 0, 0, 0 }, { "coll", imaction_P6_coll, 0, 0, 0 }, ! { "funbuff", imaction_P6_funbuff, 0, 0, 0 } }; static t_portnode imnode_newobj = { imslots_newobj, --- 913,918 ---- { "table", imaction_P6_table, 0, 0, 0 }, { "coll", imaction_P6_coll, 0, 0, 0 }, ! { "funbuff", imaction_P6_funbuff, 0, 0, 0 }, ! { "prob", imaction_P6_prob, 0, 0, 0 } }; static t_portnode imnode_newobj = { imslots_newobj, *************** *** 964,968 **** { "int", imaction_T1_int, 0, 0, 0 }, { "flags", imaction_T1_flags, 0, 0, 0 }, ! { "set", imaction_T1_set, 0, 0, 0 } }; static t_portnode imnode__T = { imslots__T, PORT_NSLOTS(imslots__T), 1 }; --- 1006,1012 ---- { "int", imaction_T1_int, 0, 0, 0 }, { "flags", imaction_T1_flags, 0, 0, 0 }, ! { "set", imaction_T1_set, 0, 0, 0 }, ! { "reset", imaction_T1_reset, 0, 0, 0 }, ! { "embed", imaction_T1_embed, 0, 0, 0 } }; static t_portnode imnode__T = { imslots__T, PORT_NSLOTS(imslots__T), 1 }; *************** *** 1293,1296 **** --- 1337,1341 ---- portps_coll = gensym("coll"); portps_funbuff = gensym("funbuff"); + portps_prob = gensym("prob"); portps_picture = gensym("picture");

1 0

externals/miXed/test/cyclone cyclone-test.pd,1.3,1.4
by Krzysztof Czaja 23 Apr '04

23 Apr '04

Update of /cvsroot/pure-data/externals/miXed/test/cyclone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15191/test/cyclone Modified Files: cyclone-test.pd Log Message: Index: cyclone-test.pd =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/test/cyclone/cyclone-test.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cyclone-test.pd 17 Apr 2004 17:45:29 -0000 1.3 --- cyclone-test.pd 23 Apr 2004 11:25:53 -0000 1.4 *************** *** 1,10 **** ! #N canvas 150 47 531 442 12; #X obj 39 399 cyclone; #X msg 39 19 bang; #X msg 244 19 import; ! #X obj 42 210 forward texthelp; ! #X obj 63 278 r texthelp; ! #X msg 56 245 send binhelp; ! #X msg 182 245 send texthelp; #X obj 90 309 r binhelp; #X obj 90 338 sprintf import ../../../ref/c74help/bin/%s.help; --- 1,10 ---- ! #N canvas 150 47 650 442 12; #X obj 39 399 cyclone; #X msg 39 19 bang; #X msg 244 19 import; ! #X obj 43 220 forward texthelp; ! #X obj 63 282 r texthelp; ! #X msg 52 252 send binhelp; ! #X msg 178 252 send texthelp; #X obj 90 309 r binhelp; #X obj 90 338 sprintf import ../../../ref/c74help/bin/%s.help; *************** *** 14,21 **** #X msg 125 181 buffir~; #X obj 244 56 cyclone; ! #X msg 42 181 record~; #X obj 39 94 cyclone ../../../ref; #X msg 211 181 fffb~; #X msg 286 181 pictctrl; #X connect 1 0 15 0; #X connect 2 0 13 0; --- 14,25 ---- #X msg 125 181 buffir~; #X obj 244 56 cyclone; ! #X msg 43 177 record~; #X obj 39 94 cyclone ../../../ref; #X msg 211 181 fffb~; #X msg 286 181 pictctrl; + #X msg 43 148 universal; + #X msg 140 148 funbuff; + #X obj 244 94 cyclone ../../../rob; + #X msg 222 148 prob; #X connect 1 0 15 0; #X connect 2 0 13 0; *************** *** 32,33 **** --- 36,40 ---- #X connect 16 0 3 0; #X connect 17 0 3 0; + #X connect 18 0 3 0; + #X connect 19 0 3 0; + #X connect 21 0 3 0;

1 0

externals/miXed/cyclone/hammer Table.c,1.3,1.4 prob.c,1.1.1.1,1.2
by Krzysztof Czaja 23 Apr '04

23 Apr '04

Update of /cvsroot/pure-data/externals/miXed/cyclone/hammer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15191/cyclone/hammer Modified Files: Table.c prob.c Log Message: Index: prob.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/prob.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** prob.c 23 May 2003 12:29:48 -0000 1.1.1.1 --- prob.c 23 Apr 2004 11:25:52 -0000 1.2 *************** *** 1,3 **** ! /* Copyright (c) 2002-2003 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ --- 1,3 ---- ! /* Copyright (c) 2002-2004 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ *************** *** 9,14 **** #include "hammer/file.h" ! /* CHECKED: no preallocation. Apparently, it looks like if the new ! state-entries were added to the list's head, and the new transition-entries were added to the sublist's head. No sorting of any kind. */ --- 9,14 ---- #include "hammer/file.h" ! /* CHECKED: no preallocation. It looks like if new state-entries ! were added to the list's head, and new transition-entries were added to the sublist's head. No sorting of any kind. */ *************** *** 63,89 **** } ! /* ! CHECKED: embedmode off: ! #N prob; ! #P newobj ... prob; ! ! CHECKED: embedmode on, after clear: ! #N prob; ! #T embed 1; ! #P newobj ... prob; - CHECKED: embedmode on, filled: - #N prob; - #T <preffix> <suffix> <count> - ... - #T embed 1; - #T reset <default>; (if set) - #P newobj ... prob; - */ static void prob_embed(t_prob *x, t_floatarg f) { x->x_embedmode = ((int)f != 0); - if (x->x_embedmode) - loud_incompatible(prob_class, "embedding not supported (yet)..."); } --- 63,86 ---- } ! static void prob_embedhook(t_pd *z, t_binbuf *bb, t_symbol *bindsym) ! { ! t_prob *x = (t_prob *)z; ! if (x->x_embedmode) ! { ! t_probtrans *pfx, *sfx; ! for (pfx = x->x_translist; pfx; pfx = pfx->tr_nextstate) ! for (sfx = pfx->tr_nexttrans; sfx; sfx = sfx->tr_nexttrans) ! binbuf_addv(bb, "siii;", bindsym, ! pfx->tr_value, sfx->tr_value, sfx->tr_count); ! binbuf_addv(bb, "ssi;", bindsym, gensym("embed"), 1); ! if (x->x_default) ! binbuf_addv(bb, "ssi;", bindsym, gensym("reset"), ! x->x_default->tr_value); ! } ! } static void prob_embed(t_prob *x, t_floatarg f) { x->x_embedmode = ((int)f != 0); } *************** *** 236,244 **** } ! static void prob_silent(t_prob *x) { if (!x->x_silent) { ! loud_incompatible(prob_class, "no 'silent' message in max"); x->x_silent = 1; } --- 233,241 ---- } ! static void prob__silent(t_prob *x) { if (!x->x_silent) { ! loud_incompatible(prob_class, "no '_silent' message in max"); x->x_silent = 1; } *************** *** 280,284 **** outlet_new((t_object *)x, &s_float); x->x_bangout = outlet_new((t_object *)x, &s_bang); ! x->x_filehandle = hammerfile_new((t_pd *)x, 0, 0, 0, 0); return (x); } --- 277,281 ---- outlet_new((t_object *)x, &s_float); x->x_bangout = outlet_new((t_object *)x, &s_bang); ! x->x_filehandle = hammerfile_new((t_pd *)x, prob_embedhook, 0, 0, 0); return (x); } *************** *** 302,312 **** gensym("dump"), 0); /* CHECKED: doesn't understand "seed" */ ! ! /* below are the incompatible extensions... */ ! class_addmethod(prob_class, (t_method)prob_silent, ! gensym("silent"), 0); class_addmethod(prob_class, (t_method)prob_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! hammerfile_setup(prob_class, 0); /* LATER embedding (, 1) */ } --- 299,307 ---- gensym("dump"), 0); /* CHECKED: doesn't understand "seed" */ ! class_addmethod(prob_class, (t_method)prob__silent, ! gensym("_silent"), 0); class_addmethod(prob_class, (t_method)prob_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! hammerfile_setup(prob_class, 1); } Index: Table.c =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/cyclone/hammer/Table.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Table.c 21 Apr 2004 14:47:26 -0000 1.3 --- Table.c 23 Apr 2004 11:25:52 -0000 1.4 *************** *** 68,71 **** --- 68,72 ---- int x_valueset; int x_head; + int x_intraversal; /* ``set-with-next/prev'' flag */ int x_loadflag; int x_loadndx; *************** *** 184,189 **** cc->c_length = length; /* CHECKED values at common indices are preserved */ ! /* CHECKED rewinding neither head, nor loadndx, but a separate ! condition of eot is preserved only for the head. */ tablecommon_modified(cc, relocate); } --- 185,191 ---- cc->c_length = length; /* CHECKED values at common indices are preserved */ ! /* CHECKED rewinding neither head, nor loadndx -- both are preserved, ! although there is a bug in handling of 'prev' after the head ! overflows due to shrinking. */ tablecommon_modified(cc, relocate); } *************** *** 428,433 **** } else table_dooutput(x, ndx); ! /* CHECKME if head is updated */ ! x->x_head = ndx; } } --- 430,434 ---- } else table_dooutput(x, ndx); ! /* CHECKED head is not updated */ } } *************** *** 501,505 **** { tablecommon_setall(x->x_common, 0); ! /* CHECKME head */ } --- 502,506 ---- { tablecommon_setall(x->x_common, 0); ! /* CHECKED head preserved */ } *************** *** 507,511 **** { tablecommon_setall(x->x_common, (int)f); ! /* CHECKME head */ } --- 508,512 ---- { tablecommon_setall(x->x_common, (int)f); ! /* CHECKED head preserved */ } *************** *** 523,536 **** static void table_next(t_table *x) { ! table_dooutput(x, x->x_head++); ! if (x->x_head >= x->x_common->c_length) x->x_head = 0; } static void table_prev(t_table *x) { ! table_dooutput(x, x->x_head--); ! if (x->x_head < 0) x->x_head = x->x_common->c_length - 1; } --- 524,541 ---- static void table_next(t_table *x) { ! if (!x->x_intraversal) ! x->x_intraversal = 1; ! else if (++x->x_head >= x->x_common->c_length) x->x_head = 0; + table_dooutput(x, x->x_head); } static void table_prev(t_table *x) { ! if (!x->x_intraversal) ! x->x_intraversal = 1; ! else if (--x->x_head < 0) x->x_head = x->x_common->c_length - 1; + table_dooutput(x, x->x_head); } *************** *** 539,549 **** /* CHECKED floats are truncated */ x->x_head = tablecommon_getindex(x->x_common, (int)f); } ! /* CHECKED 'send <target> length' works, but not max, min, sum... */ ! /* CHECKED 'send <target> <ndx> <value>' writes the value (a bug?) */ ! static void table_send(t_table *x, t_symbol *s, t_floatarg f) { ! /* FIXME */ } --- 544,580 ---- /* CHECKED floats are truncated */ x->x_head = tablecommon_getindex(x->x_common, (int)f); + /* CHECKED the head should be pre-updated during traversal, in order + to maintain the logical way of direction change. Therefore, we + need the flag below, which locks head in place that has just been + set by goto. The flag is then set by next or prev. */ + x->x_intraversal = 0; } ! static void table_send(t_table *x, t_symbol *s, int ac, t_atom *av) { ! if (ac > 1 && av->a_type == A_SYMBOL) ! { ! t_symbol *target = av->a_w.w_symbol; ! if (!target->s_thing) ! return; /* CHECKED no complaint */ ! ac--; av++; ! if (av->a_type == A_FLOAT) ! { ! if (ac == 1) ! { ! int ndx = (int)av->a_w.w_float; ! pd_float(target->s_thing, ! (t_float)tablecommon_getvalue(x->x_common, ndx)); ! } ! /* CHECKED incompatible: 'send <target> <ndx> <value>' ! stores <value> at <ndx> (a bug?) */ ! } ! else if (av->a_type == A_SYMBOL) ! { ! /* CHECKED 'send <target> length' works, but not max, min, sum... */ ! if (av->a_w.w_symbol == gensym("length")) ! pd_float(target->s_thing, (t_float)x->x_common->c_length); ! } ! } } *************** *** 613,617 **** /* FIXME arguments (from, to) */ /* CHECKED no remote dumping, symbol args bashed to 0 */ ! static void table_dump(t_table *x) { t_tablecommon *cc = x->x_common; --- 644,648 ---- /* FIXME arguments (from, to) */ /* CHECKED no remote dumping, symbol args bashed to 0 */ ! static void table_dump(t_table *x, t_symbol *s, int ac, t_atom *av) { t_tablecommon *cc = x->x_common; *************** *** 650,654 **** tablecommon_dowrite(cc, s, x->x_canvas); else ! hammerpanel_save(cc->c_filehandle, 0, 0); /* CHECKME default name */ } --- 681,686 ---- tablecommon_dowrite(cc, s, x->x_canvas); else ! /* CHECKED default name is plain `Untitled' */ ! hammerpanel_save(cc->c_filehandle, 0, 0); } *************** *** 726,729 **** --- 758,762 ---- x->x_valueset = 0; x->x_head = 0; + x->x_intraversal = 0; /* CHECKED */ x->x_loadflag = 0; rand_seed(&x->x_seed, 0); *************** *** 774,778 **** gensym("goto"), A_FLOAT, 0); class_addmethod(table_class, (t_method)table_send, ! gensym("send"), A_SYMBOL, A_FLOAT, 0); class_addmethod(table_class, (t_method)table_length, gensym("length"), 0); --- 807,811 ---- gensym("goto"), A_FLOAT, 0); class_addmethod(table_class, (t_method)table_send, ! gensym("send"), A_GIMME, 0); class_addmethod(table_class, (t_method)table_length, gensym("length"), 0); *************** *** 794,798 **** gensym("fquantile"), A_FLOAT, 0); class_addmethod(table_class, (t_method)table_dump, ! gensym("dump"), 0); class_addmethod(table_class, (t_method)table_refer, gensym("refer"), A_SYMBOL, 0); --- 827,831 ---- gensym("fquantile"), A_FLOAT, 0); class_addmethod(table_class, (t_method)table_dump, ! gensym("dump"), A_GIMME, 0); class_addmethod(table_class, (t_method)table_refer, gensym("refer"), A_SYMBOL, 0);

1 0

externals/grill/flext changes.txt,1.44,1.45
by Thomas Grill 23 Apr '04

23 Apr '04

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29779 Modified Files: changes.txt Log Message: "" Index: changes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/changes.txt,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** changes.txt 20 Apr 2004 02:33:04 -0000 1.44 --- changes.txt 23 Apr 2004 02:32:55 -0000 1.45 *************** *** 28,31 **** --- 28,32 ---- - also initialize flext::sym_int as MakeSymbol("int") for PD (since the variable is there anyhow) - fixed bug with attribute dumping + - default arguments for object construction (types float0,int0,t_symtype0 for FLEXT_NEW*) 0.4.5:

1 0

externals/grill/flext/source flbase.h,1.24,1.25 fllib.cpp,1.23,1.24 flstdc.h,1.21,1.22 flsupport.cpp,1.36,1.37 flsupport.h,1.66,1.67
by Thomas Grill 23 Apr '04

23 Apr '04

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29779/source Modified Files: flbase.h fllib.cpp flstdc.h flsupport.cpp flsupport.h Log Message: "" Index: flstdc.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flstdc.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** flstdc.h 27 Mar 2004 03:22:14 -0000 1.21 --- flstdc.h 23 Apr 2004 02:32:55 -0000 1.22 *************** *** 3,7 **** flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (c) 2001-2003 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 78,81 **** --- 78,82 ---- #define A_FLINT A_FLOAT #define A_DEFFLINT A_DEFFLOAT + #define A_DEFSYMBOL A_DEFSYM *************** *** 136,143 **** --- 137,152 ---- #endif + #ifndef A_DEFINT + #define A_DEFINT A_DEFLONG + #endif + #ifndef A_SYMBOL #define A_SYMBOL A_SYM #endif + #ifndef A_DEFSYMBOL + #define A_DEFSYMBOL A_DEFSYM + #endif + #elif FLEXT_SYS == FLEXT_SYS_JMAX Index: flbase.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flbase.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** flbase.h 3 Apr 2004 02:21:04 -0000 1.24 --- flbase.h 23 Apr 2004 02:32:55 -0000 1.25 *************** *** 3,7 **** flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (c) 2001-2003 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- flext - C++ layer for Max/MSP and pd (pure data) externals ! Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 412,418 **** --- 412,421 ---- #else #define FLEXTTPN_INT A_INT + #define FLEXTTPN_DEFINT A_DEFINT #endif #define FLEXTTPN_FLOAT A_FLOAT + #define FLEXTTPN_DEFFLOAT A_DEFFLOAT #define FLEXTTPN_SYM A_SYMBOL + #define FLEXTTPN_DEFSYM A_DEFSYMBOL #define FLEXTTPN_VAR A_GIMME #else *************** *** 423,426 **** --- 426,432 ---- #define FLEXTTPN_SYM 4 #define FLEXTTPN_VAR 5 + #define FLEXTTPN_DEFINT 6 + #define FLEXTTPN_DEFFLOAT 7 + #define FLEXTTPN_DEFSYM 8 #endif *************** *** 429,432 **** --- 435,439 ---- #define CALLBTYPE_void void #define FLEXTTYPE_float FLEXTTPN_FLOAT + #define FLEXTTYPE_float0 FLEXTTPN_DEFFLOAT #define CALLBTYPE_float float #define FLEXTTYPE_t_float FLEXTTPN_FLOAT *************** *** 435,441 **** --- 442,450 ---- #if FLEXT_SYS == FLEXT_SYS_PD #define FLEXTTYPE_int FLEXTTPN_FLOAT + #define FLEXTTYPE_int0 FLEXTTPN_DEFFLOAT #define CALLBTYPE_int float #elif FLEXT_SYS == FLEXT_SYS_MAX || FLEXT_SYS == FLEXT_SYS_JMAX #define FLEXTTYPE_int FLEXTTPN_INT + #define FLEXTTYPE_int0 FLEXTTPN_DEFINT #define CALLBTYPE_int int #else *************** *** 444,449 **** #define FLEXTTYPE_t_symptr FLEXTTPN_SYM #define CALLBTYPE_t_symptr t_symptr ! #define FLEXTTYPE_t_symtype FLEXTTPN_SYM #define CALLBTYPE_t_symtype t_symptr #define FLEXTTYPE_t_ptrtype FLEXTTPN_PTR --- 453,460 ---- #define FLEXTTYPE_t_symptr FLEXTTPN_SYM + #define FLEXTTYPE_t_symptr0 FLEXTTPN_DEFSYM #define CALLBTYPE_t_symptr t_symptr ! #define FLEXTTYPE_t_symtype FLEXTTYPE_t_symptr ! #define FLEXTTYPE_t_symtype0 FLEXTTYPE_t_symptr0 #define CALLBTYPE_t_symtype t_symptr #define FLEXTTYPE_t_ptrtype FLEXTTPN_PTR *************** *** 455,462 **** #define ARGMEMBER_int(a) GetInt(a) #define ARGMEMBER_float(a) GetFloat(a) #define ARGMEMBER_t_symptr(a) GetSymbol(a) ! #define ARGMEMBER_t_symtype(a) GetSymbol(a) ! #define ARGCAST(arg,tp) ARGMEMBER_##tp(arg) --- 466,477 ---- #define ARGMEMBER_int(a) GetInt(a) + #define ARGMEMBER_int0(a) ARGMEMBER_int(a) #define ARGMEMBER_float(a) GetFloat(a) + #define ARGMEMBER_float0(a) ARGMEMBER_float(a) #define ARGMEMBER_t_symptr(a) GetSymbol(a) ! #define ARGMEMBER_t_symptr0(a) ARGMEMBER_t_symptr(a) ! #define ARGMEMBER_t_symtype(a) ARGMEMBER_t_symptr(a) ! #define ARGMEMBER_t_symtype0(a) ARGMEMBER_t_symptr0(a) ! #define ARGCAST(a,tp) ARGMEMBER_##tp(a) *************** *** 484,488 **** #define REAL_NEW_1(NAME,NEW_CLASS,DSP,LIB, TYPE1) \ ! flext_obj *NEW_CLASS::__init__(int ,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1)); \ --- 499,503 ---- #define REAL_NEW_1(NAME,NEW_CLASS,DSP,LIB, TYPE1) \ ! flext_obj *NEW_CLASS::__init__(int,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1)); \ *************** *** 495,499 **** #define REAL_NEW_2(NAME,NEW_CLASS,DSP,LIB, TYPE1,TYPE2) \ ! flext_obj *NEW_CLASS::__init__(int ,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1),ARGCAST(argv[1],TYPE2)); \ --- 510,514 ---- #define REAL_NEW_2(NAME,NEW_CLASS,DSP,LIB, TYPE1,TYPE2) \ ! flext_obj *NEW_CLASS::__init__(int,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1),ARGCAST(argv[1],TYPE2)); \ *************** *** 506,510 **** #define REAL_NEW_3(NAME,NEW_CLASS,DSP,LIB, TYPE1, TYPE2, TYPE3) \ ! flext_obj *NEW_CLASS::__init__(int ,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1),ARGCAST(argv[1],TYPE2),ARGCAST(argv[2],TYPE3)); \ --- 521,525 ---- #define REAL_NEW_3(NAME,NEW_CLASS,DSP,LIB, TYPE1, TYPE2, TYPE3) \ ! flext_obj *NEW_CLASS::__init__(int,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1),ARGCAST(argv[1],TYPE2),ARGCAST(argv[2],TYPE3)); \ *************** *** 517,521 **** #define REAL_NEW_4(NAME,NEW_CLASS,DSP,LIB, TYPE1,TYPE2, TYPE3, TYPE4) \ ! flext_obj *NEW_CLASS::__init__(int ,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1),ARGCAST(argv[1],TYPE2),ARGCAST(argv[2],TYPE3),ARGCAST(argv[3],TYPE4)); \ --- 532,536 ---- #define REAL_NEW_4(NAME,NEW_CLASS,DSP,LIB, TYPE1,TYPE2, TYPE3, TYPE4) \ ! flext_obj *NEW_CLASS::__init__(int,t_atom *argv) \ { \ return new NEW_CLASS(ARGCAST(argv[0],TYPE1),ARGCAST(argv[1],TYPE2),ARGCAST(argv[2],TYPE3),ARGCAST(argv[3],TYPE4)); \ Index: flsupport.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** flsupport.cpp 14 Apr 2004 02:33:06 -0000 1.36 --- flsupport.cpp 23 Apr 2004 02:32:55 -0000 1.37 *************** *** 24,27 **** --- 24,28 ---- #endif + const t_symbol *flext::sym__ = NULL; const t_symbol *flext::sym_float = NULL; const t_symbol *flext::sym_symbol = NULL; *************** *** 51,54 **** --- 52,56 ---- #if FLEXT_SYS == FLEXT_SYS_PD + sym__ = gensym(""); sym_anything = gensym("anything"); sym_pointer = gensym("pointer"); *************** *** 60,63 **** --- 62,66 ---- sym_int = gensym("int"); #elif FLEXT_SYS == FLEXT_SYS_MAX + sym__ = gensym(""); sym_int = gensym("int"); sym_float = gensym("float"); *************** *** 67,70 **** --- 70,74 ---- sym_anything = gensym("anything"); #elif FLEXT_SYS == FLEXT_SYS_JMAX + sym__ = fts_new_symbol("");; // is there a static symbol for that? sym_int = fts_s_int; sym_float = fts_s_float; Index: flsupport.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flsupport.h,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** flsupport.h 26 Mar 2004 03:22:11 -0000 1.66 --- flsupport.h 23 Apr 2004 02:32:55 -0000 1.67 *************** *** 290,293 **** --- 290,295 ---- */ + //! Symbol constant for "" + static const t_symbol *sym__; //! Symbol constant for "float" static const t_symbol *sym_float; Index: fllib.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/fllib.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** fllib.cpp 3 Apr 2004 02:21:04 -0000 1.23 --- fllib.cpp 23 Apr 2004 02:32:55 -0000 1.24 *************** *** 325,360 **** #endif ! if(argc == lo->argc) { ! for(int i = 0; /*ok &&*/ i < lo->argc; ++i) { ! switch(lo->argv[i]) { #if FLEXT_SYS != FLEXT_SYS_PD ! case FLEXTTPN_INT: ! if(IsInt(argv[i])) args[i] = argv[i]; ! else if(flext::IsFloat(argv[i])) flext::SetInt(args[i],(int)flext::GetFloat(argv[i])); ! else ok = false; ! break; #endif ! case FLEXTTPN_FLOAT: ! if(IsInt(argv[i])) flext::SetFloat(args[i],(float)flext::GetInt(argv[i])); ! else if(flext::IsFloat(argv[i])) args[i] = argv[i]; ! else ok = false; ! break; ! case FLEXTTPN_SYM: ! // \todo shall we analyze the patcher args????... should already be done! ! if(IsSymbol(argv[i])) // SetSymbol(args[i],GetParamSym(GetSymbol(argv[i]),NULL)); ! args[i] = argv[i]; ! else ok = false; ! break; ! } ! } ! ! if(!ok) ! post("%s: Creation arguments do not match",GetString(s)); ! } ! else { ! error("%s: %s creation arguments",GetString(s),argc < lo->argc?"Not enough":"Too many"); ! ok = false; } } --- 325,372 ---- #endif ! int misnum = 0; ! if(argc > lo->argc) { ok = false; misnum = 1; } ! ! for(int i = 0; ok && i < lo->argc; ++i) { ! switch(lo->argv[i]) { #if FLEXT_SYS != FLEXT_SYS_PD ! case FLEXTTPN_INT: ! case FLEXTTPN_DEFINT: ! if(i >= argc) ! if(lo->argv[i] == FLEXTTPN_DEFINT) SetInt(args[i],0); ! else { misnum = -1,ok = false; break; } ! else if(IsInt(argv[i])) args[i] = argv[i]; ! else if(IsFloat(argv[i])) SetInt(args[i],(int)GetFloat(argv[i])); ! else ok = false; ! break; #endif ! case FLEXTTPN_FLOAT: ! case FLEXTTPN_DEFFLOAT: ! if(i >= argc) ! if(lo->argv[i] == FLEXTTPN_DEFFLOAT) SetFloat(args[i],0); ! else { misnum = -1,ok = false; break; } ! else if(IsInt(argv[i])) SetFloat(args[i],(float)GetInt(argv[i])); ! else if(IsFloat(argv[i])) args[i] = argv[i]; ! else ok = false; ! break; ! case FLEXTTPN_SYM: ! case FLEXTTPN_DEFSYM: ! // \todo shall we analyze the patcher args????... should already be done! ! if(i >= argc) ! if(lo->argv[i] == FLEXTTPN_DEFSYM) SetSymbol(args[i],sym__); ! else { misnum = -1,ok = false; break; } ! else if(IsSymbol(argv[i])) // SetSymbol(args[i],GetParamSym(GetSymbol(argv[i]),NULL)); ! args[i] = argv[i]; ! else ok = false; ! break; ! } } + + if(!ok) + if(misnum) + error("%s: %s creation arguments",GetString(s),misnum < 0?"Not enough":"Too many"); + else + error("%s: Creation arguments do not match",GetString(s)); }

1 0

externals/zexy/src makefile.nt,1.1,1.2
by carmen rocco 23 Apr '04

23 Apr '04

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1734 Modified Files: makefile.nt Log Message: vc++ free version makefile Index: makefile.nt =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/makefile.nt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile.nt 22 Apr 2004 23:46:41 -0000 1.1 --- makefile.nt 22 Apr 2004 23:59:05 -0000 1.2 *************** *** 1,5 **** all: zexy.dll ! SRCS = z_average.c z_connective.c z_coordinates.c z_datetime.c z_dfreq.c z_drip.c z_index.c z_limiter.c z_lp.c z_makesymbol.c z_matrix.c z_msgfile.c z_multiline.c z_multiplex.c z_noise.c z_nop.c z_operating_system.c z_pack.c z_pdf.c z_prime.c z_quantize.c z_random.c z_sfplay.c z_sfrecord.c z_sigaverage.c z_sigbin.c z_sigmatrix.c z_sigpack.c z_sigzero.c z_sort.c z_stat.c z_strings.c z_swap.c z_tabread4.c z_testfun.c z_wrap.c z_zdelay.c NTOBJETS = $(SRCS:.c=.obj) --- 1,5 ---- all: zexy.dll ! SRCS = z_average.c z_connective.c z_coordinates.c z_datetime.c z_dfreq.c z_drip.c z_index.c z_limiter.c z_lp.c z_makesymbol.c z_matrix.c z_msgfile.c z_multiline.c z_multiplex.c z_noise.c z_nop.c z_operating_system.c z_pack.c z_pdf.c z_prime.c z_quantize.c z_random.c z_sfplay.c z_sfrecord.c z_sigaverage.c z_sigbin.c z_sigmatrix.c z_sigpack.c z_sigzero.c z_sort.c z_stat.c z_strings.c z_swap.c z_tabread4.c z_testfun.c z_wrap.c z_zdelay.c zexy.c NTOBJETS = $(SRCS:.c=.obj) *************** *** 24,28 **** zexy.dll: $(NTOBJETS) ! -link /dll /out:zexy.dll $(PDNTLIB) $(NTOBJETS) clean: --- 24,28 ---- zexy.dll: $(NTOBJETS) ! -link /dll /out:zexy.dll /export:zexy_setup $(PDNTLIB) $(NTOBJETS) clean:

1 0

externals/zexy/src makefile.nt,NONE,1.1
by carmen rocco 23 Apr '04

23 Apr '04

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31241 Added Files: makefile.nt Log Message: wtf is a ".dsw" file. any way to build that from cmdline? --- NEW FILE: makefile.nt --- all: zexy.dll SRCS = z_average.c z_connective.c z_coordinates.c z_datetime.c z_dfreq.c z_drip.c z_index.c z_limiter.c z_lp.c z_makesymbol.c z_matrix.c z_msgfile.c z_multiline.c z_multiplex.c z_noise.c z_nop.c z_operating_system.c z_pack.c z_pdf.c z_prime.c z_quantize.c z_random.c z_sfplay.c z_sfrecord.c z_sigaverage.c z_sigbin.c z_sigmatrix.c z_sigpack.c z_sigzero.c z_sort.c z_stat.c z_strings.c z_swap.c z_tabread4.c z_testfun.c z_wrap.c z_zdelay.c NTOBJETS = $(SRCS:.c=.obj) NTDLLS = *.dll PDNTCFLAGS = /DNT /DMSW /DPD /nologo PDNTINCLUDE = /I. /I..\..\..\src PDNTLDIR = "c:\program\vc2003\lib" PDNTLIB = $(PDNTLDIR)\libc.lib \ $(PDNTLDIR)\oldnames.lib \ $(PDNTLDIR)\wsock32.lib \ $(PDNTLDIR)\kernel32.lib \ $(PDNTLDIR)\uuid.lib \ ..\..\..\bin\pd.lib .c.obj: cl /c $(PDNTCFLAGS) $(PDNTINCLUDE) $*.c zexy.dll: $(NTOBJETS) -link /dll /out:zexy.dll $(PDNTLIB) $(NTOBJETS) clean: del *.obj del *.dll

1 0

pd/src configure.in,1.1.1.4.2.12,1.1.1.4.2.13
by Tim Blechmann 22 Apr '04

22 Apr '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28464 Modified Files: Tag: devel_0_37 configure.in Log Message: fixed: problem without --enable-icc Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.1.1.4.2.12 retrieving revision 1.1.1.4.2.13 diff -C2 -d -r1.1.1.4.2.12 -r1.1.1.4.2.13 *** configure.in 31 Mar 2004 13:15:46 -0000 1.1.1.4.2.12 --- configure.in 22 Apr 2004 11:44:12 -0000 1.1.1.4.2.13 *************** *** 35,39 **** AC_ARG_ENABLE(fftw, [ --enable-fftw fftw3 support], fftw="yes",fftw="no") ! AC_ARG_ENABLE(icc, [ --enable-icc icc support],icc=$enableval) AC_ARG_ENABLE(optimize, [ --enable-optimize enables optimized builds for: pentium4, pentium3],optimize=$enableval) AC_ARG_ENABLE(threadedgui, [ --enable-threadedgui use yves degoyon's threaded gui patch],threadedgui=$enableval) --- 35,39 ---- AC_ARG_ENABLE(fftw, [ --enable-fftw fftw3 support], fftw="yes",fftw="no") ! AC_ARG_ENABLE(icc, [ --enable-icc icc support],icc=$enableval,icc="no") AC_ARG_ENABLE(optimize, [ --enable-optimize enables optimized builds for: pentium4, pentium3],optimize=$enableval) AC_ARG_ENABLE(threadedgui, [ --enable-threadedgui use yves degoyon's threaded gui patch],threadedgui=$enableval)

1 0

pd/src configure,1.1.1.4.2.12,1.1.1.4.2.13
by Tim Blechmann 22 Apr '04

22 Apr '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28225 Modified Files: Tag: devel_0_37 configure Log Message: fixed: problem without --enable-icc Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure,v retrieving revision 1.1.1.4.2.12 retrieving revision 1.1.1.4.2.13 diff -C2 -d -r1.1.1.4.2.12 -r1.1.1.4.2.13 *** configure 31 Mar 2004 13:15:14 -0000 1.1.1.4.2.12 --- configure 22 Apr 2004 11:43:02 -0000 1.1.1.4.2.13 *************** *** 606,609 **** --- 606,611 ---- enableval="$enable_icc" icc=$enableval + else + icc="no" fi *************** *** 626,630 **** set dummy icc; ac_word=$2 [...1532 lines suppressed...] /* Override any gcc2 internal prototype to avoid an error. */ --- 2718,2722 ---- LIBS="-lfftw3f $LIBS" cat > conftest.$ac_ext <<EOF ! #line 2721 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ *************** *** 2727,2731 **** ; return 0; } EOF ! if { (eval echo configure:2730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 2729,2733 ---- ; return 0; } EOF ! if { (eval echo configure:2732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes"

1 0

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