Update of /cvsroot/pure-data/externals/grill/pool/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21327/source
Modified Files: main.cpp pool.cpp pool.h Log Message: file loading: fixed recognition of stringified directory names fixed clearing values and dirs, e.g. with messages clrall and clrrec fixed c++ conformance
Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/main.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** main.cpp 6 Sep 2005 13:20:25 -0000 1.12 --- main.cpp 22 Oct 2005 18:56:30 -0000 1.13 *************** *** 12,21 **** #include <string>
! #define POOL_VERSION "0.2.1"
! #define VCNT 64 ! #define DCNT 16
- const t_symbol *sym_echo = flext::MakeSymbol("echo");
class pool: --- 12,20 ---- #include <string>
! #define POOL_VERSION "0.2.2pre"
! #define VCNT 32 ! #define DCNT 8
class pool: *************** *** 118,121 **** --- 117,122 ---- V ToOutAtom(I ix,const A &a);
+ static const t_symbol *sym_echo; + enum get_t { get_norm,get_cnt,get_print };
*************** *** 228,231 **** --- 229,233 ----
pooldata *pool::head,*pool::tail; + const t_symbol *pool::sym_echo;
*************** *** 237,240 **** --- 239,243 ----
head = tail = NULL; + sym_echo = MakeSymbol("echo");
FLEXT_CADDATTR_VAR(c,"pool",mg_pool,ms_pool);
Index: pool.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/pool.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** pool.cpp 22 Aug 2005 19:21:31 -0000 1.19 --- pool.cpp 22 Oct 2005 18:56:30 -0000 1.20 *************** *** 18,23 **** using namespace std;
- #define VBITS 6 - #define DBITS 5
inline I compare(I a,I b) { return a == b?0:(a < b?-1:1); } --- 18,21 ---- *************** *** 85,89 **** pooldir::pooldir(const A &d,pooldir *p,I vcnt,I dcnt): parent(p),nxt(NULL),vals(NULL),dirs(NULL), ! vbits(vcnt?Int2Bits(vcnt):VBITS),dbits(dcnt?Int2Bits(dcnt):DBITS), vsize(1<<vbits),dsize(1<<dbits) { --- 83,87 ---- pooldir::pooldir(const A &d,pooldir *p,I vcnt,I dcnt): parent(p),nxt(NULL),vals(NULL),dirs(NULL), ! vbits(Int2Bits(vcnt)),dbits(Int2Bits(dcnt)), vsize(1<<vbits),dsize(1<<dbits) { *************** *** 102,110 **** { if(rec && dirs) { ! for(I i = 0; i < dsize; ++i) if(dirs[i].d) { delete dirs[i].d; dirs[i].d = NULL; } } if(!dironly && vals) { ! for(I i = 0; i < vsize; ++i) if(vals[i].v) { delete vals[i].v; vals[i].v = NULL; } ! } }
--- 100,128 ---- { if(rec && dirs) { ! for(I i = 0; i < dsize; ++i) { ! pooldir *d = dirs[i].d,*d1; ! if(d) { ! do { ! d1 = d->nxt; ! delete d; ! } while((d = d1) != NULL); ! dirs[i].d = NULL; ! dirs[i].cnt = 0; ! } ! } } if(!dironly && vals) { ! for(I i = 0; i < vsize; ++i) { ! poolval *v = vals[i].v,*v1; ! if(v) { ! do { ! v1 = v->nxt; ! delete v; ! } while((v = v1) != NULL); ! vals[i].v = NULL; ! vals[i].cnt = 0; ! } ! } ! } }
Index: pool.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/source/pool.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pool.h 9 Jun 2005 13:38:41 -0000 1.10 --- pool.h 22 Oct 2005 18:56:30 -0000 1.11 *************** *** 54,58 **** { public: ! pooldir(const A &dir,pooldir *parent,I vcnt = 0,I dcnt = 0); ~pooldir();
--- 54,58 ---- { public: ! pooldir(const A &dir,pooldir *parent,I vcnt,I dcnt); ~pooldir();