build system for flext-based externals

reconsidered flext::buffer:Update
improved buffer handling
added object construction and destruction flags
updated autoconf system
updated documentation
updated build system

svn path=/trunk/; revision=2467

4 files changed, 172 insertions, 113 deletions

diff --git a/externals/grill/flext/source/Makefile.am b/externals/grill/flext/source/Makefile.am
index 0429724f..e4ffe27e 100755
--- a/externals/grill/flext/source/Makefile.am
+++ b/externals/grill/flext/source/Makefile.am
@@ -3,7 +3,7 @@
 # added by tim blechmann
 #
 
-lib_LIBRARIES = libflext.a libflext_d.a libflext_t.a libflext_td.a 
+lib_LIBRARIES = libflext-pd_s.a libflext-pd_sd.a libflext-pd_t.a libflext-pd_td.a 
 
 SRCS_FLEXT = \
 	flbase.cpp \
@@ -76,52 +76,53 @@ endif
 FRAMEWORKS = @FRAMEWORKS@
 
 # for static libraries we can use automake
-libflext_a_SOURCES    = $(SRCS_FLEXT)
-libflext_d_a_SOURCES  = $(SRCS_FLEXT)
-libflext_t_a_SOURCES  = $(SRCS_FLEXT)
-libflext_td_a_SOURCES = $(SRCS_FLEXT)
+libflext_pd_s_a_SOURCES    = $(SRCS_FLEXT)
+libflext_pd_sd_a_SOURCES  = $(SRCS_FLEXT)
+libflext_pd_t_a_SOURCES  = $(SRCS_FLEXT)
+libflext_pd_td_a_SOURCES = $(SRCS_FLEXT)
 
-libflext_a_CXXFLAGS    = @OPT_FLAGS@ @INCLUDEDIR@ 
-libflext_d_a_CXXFLAGS  = @INCLUDEDIR@ -g -DFLEXT_DEBUG
-libflext_t_a_CXXFLAGS  = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_THREADS 
-libflext_td_a_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS 
+libflext_pd_s_a_CXXFLAGS    = @OPT_FLAGS@ @INCLUDEDIR@ 
+libflext_pd_sd_a_CXXFLAGS  = @INCLUDEDIR@ -g -DFLEXT_DEBUG
+libflext_pd_t_a_CXXFLAGS  = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_THREADS 
+libflext_pd_td_a_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS 
 
-libflext_a_LDFLAGS    = @OPT_FLAGS@ @INCLUDEDIR@ \
+libflext_pd_s_a_LDFLAGS    = @OPT_FLAGS@ @INCLUDEDIR@ \
 	$(patsubst %,-framework %,$(FRAMEWORKS))
-libflext_d_a_LDFLAGS  = @INCLUDEDIR@ -g -DFLEXT_DEBUG \
+libflext_pd_sd_a_LDFLAGS  = @INCLUDEDIR@ -g -DFLEXT_DEBUG \
 	$(patsubst %,-framework %,$(FRAMEWORKS))
-libflext_t_a_LDFLAGS  = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_THREADS \
+libflext_pd_t_a_LDFLAGS  = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_THREADS \
 	$(patsubst %,-framework %,$(FRAMEWORKS))
-libflext_td_a_LDFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS \
+libflext_pd_td_a_LDFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_THREADS \
 	$(patsubst %,-framework %,$(FRAMEWORKS))
 
 # for shared libraries, we can't ...
-libflext_la_CXXFLAGS   = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_SHARED \
+libflext_pd_la_CXXFLAGS   = @OPT_FLAGS@ @INCLUDEDIR@ -DFLEXT_SHARED \
 	-DFLEXT_EXPORTS $(DEFS)
-libflext_d_la_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_SHARED \
+libflext_pd_d_la_CXXFLAGS = @INCLUDEDIR@ -g -DFLEXT_DEBUG -DFLEXT_SHARED \
 	-DFLEXT_EXPORTS $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
-libflext_la_LDFLAGS   = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS) \
+libflext_pd_la_LDFLAGS   = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS) \
 	$(patsubst %,-framework %,$(FRAMEWORKS))
-libflext_d_la_LDFLAGS = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS)
+libflext_pd_d_la_LDFLAGS = @DYNAMIC_LDFLAGS@ $(LIB_STK) $(LIB_SNDOBJ) $(LDFLAGS)
 	$(patsubst %,-framework %,$(FRAMEWORKS))
 
-libflext_la_NAME = libflext.@SOEXT@
-libflext_d_la_NAME = libflext_d.@SOEXT@
+libflext_pd_la_NAME = libflext-pd.@SOEXT@
+libflext_pd_d_la_NAME = libflext-pd_d.@SOEXT@
 
-all-local: $(libflext_la_NAME) $(libflext_d_la_NAME)
+all-local: $(libflext_pd_la_NAME) $(libflext_pd_d_la_NAME)
 
-$(libflext_la_NAME): $(patsubst %.cpp,libflext_la-%.o,$(SRCS_FLEXT))
-	$(CXX) -shared $(libflext_la_LDFLAGS) $(LIBS) -o $(libflext_la_NAME) $^
+$(libflext_pd_la_NAME): $(patsubst %.cpp,libflext_pd_la-%.o,$(SRCS_FLEXT))
+	$(CXX) $(libflext_pd_la_LDFLAGS) $(LIBS) -o $(libflext_pd_la_NAME) $^
 
-libflext_la-%.o : %.cpp
-	$(CXX) -shared -c $(libflext_la_CXXFLAGS) $< -o $@
+libflext_pd_la-%.o : %.cpp
+	$(CXX) -c $(libflext_pd_la_CXXFLAGS) $< -o $@
 
-$(libflext_d_la_NAME): $(patsubst %.cpp,libflext_d_la-%.o,$(SRCS_FLEXT))
-	$(CXX) -shared $(libflext_d_la_LDFLAGS) $(LIBS) -o $(libflext_d_la_NAME) $^
+$(libflext_pd_d_la_NAME): $(patsubst %.cpp,libflext_pd_d_la-%.o,$(SRCS_FLEXT))
+	$(CXX) $(libflext_pd_d_la_LDFLAGS) $(LIBS) -o $(libflext_pd_d_la_NAME) $^
 
-libflext_d_la-%.o: %.cpp
-	$(CXX) -shared -c $(libflext_d_la_CXXFLAGS) $< -o $@
+libflext_pd_d_la-%.o: %.cpp
+	$(CXX) -c $(libflext_pd_d_la_CXXFLAGS) $< -o $@
 
 install-exec-local: 
-	$(libLIBRARIES_INSTALL) $(libflext_la_NAME) $(DESTDIR)$(libdir)
-	$(libLIBRARIES_INSTALL) $(libflext_d_la_NAME) $(DESTDIR)$(libdir)
\ No newline at end of file
+	$(libLIBRARIES_INSTALL) $(libflext_pd_la_NAME) $(DESTDIR)$(libdir)
+	$(libLIBRARIES_INSTALL) $(libflext_pd_d_la_NAME) $(DESTDIR)$(libdir)
+
diff --git a/externals/grill/flext/source/flbuf.cpp b/externals/grill/flext/source/flbuf.cpp
index 649e1b8d..83ee3ebb 100644
--- a/externals/grill/flext/source/flbuf.cpp
+++ b/externals/grill/flext/source/flbuf.cpp
@@ -2,7 +2,7 @@
 
 flext - C++ layer for Max/MSP and pd (pure data) externals
 
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2005 Thomas Grill (gr@grrrr.org)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
@@ -16,10 +16,6 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 
 #if FLEXT_SYS != FLEXT_SYS_JMAX
 
-#if FLEXT_SYS == FLEXT_SYS_MAX
-#include "flmspbuffer.h" // include inofficial buffer.h
-#endif
-
 #if FLEXT_SYS == FLEXT_SYS_PD
 #define DIRTY_INTERVAL 0   // buffer dirty check in msec
 #endif
@@ -31,6 +27,11 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #endif
 #endif
 
+#if FLEXT_SYS == FLEXT_SYS_MAX
+static const t_symbol *sym_buffer = flext::MakeSymbol("buffer~");
+static const t_symbol *sym_size = flext::MakeSymbol("size");
+#endif
+
 flext::buffer::buffer(const t_symbol *bn,bool delayed):
     sym(NULL),data(NULL),
     chns(0),frames(0)
@@ -100,10 +101,12 @@ int flext::buffer::Set(const t_symbol *s,bool nameonly)
         }
 #elif FLEXT_SYS == FLEXT_SYS_MAX
         if(sym->s_thing) {
-            const _buffer *p = (const _buffer *)sym->s_thing;
+            const t_buffer *p = (const t_buffer *)sym->s_thing;
+            
+            FLEXT_ASSERT(!NOGOOD(p));
             
-            if(NOGOOD(p) || !p->b_valid) {
-                post("buffer: buffer object '%s' no good",GetString(sym)); 
+            if(ob_sym(p) != sym_buffer) {
+                post("buffer: object '%s' not valid",GetString(sym)); 
                 if(valid) ret = -2;
             }
             else {
@@ -127,66 +130,101 @@ int flext::buffer::Set(const t_symbol *s,bool nameonly)
     return ret;
 }
 
-bool flext::buffer::Valid() const
-{
-    if(sym) {
-#if FLEXT_SYS == FLEXT_SYS_PD
-        int frames1;
-        t_sample *data1;
-        return arr && garray_getfloatarray(arr, &frames1, &data1) != 0;
-#elif FLEXT_SYS == FLEXT_SYS_MAX
-        const _buffer *p = (const _buffer *)sym->s_thing;
-        return p && p->b_valid;
-#else
-#error
-#endif 
-    }
-    else return false;
-}
-
-
 bool flext::buffer::Update()
 {
-//    if(!Ok()) return false;
+    FLEXT_ASSERT(sym);
 
-    bool ok = false;
+    bool upd = false;
 
 #if FLEXT_SYS == FLEXT_SYS_PD
-    if(!sym || !arr) return data == NULL;
+    if(!arr) return data == NULL;
 
     int frames1;
     t_sample *data1;
     if(!garray_getfloatarray(arr, &frames1, &data1)) {
-        frames = 0;
         data = NULL;
         chns = 0;
-        ok = true;
+        frames = 0;
+        upd = true;
     }
     else if(data != data1 || frames != frames1) {
-        frames = frames1;
         data = data1;
-        ok = true;
+        frames = frames1;
+        upd = true;
     }
 #elif FLEXT_SYS == FLEXT_SYS_MAX
-    if(!sym) return data == NULL;
-
-    if(sym->s_thing) {
-        const _buffer *p = (const _buffer *)sym->s_thing;
+    const t_buffer *p = (const t_buffer *)sym->s_thing;
+    if(p) {
+        FLEXT_ASSERT(!NOGOOD(p) && ob_sym(p) == sym_buffer);
+    
         if(data != p->b_samples || chns != p->b_nchans || frames != p->b_frames) {
             data = p->b_samples;
             chns = p->b_nchans;
             frames = p->b_frames;
-            ok = true;
+            upd = true;
         }
     }
+    else {
+        // buffer~ has e.g. been renamed
+        data = NULL;
+        chns = 0;
+        frames = 0;
+        upd = true;
+    }
+#else
+#error not implemented
+#endif
+    return upd;
+}
+
+flext::buffer::lock_t flext::buffer::Lock()
+{
+    FLEXT_ASSERT(sym);
+#if FLEXT_SYS == FLEXT_SYS_PD
+    FLEXT_ASSERT(arr);
+#if PD_MINOR_VERSION >= 38 && defined(PD_DEVEL_VERSION)
+    garray_lock(arr);
+#endif
+    return false;
+#elif FLEXT_SYS == FLEXT_SYS_MAX
+    t_buffer *p = (t_buffer *)sym->s_thing;
+    FLEXT_ASSERT(p);
+#if defined(MAC_VERSION) || defined(WIN_VERSION) 
+    long old = p->b_inuse;
+    p->b_inuse = 1;
+    return old;
+#else
+    // undefined for OS9
+    return 0;
+#endif
+#else
+#error not implemented
+#endif
+}
+
+void flext::buffer::Unlock(flext::buffer::lock_t prv)
+{
+    FLEXT_ASSERT(sym);
+#if FLEXT_SYS == FLEXT_SYS_PD
+    FLEXT_ASSERT(arr);
+#if PD_MINOR_VERSION >= 38 && defined(PD_DEVEL_VERSION)
+    garray_unlock(arr);
+#endif
+#elif FLEXT_SYS == FLEXT_SYS_MAX
+    t_buffer *p = (t_buffer *)sym->s_thing;
+    FLEXT_ASSERT(p);
+#if defined(MAC_VERSION) || defined(WIN_VERSION) 
+    // not for OS9
+    p->b_inuse = prv;
+#endif
 #else
 #error not implemented
 #endif
-    return ok;
 }
 
 void flext::buffer::Frames(int fr,bool keep,bool zero)
 {
+    FLEXT_ASSERT(sym);
 #if FLEXT_SYS == FLEXT_SYS_PD
     // is this function guaranteed to keep memory and set rest to zero?
     ::garray_resize(arr,(float)fr);
@@ -199,20 +237,18 @@ void flext::buffer::Frames(int fr,bool keep,bool zero)
     if(keep) {
         // copy buffer data to tmp storage
         tmp = (t_sample *)NewAligned(sz*sizeof(t_sample));
-        if(tmp)
-            CopySamples(tmp,data,sz);
-        else
-            error("flext::buffer - not enough memory for keeping buffer~ contents");
+        FLEXT_ASSERT(tmp);
+        CopySamples(tmp,data,sz);
     }
     
     t_atom msg;
-    _buffer *buf = (_buffer *)sym->s_thing;
+    t_buffer *buf = (t_buffer *)sym->s_thing;
     // b_msr reflects buffer sample rate... is this what we want?
     // Max bug: adding half a sample to prevent roundoff errors....
     float ms = (fr+0.5)/buf->b_msr;
     
     SetFloat(msg,ms); 
-    ::typedmess((object *)buf,gensym("size"),1,&msg);
+    ::typedmess((object *)buf,(t_symbol *)sym_size,1,&msg);
     
     Update();
 
@@ -248,34 +284,23 @@ void flext::buffer::SetRefrIntv(float) {}
 
 void flext::buffer::Dirty(bool force)
 {
-    if(sym) {
+    FLEXT_ASSERT(sym);
 #if FLEXT_SYS == FLEXT_SYS_PD
-        if((!ticking) && (interval || force)) {
-            ticking = true;
-            cb_tick(this); // immediately redraw
-        }
-        else {
-            if(force) clock_delay(tick,0);
-            isdirty = true;
-        }
+    if((!ticking) && (interval || force)) {
+        ticking = true;
+        cb_tick(this); // immediately redraw
+    }
+    else {
+        if(force) clock_delay(tick,0);
+        isdirty = true;
+    }
 #elif FLEXT_SYS == FLEXT_SYS_MAX
-        if(sym->s_thing) {
-            _buffer *p = (_buffer *)sym->s_thing;
-            
-            if(NOGOOD(p)) {
-                post("buffer: buffer object '%s' no good",sym->s_name);
-            }
-            else {
-                p->b_modtime = gettime();
-            }
-        }
-        else {
-            FLEXT_LOG1("buffer: symbol '%s' not defined",sym->s_name);
-        }
+    t_buffer *p = (t_buffer *)sym->s_thing;
+    FLEXT_ASSERT(p && !NOGOOD(p));
+    p->b_modtime = gettime();
 #else
 #error Not implemented
 #endif 
-    }
 }
 
 #if FLEXT_SYS == FLEXT_SYS_PD
@@ -309,8 +334,9 @@ void flext::buffer::ClearDirty()
 
 bool flext::buffer::IsDirty() const
 {
+    FLEXT_ASSERT(sym);
 #if FLEXT_SYS == FLEXT_SYS_PD
-    if(!arr) return false;
+    FLEXT_ASSERT(arr);
     #ifdef FLEXT_PDBUFDIRTYTIME
     return isdirty || garray_updatetime(arr) > cleantime;
     #else
@@ -318,15 +344,8 @@ bool flext::buffer::IsDirty() const
     return true; 
     #endif
 #elif FLEXT_SYS == FLEXT_SYS_MAX
-    if(!sym->s_thing) return false;
-
-    _buffer *p = (_buffer *)sym->s_thing;
-#ifdef FLEXT_DEBUG
-    if(NOGOOD(p)) {
-        post("buffer: buffer object '%s' no good",sym->s_name);
-        return false;
-    }
-#endif
+    t_buffer *p = (t_buffer *)sym->s_thing;
+    FLEXT_ASSERT(p && !NOGOOD(p));
     return p->b_modtime > cleantime;
 #else
 #error Not implemented
diff --git a/externals/grill/flext/source/flstdc.h b/externals/grill/flext/source/flstdc.h
index d12b31b0..7d912090 100644
--- a/externals/grill/flext/source/flstdc.h
+++ b/externals/grill/flext/source/flstdc.h
@@ -2,7 +2,7 @@
 
 flext - C++ layer for Max/MSP and pd (pure data) externals
 
-Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2005 Thomas Grill (gr@grrrr.org)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
@@ -121,6 +121,10 @@ extern "C" {
 #if FLEXT_OS != FLEXT_OS_MAC || defined(MAC_VERSION)
 // doesn't exist for OS9
 #include "ext_critical.h"
+#include "buffer.h"
+#else
+// for OS9 include "inofficial" header file
+#include "flmspbuffer.h"
 #endif
 #include "z_dsp.h"
 
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h
index 31b64f2a..e7e284c4 100644
--- a/externals/grill/flext/source/flsupport.h
+++ b/externals/grill/flext/source/flsupport.h
@@ -148,6 +148,15 @@ public:
         public flext_root
 	{
 	public:
+    
+#if FLEXT_SYS == FLEXT_SYS_PD
+        typedef bool lock_t;
+#elif FLEXT_SYS == FLEXT_SYS_MAX
+        typedef long lock_t;
+#else
+#error Not implemented
+#endif
+    
 		/*! \brief Construct buffer.
 			\param s: symbol name, can be NULL
 			\param delayed = true: only sets name, needs another Set(NULL) to really initialize the buffer 
@@ -158,17 +167,43 @@ public:
 		//! Destroy buffer
 		~buffer();
 
-		/*! \brief Check if the data is valid
+		/*! \brief Check if the buffer is valid for use
+            \note This must be true to use any of the other functions except set
 		*/
-		bool Ok() const { return sym != NULL && data != NULL; }
+		bool Ok() const { return sym && data; }
 		
-		/*! \brief Check if buffer is valid
+		/*! \brief Check if buffer content is valid (not in state of content change)
+            \note buffer must be Ok()
 		*/
-		bool Valid() const;
+		bool Valid() const
+        {
+            FLEXT_ASSERT(sym);
+#if FLEXT_SYS == FLEXT_SYS_PD
+            return true;
+#elif FLEXT_SYS == FLEXT_SYS_MAX
+            const t_buffer *p = (const t_buffer *)sym->s_thing;
+            return p && p->b_valid;
+#else
+#error not implemented
+#endif
+        }
 		
 		/*! \brief Check and update if the buffer has been changed (e.g. resized)
+            \note buffer must be Ok()
 		*/
 		bool Update();
+        
+		/*! \brief Lock buffer
+            \return previous state (needed for Unlock)
+            \note buffer must be Ok()
+		*/
+        lock_t Lock();
+        
+		/*! \brief Unlock buffer
+            \param prv: Previous state is returned by Lock()
+            \note buffer must be Ok()
+		*/
+        void Unlock(lock_t prv);
 		
 		/*! \brief Set to specified buffer.
 			\param nameonly: if true sets name only, but doesn't look at buffer actually