From 9ac7977b87ef9b5bd1c6036b91dcce5a5e1c4ea1 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Wed, 20 Jul 2005 08:11:18 +0000 Subject: corrected Python object propagation (attribute "py") and adjusted help files better exception handling and error message much better detach method handling (one thread for all object instances) better definition of output values (atoms, lists, anythings) svn path=/trunk/; revision=3364 --- externals/grill/py/source/py.cpp | 4 ++-- externals/grill/py/source/pybase.cpp | 4 ++-- externals/grill/py/source/pybase.h | 2 +- externals/grill/py/source/pyext.cpp | 2 +- externals/grill/py/source/pyext.h | 2 +- externals/grill/py/source/pymeth.cpp | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'externals/grill/py/source') diff --git a/externals/grill/py/source/py.cpp b/externals/grill/py/source/py.cpp index b4b4f225..caa759f2 100644 --- a/externals/grill/py/source/py.cpp +++ b/externals/grill/py/source/py.cpp @@ -66,7 +66,7 @@ private: // callbacks FLEXT_ATTRVAR_I(detach) - FLEXT_ATTRVAR_B(xlate) + FLEXT_ATTRVAR_B(pymsg) FLEXT_ATTRVAR_B(respond) FLEXT_CALLBACK_V(m_stop) @@ -99,7 +99,7 @@ void pyobj::Setup(t_classid c) FLEXT_CADDMETHOD_(c,0,"set",m_set); - FLEXT_CADDATTR_VAR1(c,"py",xlate); + FLEXT_CADDATTR_VAR1(c,"py",pymsg); FLEXT_CADDATTR_VAR1(c,"respond",respond); } diff --git a/externals/grill/py/source/pybase.cpp b/externals/grill/py/source/pybase.cpp index 20f16e13..d569a84c 100644 --- a/externals/grill/py/source/pybase.cpp +++ b/externals/grill/py/source/pybase.cpp @@ -192,7 +192,7 @@ pybase::pybase() , shouldexit(false),stoptick(0) #endif , detach(0) - , xlate(true) + , pymsg(false) { PyThreadState *state = PyLockSys(); Py_INCREF(module_obj); @@ -453,7 +453,7 @@ void pybase::AddCurrentPath(t_canvas *cnv) bool pybase::OutObject(flext_base *ext,int o,PyObject *obj) { flext::AtomListStatic<16> lst; - const t_symbol *sym = xlate?GetPyArgs(lst,obj):GetPyAtom(lst,obj); + const t_symbol *sym = pymsg?GetPyAtom(lst,obj):GetPyArgs(lst,obj); if(sym) { // call to outlet _outside_ the Mutex lock! // otherwise (if not detached) deadlock will occur diff --git a/externals/grill/py/source/pybase.h b/externals/grill/py/source/pybase.h index 28ee9770..5fadb946 100644 --- a/externals/grill/py/source/pybase.h +++ b/externals/grill/py/source/pybase.h @@ -133,7 +133,7 @@ protected: #endif int detach; - bool xlate; + bool pymsg; bool gencall(PyObject *fun,PyObject *args); diff --git a/externals/grill/py/source/pyext.cpp b/externals/grill/py/source/pyext.cpp index 4252e64a..48f4849f 100644 --- a/externals/grill/py/source/pyext.cpp +++ b/externals/grill/py/source/pyext.cpp @@ -41,7 +41,7 @@ void pyext::Setup(t_classid c) FLEXT_CADDMETHOD_(c,0,"get",m_get); FLEXT_CADDMETHOD_(c,0,"set",m_set); - FLEXT_CADDATTR_VAR1(c,"py",xlate); + FLEXT_CADDATTR_VAR1(c,"py",pymsg); FLEXT_CADDATTR_VAR1(c,"respond",respond); // ---------------------------------------------------- diff --git a/externals/grill/py/source/pyext.h b/externals/grill/py/source/pyext.h index d4652409..3aaf62bf 100644 --- a/externals/grill/py/source/pyext.h +++ b/externals/grill/py/source/pyext.h @@ -137,7 +137,7 @@ private: // callbacks FLEXT_ATTRVAR_I(detach) - FLEXT_ATTRVAR_B(xlate) + FLEXT_ATTRVAR_B(pymsg) FLEXT_ATTRVAR_B(respond) FLEXT_CALLBACK_V(m_stop) diff --git a/externals/grill/py/source/pymeth.cpp b/externals/grill/py/source/pymeth.cpp index 399c9463..177802b7 100644 --- a/externals/grill/py/source/pymeth.cpp +++ b/externals/grill/py/source/pymeth.cpp @@ -143,7 +143,7 @@ private: // callbacks FLEXT_ATTRVAR_I(detach) - FLEXT_ATTRVAR_B(xlate) + FLEXT_ATTRVAR_B(pymsg) FLEXT_ATTRVAR_B(respond) FLEXT_CALLBACK_V(m_stop) @@ -176,7 +176,7 @@ void pymeth::Setup(t_classid c) FLEXT_CADDMETHOD_(c,0,"set",m_set); - FLEXT_CADDATTR_VAR1(c,"py",xlate); + FLEXT_CADDATTR_VAR1(c,"py",pymsg); FLEXT_CADDATTR_VAR1(c,"respond",respond); // init translation map -- cgit v1.2.1