From 06f62d1168209ca6b9e2c3c5264c96a0a4c7cc98 Mon Sep 17 00:00:00 2001 From: Thomas Grill Date: Mon, 10 Feb 2003 04:39:47 +0000 Subject: "" svn path=/trunk/; revision=387 --- externals/grill/flext/source/flbuf.cpp | 10 ++++---- externals/grill/flext/source/flprefix.h | 43 +++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 10 deletions(-) (limited to 'externals/grill/flext/source') diff --git a/externals/grill/flext/source/flbuf.cpp b/externals/grill/flext/source/flbuf.cpp index 4b4da40a..ebfe2abf 100644 --- a/externals/grill/flext/source/flbuf.cpp +++ b/externals/grill/flext/source/flbuf.cpp @@ -73,13 +73,13 @@ int flext::buffer::Set(const t_symbol *s,bool nameonly) arr = (t_garray *)pd_findbyclass(const_cast(sym), garray_class); if(!arr) { - if (*sym->s_name) error("buffer: no such array '%s'",sym->s_name); + if (*GetString(sym)) error("buffer: no such array '%s'",GetString(sym)); sym = NULL; if(valid) ret = -1; } else if(!garray_getfloatarray(arr, &frames1, &data1)) { - error("buffer: bad template '%s'", sym->s_name); + error("buffer: bad template '%s'",GetString(sym)); data = NULL; frames = 0; if(valid) ret = -1; @@ -95,12 +95,12 @@ int flext::buffer::Set(const t_symbol *s,bool nameonly) const _buffer *p = (const _buffer *)sym->s_thing; if(NOGOOD(p)) { - post("buffer: buffer object '%s' no good",sym->s_name); + post("buffer: buffer object '%s' no good",GetString(sym)); if(valid) ret = -1; } else { #ifdef FLEXT_DEBUG - post("%s: buffer object '%s' - valid:%i samples:%i channels:%i frames:%i",thisName(),bufname->s_name,p->b_valid,p->b_frames,p->b_nchans,p->b_frames); + post("flext: buffer object '%s' - valid:%i samples:%i channels:%i frames:%i",GetString(sym),p->b_valid,p->b_frames,p->b_nchans,p->b_frames); #endif if(data != p->b_samples) { data = p->b_samples; if(!ret) ret = 1; } if(chns != p->b_nchans) { chns = p->b_nchans; if(!ret) ret = 1; } @@ -108,7 +108,7 @@ int flext::buffer::Set(const t_symbol *s,bool nameonly) } } else { - error("buffer: symbol '%s' not defined", sym->s_name); + error("buffer: symbol '%s' not defined", GetString(sym)); if(valid) ret = -1; } #else diff --git a/externals/grill/flext/source/flprefix.h b/externals/grill/flext/source/flprefix.h index 51c88096..ad1d1edb 100755 --- a/externals/grill/flext/source/flprefix.h +++ b/externals/grill/flext/source/flprefix.h @@ -52,6 +52,11 @@ WARRANTIES, see the file, "license.txt," in this distribution. #define FLEXT_OS_LINUX 3 #define FLEXT_OS_IRIX 4 +// --- definitions for FLEXT_OS_API --------------------- +#define FLEXT_OSAPI_UNKNOWN 0 +#define FLEXT_OSAPI_MAC_CARBON 1 +#define FLEXT_OSAPI_MAC_OSX 2 + // --- definitions for FLEXT_CPU --------------------- #define FLEXT_CPU_UNKNOWN 0 #define FLEXT_CPU_INTEL 1 @@ -118,6 +123,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #endif #endif + #define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN + #elif defined(__BORLANDC__) // Borland C++ @@ -128,25 +135,33 @@ WARRANTIES, see the file, "license.txt," in this distribution. #define FLEXT_OS FLEXT_OS_WIN #endif + #define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN + #elif defined(__MWERKS__) // Metrowerks CodeWarrior + #ifndef __CONDITIONALMACROS__ + #include + #endif + #ifndef FLEXT_CPU - #if defined(__INTEL__) + #if TARGET_CPU_X86 #define FLEXT_CPU FLEXT_CPU_INTEL - #elif defined(__POWERPC__) + #elif TARGET_CPU_PPC #define FLEXT_CPU FLEXT_CPU_PPC - #elif defined(__MIPS__) + #elif TARGET_CPU_MIPS #define FLEXT_CPU FLEXT_CPU_MIPS + #elif TARGET_CPU_ALPHA + #define FLEXT_CPU FLEXT_CPU_ALPHA #else #define FLEXT_CPU FLEXT_CPU_UNKNOWN #endif #endif #ifndef FLEXT_OS - #if defined(macintosh) + #if TARGET_OS_MAC #define FLEXT_OS FLEXT_OS_MACOS - #elif defined(__INTEL__) + #elif TARGET_OS_WIN32 // assume Windows #define FLEXT_OS FLEXT_OS_WIN #else @@ -154,6 +169,16 @@ WARRANTIES, see the file, "license.txt," in this distribution. #endif #endif + #ifndef FLEXT_OSAPI + #if TARGET_API_MAC_CARBON + #define FLEXT_OSAPI FLEXT_OSAPI_MAC_CARBON + #elif TARGET_API_MAC_OSX + #define FLEXT_OSAPI FLEXT_OSAPI_MAC_OSX + #else + #define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN + #endif + #endif + // This is important for method and attribute callbacks #pragma enumsalwaysint on // This is important for everything @@ -187,6 +212,12 @@ WARRANTIES, see the file, "license.txt," in this distribution. #endif #endif + #if FLEXT_OS == FLEXT_OS_MACOS + #define FLEXT_OSAPI FLEXT_OSAPI_MAC_OSX + #else + #define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN + #endif + #elif defined(__MRC__) && defined(MPW_CPLUS) // Apple MPW MrCpp #if __MRC__ < 0x500 @@ -209,6 +240,8 @@ WARRANTIES, see the file, "license.txt," in this distribution. #endif #endif + #define FLEXT_OSAPI FLEXT_OSAPI_UNKNOWN + #endif #if FLEXT_OS == FLEXT_OS_WIN -- cgit v1.2.1