From d1ecedf8e46d5486253436aa7fd5ba4dff19d65b Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Wed, 3 Sep 2003 02:38:08 +0000 Subject: "" svn path=/trunk/; revision=930 --- externals/grill/flext/source/flatom_pr.cpp | 14 +++++++++++++- externals/grill/flext/source/flattr.cpp | 5 +++-- externals/grill/flext/source/flattr_ed.cpp | 1 - externals/grill/flext/source/flbase.cpp | 2 +- externals/grill/flext/source/flqueue.cpp | 2 +- externals/grill/flext/source/flsupport.h | 3 +-- 6 files changed, 19 insertions(+), 8 deletions(-) (limited to 'externals/grill/flext/source') diff --git a/externals/grill/flext/source/flatom_pr.cpp b/externals/grill/flext/source/flatom_pr.cpp index 20ae6cad..a77374b9 100644 --- a/externals/grill/flext/source/flatom_pr.cpp +++ b/externals/grill/flext/source/flatom_pr.cpp @@ -33,7 +33,7 @@ bool flext::PrintAtom(const t_atom &a,char *buf,int bufsz) } else if(IsPointer(a)) { STD::sprintf(buf,"%p",GetPointer(a)); - } + } #if FLEXT_SYS == FLEXT_SYS_PD else if(a.a_type == A_DOLLAR) { STD::sprintf(buf,"$%d",a.a_w.w_index); @@ -41,6 +41,12 @@ bool flext::PrintAtom(const t_atom &a,char *buf,int bufsz) else if(a.a_type == A_DOLLSYM) { STD::sprintf(buf,"$%s",GetString(a)); } +#elif FLEXT_SYS == FLEXT_SYS_MAX + else if(a.a_type == A_DOLLAR) { + STD::sprintf(buf,"$%d",a.a_w.w_long); + } +#else +//#pragma message("Not implemented") #endif else { ERRINTERNAL(); @@ -66,6 +72,12 @@ bool flext::PrintList(int argc,const t_atom *argv,char *buf,int bufsz) return ok; } +bool flext::AtomList::Print(char *buffer,int buflen) const +{ + return flext::PrintList(Count(),Atoms(),buffer,buflen); +} + + bool flext::ScanAtom(t_atom &a,const char *buf) { // skip whitespace diff --git a/externals/grill/flext/source/flattr.cpp b/externals/grill/flext/source/flattr.cpp index 10c46af0..52d46872 100644 --- a/externals/grill/flext/source/flattr.cpp +++ b/externals/grill/flext/source/flattr.cpp @@ -27,8 +27,9 @@ WARRANTIES, see the file, "license.txt," in this distribution. flext_base::AttrItem::AttrItem(const t_symbol *t,metharg tp,methfun f,int fl): Item(t,0,NULL),index(0), - flags(fl|afl_shown),counter(NULL), - argtp(tp),fun(f) + flags(fl|afl_shown), + argtp(tp),fun(f), + counter(NULL) {} flext_base::AttrItem::~AttrItem() diff --git a/externals/grill/flext/source/flattr_ed.cpp b/externals/grill/flext/source/flattr_ed.cpp index fddbb69b..a75e3715 100644 --- a/externals/grill/flext/source/flattr_ed.cpp +++ b/externals/grill/flext/source/flattr_ed.cpp @@ -328,7 +328,6 @@ void flext_base::cb_GfxProperties(t_gobj *c, t_glist *) for(int i = 0; i < cnt; ++i) { const t_symbol *sym = GetSymbol(la[i]); - const char *bcur = b; // get attribute AttrItem *gattr = th->FindAttrib(sym,true); diff --git a/externals/grill/flext/source/flbase.cpp b/externals/grill/flext/source/flbase.cpp index 0619b796..357df17e 100644 --- a/externals/grill/flext/source/flbase.cpp +++ b/externals/grill/flext/source/flbase.cpp @@ -114,7 +114,7 @@ const t_symbol *flext_obj::GetParamSym(const t_symbol *sym,t_canvas *c) } else #else - #pragma warning("Not implemented") + #pragma message("Not implemented") #endif return sym; } diff --git a/externals/grill/flext/source/flqueue.cpp b/externals/grill/flext/source/flqueue.cpp index d47666e3..a75b4a89 100755 --- a/externals/grill/flext/source/flqueue.cpp +++ b/externals/grill/flext/source/flqueue.cpp @@ -22,7 +22,7 @@ WARRANTIES, see the file, "license.txt," in this distribution. class qmsg { public: - qmsg(flext_base *b): th(b),nxt(NULL),tp(tp_none) {} + qmsg(flext_base *b): nxt(NULL),th(b),tp(tp_none) {} ~qmsg(); qmsg *nxt; diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h index bf37c355..c2eaa18f 100644 --- a/externals/grill/flext/source/flsupport.h +++ b/externals/grill/flext/source/flsupport.h @@ -17,7 +17,6 @@ WARRANTIES, see the file, "license.txt," in this distribution. #include "flstdc.h" - class FLEXT_SHARE FLEXT_CLASSDEF(flext); typedef class FLEXT_CLASSDEF(flext) flext; @@ -535,7 +534,7 @@ public: AtomList &Part(int offs,int len) { return (*this = GetPart(offs,len)); } //! Represent as a string - bool Print(char *buffer,int buflen) const { return flext::PrintList(Count(),Atoms(),buffer,buflen); } + bool Print(char *buffer,int buflen) const; protected: int cnt; -- cgit v1.2.1