[PD-cvs] externals/grill/xsample/source prefix.h,NONE,1.1 xsample-Info.plist,NONE,1.1 groove.cpp,1.27,1.28 inter.cpp,1.7,1.8 main.h,1.31,1.32 record.cpp,1.15,1.16

[Thomas Grill]

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

Modified Files:
	groove.cpp inter.cpp main.h record.cpp 
Added Files:
	prefix.h xsample-Info.plist 
Log Message:
- made xcode project
- fixed loop record bug
- some small cleanups


Index: groove.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/source/groove.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** groove.cpp	21 Jun 2004 14:02:12 -0000	1.27
--- groove.cpp	16 Dec 2004 05:02:24 -0000	1.28
***************
*** 198,206 ****
  
  xgroove::xgroove(I argc,const t_atom *argv):
! 	loopmode(xsl_loop),curpos(0),
! 	_xzone(0),xzone(0),pblksz(0),
  	xfade(xsf_keeplooppos),xshape(xss_lin),
! 	znidx(NULL),znpos(NULL),
! 	bidir(1)
  {
  	I argi = 0;
--- 198,206 ----
  
  xgroove::xgroove(I argc,const t_atom *argv):
! 	loopmode(xsl_loop),curpos(0),bidir(1),
! 	_xzone(0),xzone(0),
  	xfade(xsf_keeplooppos),xshape(xss_lin),
! 	znpos(NULL),znmul(NULL),znidx(NULL),
! 	pblksz(0)
  {
  	I argi = 0;
***************
*** 868,871 ****
--- 868,872 ----
  			SETSIGFUN(posfun,SIGFUN(s_pos_bidir)); 
  			break;
+         default: ; // just to prevent warning
  		}
  	}

--- NEW FILE: prefix.h ---
/*

xsample - extended sample objects for Max/MSP and pd (pure data)

Copyright (c) 2001-2004 Thomas Grill (xovo at gmx.net)
For information on usage and redistribution, and for a DISCLAIMER OF ALL
WARRANTIES, see the file, "license.txt," in this distribution.  

*/

#define FLEXT_ATTRIBUTES 1 

#include <flext.h>


Index: main.h
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** main.h	21 Jun 2004 14:02:12 -0000	1.31
--- main.h	16 Dec 2004 05:02:24 -0000	1.32
***************
*** 12,22 ****
  #define __XSAMPLE_H
  
! 
! #define XSAMPLE_VERSION "0.3.1pre3"
! 
! 
! #define FLEXT_ATTRIBUTES 1 
! 
! #include <flext.h>
  
  #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406)
--- 12,16 ----
  #define __XSAMPLE_H
  
! #include "prefix.h"
  
  #if !defined(FLEXT_VERSION) || (FLEXT_VERSION < 406)
***************
*** 24,27 ****
--- 18,23 ----
  #endif
  
+ #define XSAMPLE_VERSION "0.3.1pre3"
+ 
  
  // most compilers are somehow broken - in other words - can't handle all C++ features
***************
*** 296,300 ****
  	
  public:
! 	xinter();
  	
  protected:
--- 292,296 ----
  	
  public:
! 	xinter(): outchns(1),doplay(false),interp(xsi_4p) {}
  	
  protected:

Index: record.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/source/record.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** record.cpp	8 Feb 2004 03:40:47 -0000	1.15
--- record.cpp	16 Dec 2004 05:02:24 -0000	1.16
***************
*** 109,117 ****
  
  xrecord::xrecord(I argc,const t_atom *argv):
! 	dorec(false),
! 	sigmode(false),mixmode(0),
! 	appmode(true),doloop(false),
  	drintv(0),
! 	inchns(1)
  {
  	I argi = 0;
--- 109,117 ----
  
  xrecord::xrecord(I argc,const t_atom *argv):
! 	inchns(1),
! 	sigmode(false),appmode(true),
  	drintv(0),
! 	dorec(false),doloop(false),
!     mixmode(0)
  {
  	I argi = 0;
***************
*** 395,400 ****
  					    for(int ci = 0; ci < ICHNS; ++ci) {	
  						    register S *b = bf+ci;
! 						    register const F *s = sig[ci];
! 						    for(i = 0; i < ncur; ++i,b += BCHNS,++s) *b = *s;	
  					    }
  					    si += ncur;
--- 395,401 ----
  					    for(int ci = 0; ci < ICHNS; ++ci) {	
  						    register S *b = bf+ci;
! 						    register const F *s = sig[ci]+si;
! 						    for(i = 0; i < ncur; ++i,b += BCHNS,++s) 
!                                 *b = *s;	
  					    }
  					    si += ncur;
***************
*** 413,417 ****
  					    for(int ci = 0; ci < ICHNS; ++ci) {	
  						    register S *b = bf+ci;
! 						    register const F *s = sig[ci];
  						    for(i = 0; i < ncur; ++i,b += BCHNS,++s) *b += *s;	
  					    }
--- 414,418 ----
  					    for(int ci = 0; ci < ICHNS; ++ci) {	
  						    register S *b = bf+ci;
! 						    register const F *s = sig[ci]+si;
  						    for(i = 0; i < ncur; ++i,b += BCHNS,++s) *b += *s;	
  					    }

--- NEW FILE: xsample-Info.plist ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
	<key>CFBundleDevelopmentRegion</key>
	<string>English</string>
	<key>CFBundleExecutable</key>
	<string>xsample</string>
	<key>CFBundleIdentifier</key>
	<string>org.grrrr.xsample</string>
	<key>CFBundleInfoDictionaryVersion</key>
	<string>6.0</string>
	<key>CFBundlePackageType</key>
	<string>APPL</string>
	<key>CFBundleSignature</key>
	<string>????</string>
	<key>CFBundleVersion</key>
	<string>1.0</string>
	<key>CSResourcesFileMapped</key>
	<string>yes</string>
</dict>
</plist>

Index: inter.cpp
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/xsample/source/inter.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** inter.cpp	8 Feb 2004 03:40:47 -0000	1.7
--- inter.cpp	16 Dec 2004 05:02:24 -0000	1.8
***************
*** 25,34 ****
  }
  
- xinter::xinter():
- 	doplay(false),outchns(1),
- 	interp(xsi_4p)
- {
- }
- 
  I xinter::m_set(I argc,const t_atom *argv) 
  {
--- 25,28 ----