From da93c2de9bcc91555e5cbf8255d811818d8beca8 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Sat, 20 Jan 2007 14:26:45 +0000 Subject: use new ToSys* methods a few fixes (printout and initialization) attempt fix for bug #143. svn path=/trunk/; revision=7369 --- externals/grill/absattr/absattr.cpp | 60 +++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/externals/grill/absattr/absattr.cpp b/externals/grill/absattr/absattr.cpp index 8d5da671..cb1418f2 100644 --- a/externals/grill/absattr/absattr.cpp +++ b/externals/grill/absattr/absattr.cpp @@ -2,13 +2,13 @@ absattr - patcher attributes -Copyright (c) 2002-2006 Thomas Grill (gr@grrrr.org) +Copyright (c) 2002-2007 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. */ -#define VERSION "0.2.0" +#define VERSION "0.2.1" #include @@ -44,8 +44,14 @@ public: Process(args.Count(),args.Atoms(),true); // add to loadbang registry - Objects &o = loadbangs[parent].obj; - o.insert(this); + Loadbangs::iterator it = loadbangs.find(parent); + if(it != loadbangs.end()) + it->second.obj.insert(this); + else { + Loadbang &lb = loadbangs[parent]; + lb.lasttime = -1; + lb.obj.insert(this); + } } ~absattr() @@ -66,7 +72,7 @@ public: if(o.empty()) loadbangs.erase(it); } else - error("%s - not found in loadbang registry"); + error("%s - not found in loadbang registry (parent=%i)",thisName(),parent); } //! dump parameters @@ -124,27 +130,35 @@ protected: virtual void CbLoadbang() { - // all loadbangs have the same logical time - double time = GetTime(); + if(parent) { + // we are a sub-abstraction, sharing a parent with others + + // all loadbangs have the same logical time + double time = GetTime(); + + Loadbangs::iterator it = loadbangs.find(parent); + if(it != loadbangs.end()) { + Loadbang &lb = it->second; + // found + if(lb.lasttime < time) { + // bang all objects with the same parent in the prioritized order + for(Objects::iterator oit = lb.obj.begin(); oit != lb.obj.end(); ++oit) { + absattr *o = *oit; + FLEXT_ASSERT(o); + if(o->loadbang) o->m_bang(); + } - Loadbangs::iterator it = loadbangs.find(parent); - if(it != loadbangs.end()) { - Loadbang &lb = it->second; - // found - if(lb.lasttime < time) { - // bang all objects with the same parent in the prioritized order - for(Objects::iterator oit = lb.obj.begin(); oit != lb.obj.end(); ++oit) { - absattr *o = *oit; - FLEXT_ASSERT(o); - if(o->loadbang) o->m_bang(); + // set timestamp + lb.lasttime = time; } - - // set timestamp - lb.lasttime = time; } + else + error("%s - not found in database",thisName()); + } + else { + // loadbang only this + if(loadbang) m_bang(); } - else - error("%s - not found in database"); } void BangAttr(int ix) @@ -249,6 +263,8 @@ private: static void Setup(t_classid cl) { + post("absattr " VERSION ", (C)2006-2007 Thomas Grill"); + sym_attributes = MakeSymbol("attributes"); sym_loadbang = MakeSymbol("loadbang"); -- cgit v1.2.1