better exception handling and error message

much better detach method handling (one thread for all object instances)
oops, forgot to code one branch
better definition of output values (atoms, lists, anythings)

svn path=/trunk/; revision=3360

1 files changed, 1 insertions, 13 deletions

diff --git a/externals/grill/py/source/pymeth.cpp b/externals/grill/py/source/pymeth.cpp
index e2278d1c..399c9463 100644
--- a/externals/grill/py/source/pymeth.cpp
+++ b/externals/grill/py/source/pymeth.cpp
@@ -124,7 +124,6 @@ protected:
 	void SetFunction(const t_symbol *func);

 	void ResetFunction();

 

-    virtual bool thrcall(void *data);

     virtual void DumpOut(const t_symbol *sym,int argc,const t_atom *argv);

 

     PyObject **objects;

@@ -154,10 +153,6 @@ private:
 

 #ifdef FLEXT_THREADS

     FLEXT_CALLBACK_T(tick)

-    FLEXT_THREAD(threadworker)

-	FLEXT_THREAD_X(work_wrapper)

-#else

-	FLEXT_CALLBACK_X(work_wrapper)

 #endif

 };

 

@@ -181,7 +176,7 @@ void pymeth::Setup(t_classid c)
 

 	FLEXT_CADDMETHOD_(c,0,"set",m_set);

 

-  	FLEXT_CADDATTR_VAR1(c,"xlate",xlate);

+  	FLEXT_CADDATTR_VAR1(c,"py",xlate);

   	FLEXT_CADDATTR_VAR1(c,"respond",respond);

 

     // init translation map

@@ -195,8 +190,6 @@ pymeth::pymeth(int argc,const t_atom *argv)
 { 

 #ifdef FLEXT_THREADS

     FLEXT_ADDTIMER(stoptmr,tick);

-    // launch thread worker

-    FLEXT_CALLMETHOD(threadworker);

 #endif

 

 	PyThreadState *state = PyLockSys();

@@ -436,8 +429,3 @@ void pymeth::DumpOut(const t_symbol *sym,int argc,const t_atom *argv)
 {

     ToOutAnything(GetOutAttr(),sym?sym:thisTag(),argc,argv);

 }

-

-bool pymeth::thrcall(void *data)

-{ 

-    return FLEXT_CALLMETHOD_X(work_wrapper,data);

-}