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

Modified Files: groove.cpp inter.h main.cpp main.h play.cpp record.cpp Log Message: use branch hints added xcode 2.4 project fixed one-shot loop bang updated copyrights

Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** main.cpp 2 Nov 2006 00:27:23 -0000 1.24 --- main.cpp 19 Jun 2007 14:34:10 -0000 1.25 *************** *** 2,6 **** xsample - extended sample objects for Max/MSP and pd (pure data)

! Copyright (c) 2001-2006 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 2,6 ---- xsample - extended sample objects for Max/MSP and pd (pure data)

! Copyright (c) 2001-2007 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 17,21 **** flext::post(""); flext::post(" xrecord~, xplay~, xgroove~ "); ! flext::post(" (C)2001-2006 Thomas Grill "); #ifdef FLEXT_DEBUG flext::post(""); --- 17,21 ---- flext::post(""); flext::post(" xrecord~, xplay~, xgroove~ "); ! flext::post(" (C)2001-2007 Thomas Grill "); #ifdef FLEXT_DEBUG flext::post("");

Index: play.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/play.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** play.cpp 2 Nov 2006 00:27:23 -0000 1.12 --- play.cpp 19 Jun 2007 14:34:11 -0000 1.13 *************** *** 2,6 **** xsample - extended sample objects for Max/MSP and pd (pure data)

! Copyright (c) 2001-2006 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 2,6 ---- xsample - extended sample objects for Max/MSP and pd (pure data)

! Copyright (c) 2001-2007 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 118,122 **** post("compiled on " __DATE__ " " __TIME__); #endif ! post("(C) Thomas Grill, 2001-2006"); #if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName()); --- 118,122 ---- post("compiled on " __DATE__ " " __TIME__); #endif ! post("(C) Thomas Grill, 2001-2007"); #if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName());

Index: groove.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/groove.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** groove.cpp 2 Nov 2006 00:27:23 -0000 1.37 --- groove.cpp 19 Jun 2007 14:34:10 -0000 1.38 *************** *** 2,6 **** xsample - extended sample objects for Max/MSP and pd (pure data)

! Copyright (c) 2001-2006 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 2,6 ---- xsample - extended sample objects for Max/MSP and pd (pure data)

! Copyright (c) 2001-2007 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 323,327 **** s_pos_off(n,invecs,outvecs); ! if(UNLIKELY(lpbang)) ToOutBang(outchns+3); }

--- 323,330 ---- s_pos_off(n,invecs,outvecs); ! if(UNLIKELY(lpbang)) { ! doplay = false; ! ToOutBang(outchns+3); ! } }

*************** *** 362,365 **** --- 365,371 ---- } else { + /////////////////////////////////// + // Most of the time is spent in here + /////////////////////////////////// for(int i = 0; i < n; ++i) { const t_sample spd = speed[i]; // must be first because the vector is reused for output! *************** *** 757,761 **** { post("%s - part of xsample objects, version " XSAMPLE_VERSION,thisName()); ! post("(C) Thomas Grill, 2001-2006"); #if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName()); --- 763,767 ---- { post("%s - part of xsample objects, version " XSAMPLE_VERSION,thisName()); ! post("(C) Thomas Grill, 2001-2007"); #if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName());

Index: inter.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/inter.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** inter.h 2 Nov 2006 00:27:23 -0000 1.10 --- inter.h 19 Jun 2007 14:34:10 -0000 1.11 *************** *** 207,211 **** t_sample *sig0 = sig[0]; for(int i = 0; i < n; ++i) { ! float o = *(pos++); register long oint = CASTINT<long>(o); register t_sample fa,fb,fc,fd; --- 207,211 ---- t_sample *sig0 = sig[0]; for(int i = 0; i < n; ++i) { ! float o = pos[i]; register long oint = CASTINT<long>(o); register t_sample fa,fb,fc,fd; *************** *** 290,294 **** } ! const float f1 = 0.5f*(frac-1.0f); const float f3 = frac*3.0f-1.0f; --- 290,294 ---- } ! const float f1 = frac*0.5f-0.5f; const float f3 = frac*3.0f-1.0f; *************** *** 296,300 **** const float cmb = fc-fb; const float bma = fb-fa; ! *(sig0++) = fb + frac*( cmb - f1 * ( amdf+bma+cmb*f3 ) ); } } --- 296,300 ---- const float cmb = fc-fb; const float bma = fb-fa; ! sig0[i] = fb + frac*( cmb - f1 * ( amdf+bma+cmb*f3 ) ); } }

Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/main.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** main.h 2 Nov 2006 00:27:23 -0000 1.42 --- main.h 19 Jun 2007 14:34:10 -0000 1.43 *************** *** 87,92 **** #endif

! #if FLEXT_CPU == FLEXT_CPU_INTEL && defined(__GNUC__) ! template<typename I,typename F> inline I CASTINT(F o) { return lrintf(o); } #elif FLEXT_CPU == FLEXT_CPU_INTEL && defined(_MSC_VER) template<typename I,typename F> --- 87,99 ---- #endif

! #if 0 // FLEXT_CPU == FLEXT_CPU_PPC && defined(__GNUC__) ! #include <ppc_intrinsics.h> ! template<typename I,typename F> ! inline I CASTINT( F f ) ! { ! int i; ! __stfiwx(__fctiwz(f),0,&i); ! return i; ! } #elif FLEXT_CPU == FLEXT_CPU_INTEL && defined(_MSC_VER) template<typename I,typename F>

Index: record.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/source/record.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** record.cpp 2 Nov 2006 00:27:23 -0000 1.20 --- record.cpp 19 Jun 2007 14:34:11 -0000 1.21 *************** *** 2,6 **** xsample - extended sample objects for Max/MSP and pd (pure data)

! Copyright (c) 2001-2006 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 2,6 ---- xsample - extended sample objects for Max/MSP and pd (pure data)

! Copyright (c) 2001-2007 Thomas Grill (gr@grrrr.org) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 453,457 **** post("compiled on " __DATE__ " " __TIME__); #endif ! post("(C) Thomas Grill, 2001-2006"); #if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName()); --- 453,457 ---- post("compiled on " __DATE__ " " __TIME__); #endif ! post("(C) Thomas Grill, 2001-2007"); #if FLEXT_SYS == FLEXT_SYS_MAX post("Arguments: %s [channels=1] [buffer]",thisName());