""

svn path=/trunk/; revision=262

10 files changed, 23 insertions, 150 deletions

diff --git a/externals/grill/xsample/source/groove.cpp b/externals/grill/xsample/source/groove.cpp
index 5c2b056f..e5a0eaf5 100644
--- a/externals/grill/xsample/source/groove.cpp
+++ b/externals/grill/xsample/source/groove.cpp
@@ -26,7 +26,7 @@ class xgroove:
 	FLEXT_HEADER(xgroove,xinter)
 
 public:
-	xgroove(I argc,t_atom *argv);
+	xgroove(I argc,const t_atom *argv);
 	~xgroove();
 
 	virtual BL Init();
@@ -49,7 +49,7 @@ public:
 	
 	V m_xzone(F xz);
 	V m_xsymm(F xz);
-	V m_xshape(I argc = 0,t_atom *argv = NULL);
+	V m_xshape(I argc = 0,const t_atom *argv = NULL);
 	V m_xkeep(BL k);
 
 	enum xs_loop {
@@ -132,7 +132,7 @@ V xgroove::setup(t_class *)
 }
 */
 
-xgroove::xgroove(I argc,t_atom *argv):
+xgroove::xgroove(I argc,const t_atom *argv):
 	loopmode(xsl_loop),curpos(0),
 	_xzone(0),xzone(0),xsymm(0.5),xkeep(0),pblksz(0),
 	znbuf(NULL),znmul(NULL),znidx(NULL),znpos(NULL),
@@ -280,7 +280,7 @@ V xgroove::m_xsymm(F xs)
 	do_xzone();
 }
 
-V xgroove::m_xshape(I argc,t_atom *argv) 
+V xgroove::m_xshape(I argc,const t_atom *argv) 
 { 
 	const F pi = 3.14159265358979f;
 	I i,sh = 0;
@@ -652,6 +652,7 @@ V xgroove::m_help()
 	post("\txzone {unit}: length of loop crossfade zone");
 	post("\txsymm -1,0...1: symmetry of crossfade zone inside/outside point");
 	post("\txshape 0/1 [param 0...1]: shape of crossfading (linear/trig)");
+	post("\txkeep 0/1: try to preserve xzone/loop length");
 	post("");
 } 
 
diff --git a/externals/grill/xsample/source/inter.cpp b/externals/grill/xsample/source/inter.cpp
index 095fba6f..c88ceedb 100644
--- a/externals/grill/xsample/source/inter.cpp
+++ b/externals/grill/xsample/source/inter.cpp
@@ -27,7 +27,7 @@ xinter::xinter():
 	FLEXT_ADDMETHOD_E(0,"interp",m_interp);
 }
 
-I xinter::m_set(I argc,t_atom *argv) 
+I xinter::m_set(I argc,const t_atom *argv) 
 {
 	I r = xsample::m_set(argc,argv);
 	if(r < 0) m_reset(); // resets pos/min/max
diff --git a/externals/grill/xsample/source/main.cpp b/externals/grill/xsample/source/main.cpp
index 410746ff..27d66338 100644
--- a/externals/grill/xsample/source/main.cpp
+++ b/externals/grill/xsample/source/main.cpp
@@ -69,7 +69,7 @@ xsample::~xsample()
 
 
 
-I xsample::m_set(I argc, t_atom *argv)
+I xsample::m_set(I argc,const t_atom *argv)
 {
 	return buf->Set(argc >= 1?GetASymbol(argv[0]):NULL);
 }
diff --git a/externals/grill/xsample/source/main.h b/externals/grill/xsample/source/main.h
index db78a630..5467bc1d 100644
--- a/externals/grill/xsample/source/main.h
+++ b/externals/grill/xsample/source/main.h
@@ -91,7 +91,7 @@ protected:
 	virtual V m_stop() = 0;
 	virtual BL m_reset();
 
-  	virtual I m_set(I argc,t_atom *argv);
+  	virtual I m_set(I argc,const t_atom *argv);
 	virtual V m_print() = 0;
 	virtual BL m_refresh();
 	virtual V m_loadbang();
@@ -238,7 +238,7 @@ public:
 	xinter();
 	
 protected:
-	virtual I m_set(I argc,t_atom *argv);
+	virtual I m_set(I argc,const t_atom *argv);
 
 	virtual V m_start();
 	virtual V m_stop();
diff --git a/externals/grill/xsample/source/makefile.pd-linux b/externals/grill/xsample/source/makefile.pd-linux
index 863a0068..2dba8cec 100644
--- a/externals/grill/xsample/source/makefile.pd-linux
+++ b/externals/grill/xsample/source/makefile.pd-linux
@@ -30,7 +30,8 @@ TARGDIR=../pd-linux
 CXX=g++-3.2
 INCLUDES=$(PDPATH)
 FLAGS=-DPD
-CFLAGS=-O6 -mcpu=pentiumpro -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions
+#CFLAGS=-O6 -mcpu=pentiumpro -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions
+CFLAGS=-O6 -mcpu=pentium3 -msse -mfpmath=sse -funroll-loops -fmove-all-movables -frerun-loop-opt -finline-functions
 LIBS=m
 
 # ----------------------------------------------
diff --git a/externals/grill/xsample/source/play.cpp b/externals/grill/xsample/source/play.cpp
index 827d88de..6a84548f 100644
--- a/externals/grill/xsample/source/play.cpp
+++ b/externals/grill/xsample/source/play.cpp
@@ -22,7 +22,7 @@ class xplay:
 	FLEXT_HEADER(xplay,xinter)
 
 public:
-	xplay(I argc, t_atom *argv);
+	xplay(I argc,const t_atom *argv);
 	
 	virtual BL Init();
 		
@@ -54,7 +54,7 @@ V xplay::setup(t_class *)
 }
 */
 
-xplay::xplay(I argc, t_atom *argv)
+xplay::xplay(I argc,const t_atom *argv)
 {
 	I argi = 0;
 #ifdef MAXMSP
diff --git a/externals/grill/xsample/source/record.cpp b/externals/grill/xsample/source/record.cpp
index cc3543a3..869ca3d2 100644
--- a/externals/grill/xsample/source/record.cpp
+++ b/externals/grill/xsample/source/record.cpp
@@ -22,7 +22,7 @@ class xrecord:
 	FLEXT_HEADER(xrecord,xsample)
 
 public:
-	xrecord(I argc,t_atom *argv);
+	xrecord(I argc,const t_atom *argv);
 	
 	virtual BL Init();
 		
@@ -33,7 +33,7 @@ public:
 	virtual V m_help();
 	virtual V m_print();
 	
-	virtual I m_set(I argc,t_atom *argv);
+	virtual I m_set(I argc,const t_atom *argv);
 
 	virtual V m_pos(F pos);
 	virtual V m_all();
@@ -51,7 +51,7 @@ public:
 	virtual V m_loop(BL lp) { doloop = lp; }
 	virtual V m_append(BL app) { if(!(appmode = app)) m_pos(0); }
 
-	virtual V m_draw(I argc,t_atom *argv);	
+	virtual V m_draw(I argc,const t_atom *argv);	
 
 protected:
 	I inchns;
@@ -105,7 +105,7 @@ V xrecord::setup(t_class *)
 }
 */
 
-xrecord::xrecord(I argc,t_atom *argv):
+xrecord::xrecord(I argc,const t_atom *argv):
 	dorec(false),
 	sigmode(false),mixmode(false),
 	appmode(true),doloop(false),
@@ -211,7 +211,7 @@ V xrecord::m_pos(F pos)
 }
 
 
-I xrecord::m_set(I argc,t_atom *argv)
+I xrecord::m_set(I argc,const t_atom *argv)
 {
 	I r = xsample::m_set(argc,argv);
 	if(r < 0) m_reset(); // resets pos/min/max
@@ -242,7 +242,7 @@ BL xrecord::m_reset()
 	return xsample::m_reset();
 }
 
-V xrecord::m_draw(I argc,t_atom *argv)
+V xrecord::m_draw(I argc,const t_atom *argv)
 {
 	if(argc >= 1) {
 		drintv = GetInt(argv[0]);
diff --git a/externals/grill/xsample/source/xsample.cw b/externals/grill/xsample/source/xsample.cw
index c9e91616..9ac0d8c8 100644
--- a/externals/grill/xsample/source/xsample.cw
+++ b/externals/grill/xsample/source/xsample.cw
diff --git a/externals/grill/xsample/source/xsample.dsp b/externals/grill/xsample/source/xsample.dsp
index 6c97b49e..161c0264 100644
--- a/externals/grill/xsample/source/xsample.dsp
+++ b/externals/grill/xsample/source/xsample.dsp
@@ -5,17 +5,17 @@
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
 CFG=xsample - Win32 Debug
-!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
+!MESSAGE Dies ist kein gŸltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und fŸhren Sie den Befehl
 !MESSAGE 
 !MESSAGE NMAKE /f "xsample.mak".
 !MESSAGE 
-!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE Sie kšnnen beim AusfŸhren von NMAKE eine Konfiguration angeben
 !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
 !MESSAGE 
 !MESSAGE NMAKE /f "xsample.mak" CFG="xsample - Win32 Debug"
 !MESSAGE 
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
+!MESSAGE FŸr die Konfiguration stehen zur Auswahl:
 !MESSAGE 
 !MESSAGE "xsample - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "xsample - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
diff --git a/externals/grill/xsample/source/xsample.mpw b/externals/grill/xsample/source/xsample.mpw
deleted file mode 100644
index 9e6b625e..00000000
--- a/externals/grill/xsample/source/xsample.mpw
+++ /dev/null
@@ -1,129 +0,0 @@
-# xsample - extended sample objects for Max/MSP and pd (pure data)
-# Copyright (c) 2001,2002 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for Apple MPW-PR 
-#
-# usage: make -f xsample.mpw
-#
-# ---------------------------------------------
-
-MAKEFILE        = xsample.mpw
-€MondoBuild€    = {MAKEFILE}  # Make blank to avoid rebuilds when makefile is modified
-
-ObjDir          = ::MPW:
-MaxSDK			= HD Daten:Prog Stuff:Max/MSP SDK:SDK Examples
-flext			= :::flext:
-Includes        = -i :,"{flext}","{MaxSDK}:Max Includes","{MaxSDK}:MSP Includes"
-Defines			= -d MAXMSP 
-
-Sym-PPC         = -sym off
-Flags			= -bool on -enum int -includes unix -opt speed,unroll,unswitch  
-WarnOff			= -w 35
-
-PPCCPlusOptions = {Includes} {Sym-PPC} {Defines} {Flags} {WarnOff}
-
-
-### Source Files ###
-
-SrcFiles        =  main.cpp inter.cpp groove.cpp play.cpp record.cpp
-Headers			=  main.h
-
-### Object Files ###
-
-Obj-groove    =  �
-				  "{ObjDir}main.cpp.x" �
-				  "{ObjDir}inter.cpp.x" �
-				  "{ObjDir}groove.cpp.x" 
-
-Obj-play      =  �
-				  "{ObjDir}main.cpp.x" �
-				  "{ObjDir}inter.cpp.x" �
-				  "{ObjDir}play.cpp.x" 
-
-Obj-record    =  �
-				  "{ObjDir}main.cpp.x" �
-				  "{ObjDir}inter.cpp.x" �
-				  "{ObjDir}record.cpp.x"
-				  
-Obj			  = �
-				  "{ObjDir}main.cpp.x" �
-				  "{ObjDir}record.cpp.x" �
-				  "{ObjDir}play.cpp.x" �
-				  "{ObjDir}inter.cpp.x" �
-				  "{ObjDir}groove.cpp.x" 
-
-
-### Libraries ###
-
-LibFiles-Ext    =  �
-				  "{flext}MPW:flext.o" �
-				  "{MaxSDK}:Max Includes:MaxLib" �
-				  "{MaxSDK}:MSP Includes:MaxAudioLib"
-
-LibFiles-PPC    =  �
-				  "{SharedLibraries}StdCLib" �
-				  "{SharedLibraries}MathLib" �
-				  "{PPCLibraries}StdCRuntime.o" �
-				  "{PPCLibraries}PPCCRuntime.o" �
-				  "{PPCLibraries}MrCPlusLib.o" �
-
-
-### Default Rules ###
-
-{ObjDir} Ÿ :
-
-.cpp.x  Ÿ  .cpp  {€MondoBuild€} {Headers}
-	{PPCCPlus} {depDir}{default}.cpp -o {targDir}{default}.cpp.x {PPCCPlusOptions}
-
-
-### Build Rules ###
-
-all Ÿ Folder {ObjDir}xsample 
-single Ÿ Folder {ObjDir}xgroove~ {ObjDir}xplay~ {ObjDir}xrecord~
-
-Folder Ÿ
-	if !`Exists {ObjDir}` ; NewFolder {ObjDir} ; end
-
-{ObjDir}xgroove~  ŸŸ  {Obj-groove}  {LibFiles-Ext} 
-	PPCLink �
-		-o {Targ} �
-		{deps} �
-		{LibFiles-PPC} �
-		{Sym-PPC} �
-		-mf -d �
-		-t 'iLaF' -c 'max2' �
-		-xm s �
-		-export main -main main
-
-{ObjDir}xplay~  ŸŸ  {Obj-play}  {LibFiles-Ext} 
-	PPCLink �
-		-o {Targ} �
-		{deps} �
-		{LibFiles-PPC} �
-		{Sym-PPC} �
-		-mf -d �
-		-t 'iLaF' -c 'max2' �
-		-xm s �
-		-export main -main main
-
-{ObjDir}xrecord~  ŸŸ  {Obj-record}  {LibFiles-Ext} 
-	PPCLink �
-		-o {Targ} �
-		{deps} �
-		{LibFiles-PPC} �
-		{Sym-PPC} �
-		-mf -d �
-		-t 'iLaF' -c 'max2' �
-		-xm s �
-		-export main -main main
-
-{ObjDir}xsample  ŸŸ  {Obj}  {LibFiles-Ext} 
-	PPCLink �
-		-o {Targ} �
-		{deps} �
-		{LibFiles-PPC} �
-		{Sym-PPC} �
-		-mf -d �
-		-t 'iLaF' -c 'max2' �
-		-xm s �
-		-export main -main main