aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/flext
diff options
context:
space:
mode:
Diffstat (limited to 'externals/grill/flext')
-rw-r--r--externals/grill/flext/source/flclass.h10
-rw-r--r--externals/grill/flext/source/flout.cpp4
2 files changed, 5 insertions, 9 deletions
diff --git a/externals/grill/flext/source/flclass.h b/externals/grill/flext/source/flclass.h
index bfae95c6..4aa17a7d 100644
--- a/externals/grill/flext/source/flclass.h
+++ b/externals/grill/flext/source/flclass.h
@@ -190,13 +190,7 @@ public:
class outlet;
//! Get pointer to outlet (not in the constructor!)
- outlet *GetOut(int ix) const {
-#ifdef FLEXT_DEBUG
- return (outlets && ix < (procattr?outcnt+1:outcnt))?outlets[ix]:NULL;
-#else
- return outlets[ix];
-#endif
- }
+ outlet *GetOut(int ix) const { return outlets[ix]; }
#endif
int GetOutAttr() const { return procattr?CntOut():0; }
@@ -240,7 +234,7 @@ public:
void ToOutList(int n,const AtomList &list) const { ToOutList(n,list.Count(),list.Atoms()); }
//! Output anything (to appointed outlet)
- void ToOutAnything(outlet *o,const t_symbol *s,int argc,const t_atom *argv) const;
+// void ToOutAnything(outlet *o,const t_symbol *s,int argc,const t_atom *argv) const;
//! Output anything (index n starts with 0)
void ToOutAnything(int n,const t_symbol *s,int argc,const t_atom *argv) const; // { outlet *o = GetOut(n); if(o) ToOutAnything(o,const_cast<t_symbol *>(s),argc,argv); }
//! Output anything (index n starts with 0)
diff --git a/externals/grill/flext/source/flout.cpp b/externals/grill/flext/source/flout.cpp
index c745924c..802d299d 100644
--- a/externals/grill/flext/source/flout.cpp
+++ b/externals/grill/flext/source/flout.cpp
@@ -376,12 +376,13 @@ bool flext_base::InitOutlets()
}
}
- fts_object_set_outlets_number((fts_object_t *)thisHdr(), outcnt);
+ fts_object_set_outlets_number((fts_object_t *)thisHdr(), outcnt+(procattr?1:0));
#endif
delete[] list;
}
+#if FLEXT_SYS == FLEXT_SYS_PD || FLEXT_SYS == FLEXT_SYS_MAX
if(procattr) {
// attribute dump outlet is the last one
outlets[outcnt] =
@@ -393,6 +394,7 @@ bool flext_base::InitOutlets()
#endif
}
+#endif
return ok;
}