[PD-cvs] externals/grill/xsample/source groove.cpp, 1.32, 1.33 main.cpp, 1.20, 1.21 main.h, 1.36, 1.37

[Thomas Grill]

Update of /cvsroot/pure-data/externals/grill/xsample/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14403/source

Modified Files:
	groove.cpp main.cpp main.h 
Log Message:
merge in branch "20041229-unify"
Mac adaptations
some safety for settings
cross-fading loop zone now functional
update for new flext callback naming
more loop zone optimizations
enhanced PD help files
simplified and bug-fixed crossfade-zone sampling
rename help file
fix: loopmodes 0 and 2 now setting loopzone parameters
64 bit fixes
minor updates
*** empty log message ***
more fixes
fix for OSX 10.4.1 (thanks to Jamie)
renamed help files
more fixes and cleanups for fade-zones


Index: groove.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/source/groove.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** groove.cpp	13 Mar 2005 04:58:28 -0000	1.32
--- groove.cpp	11 Aug 2005 15:01:42 -0000	1.33
***************
*** 57,60 ****
--- 57,61 ----
  	void ms_xfade(int xf)
      { 
+         if(xf < 0 || xf > xsf_inside) xf = xsf_keeplooppos;
  	    xfade = (xs_fade)xf;
          Update(xsc_fade,true);
***************
*** 264,267 ****
--- 265,270 ----
  void xgroove::ms_xshape(int sh) 
  { 
+     if(sh < 0 || sh > xss_hsine) sh = xss_lin;
+ 
  	xshape = (xs_shape)sh;
  	switch(xshape) {

Index: main.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** main.cpp	13 Mar 2005 04:58:29 -0000	1.20
--- main.cpp	11 Aug 2005 15:01:42 -0000	1.21
***************
*** 57,61 ****
  #endif
  	sclmode(xss_unitsinbuf),
! 	curmin(0),curmax(1<<(sizeof(curmax)*8-2))
  {}
  	
--- 57,61 ----
  #endif
  	sclmode(xss_unitsinbuf),
! 	curmin(0),curmax(1L<<(sizeof(curmax)*8-2))
  {}
  	

Index: main.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** main.h	30 Jul 2005 22:08:53 -0000	1.36
--- main.h	11 Aug 2005 15:01:42 -0000	1.37
***************
*** 16,20 ****
  #endif
  
! #define XSAMPLE_VERSION "0.3.1pre6"
  
  
--- 16,20 ----
  #endif
  
! #define XSAMPLE_VERSION "0.3.1pre7"