aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/flext/source
diff options
context:
space:
mode:
Diffstat (limited to 'externals/grill/flext/source')
-rw-r--r--externals/grill/flext/source/flattr.cpp4
-rw-r--r--externals/grill/flext/source/flattr_ed.cpp1
-rw-r--r--externals/grill/flext/source/fldsp.cpp10
-rw-r--r--externals/grill/flext/source/flext.cpp4
-rwxr-xr-xexternals/grill/flext/source/flitem.cpp2
-rwxr-xr-xexternals/grill/flext/source/fllib.cpp2
-rw-r--r--externals/grill/flext/source/flout.cpp4
-rw-r--r--externals/grill/flext/source/flstdc.h2
8 files changed, 13 insertions, 16 deletions
diff --git a/externals/grill/flext/source/flattr.cpp b/externals/grill/flext/source/flattr.cpp
index f4036949..764e1f02 100644
--- a/externals/grill/flext/source/flattr.cpp
+++ b/externals/grill/flext/source/flattr.cpp
@@ -28,8 +28,8 @@ WARRANTIES, see the file, "license.txt," in this distribution.
flext_base::AttrItem::AttrItem(const t_symbol *t,metharg tp,methfun f,int fl):
Item(NULL),index(0),
flags(fl|afl_shown),
- argtp(tp),fun(f),tag(t),
- counter(NULL)
+ argtp(tp),fun(f),
+ counter(NULL),tag(t)
{}
diff --git a/externals/grill/flext/source/flattr_ed.cpp b/externals/grill/flext/source/flattr_ed.cpp
index f4e26d52..7b12a489 100644
--- a/externals/grill/flext/source/flattr_ed.cpp
+++ b/externals/grill/flext/source/flattr_ed.cpp
@@ -447,7 +447,6 @@ void flext_base::SetAttrEditor(t_classid c)
static size_t escapeit(char *dst,size_t maxlen,const char *src)
{
- int ret = 0;
char *d;
for(d = dst; *src && (d-dst) < (int)maxlen; ++src) {
if(*src == '%')
diff --git a/externals/grill/flext/source/fldsp.cpp b/externals/grill/flext/source/fldsp.cpp
index 3344f4a1..2384c5fe 100644
--- a/externals/grill/flext/source/fldsp.cpp
+++ b/externals/grill/flext/source/fldsp.cpp
@@ -27,8 +27,8 @@ void flext_dsp::Setup(t_classid id)
t_class *c = getClass(id);
#if FLEXT_SYS == FLEXT_SYS_MAX
-// dsp_initclass();
- dsp_initboxclass();
+ dsp_initclass();
+// dsp_initboxclass();
add_dsp(c,cb_dsp);
#elif FLEXT_SYS == FLEXT_SYS_PD
CLASS_MAINSIGNALIN(c,flext_hdr,defsig); // float messages going into the left inlet are converted to signal
@@ -46,15 +46,13 @@ flext_dsp::FLEXT_CLASSDEF(flext_dsp)():
srate(fts_dsp_get_sample_rate()), // should we set it?
blksz(fts_dsp_get_tick_size()),
#else
- srate(sys_getsr()), // should we set it?
- blksz(sys_getblksize()),
+ srate(sys_getsr()),blksz(sys_getblksize()),
#endif
#if FLEXT_SYS == FLEXT_SYS_PD
chnsin(sys_get_inchannels()),
chnsout(sys_get_outchannels()),
#elif FLEXT_SYS == FLEXT_SYS_MAX
- chnsin(sys_getch()),
- chnsout(sys_getch()),
+ chnsin(0),chnsout(0),
#elif FLEXT_SYS == FLEXT_SYS_JMAX
#pragma message("not implemented")
chnsin(0),chnsout(0),
diff --git a/externals/grill/flext/source/flext.cpp b/externals/grill/flext/source/flext.cpp
index e2ace494..fc960f01 100644
--- a/externals/grill/flext/source/flext.cpp
+++ b/externals/grill/flext/source/flext.cpp
@@ -61,8 +61,8 @@ flext_base::~FLEXT_CLASSDEF(flext_base)()
#if FLEXT_SYS == FLEXT_SYS_MAX
// according to David Z. one should do that first...
-// if(insigs) dsp_free(thisHdr());
- if(insigs) dsp_freebox(thisHdr());
+ if(insigs) dsp_free(thisHdr());
+// if(insigs) dsp_freebox(thisHdr());
#endif
#ifdef FLEXT_THREADS
diff --git a/externals/grill/flext/source/flitem.cpp b/externals/grill/flext/source/flitem.cpp
index 8970e1c3..90c357d9 100755
--- a/externals/grill/flext/source/flitem.cpp
+++ b/externals/grill/flext/source/flitem.cpp
@@ -30,7 +30,7 @@ flext_base::ItemSet::~ItemSet()
}
flext_base::ItemCont::ItemCont():
- memsize(0),size(0),members(0),cont(NULL)
+ members(0),memsize(0),size(0),cont(NULL)
{}
flext_base::ItemCont::~ItemCont()
diff --git a/externals/grill/flext/source/fllib.cpp b/externals/grill/flext/source/fllib.cpp
index 80e95729..509ba2c2 100755
--- a/externals/grill/flext/source/fllib.cpp
+++ b/externals/grill/flext/source/fllib.cpp
@@ -281,7 +281,7 @@ void flext_obj::obj_add(bool lib,bool dsp,bool attr,const char *idname,const cha
// add to name list
const t_symbol *lsym = MakeSymbol(c);
- libclass *lcl = FindName(lsym,lo);
+ /*libclass *lcl =*/ FindName(lsym,lo);
#if FLEXT_SYS == FLEXT_SYS_PD
if(ix > 0)
diff --git a/externals/grill/flext/source/flout.cpp b/externals/grill/flext/source/flout.cpp
index 0c7beedc..922dc59f 100644
--- a/externals/grill/flext/source/flout.cpp
+++ b/externals/grill/flext/source/flout.cpp
@@ -230,8 +230,8 @@ bool flext_base::InitInlets()
// incnt = cnt;
if(insigs)
-// dsp_setup(thisHdr(),insigs); // signal inlets
- dsp_setupbox(thisHdr(),insigs); // signal inlets
+ dsp_setup(thisHdr(),insigs); // signal inlets
+// dsp_setupbox(thisHdr(),insigs); // signal inlets
}
#elif FLEXT_SYS == FLEXT_SYS_JMAX
{
diff --git a/externals/grill/flext/source/flstdc.h b/externals/grill/flext/source/flstdc.h
index 97dacd54..0bc70cd3 100644
--- a/externals/grill/flext/source/flstdc.h
+++ b/externals/grill/flext/source/flstdc.h
@@ -125,7 +125,7 @@ extern "C" {
#undef WIN_VERSION
-typedef t_pxbox t_sigobj; // that's the all-in-one object type of Max/MSP (not very memory-efficent, i guess)
+typedef t_pxobject t_sigobj; // that's the all-in-one object type of Max/MSP (not very memory-efficent, i guess)
typedef t_patcher t_canvas;
typedef t_int t_flint;