Commit 759d72c0 authored by thomas's avatar thomas
Browse files

no message


git-svn-id: https://svn.grrrr.org/ext/trunk@340 4d9ac71a-51e6-0310-8455-cad1006bcd31
parent cfc0291c
......@@ -852,6 +852,8 @@ static bool FLEXT_GET_PRE(VAR)(flext_base *c,TP &arg) \
#define FLEXT_CALLSET_F(SFUN) FLEXT_CALLSET_(SFUN,float)
#define FLEXT_CALLSET_I(SFUN) FLEXT_CALLSET_(SFUN,int)
#define FLEXT_CALLSET_B(SFUN) FLEXT_CALLSET_(SFUN,bool)
#define FLEXT_CALLSET_E(SFUN,TP) FLEXT_CALLSET_(SFUN,TP)
#define FLEXT_CALLSET_S(SFUN) FLEXT_CALLSET_(SFUN,t_symptr)
#define FLEXT_CALLSET_V(FUN) \
......@@ -860,6 +862,8 @@ static bool FLEXT_SET_PRE(FUN)(flext_base *c,AtomList *&arg) \
#define FLEXT_CALLGET_F(GFUN) FLEXT_CALLGET_(GFUN,float)
#define FLEXT_CALLGET_I(GFUN) FLEXT_CALLGET_(GFUN,int)
#define FLEXT_CALLGET_B(GFUN) FLEXT_CALLGET_(GFUN,bool)
#define FLEXT_CALLGET_E(GFUN,TP) FLEXT_CALLGET_(GFUN,TP)
#define FLEXT_CALLGET_S(GFUN) FLEXT_CALLGET_(GFUN,t_symptr)
#define FLEXT_CALLGET_V(FUN) \
......@@ -869,13 +873,15 @@ static bool FLEXT_GET_PRE(FUN)(flext_base *c,AtomList *&arg) \
#define FLEXT_CALLXFER_F(GFUN,SFUN) FLEXT_CALLGET_F(GFUN) FLEXT_CALLSET_F(SFUN)
#define FLEXT_CALLXFER_I(GFUN,SFUN) FLEXT_CALLGET_I(GFUN) FLEXT_CALLSET_I(SFUN)
#define FLEXT_CALLXFER_S(GFUN,SFUN) FLEXT_CALLGET_S(GFUN) FLEXT_CALLSET_S(SFUN)
#define FLEXT_CALLXFER_B(GFUN,SFUN) FLEXT_CALLGET_B(GFUN) FLEXT_CALLSET_B(SFUN)
#define FLEXT_CALLXFER_E(GFUN,SFUN,TP) FLEXT_CALLGET_E(GFUN,TP) FLEXT_CALLSET_E(SFUN,TP)
#define FLEXT_CALLXFER_V(GFUN,SFUN) FLEXT_CALLGET_V(GFUN) FLEXT_CALLSET_V(SFUN)
#define FLEXT_ATTRSET_F(VAR) FLEXT_ATTRSET_(VAR,float)
#define FLEXT_ATTRSET_I(VAR) FLEXT_ATTRSET_(VAR,int)
#define FLEXT_ATTRSET_S(VAR) FLEXT_ATTRSET_(VAR,t_symptr)
#define FLEXT_ATTRSET_B(VAR) FLEXT_ATTRSET_(VAR,bool)
#define FLEXT_ATTRSET_E(VAR) FLEXT_ATTRSET_(VAR,int)
#define FLEXT_ATTRSET_E(VAR,TP) FLEXT_ATTRSET_(VAR,TP)
#define FLEXT_ATTRSET_V(VAR) \
static bool FLEXT_SET_PRE(VAR)(flext_base *c,AtomList *&arg) \
......@@ -885,7 +891,7 @@ static bool FLEXT_SET_PRE(VAR)(flext_base *c,AtomList *&arg) \
#define FLEXT_ATTRGET_I(VAR) FLEXT_ATTRGET_(VAR,int)
#define FLEXT_ATTRGET_S(VAR) FLEXT_ATTRGET_(VAR,t_symptr)
#define FLEXT_ATTRGET_B(VAR) FLEXT_ATTRGET_(VAR,bool)
#define FLEXT_ATTRGET_E(VAR) FLEXT_ATTRGET_(VAR,int)
#define FLEXT_ATTRGET_E(VAR,TP) FLEXT_ATTRGET_(VAR,TP)
#define FLEXT_ATTRGET_V(VAR) \
static bool FLEXT_GET_PRE(VAR)(flext_base *c,AtomList *&arg) \
......@@ -896,7 +902,7 @@ static bool FLEXT_GET_PRE(VAR)(flext_base *c,AtomList *&arg) \
#define FLEXT_ATTRXFER_S(VAR) FLEXT_ATTRGET_S(VAR) FLEXT_ATTRSET_S(VAR)
#define FLEXT_ATTRXFER_V(VAR) FLEXT_ATTRGET_V(VAR) FLEXT_ATTRSET_V(VAR)
#define FLEXT_ATTRXFER_B(VAR) FLEXT_ATTRGET_B(VAR) FLEXT_ATTRSET_B(VAR)
#define FLEXT_ATTRXFER_(VAR,TP) FLEXT_ATTRGET_(VAR,TP) FLEXT_ATTRSET_(VAR,TP)
#define FLEXT_ATTRXFER_E(VAR,TP) FLEXT_ATTRGET_(VAR,TP) FLEXT_ATTRSET_(VAR,TP)
//! @}
......@@ -908,12 +914,13 @@ static bool FLEXT_GET_PRE(VAR)(flext_base *c,AtomList *&arg) \
#define FLEXT_ADDATTR_GET(NAME,GFUN) AddAttrib(NAME,(FLEXT_GET_PRE(GFUN)),NULL)
#define FLEXT_ADDATTR_SET(NAME,SFUN) AddAttrib(NAME,NULL,(FLEXT_SET_PRE(SFUN)))
#define FLEXT_ADDATTR_XFER(NAME,GFUN,SFUN) AddAttrib(NAME,(FLEXT_GET_PRE(GFUN)),(FLEXT_SET_PRE(SFUN)))
#define FLEXT_ADDATTRIB(NAME,FUN) AddAttrib(NAME,(FLEXT_GET_PRE(FUN)),(FLEXT_SET_PRE(FUN)))
// for enums
#define FLEXT_ADDATTR_GET_(NAME,GFUN) AddAttrib(NAME,(bool (*)(flext_base *,int &))(FLEXT_GET_PRE(GFUN)),NULL)
#define FLEXT_ADDATTR_SET_(NAME,SFUN) AddAttrib(NAME,NULL,(bool (*)(flext_base *,int &))(FLEXT_SET_PRE(SFUN)))
#define FLEXT_ADDATTRIB_(NAME,FUN) AddAttrib(NAME,(bool (*)(flext_base *,int &))(FLEXT_GET_PRE(FUN)),(bool (*)(flext_base *,int &))(FLEXT_SET_PRE(FUN)))
#define FLEXT_ADDATTR_GET_E(NAME,GFUN) AddAttrib(NAME,(bool (*)(flext_base *,int &))(FLEXT_GET_PRE(GFUN)),NULL)
#define FLEXT_ADDATTR_SET_E(NAME,SFUN) AddAttrib(NAME,NULL,(bool (*)(flext_base *,int &))(FLEXT_SET_PRE(SFUN)))
#define FLEXT_ADDATTRIB_E(NAME,FUN) AddAttrib(NAME,(bool (*)(flext_base *,int &))(FLEXT_GET_PRE(FUN)),(bool (*)(flext_base *,int &))(FLEXT_SET_PRE(FUN)))
//! @}
......
......@@ -331,7 +331,7 @@ flext_hdr *flext_obj::obj_new(const t_symbol *s,int _argc_,t_atom *argv)
flext_obj::m_holdname = NULL;
flext_obj::m_holdattr = false;
bool ok = obj->data ||
bool ok = obj->data &&
// check constructor exit flag
obj->data->InitOk();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment