""

svn path=/trunk/; revision=684

9 files changed, 19 insertions, 59 deletions

diff --git a/externals/grill/flext/changes.txt b/externals/grill/flext/changes.txt
index 4125fc05..5bb63b9c 100644
--- a/externals/grill/flext/changes.txt
+++ b/externals/grill/flext/changes.txt
@@ -15,6 +15,7 @@ Version history:
 
 0.5.0:
 - added some more SIMD functions
+- fixed wrong returned result of flext::buffer::set function
 
 0.4.4:
 - fixed deadly bug for Max/MSP method-to-symbol-binding proxies
@@ -254,7 +255,6 @@ TODO list:
 general:
 - documentation
 - add log messages for debugging version
-- MaxMSP: how to call separate help files for objects in a library? -> object mappings (in OSX)
 - use PD's t_float and t_int types (or comparable for 32-Bit safety)
 
 bugs:
diff --git a/externals/grill/flext/source/flbuf.cpp b/externals/grill/flext/source/flbuf.cpp
index 89258b11..1e7b6ccf 100644
--- a/externals/grill/flext/source/flbuf.cpp
+++ b/externals/grill/flext/source/flbuf.cpp
@@ -85,6 +85,7 @@ int flext::buffer::Set(const t_symbol *s,bool nameonly)
 			if(valid) ret = -1;
 		}
 		else {
+            ret = 0;
 			garray_usedindsp(arr);
 			if(frames != frames1) { frames = frames1; if(!ret) ret = 1; }
 			if(data != data1) { data = data1; if(!ret) ret = 1; }
diff --git a/externals/grill/flext/source/fldefs_setup.h b/externals/grill/flext/source/fldefs_setup.h
index b1a1f00d..e00cc943 100644
--- a/externals/grill/flext/source/fldefs_setup.h
+++ b/externals/grill/flext/source/fldefs_setup.h
@@ -19,8 +19,14 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 // ====================================================================================
 
 /*!	\defgroup FLEXT_D_INSTANCE Class instantiation
-    \note The name of your class is of importance! It must be the same as the external
-    \note (excluded an eventual ~ (tilde))
+    \note For stand-alone externals (not part of a library) the name of your class 
+    \note is of importance! It must be the same as the external (excluded an eventual ~ (tilde))
+
+    There are additional parameters that can be included in the NAME field of FLEXT_NEW etc.:
+
+    - There may be additional names (aliases) appened, separated by spaces
+    - There may be a help path prepended, separated by a colon
+    - This help path doesn't work for Max/MSP. There you'll have to use a object mapping file (Max/MSP version >= 4.2)
 */
 
 
diff --git a/externals/grill/flext/source/flsupport.h b/externals/grill/flext/source/flsupport.h
index fef7e16a..8c04c3ce 100644
--- a/externals/grill/flext/source/flsupport.h
+++ b/externals/grill/flext/source/flsupport.h
@@ -122,6 +122,7 @@ public:
 		
 		/*! \brief Set to specified buffer.
 			\param nameonly: if true sets name only, but doesn't look at buffer actually
+            \return -1 on failure, 0 on success, 1 if parameters (length, data ptr, channels) have changed
 		*/
 		int Set(const t_symbol *s = NULL,bool nameonly = false);
 		
diff --git a/externals/grill/xsample/readme.txt b/externals/grill/xsample/readme.txt
index 1785d254..427c9327 100644
--- a/externals/grill/xsample/readme.txt
+++ b/externals/grill/xsample/readme.txt
@@ -103,6 +103,7 @@ Version history:
 - Max/MSP OSX: new file xsample-objectmappings.txt fixes load of library on finding correct helpfiles!
 - makefiles for command line MSVC++, BCC, cygwin GCC
 - better handling of non-existent buffers
+- fixed flext-related error on setting buffers
 
 0.2.4:
 - according to flext 0.2.3 changed sample type to t_sample (S)
diff --git a/externals/grill/xsample/source/inter.cpp b/externals/grill/xsample/source/inter.cpp
index f3fba86c..f9d2fe1a 100644
--- a/externals/grill/xsample/source/inter.cpp
+++ b/externals/grill/xsample/source/inter.cpp
@@ -33,8 +33,9 @@ xinter::xinter():
 I xinter::m_set(I argc,const t_atom *argv) 
 {
 	I r = xsample::m_set(argc,argv);
-	if(r < 0) m_reset(); // resets pos/min/max
-	if(r != 0) m_units();
+	if(r) 
+        // buffer parameters have changed, reset pos/min/max
+        m_reset(); 
 	return r;
 }
 
diff --git a/externals/grill/xsample/source/main.cpp b/externals/grill/xsample/source/main.cpp
index 1a44a866..5149ea05 100644
--- a/externals/grill/xsample/source/main.cpp
+++ b/externals/grill/xsample/source/main.cpp
@@ -222,54 +222,3 @@ V xsample::m_dsp(I /*n*/,S *const * /*insigs*/,S *const * /*outsigs*/)
 
 	if(!m_refresh()) s_dsp();
 }
-
-/*
-V xsample::arrscale(I n,const S *src,S *dst,S add,S mul)
-{
-#if 1
-    flext::ScaleSamples(dst,src,mul,add*mul,n);
-#else
-	int n8 = n>>3;
-	n -= n8<<3;
-	while(n8--) {
-		dst[0] = (src[0]+add)*mul; 
-		dst[1] = (src[1]+add)*mul; 
-		dst[2] = (src[2]+add)*mul; 
-		dst[3] = (src[3]+add)*mul; 
-		dst[4] = (src[4]+add)*mul; 
-		dst[5] = (src[5]+add)*mul; 
-		dst[6] = (src[6]+add)*mul; 
-		dst[7] = (src[7]+add)*mul; 
-		src += 8,dst += 8;
-	}
-	
-	while(n--) *(dst++) = (*(src++)+add)*mul; 
-#endif
-}
-
-V xsample::arrmul(I n,const S *src,S *dst,S mul)
-{
-#if 1
-    flext::MulSamples(dst,src,mul,n);
-#else
-	int n8 = n>>3;
-	n -= n8<<3;
-	while(n8--) {
-		dst[0] = src[0]*mul; 
-		dst[1] = src[1]*mul; 
-		dst[2] = src[2]*mul; 
-		dst[3] = src[3]*mul; 
-		dst[4] = src[4]*mul; 
-		dst[5] = src[5]*mul; 
-		dst[6] = src[6]*mul; 
-		dst[7] = src[7]*mul; 
-		src += 8,dst += 8;
-	}
-	
-	while(n--) *(dst++) = *(src++)*mul; 
-#endif
-}
-*/
-
-
-
diff --git a/externals/grill/xsample/source/main.h b/externals/grill/xsample/source/main.h
index 2968624e..e73c4d84 100644
--- a/externals/grill/xsample/source/main.h
+++ b/externals/grill/xsample/source/main.h
@@ -12,7 +12,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #define __XSAMPLE_H
 
 
-#define XSAMPLE_VERSION "0.3.0pre9"
+#define XSAMPLE_VERSION "0.3.0pre10"
 
 
 #define FLEXT_ATTRIBUTES 1 
diff --git a/externals/grill/xsample/source/record.cpp b/externals/grill/xsample/source/record.cpp
index 02ab41b8..2f16a746 100644
--- a/externals/grill/xsample/source/record.cpp
+++ b/externals/grill/xsample/source/record.cpp
@@ -207,8 +207,9 @@ V xrecord::m_pos(F pos)
 I xrecord::m_set(I argc,const t_atom *argv)
 {
 	I r = xsample::m_set(argc,argv);
-	if(r < 0) m_reset(); // resets pos/min/max
-	if(r != 0) m_units();
+	if(r) 
+        // buffer parameters have changed, reset pos/min/max
+        m_reset(); 
 	return r;
 }