From 8a0ff7683227964f6aad09e1be750ce9b3821243 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Thu, 7 Apr 2005 15:03:53 +0000 Subject: cleaner error reporting added generic numpy support (not working) use lock count instead of message queuing to avoid py->py messaging deadlock fixing strange gcc behavior fixes for maxmsp support for buffer objects (preliminary) fixed reference count bug use optimized version adjust pd and py files for correct argument passing more optimizations little restructuring svn path=/trunk/; revision=2687 --- externals/grill/py/source/clmeth.cpp | 4 ++-- externals/grill/py/source/py.cpp | 2 +- externals/grill/py/source/pyext.cpp | 2 +- externals/grill/py/source/pyext.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'externals/grill/py') diff --git a/externals/grill/py/source/clmeth.cpp b/externals/grill/py/source/clmeth.cpp index 4b403cf8..267d2da9 100644 --- a/externals/grill/py/source/clmeth.cpp +++ b/externals/grill/py/source/clmeth.cpp @@ -173,7 +173,7 @@ PyObject *pyext::pyext_outlet(PyObject *,PyObject *args) if(!tp) val = PySequence_GetSlice(args,2,sz); // new ref - AtomListStatic<16> lst; + flext::AtomListStatic<16> lst; if(GetPyArgs(lst,val)) { int o = PyInt_AsLong(outl); if(o >= 1 && o <= ext->Outlets()) { @@ -295,7 +295,7 @@ PyObject *pyext::pyext_tocanvas(PyObject *,PyObject *args) if(!tp) val = PyTuple_GetSlice(args,1,sz); // new ref - AtomListStatic<16> lst; + flext::AtomListStatic<16> lst; if(GetPyArgs(lst,val)) { t_glist *gl = ext->thisCanvas(); //canvas_getcurrent(); t_class **cl = (t_pd *)gl; diff --git a/externals/grill/py/source/py.cpp b/externals/grill/py/source/py.cpp index 4f46a9ea..44d7a608 100644 --- a/externals/grill/py/source/py.cpp +++ b/externals/grill/py/source/py.cpp @@ -331,7 +331,7 @@ bool pyobj::callpy(PyObject *fun,PyObject *args) return false; } else { - AtomListStatic<16> rargs; + flext::AtomListStatic<16> rargs; if(GetPyArgs(rargs,ret)) { // call to outlet _outside_ the Mutex lock! // otherwise (if not detached) deadlock will occur diff --git a/externals/grill/py/source/pyext.cpp b/externals/grill/py/source/pyext.cpp index 7d234956..2fd0ee22 100644 --- a/externals/grill/py/source/pyext.cpp +++ b/externals/grill/py/source/pyext.cpp @@ -414,7 +414,7 @@ void pyext::m_get(const t_symbol *s) PyObject *pvar = PyObject_GetAttrString(pyobj,const_cast(GetString(s))); /* fetch bound method */ if(pvar) { - AtomListStatic<16> lst; + flext::AtomListStatic<16> lst; if(GetPyArgs(lst,pvar,1)) { // dump value to attribute outlet SetSymbol(lst[0],s); diff --git a/externals/grill/py/source/pyext.h b/externals/grill/py/source/pyext.h index 4dd97983..c0b5909a 100644 --- a/externals/grill/py/source/pyext.h +++ b/externals/grill/py/source/pyext.h @@ -76,7 +76,7 @@ protected: int inlets,outlets; int siginlets,sigoutlets; - AtomListStatic<16> initargs; + flext::AtomListStatic<16> initargs; virtual bool Reload(); virtual bool DoInit(); -- cgit v1.2.1