[PD-cvs] externals/grill/xsample/source main.cpp, 1.21, 1.22 main.h, 1.38, 1.39

Thomas Grill xovo at users.sourceforge.net
Tue Oct 11 12:09:49 CEST 2005


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

Modified Files:
	main.cpp main.h 
Log Message:
fixes for Metrowerks
fix compilation for CFM
small fixes
correction of limits on buffer resize


Index: main.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** main.cpp	11 Aug 2005 15:01:42 -0000	1.21
--- main.cpp	11 Oct 2005 10:09:47 -0000	1.22
***************
*** 168,173 ****
  
      if(flags&xsc_range && buf.Ok()) {
          if(curmin < 0) curmin = 0;
!         if(curmax > buf.Frames()) curmax = buf.Frames();
      }
  
--- 168,178 ----
  
      if(flags&xsc_range && buf.Ok()) {
+ 		const int f = buf.Frames();
+ 		
          if(curmin < 0) curmin = 0;
! 		else if(curmin > f) curmin = f;
! 		
!         if(curmax > f) curmax = f;
! 		else if(curmax < curmin) curmax = curmin;		
      }
  

Index: main.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** main.h	26 Sep 2005 14:00:26 -0000	1.38
--- main.h	11 Oct 2005 10:09:47 -0000	1.39
***************
*** 70,74 ****
--- 70,76 ----
      // this is for the UInt32 prototype (thanks to Jamie)
      // \TODO we'd rather not use Carbon but some other framework
+     #ifdef __MACH__
      #include <Carbon/Carbon.h>
+     #endif
  
  	// Initialize a prefetch constant for use with vec_dst(), vec_dstt(), vec_dstst or vec_dststt





More information about the Pd-cvs mailing list