"no message"

svn path=/trunk/; revision=306

1 files changed, 20 insertions, 30 deletions

diff --git a/externals/grill/flext/source/fldefs.h b/externals/grill/flext/source/fldefs.h
index f7488fe0..353752f7 100644
--- a/externals/grill/flext/source/fldefs.h
+++ b/externals/grill/flext/source/fldefs.h
@@ -412,10 +412,10 @@ FLEXT_CALLBACK_1(M_FUN,t_symptr)
 //! Set up a threaded method callback with no arguments
 #define FLEXT_THREAD(M_FUN) \
 static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c) {  \
-	thr_params *p = new thr_params(c); \
+	thr_params *p = new thr_params; \
 	return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \
 } \
-static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
+static void FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 	thisType *th = FLEXT_CAST<thisType *>(p->cl); \
 	bool ok = th->PushThread(); \
 	delete p; \
@@ -423,16 +423,15 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 		th->M_FUN(); \
 		th->PopThread(); \
 	} \
-	return NULL; \
 } 
 
 //! Set up a threaded method callback for an anything argument
 #define FLEXT_THREAD_A(M_FUN) \
 static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,t_symbol *s,int argc,t_atom *argv) {  \
-	thr_params *p = new thr_params(c); p->set_any(s,argc,argv); \
+	thr_params *p = new thr_params; p->set_any(s,argc,argv); \
 	return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \
 } \
-static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
+static void FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 	thisType *th = FLEXT_CAST<thisType *>(p->cl); \
 	bool ok = th->PushThread(); \
 	AtomAnything *args = p->var[0]._any.args; \
@@ -442,16 +441,15 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 		th->PopThread(); \
 	} \
 	delete args; \
-	return NULL; \
 } 
 
 //! Set up a threaded method callback for a variable argument list
 #define FLEXT_THREAD_V(M_FUN) \
 static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,int argc,t_atom *argv) {  \
-	thr_params *p = new thr_params(c); p->set_list(argc,argv); \
+	thr_params *p = new thr_params; p->set_list(argc,argv); \
 	return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \
 } \
-static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
+static void FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 	thisType *th = FLEXT_CAST<thisType *>(p->cl); \
 	bool ok = th->PushThread(); \
 	AtomList *args = p->var[0]._list.args; \
@@ -461,7 +459,6 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 		th->PopThread(); \
 	} \
 	delete args; \
-	return NULL; \
 } 
 
 /*! \brief Set up a threaded method callback for an arbitrary data struct
@@ -469,10 +466,10 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 */
 #define FLEXT_THREAD_X(M_FUN) \
 static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,void *data) {  \
-	thr_params *p = new thr_params(c); p->var[0]._ext.data = data; \
+	thr_params *p = new thr_params; p->var[0]._ext.data = data; \
 	return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \
 } \
-static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
+static void FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 	thisType *th = FLEXT_CAST<thisType *>(p->cl); \
 	bool ok = th->PushThread(); \
 	void *data = p->var[0]._ext.data; \
@@ -482,16 +479,15 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 		th->PopThread(); \
 	} \
 	delete data; \
-	return NULL; \
 } 
 
 //! Set up a threaded method callback for a boolean argument
 #define FLEXT_THREAD_B(M_FUN) \
 static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,int &arg1) {  \
-	thr_params *p = new thr_params(c); p->var[0]._bool = arg1 != 0; \
+	thr_params *p = new thr_params; p->var[0]._bool = arg1 != 0; \
 	return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \
 } \
-static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
+static void FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 	thisType *th = FLEXT_CAST<thisType *>(p->cl); \
 	bool ok = th->PushThread(); \
 	bool b = p->var[0]._bool; \
@@ -500,17 +496,16 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 		th->M_FUN(b); \
 		th->PopThread(); \
 	} \
-	return NULL; \
 } 
 
 //! Set up a threaded method callback for 1 argument
 #define FLEXT_THREAD_1(M_FUN,TP1) \
 static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,TP1 &arg1) {  \
-	thr_params *p = new thr_params(c,1); \
+	thr_params *p = new thr_params(1); \
 	p->var[0]._ ## TP1 = arg1; \
 	return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \
 } \
-static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
+static void FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 	thisType *th = FLEXT_CAST<thisType *>(p->cl); \
 	bool ok = th->PushThread(); \
 	const TP1 v1 = p->var[0]._ ## TP1; \
@@ -519,18 +514,17 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 		th->M_FUN(v1); \
 		th->PopThread(); \
 	} \
-	return NULL; \
 } 
 
 //! Set up a threaded method callback for 2 arguments
 #define FLEXT_THREAD_2(M_FUN,TP1,TP2) \
 static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,TP1 &arg1,TP2 &arg2) {  \
-	thr_params *p = new thr_params(c,2); \
+	thr_params *p = new thr_params(2); \
 	p->var[0]._ ## TP1 = arg1; \
 	p->var[1]._ ## TP2 = arg2; \
 	return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \
 } \
-static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
+static void FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 	thisType *th = FLEXT_CAST<thisType *>(p->cl); \
 	bool ok = th->PushThread(); \
 	const TP1 v1 = p->var[0]._ ## TP1; \
@@ -540,19 +534,18 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 		th->M_FUN(v1,v2); \
 		th->PopThread(); \
 	} \
-	return NULL; \
 } 
 
 //! Set up a threaded method callback for 3 arguments
 #define FLEXT_THREAD_3(M_FUN,TP1,TP2,TP3) \
 static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,TP1 &arg1,TP2 &arg2,TP3 &arg3) {  \
-	thr_params *p = new thr_params(c,3); \
+	thr_params *p = new thr_params(3); \
 	p->var[0]._ ## TP1 = arg1; \
 	p->var[1]._ ## TP2 = arg2; \
 	p->var[2]._ ## TP3 = arg3; \
 	return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \
 } \
-static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
+static void FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 	thisType *th = FLEXT_CAST<thisType *>(p->cl); \
 	bool ok = th->PushThread(); \
 	const TP1 v1 = p->var[0]._ ## TP1; \
@@ -563,20 +556,19 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 		th->M_FUN(v1,v2,v3); \
 		th->PopThread(); \
 	} \
-	return NULL; \
 } 
 
 //! Set up a threaded method callback for 4 arguments
 #define FLEXT_THREAD_4(M_FUN,TP1,TP2,TP3,TP4) \
 static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,TP1 &arg1,TP2 &arg2,TP3 &arg3,TP4 &arg4) {  \
-	thr_params *p = new thr_params(c,4); \
+	thr_params *p = new thr_params(4); \
 	p->var[0]._ ## TP1 = arg1; \
 	p->var[1]._ ## TP2 = arg2; \
 	p->var[2]._ ## TP3 = arg3; \
 	p->var[3]._ ## TP4 = arg4; \
 	return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \
 } \
-static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
+static void FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 	thisType *th = FLEXT_CAST<thisType *>(p->cl); \
 	bool ok = th->PushThread(); \
 	const TP1 v1 = p->var[0]._ ## TP1; \
@@ -588,13 +580,12 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 		th->M_FUN(v1,v2,v3,v4); \
 		th->PopThread(); \
 	} \
-	return NULL; \
 } 
 
 //! Set up a threaded method callback for 5 arguments
 #define FLEXT_THREAD_5(M_FUN,TP1,TP2,TP3,TP4,TP5) \
 static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,TP1 &arg1,TP2 &arg2,TP3 &arg3,TP4 &arg4,TP5 &arg5) {  \
-	thr_params *p = new thr_params(c,5); \
+	thr_params *p = new thr_params(5); \
 	p->var[0]._ ## TP1 = arg1; \
 	p->var[1]._ ## TP2 = arg2; \
 	p->var[2]._ ## TP3 = arg3; \
@@ -602,7 +593,7 @@ static bool FLEXT_CALL_PRE(M_FUN)(flext_base *c,TP1 &arg1,TP2 &arg2,TP3 &arg3,TP
 	p->var[4]._ ## TP5 = arg5; \
 	return c->StartThread(FLEXT_THR_PRE(M_FUN),p,#M_FUN); \
 } \
-static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
+static void FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 	thisType *th = FLEXT_CAST<thisType *>(p->cl); \
 	bool ok = th->PushThread(); \
 	const TP1 v1 = p->var[0]._ ## TP1; \
@@ -615,7 +606,6 @@ static void *FLEXT_THR_PRE(M_FUN)(thr_params *p) {  \
 		th->M_FUN(v1,v2,v3,v4,v5); \
 		th->PopThread(); \
 	} \
-	return NULL; \
 }