From c2d193b8e78aeca08c8c49baa83cc40b9951b833 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 4 Jan 2003 04:36:49 +0000 Subject: "" svn path=/trunk/; revision=320 --- externals/grill/flext/source/flext.cpp | 14 ++++++- externals/grill/flext/source/flmsg.cpp | 3 ++ externals/grill/pool/data.cpp | 2 +- externals/grill/pool/license.txt | 4 +- externals/grill/pool/main.cpp | 6 +-- externals/grill/pool/pool.cpp | 2 +- externals/grill/pool/pool.h | 2 +- externals/grill/pool/pool.pd | 74 +++++++++++++++++----------------- externals/grill/pool/readme.txt | 2 +- externals/grill/py/license.txt | 4 +- externals/grill/py/readme.txt | 2 +- externals/grill/py/scripts/script.py | 2 +- externals/grill/py/scripts/sendrecv.py | 2 +- externals/grill/py/scripts/simple.py | 2 +- externals/grill/py/scripts/tcltk.py | 2 +- externals/grill/py/scripts/threads.py | 2 +- externals/grill/py/source/bound.cpp | 2 +- externals/grill/py/source/clmeth.cpp | 2 +- externals/grill/py/source/main.cpp | 2 +- externals/grill/py/source/main.h | 2 +- externals/grill/py/source/modmeth.cpp | 2 +- externals/grill/py/source/py.cpp | 4 +- externals/grill/py/source/pyargs.cpp | 2 +- externals/grill/py/source/pyext.cpp | 4 +- externals/grill/py/source/pyext.h | 4 +- externals/grill/py/source/register.cpp | 2 +- 26 files changed, 82 insertions(+), 69 deletions(-) (limited to 'externals/grill') diff --git a/externals/grill/flext/source/flext.cpp b/externals/grill/flext/source/flext.cpp index c13d8732..e54ad339 100644 --- a/externals/grill/flext/source/flext.cpp +++ b/externals/grill/flext/source/flext.cpp @@ -27,8 +27,6 @@ flext_base::flext_base(): insigs(0),outsigs(0), outlets(NULL),outattr(NULL), distmsgs(false), - methhead(new itemarr),attrhead(new itemarr), - clmethhead(ClMeths(thisClassId())),clattrhead(ClAttrs(thisClassId())), inlets(NULL) #if FLEXT_SYS == FLEXT_SYS_MAX ,indesc(NULL),outdesc(NULL) @@ -36,6 +34,18 @@ flext_base::flext_base(): { LOG1("%s - flext logging is on",thisName()); + t_classid clid = thisClassId(); + clmethhead = ClMeths(clid); + methhead = new itemarr; + + if(procattr) { + // initialize when attribute processing is enabled + attrhead = new itemarr; + clattrhead = ClAttrs(clid); + } + else + attrhead = clattrhead = NULL; + // message queue ticker qhead = qtail = NULL; qclk = (t_qelem *)(qelem_new(this,(t_method)QTick)); diff --git a/externals/grill/flext/source/flmsg.cpp b/externals/grill/flext/source/flmsg.cpp index 4a6e0c20..3041ea0b 100755 --- a/externals/grill/flext/source/flmsg.cpp +++ b/externals/grill/flext/source/flmsg.cpp @@ -128,6 +128,9 @@ bool flext_base::TryMethAny(const methitem *m,int inlet,const t_symbol *t,const return false; } +/*! \brief Find a method item for a specific tag and arguments + \remark All attributes are also stored in the method list and retrieved by a member of the method item +*/ bool flext_base::FindMeth(int inlet,const t_symbol *s,int argc,const t_atom *argv) { methitem *m; diff --git a/externals/grill/pool/data.cpp b/externals/grill/pool/data.cpp index 38c13bd5..4984129b 100644 --- a/externals/grill/pool/data.cpp +++ b/externals/grill/pool/data.cpp @@ -2,7 +2,7 @@ pool - hierarchical storage object for PD and Max/MSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/pool/license.txt b/externals/grill/pool/license.txt index 7f371766..4be8d32a 100644 --- a/externals/grill/pool/license.txt +++ b/externals/grill/pool/license.txt @@ -1,5 +1,5 @@ pool - a hierarchical storage object for PD and MaxMSP -Copyright (C) 2002 Thomas Grill +Copyright (C) 2002-2003 Thomas Grill This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -28,7 +28,7 @@ This package uses the flext C++ layer - See its license text below: --- flext ---------------------------------------------- flext - C++ layer for Max/MSP and pd (pure data) externals -Copyright (C) 2001,2002 Thomas Grill +Copyright (C) 2001-2003 Thomas Grill This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/externals/grill/pool/main.cpp b/externals/grill/pool/main.cpp index 07d96e20..cf513d87 100644 --- a/externals/grill/pool/main.cpp +++ b/externals/grill/pool/main.cpp @@ -2,7 +2,7 @@ pool - hierarchical storage object for PD and Max/MSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. @@ -21,7 +21,7 @@ public: pool(I argc,const A *argv); ~pool(); - static V setup(t_class *); + static V setup(t_classid); pooldata *Pool() { return pl; } @@ -172,7 +172,7 @@ FLEXT_NEW_V("pool",pool); pooldata *pool::head,*pool::tail; -V pool::setup(t_class *c) +V pool::setup(t_classid c) { post(""); post("pool %s - hierarchical storage object, (C)2002 Thomas Grill",POOL_VERSION); diff --git a/externals/grill/pool/pool.cpp b/externals/grill/pool/pool.cpp index 9c30603c..886debc6 100644 --- a/externals/grill/pool/pool.cpp +++ b/externals/grill/pool/pool.cpp @@ -2,7 +2,7 @@ pool - hierarchical storage object for PD and Max/MSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/pool/pool.h b/externals/grill/pool/pool.h index 5e1c0cc1..2fdbbd28 100644 --- a/externals/grill/pool/pool.h +++ b/externals/grill/pool/pool.h @@ -2,7 +2,7 @@ pool - hierarchical storage object for PD and Max/MSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/pool/pool.pd b/externals/grill/pool/pool.pd index 14ac7d7d..4d5592e3 100644 --- a/externals/grill/pool/pool.pd +++ b/externals/grill/pool/pool.pd @@ -1,4 +1,4 @@ -#N canvas 25 23 978 681 12; +#N canvas 25 23 980 683 12; #X msg 295 108 set 1 2 3; #X obj 254 615 print K; #X msg 607 211 getall; @@ -12,7 +12,7 @@ #X msg 432 181 get A; #X msg 432 213 get 2; #X msg 40 132 echodir \$1; -#X obj 40 111 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1 1 +#X obj 40 111 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X obj 40 213 tgl 15 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; @@ -56,7 +56,7 @@ #X text 673 376 (depth may be given); #X msg 296 282 add 3 14; #X text 294 261 set but don't replace; -#N canvas 0 0 510 536 dirs 0; +#N canvas 0 0 512 538 dirs 0; #X msg 109 27 mkdir fld1; #X msg 111 122 chdir; #X msg 110 217 updir; @@ -167,9 +167,7 @@ ; #X obj 26 10 cnv 15 850 40 empty empty pool 10 22 0 24 -260818 -1 0 ; -#X text 337 32 http://www.parasitaere-kapazitaeten.net; -#X text 337 12 a hierarchical storage object \, (C)2002 Thomas Grill -; +#X text 272 33 http://www.parasitaere-kapazitaeten.net; #X obj 317 529 print A; #X text 382 529 attributes; #X msg 43 490 getattributes; @@ -177,36 +175,38 @@ #X msg 132 232 getabsdir; #X msg 146 313 getpool; #X obj 260 478 pool; -#X connect 0 0 73 0; -#X connect 2 0 73 0; -#X connect 3 0 73 0; -#X connect 6 0 73 0; -#X connect 7 0 73 0; -#X connect 8 0 73 0; -#X connect 9 0 73 0; -#X connect 10 0 73 0; -#X connect 11 0 73 0; -#X connect 12 0 73 0; +#X text 272 13 a hierarchical storage object \, (C)2002-2003 Thomas +Grill; +#X connect 0 0 72 0; +#X connect 2 0 72 0; +#X connect 3 0 72 0; +#X connect 6 0 72 0; +#X connect 7 0 72 0; +#X connect 8 0 72 0; +#X connect 9 0 72 0; +#X connect 10 0 72 0; +#X connect 11 0 72 0; +#X connect 12 0 72 0; #X connect 13 0 12 0; #X connect 14 0 15 0; -#X connect 15 0 73 0; -#X connect 23 0 73 0; -#X connect 24 0 73 0; -#X connect 26 0 73 0; -#X connect 28 0 73 0; -#X connect 33 0 73 0; -#X connect 34 0 73 0; -#X connect 45 0 73 0; -#X connect 48 0 73 0; -#X connect 50 0 73 0; -#X connect 53 0 73 0; -#X connect 62 0 73 0; -#X connect 69 0 73 0; -#X connect 70 0 73 0; -#X connect 71 0 73 0; -#X connect 72 0 73 0; -#X connect 73 0 4 0; -#X connect 73 1 1 0; -#X connect 73 2 5 0; -#X connect 73 3 18 0; -#X connect 73 4 67 0; +#X connect 15 0 72 0; +#X connect 23 0 72 0; +#X connect 24 0 72 0; +#X connect 26 0 72 0; +#X connect 28 0 72 0; +#X connect 33 0 72 0; +#X connect 34 0 72 0; +#X connect 45 0 72 0; +#X connect 48 0 72 0; +#X connect 50 0 72 0; +#X connect 53 0 72 0; +#X connect 62 0 72 0; +#X connect 68 0 72 0; +#X connect 69 0 72 0; +#X connect 70 0 72 0; +#X connect 71 0 72 0; +#X connect 72 0 4 0; +#X connect 72 1 1 0; +#X connect 72 2 5 0; +#X connect 72 3 18 0; +#X connect 72 4 66 0; diff --git a/externals/grill/pool/readme.txt b/externals/grill/pool/readme.txt index e8053aed..56d7b7b5 100644 --- a/externals/grill/pool/readme.txt +++ b/externals/grill/pool/readme.txt @@ -1,6 +1,6 @@ pool - a hierarchical storage object for PD and Max/MSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/py/license.txt b/externals/grill/py/license.txt index 949207fd..7de52136 100644 --- a/externals/grill/py/license.txt +++ b/externals/grill/py/license.txt @@ -1,5 +1,5 @@ py/pyext - python script objects for PD and MaxMSP -Copyright (C) 2002 Thomas Grill +Copyright (C) 2002-2003 Thomas Grill This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -28,7 +28,7 @@ This package uses the flext C++ layer - See its license text below: --- flext ---------------------------------------------- flext - C++ layer for Max/MSP and pd (pure data) externals -Copyright (C) 2001,2002 Thomas Grill +Copyright (C) 2001-2003 Thomas Grill This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/externals/grill/py/readme.txt b/externals/grill/py/readme.txt index 82d88985..3c0cdb43 100644 --- a/externals/grill/py/readme.txt +++ b/externals/grill/py/readme.txt @@ -1,6 +1,6 @@ py/pyext - python script objects for PD (and MaxMSP... once, under MacOSX and Windows) -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/py/scripts/script.py b/externals/grill/py/scripts/script.py index 4796949c..b4741b00 100644 --- a/externals/grill/py/scripts/script.py +++ b/externals/grill/py/scripts/script.py @@ -1,6 +1,6 @@ # py/pyext - python script objects for PD and MaxMSP # -# Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) # For information on usage and redistribution, and for a DISCLAIMER OF ALL # WARRANTIES, see the file, "license.txt," in this distribution. # diff --git a/externals/grill/py/scripts/sendrecv.py b/externals/grill/py/scripts/sendrecv.py index 5b0cc1df..2d0eb9e6 100644 --- a/externals/grill/py/scripts/sendrecv.py +++ b/externals/grill/py/scripts/sendrecv.py @@ -1,6 +1,6 @@ # py/pyext - python script objects for PD and MaxMSP # -# Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) # For information on usage and redistribution, and for a DISCLAIMER OF ALL # WARRANTIES, see the file, "license.txt," in this distribution. # diff --git a/externals/grill/py/scripts/simple.py b/externals/grill/py/scripts/simple.py index da35a6b4..2962ab39 100644 --- a/externals/grill/py/scripts/simple.py +++ b/externals/grill/py/scripts/simple.py @@ -1,6 +1,6 @@ # py/pyext - python script objects for PD and MaxMSP # -# Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) # For information on usage and redistribution, and for a DISCLAIMER OF ALL # WARRANTIES, see the file, "license.txt," in this distribution. # diff --git a/externals/grill/py/scripts/tcltk.py b/externals/grill/py/scripts/tcltk.py index 04828a25..08131995 100644 --- a/externals/grill/py/scripts/tcltk.py +++ b/externals/grill/py/scripts/tcltk.py @@ -1,6 +1,6 @@ # py/pyext - python script objects for PD and MaxMSP # -# Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) # For information on usage and redistribution, and for a DISCLAIMER OF ALL # WARRANTIES, see the file, "license.txt," in this distribution. # diff --git a/externals/grill/py/scripts/threads.py b/externals/grill/py/scripts/threads.py index ec0488d7..7ab31a80 100644 --- a/externals/grill/py/scripts/threads.py +++ b/externals/grill/py/scripts/threads.py @@ -1,6 +1,6 @@ # py/pyext - python script objects for PD and MaxMSP # -# Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +# Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) # For information on usage and redistribution, and for a DISCLAIMER OF ALL # WARRANTIES, see the file, "license.txt," in this distribution. # diff --git a/externals/grill/py/source/bound.cpp b/externals/grill/py/source/bound.cpp index f402480b..c2d0a2cc 100644 --- a/externals/grill/py/source/bound.cpp +++ b/externals/grill/py/source/bound.cpp @@ -2,7 +2,7 @@ py/pyext - python external object for PD and MaxMSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/py/source/clmeth.cpp b/externals/grill/py/source/clmeth.cpp index 283f52e9..cf2b6842 100644 --- a/externals/grill/py/source/clmeth.cpp +++ b/externals/grill/py/source/clmeth.cpp @@ -2,7 +2,7 @@ py/pyext - python external object for PD and MaxMSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/py/source/main.cpp b/externals/grill/py/source/main.cpp index a0e77cef..21e78f05 100644 --- a/externals/grill/py/source/main.cpp +++ b/externals/grill/py/source/main.cpp @@ -2,7 +2,7 @@ py/pyext - python external object for PD and MaxMSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/py/source/main.h b/externals/grill/py/source/main.h index 721a1d43..52990fe0 100644 --- a/externals/grill/py/source/main.h +++ b/externals/grill/py/source/main.h @@ -2,7 +2,7 @@ py/pyext - python script object for PD and MaxMSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/py/source/modmeth.cpp b/externals/grill/py/source/modmeth.cpp index 96108099..3d5c0a1d 100644 --- a/externals/grill/py/source/modmeth.cpp +++ b/externals/grill/py/source/modmeth.cpp @@ -2,7 +2,7 @@ py/pyext - python external object for PD and MaxMSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/py/source/py.cpp b/externals/grill/py/source/py.cpp index 00f1f992..57bf063d 100644 --- a/externals/grill/py/source/py.cpp +++ b/externals/grill/py/source/py.cpp @@ -2,7 +2,7 @@ py/pyext - python script object for PD and MaxMSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. @@ -50,7 +50,7 @@ protected: V ResetFunction(); private: - static void Setup(t_class *c); + static void Setup(t_classid c); FLEXT_CALLBACK(m_bang) FLEXT_CALLBACK(m_reload) diff --git a/externals/grill/py/source/pyargs.cpp b/externals/grill/py/source/pyargs.cpp index be4adaa1..5ed3a89c 100644 --- a/externals/grill/py/source/pyargs.cpp +++ b/externals/grill/py/source/pyargs.cpp @@ -2,7 +2,7 @@ py/pyext - python external object for PD and MaxMSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. diff --git a/externals/grill/py/source/pyext.cpp b/externals/grill/py/source/pyext.cpp index 958f1882..5f984b4b 100644 --- a/externals/grill/py/source/pyext.cpp +++ b/externals/grill/py/source/pyext.cpp @@ -2,7 +2,7 @@ py/pyext - python script object for PD and MaxMSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. @@ -14,7 +14,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. FLEXT_LIB_V("pyext",pyext) -V pyext::Setup(t_class *c) +V pyext::Setup(t_classid c) { px_head = px_tail = NULL; diff --git a/externals/grill/py/source/pyext.h b/externals/grill/py/source/pyext.h index 4d35e0a4..0dce4ed5 100644 --- a/externals/grill/py/source/pyext.h +++ b/externals/grill/py/source/pyext.h @@ -2,7 +2,7 @@ py/pyext - python external object for PD and MaxMSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. @@ -53,7 +53,7 @@ protected: I inlets,outlets; private: - static V Setup(t_class *); + static V Setup(t_classid); static pyext *GetThis(PyObject *self); V ClearBinding(); diff --git a/externals/grill/py/source/register.cpp b/externals/grill/py/source/register.cpp index 63a9f952..9fe4dfc7 100644 --- a/externals/grill/py/source/register.cpp +++ b/externals/grill/py/source/register.cpp @@ -2,7 +2,7 @@ py/pyext - python external object for PD and MaxMSP -Copyright (c) 2002 Thomas Grill (xovo@gmx.net) +Copyright (c) 2002-2003 Thomas Grill (xovo@gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. -- cgit v1.2.1