From 927c48a90eb2a5ebf9e221041cd963c7377c8349 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Fri, 20 Dec 2002 04:31:40 +0000 Subject: "" svn path=/trunk/; revision=305 --- externals/grill/flext/flext.cw | Bin 202097 -> 202097 bytes externals/grill/flext/flext.pbproj/project.pbxproj | 12 ++++++------ externals/grill/flext/source/flbase.cpp | 2 +- externals/grill/flext/source/flclass.h | 6 +++--- externals/grill/flext/source/fldsp.cpp | 6 +++--- externals/grill/flext/source/flext.cpp | 11 ++++++----- externals/grill/flext/source/fllib.cpp | 4 +++- externals/grill/flext/source/flthr.cpp | 2 -- externals/grill/flext/source/flxlet.cpp | 2 +- 9 files changed, 23 insertions(+), 22 deletions(-) (limited to 'externals/grill') diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.cw index 17b5aa53..120b5560 100644 Binary files a/externals/grill/flext/flext.cw and b/externals/grill/flext/flext.cw differ diff --git a/externals/grill/flext/flext.pbproj/project.pbxproj b/externals/grill/flext/flext.pbproj/project.pbxproj index 05157eac..6665b953 100755 --- a/externals/grill/flext/flext.pbproj/project.pbxproj +++ b/externals/grill/flext/flext.pbproj/project.pbxproj @@ -381,7 +381,7 @@ INSTALL_PATH = /usr/local/pd/flext; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-D FLEXT_SYS=2 -Wno-reorder -Wno-switch"; + OTHER_CFLAGS = "-D FLEXT_SYS=2 -Wno-switch"; OTHER_LDFLAGS = ""; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; @@ -558,7 +558,7 @@ INSTALL_PATH = /usr/local/pd/flext; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-D FLEXT_SYS=2 -D FLEXT_THREADS -Wno-reorder -Wno-switch"; + OTHER_CFLAGS = "-D FLEXT_SYS_PD -D FLEXT_THREADS -Wno-switch"; OTHER_LDFLAGS = ""; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; @@ -785,7 +785,7 @@ INSTALL_PATH = /usr/local/pd/flext; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-O0"; - OTHER_CFLAGS = "-D FLEXT_SYS=2 -D FLEXT_DEBUG -Wno-reorder -Wno-switch"; + OTHER_CFLAGS = "-D FLEXT_SYS=2 -D FLEXT_DEBUG -Wno-switch"; OTHER_LDFLAGS = ""; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; @@ -1012,7 +1012,7 @@ INSTALL_PATH = /usr/local/pd/flext; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-O0"; - OTHER_CFLAGS = "-D FLEXT_SYS=2 -D FLEXT_THREADS -D FLEXT_DEBUG -Wno-reorder -Wno-switch"; + OTHER_CFLAGS = "-D FLEXT_SYS=2 -D FLEXT_THREADS -D FLEXT_DEBUG -Wno-switch"; OTHER_LDFLAGS = ""; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; @@ -1277,7 +1277,7 @@ HEADER_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" /Volumes/Daten/Prog/sdk-beta-osx/c74support/msp-includes /Volumes/Daten/Prog/sdk-beta-osx/c74support/max-includes"; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-D FLEXT_SYS=1 -D FLEXT_THREADS -Wno-reorder -Wno-switch"; + OTHER_CFLAGS = "-D FLEXT_SYS=1 -D FLEXT_THREADS -Wno-switch"; OTHER_LDFLAGS = ""; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; @@ -1503,7 +1503,7 @@ HEADER_SEARCH_PATHS = "\"$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon\" /Volumes/Daten/Prog/sdk-beta-osx/c74support/msp-includes /Volumes/Daten/Prog/sdk-beta-osx/c74support/max-includes"; LIBRARY_STYLE = STATIC; OPTIMIZATION_CFLAGS = "-O3"; - OTHER_CFLAGS = "-D FLEXT_SYS=1 -Wno-reorder -Wno-switch"; + OTHER_CFLAGS = "-D FLEXT_SYS=1 -Wno-switch"; OTHER_LDFLAGS = ""; OTHER_LIBTOOL_FLAGS = ""; OTHER_REZFLAGS = ""; diff --git a/externals/grill/flext/source/flbase.cpp b/externals/grill/flext/source/flbase.cpp index b321fbf1..f1791884 100644 --- a/externals/grill/flext/source/flbase.cpp +++ b/externals/grill/flext/source/flbase.cpp @@ -37,9 +37,9 @@ bool flext_obj::process_attributes = false; ///////////////////////////////////////////////////////// flext_obj :: flext_obj() : x_obj(m_holder) - , m_name(m_holdname) , procattr(m_holdattr) , init_ok(true) + , m_name(m_holdname) { #if FLEXT_SYS == FLEXT_SYS_PD m_canvas = canvas_getcurrent(); diff --git a/externals/grill/flext/source/flclass.h b/externals/grill/flext/source/flclass.h index 66da8e7a..dd51d85a 100644 --- a/externals/grill/flext/source/flclass.h +++ b/externals/grill/flext/source/flclass.h @@ -443,11 +443,11 @@ protected: //! \brief Check if this class represents the current thread bool Is(pthread_t id = pthread_self()) const { return pthread_equal(thrid,id) != 0; } - bool active,shouldexit; - pthread_t thrid; + flext_base *th; void *(*meth)(thr_params *); thr_params *params; - flext_base *th; + pthread_t thrid; + bool active,shouldexit; thr_entry *nxt; }; diff --git a/externals/grill/flext/source/fldsp.cpp b/externals/grill/flext/source/fldsp.cpp index f5a5d94e..0a0a3276 100644 --- a/externals/grill/flext/source/fldsp.cpp +++ b/externals/grill/flext/source/fldsp.cpp @@ -34,9 +34,6 @@ void flext_dsp::Setup(t_class *c) } flext_dsp::flext_dsp(): -#if FLEXT_SYS != FLEXT_SYS_MAX - dspon(true), -#endif srate(sys_getsr()), // should we set it? blksz(sys_getblksize()), #if FLEXT_SYS == FLEXT_SYS_PD @@ -47,6 +44,9 @@ flext_dsp::flext_dsp(): chnsout(sys_getch()), #else #error +#endif +#if FLEXT_SYS != FLEXT_SYS_MAX + dspon(true), #endif invecs(NULL),outvecs(NULL) {} diff --git a/externals/grill/flext/source/flext.cpp b/externals/grill/flext/source/flext.cpp index 764bfa98..e052e56a 100644 --- a/externals/grill/flext/source/flext.cpp +++ b/externals/grill/flext/source/flext.cpp @@ -120,12 +120,13 @@ bool flext_base::compatibility = true; flext_base::flext_base(): inlist(NULL),outlist(NULL), + curtag(NULL), incnt(0),outcnt(0), insigs(0),outsigs(0), - curtag(NULL), - outlets(NULL),inlets(NULL),outattr(NULL), + outlets(NULL),outattr(NULL), + distmsgs(false), methhead(NULL),attrhead(NULL),attrcnt(0), - distmsgs(false) + inlets(NULL) { LOG1("%s - flext logging is on",thisName()); @@ -661,9 +662,9 @@ bool flext_base::m_method_(int inlet,const t_symbol *s,int argc,const t_atom *ar flext_base::methitem::methitem(int in,const t_symbol *t): - inlet(in),tag(t), - fun(NULL), + tag(t),inlet(in), argc(0),args(NULL), + fun(NULL), nxt(NULL) {} diff --git a/externals/grill/flext/source/fllib.cpp b/externals/grill/flext/source/fllib.cpp index 2f4e8e59..77f85dbc 100755 --- a/externals/grill/flext/source/fllib.cpp +++ b/externals/grill/flext/source/fllib.cpp @@ -113,7 +113,9 @@ public: }; libobject::libobject(t_class *&cl,flext_obj *(*newf)(int,t_atom *),void (*freef)(flext_hdr *)): - clss(cl),newfun(newf),freefun(freef),argc(0),argv(NULL) + newfun(newf),freefun(freef), + clss(cl), + argc(0),argv(NULL) {} // this class stands for one registered object name diff --git a/externals/grill/flext/source/flthr.cpp b/externals/grill/flext/source/flthr.cpp index 36184025..96e52b0d 100644 --- a/externals/grill/flext/source/flthr.cpp +++ b/externals/grill/flext/source/flthr.cpp @@ -174,8 +174,6 @@ void flext_base::PopThread() // post("Pop thread"); - pthread_t id = pthread_self(); - thr_entry *prv = NULL,*ti; for(ti = thrhead; ti; prv = ti,ti = ti->nxt) if(ti->Is()) break; diff --git a/externals/grill/flext/source/flxlet.cpp b/externals/grill/flext/source/flxlet.cpp index c360daf3..2804bae3 100755 --- a/externals/grill/flext/source/flxlet.cpp +++ b/externals/grill/flext/source/flxlet.cpp @@ -57,7 +57,7 @@ unsigned long flext_base::XletCode(xlet::type tp,...) va_list marker; va_start(marker,tp); int cnt = 0; - xlet::type *args = NULL,arg = tp; + xlet::type arg = tp; for(; arg; ++cnt) { #ifdef FLEXT_DEBUG if(cnt > 9) { -- cgit v1.2.1