""

svn path=/trunk/; revision=652

6 files changed, 78 insertions, 64 deletions

diff --git a/externals/grill/vasp/vasp.cw b/externals/grill/vasp/vasp.cw
index e45ae977..f0229a51 100644
--- a/externals/grill/vasp/vasp.cw
+++ b/externals/grill/vasp/vasp.cw
diff --git a/externals/grill/xsample/maxmsp/xgroove~.help b/externals/grill/xsample/maxmsp/xgroove~.help
index e00533b1..c839f411 100644
--- a/externals/grill/xsample/maxmsp/xgroove~.help
+++ b/externals/grill/xsample/maxmsp/xgroove~.help
diff --git a/externals/grill/xsample/pd/ramp.pd b/externals/grill/xsample/pd/ramp.pd
deleted file mode 100644
index c83678ac..00000000
--- a/externals/grill/xsample/pd/ramp.pd
+++ /dev/null
@@ -1,29 +0,0 @@
-#N canvas 79 120 562 484 12;

-#X obj 85 248 line~;

-#X obj 88 124 delay \$1;

-#X obj 85 177 pack 1 \$1;

-#X obj 84 307 outlet~;

-#X obj 139 61 route pos;

-#X obj 88 98 t b b f;

-#X obj 207 307 outlet;

-#X msg 186 268 pos \$1;

-#X obj 186 241 f;

-#X obj 139 31 inlet;

-#X obj 18 35 loadbang;

-#X obj 17 69 1;

-#X obj 120 151 pack 0 \$1;

-#X connect 0 0 3 0;

-#X connect 1 0 2 0;

-#X connect 1 0 8 0;

-#X connect 2 0 0 0;

-#X connect 4 0 5 0;

-#X connect 4 1 6 0;

-#X connect 5 0 1 0;

-#X connect 5 1 12 0;

-#X connect 5 2 8 1;

-#X connect 7 0 6 0;

-#X connect 8 0 7 0;

-#X connect 9 0 4 0;

-#X connect 10 0 11 0;

-#X connect 11 0 0 0;

-#X connect 12 0 0 0;

diff --git a/externals/grill/xsample/pd/xgroove~.pd b/externals/grill/xsample/pd/xgroove~.pd
index f856025d..012dcb92 100644
--- a/externals/grill/xsample/pd/xgroove~.pd
+++ b/externals/grill/xsample/pd/xgroove~.pd
@@ -1,6 +1,6 @@
-#N canvas 92 110 841 560 12;

+#N canvas 92 110 847 566 12;

 #X obj 258 240 hsl 128 15 0.001 3 1 1 empty empty empty 20 8 0 8 -225271

--1 -1 3600 1;

+-1 -1 3400 1;

 #X floatatom 255 261 8 0 0 0 - - -;

 #X floatatom 275 312 8 0 0 0 - - -;

 #X floatatom 350 312 8 0 0 0 - - -;

@@ -76,16 +76,15 @@
 #X msg 157 144 set buf;

 #X msg 372 82 interp \$1;

 #X msg 240 312 all;

-#X obj 198 341 xgroove~ buf;

+#X obj 191 344 xgroove~ buf;

 #X text 255 10 looping mode;

 #X text 370 9 interpolation;

-#X msg 20 170 pos 100;

-#X msg 35 199 pos 200;

+#X msg 10 149 pos 100;

+#X msg 25 180 pos 200;

 #X obj 152 447 *~;

-#X obj 22 242 ramp 10;

 #X msg 10 105 xzone \$1;

 #X obj 13 62 hsl 128 15 0 300 0 0 empty empty empty -2 -6 0 8 -262144

--1 -1 800 1;

+-1 -1 0 1;

 #X floatatom 10 83 5 0 0 0 - - -;

 #X obj 258 32 vdl 15 0 0 3 empty empty empty 0 -6 0 8 -262144 -1 -1

 0;

@@ -126,6 +125,42 @@
 #X msg 131 213 getattributes;

 #X msg 177 248 getmax;

 #X msg 120 248 getmin;

+#N canvas 0 0 493 429 ramp 0;

+#X obj 85 248 line~;

+#X obj 84 307 outlet~;

+#X obj 139 61 route pos;

+#X obj 88 98 t b b f;

+#X obj 207 307 outlet;

+#X msg 186 268 pos \$1;

+#X obj 186 241 f;

+#X obj 139 31 inlet;

+#X obj 18 35 loadbang;

+#X obj 17 69 1;

+#X obj 258 31 inlet;

+#X obj 88 124 delay 0;

+#X obj 120 151 pack 0 0;

+#X obj 85 177 pack 1 0;

+#X connect 0 0 1 0;

+#X connect 2 0 3 0;

+#X connect 2 1 4 0;

+#X connect 3 0 11 0;

+#X connect 3 1 12 0;

+#X connect 3 2 6 1;

+#X connect 5 0 4 0;

+#X connect 6 0 5 0;

+#X connect 7 0 2 0;

+#X connect 8 0 9 0;

+#X connect 9 0 0 0;

+#X connect 10 0 11 1;

+#X connect 10 0 12 1;

+#X connect 10 0 13 1;

+#X connect 11 0 6 0;

+#X connect 11 0 13 0;

+#X connect 12 0 0 0;

+#X connect 13 0 0 0;

+#X restore 19 287 pd ramp;

+#X obj 46 230 loadbang;

+#X msg 46 255 10;

 #X connect 0 0 1 0;

 #X connect 1 0 31 0;

 #X connect 2 0 31 1;

@@ -147,28 +182,30 @@
 #X connect 31 1 8 0;

 #X connect 31 2 4 0;

 #X connect 31 3 5 0;

-#X connect 31 5 70 0;

-#X connect 34 0 37 0;

-#X connect 35 0 37 0;

+#X connect 31 5 69 0;

+#X connect 34 0 73 0;

+#X connect 35 0 73 0;

 #X connect 36 0 14 0;

 #X connect 36 0 14 1;

-#X connect 37 0 36 0;

-#X connect 37 1 31 0;

-#X connect 38 0 31 0;

-#X connect 39 0 40 0;

-#X connect 40 0 38 0;

-#X connect 41 0 10 0;

-#X connect 45 0 29 0;

-#X connect 49 0 50 0;

-#X connect 50 0 26 0;

-#X connect 51 0 49 0;

-#X connect 52 0 54 0;

-#X connect 54 0 31 0;

-#X connect 55 0 57 0;

-#X connect 57 0 31 0;

-#X connect 66 0 67 0;

-#X connect 68 0 67 0;

-#X connect 69 0 67 0;

+#X connect 37 0 31 0;

+#X connect 38 0 39 0;

+#X connect 39 0 37 0;

+#X connect 40 0 10 0;

+#X connect 44 0 29 0;

+#X connect 48 0 49 0;

+#X connect 49 0 26 0;

+#X connect 50 0 48 0;

+#X connect 51 0 53 0;

+#X connect 53 0 31 0;

+#X connect 54 0 56 0;

+#X connect 56 0 31 0;

+#X connect 65 0 66 0;

+#X connect 67 0 66 0;

+#X connect 68 0 66 0;

+#X connect 70 0 31 0;

 #X connect 71 0 31 0;

 #X connect 72 0 31 0;

-#X connect 73 0 31 0;

+#X connect 73 0 36 0;

+#X connect 73 1 31 0;

+#X connect 74 0 75 0;

+#X connect 75 0 73 1;

diff --git a/externals/grill/xsample/source/groove.cpp b/externals/grill/xsample/source/groove.cpp
index 66e55cea..7107f791 100644
--- a/externals/grill/xsample/source/groove.cpp
+++ b/externals/grill/xsample/source/groove.cpp
@@ -43,7 +43,8 @@ public:
 	virtual V m_min(F mn);
 	virtual V m_max(F mx);
 	
-	V m_xzone(F xz);
+	V ms_xzone(F xz);
+	V mg_xzone(F &xz);
 	V m_xsymm(F xz);
 	V m_xshape(I argc = 0,const t_atom *argv = NULL);
 	inline V ms_xshape(const AtomList &ret) { m_xshape(ret.Count(),ret.Atoms()); }
@@ -115,8 +116,8 @@ private:
 	FLEXT_CALLBACK_F(m_max)
 	FLEXT_CALLBACK(m_all)
 
-	FLEXT_CALLSET_F(m_xzone)
-	FLEXT_ATTRGET_F(_xzone)
+	FLEXT_CALLSET_F(ms_xzone)
+	FLEXT_CALLGET_F(mg_xzone)
 	FLEXT_CALLSET_F(m_xsymm)
 	FLEXT_ATTRGET_F(xsymm)
 	FLEXT_CALLVAR_V(mg_xshape,ms_xshape)
@@ -148,7 +149,7 @@ V xgroove::setup(t_classid c)
 
 	FLEXT_CADDATTR_VAR_E(c,"loop",loopmode,m_loop);
 
-	FLEXT_CADDATTR_VAR(c,"xzone",_xzone,m_xzone);
+	FLEXT_CADDATTR_VAR(c,"xzone",mg_xzone,ms_xzone);
 	FLEXT_CADDATTR_VAR(c,"xsymm",xsymm,m_xsymm);
 	FLEXT_CADDATTR_VAR(c,"xshape",mg_xshape,ms_xshape);
 	FLEXT_CADDATTR_VAR(c,"xkeep",xkeep,m_xkeep);
@@ -276,14 +277,19 @@ BL xgroove::m_reset()
 	return xsample::m_reset();
 }
 
-V xgroove::m_xzone(F xz) 
+V xgroove::ms_xzone(F xz) 
 { 
 	bufchk();
-	_xzone = xz < 0?0:xz; 
+	_xzone = xz < 0?0:xz/s2u; 
 //	do_xzone();
 	s_dsp(); 
 }
 
+V xgroove::mg_xzone(F &xz) 
+{ 
+	xz = _xzone*s2u; 
+}
+
 V xgroove::m_xsymm(F xs) 
 { 
 	if(xs < 0) 
@@ -341,7 +347,7 @@ V xgroove::do_xzone()
 {
 	if(!s2u) return; // this can happen if DSP is off
 
-	xzone = _xzone/s2u;
+	xzone = _xzone; // make a copy for changing it
 	znsmin = curmin,znsmax = curmax;
     I plen = znsmax-znsmin; //curlen;
 
diff --git a/externals/grill/xsample/xsample.cw b/externals/grill/xsample/xsample.cw
index af146954..5e0c9d21 100755
--- a/externals/grill/xsample/xsample.cw
+++ b/externals/grill/xsample/xsample.cw