From e728a5bc3db296b4b67c2d3e5b56558c42c566a8 Mon Sep 17 00:00:00 2001
From: Thomas Grill <xovo@users.sourceforge.net>
Date: Mon, 21 Jun 2004 14:08:57 +0000
Subject:  ""

svn path=/trunk/; revision=1826
---
 externals/grill/xsample/source/groove.cpp | 67 +++++++++++++++++++++++++------
 1 file changed, 55 insertions(+), 12 deletions(-)

(limited to 'externals/grill/xsample/source/groove.cpp')

diff --git a/externals/grill/xsample/source/groove.cpp b/externals/grill/xsample/source/groove.cpp
index f96b33bb..a3f2ed02 100644
--- a/externals/grill/xsample/source/groove.cpp
+++ b/externals/grill/xsample/source/groove.cpp
@@ -17,7 +17,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #endif
 
 
-#define XZONE_TABLE 64
+#define XZONE_TABLE 512
 
 
 class xgroove:
@@ -300,7 +300,7 @@ V xgroove::m_max(F mx)
 
 V xgroove::m_pos(F pos)
 {
-	setpos(pos?pos/s2u:0);
+	setpos(pos && s2u?pos/s2u:0);
 }
 
 V xgroove::m_all()
@@ -329,7 +329,7 @@ V xgroove::ms_xfade(I xf)
 V xgroove::ms_xzone(F xz) 
 { 
 	bufchk();
-	_xzone = xz < 0?0:xz/s2u; 
+	_xzone = xz < 0 || !s2u?0:xz/s2u; 
 //	do_xzone();
 	s_dsp(); 
 }
@@ -642,6 +642,11 @@ V xgroove::s_pos_loopzn(I n,S *const *invecs,S *const *outvecs)
     // adapt the playing bounds to the current cross-fade zone
     const L smin = znsmin,smax = znsmax,plen = smax-smin;
 
+	// temporary storage
+	const L cmin = curmin,cmax = curmax;
+	// hack -> set curmin/curmax to loop extremes so that sampling functions (playfun) don't get confused
+	curmin = smin,curmax = smax;
+
 	if(buf && plen > 0) {
 		BL inzn = false;
 		register D o = curpos;
@@ -661,17 +666,24 @@ V xgroove::s_pos_loopzn(I n,S *const *invecs,S *const *outvecs)
 				lpbang = true;
 			}
 
+#if 1
 			if(o < lmin) {
 				register F inp;
 				if(o < lmin2) {
+					// in first half of early cross-fade zone
+					// this happens only once, then the offset is normalized to the end
+					// of the loop (before mid of late crossfade)
+
 					o += lsh;
-					lpbang = true;
 					// now lmax <= o <= lmax2
+					lpbang = true;
 
 					inp = xz-(F)(o-lmax);  // 0 <= inp < xz
 					znpos[i] = lmin-inp;
 				}
-				else { // in early cross-fade zone
+				else { 
+					// in second half of early cross-fade zone
+
 					inp = xz+(F)(o-lmin);  // 0 <= inp < xz
 					znpos[i] = lmax+inp;
 				}
@@ -681,14 +693,18 @@ V xgroove::s_pos_loopzn(I n,S *const *invecs,S *const *outvecs)
 			else if(!(o < lmax)) {
 				register F inp;
 				if(!(o < lmax2)) {
+					// in second half of late cross-fade zone
+					// this happens only once, then the offset is normalized to the beginning
+					// of the loop (after mid of early crossfade)
 					o -= lsh;
-					lpbang = true;
 					// now lmin2 <= o <= lmin
+					lpbang = true;
 
 					inp = xz+(F)(o-lmin);  // 0 <= inp < xz
 					znpos[i] = lmax+inp;
 				}
-				else { // in late cross-fade zone
+				else { 
+					// in first half of late cross-fade zone
 					inp = xz-(F)(o-lmax);  // 0 <= inp < xz
 					znpos[i] = lmin-inp;
 				}
@@ -701,6 +717,27 @@ V xgroove::s_pos_loopzn(I n,S *const *invecs,S *const *outvecs)
 			const S spd = speed[i];  // must be first because the vector is reused for output!
 			pos[i] = o;
 			o += spd;
+#else
+			if(o >= lmax) { 
+				o -= lsh; 
+				lpbang = true; 
+			}
+
+			if(o < lmin) {
+				register F inp = (F)(o-smin); // 0 <= inp < xz
+				znpos[i] = lmax+inp;
+				znidx[i] = inp*xf;
+				inzn = true;
+			}
+			else {
+				znpos[i] = 0;
+				znidx[i] = XZONE_TABLE;
+			}
+
+			const S spd = speed[i];  // must be first because the vector is reused for output!
+			pos[i] = o;
+			o += spd;
+#endif
 		}
 
 		// normalize and store current playing position
@@ -736,6 +773,8 @@ V xgroove::s_pos_loopzn(I n,S *const *invecs,S *const *outvecs)
 	else 
 		s_pos_off(n,invecs,outvecs);
 		
+	curmin = cmin,curmax = cmax;
+
 	if(lpbang) ToOutBang(outchns+3);
 }
 
@@ -787,12 +826,14 @@ V xgroove::s_pos_bidir(I n,S *const *invecs,S *const *outvecs)
 V xgroove::s_dsp()
 {
 	if(doplay) {
+        // xzone might not be set yet (is done in do_xzone() )
+		do_xzone(); // recalculate (s2u may have been 0 before)
+
 		switch(loopmode) {
-		case xsl_once: SETSIGFUN(posfun,SIGFUN(s_pos_once)); break;
+		case xsl_once: 
+			SETSIGFUN(posfun,SIGFUN(s_pos_once)); 
+			break;
 		case xsl_loop: 
-            // xzone might not be set yet (is done in do_xzone() )
-			do_xzone(); // recalculate (s2u may have been 0 before)
-
 			if(xzone > 0) {
 				const I blksz = Blocksize();
 
@@ -823,7 +864,9 @@ V xgroove::s_dsp()
 			else
 				SETSIGFUN(posfun,SIGFUN(s_pos_loop)); 
 			break;
-		case xsl_bidir: SETSIGFUN(posfun,SIGFUN(s_pos_bidir)); break;
+		case xsl_bidir: 
+			SETSIGFUN(posfun,SIGFUN(s_pos_bidir)); 
+			break;
 		}
 	}
 	else
-- 
cgit v1.2.1