""

svn path=/trunk/; revision=1315

20 files changed, 221 insertions, 267 deletions

diff --git a/externals/grill/flext/changes.txt b/externals/grill/flext/changes.txt
index 113180ef..ebcc3953 100644
--- a/externals/grill/flext/changes.txt
+++ b/externals/grill/flext/changes.txt
@@ -16,6 +16,8 @@ Version history:
 0.4.6:
 - added a text edit window for list attributes
 - finally use global allocator operators (MFC doesn't like but who cares)
+- fixed entry of local variables with attribute editor
+- help window for attribute editor
 
 0.4.5:
 - added some more SIMD functions
diff --git a/externals/grill/flext/source/flatom_pr.cpp b/externals/grill/flext/source/flatom_pr.cpp
index 10eaa54b..2e35f89c 100644
--- a/externals/grill/flext/source/flatom_pr.cpp
+++ b/externals/grill/flext/source/flatom_pr.cpp
@@ -2,7 +2,7 @@
 
 flext - C++ layer for Max/MSP and pd (pure data) externals
 
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
@@ -29,7 +29,9 @@ bool flext::PrintAtom(const t_atom &a,char *buf,int bufsz)
 		STD::sprintf(buf,"%i",GetInt(a));
 	}
 	else if(IsSymbol(a)) {
-		STD::strcpy(buf,GetString(a));
+        if(!FLEXT_ASSERT(GetSymbol(a))) *buf = 0;
+        else 
+            STD::strcpy(buf,GetString(a));
 	}
 	else if(IsPointer(a)) {
 		STD::sprintf(buf,"%p",GetPointer(a));
diff --git a/externals/grill/flext/source/flattr_ed.cpp b/externals/grill/flext/source/flattr_ed.cpp
index aceca5b4..672e4e56 100644
--- a/externals/grill/flext/source/flattr_ed.cpp
+++ b/externals/grill/flext/source/flattr_ed.cpp
@@ -2,7 +2,7 @@
 
 flext - C++ layer for Max/MSP and pd (pure data) externals
 
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
@@ -83,18 +83,16 @@ void flext_base::SetAttrEditor(t_classid c)
 			"set vid [string trimleft $id .]\n"
 
 			// make a list of the attribute values (including save flags)
+
 			"set lst {}\n"
 			"for {set ix 1} {$ix <= $alen} {incr ix} {\n"
 				"set var_attr_name [concat [concat var_name_$ix]_$vid ]\n"
-				"global $var_attr_name\n"
 				"set var_attr_init [concat [concat var_init_$ix]_$vid ]\n"
-				"global $var_attr_init\n"
 				"set var_attr_val [concat [concat var_val_$ix]_$vid ]\n"
-				"global $var_attr_val\n"
 				"set var_attr_save [concat [concat var_save_$ix]_$vid ]\n"
-				"global $var_attr_save\n"
 				"set var_attr_type [concat [concat var_type_$ix]_$vid ]\n"
-				"global $var_attr_type\n"
+
+				"global $var_attr_name $var_attr_init $var_attr_val $var_attr_save $var_attr_type\n"
 		
 				"if { [expr $$var_attr_type] != 0 } {\n"
 					// attribute is puttable
@@ -102,23 +100,33 @@ void flext_base::SetAttrEditor(t_classid c)
 					"lappend lst [eval concat $$var_attr_name]\n" 
 
 					// process current value
-					"set len [llength [expr $$var_attr_val]]\n"
+                    "set tmp [eval concat $$var_attr_val]\n"
+					"set len [llength $tmp]\n"
 					"if { $len == 1 } {\n"
 						// it's an atom
-						"lappend lst [expr $$var_attr_val]\n" 
+                        // if atom starts with $, replace it by # ($ can't be passed by TCL)
+                        "if { [string index $tmp 0] == \"$\" } {\n"
+                            "set tmp [string replace $tmp 0 0 #]\n" 
+                        "}\n"
+                        "lappend lst $tmp\n" 
 					"} else {\n"
 						// it's a list
-						"set lst [concat $lst {list} $len [expr $$var_attr_val]]\n" 
+						"set lst [concat $lst {list} $len $tmp]\n" 
 					"}\n"
 
 					// process init value
-					"set len [llength [expr $$var_attr_init]]\n"
+					"set tmp [eval concat $$var_attr_init]\n"
+					"set len [llength $tmp]\n"
 					"if { $len == 1 } {\n"
 						// it's an atom
-						"lappend lst [expr $$var_attr_init]\n" 
+                        // if atom starts with $, replace it by # ($ can't be passed by TCL)
+                        "if { [string index $tmp 0] == \"$\" } {\n"
+                            "set tmp [string replace $tmp 0 0 #]\n" 
+                        "}\n"
+                        "lappend lst $tmp\n" 
 					"} else {\n"
 						// it's a list
-						"set lst [concat $lst {list} $len [expr $$var_attr_init]]\n" 
+						"set lst [concat $lst {list} $len $tmp]\n" 
 					"}\n"
 
 					"lappend lst [eval concat $$var_attr_save]\n" 
@@ -139,9 +147,35 @@ void flext_base::SetAttrEditor(t_classid c)
 			"flext_cancel $id\n"
 		"}\n"
 
+        "proc flext_help {id} {\n"
+        	"toplevel $id.hw\n"
+            "wm title $id.hw \"Flext attribute editor help\"\n"
+
+            "frame $id.hw.buttons\n"
+            "pack $id.hw.buttons -side bottom -fill x -pady 2m\n"
+
+            "text $id.hw.text -relief sunken -bd 2 -yscrollcommand \"$id.hw.scroll set\" -setgrid 1 -width 80 -height 10 -wrap word\n"
+            "scrollbar $id.hw.scroll -command \"$id.hw.text yview\"\n"
+            "pack $id.hw.scroll -side right -fill y\n"
+            "pack $id.hw.text -expand yes -fill both\n"
+
+            "button $id.hw.buttons.ok -text OK -command \"destroy $id.hw\"\n"
+            "pack $id.hw.buttons.ok -side left -expand 1\n"
+			"bind $id.hw {<KeyPress-Escape>} \"destroy $id.hw\"\n"
+
+            "$id.hw.text tag configure big -font {Arial 10 bold}\n"
+            "$id.hw.text configure -font {Arial 8 bold}\n"
+            "$id.hw.text insert end \""
+                "The flext attribute editor lets you query or change attribute values exposed by an external object. \" big \"\n\n"
+                "Local variable names ($-values) will only be saved as such for init values. "
+                "Alternatively, # can be used instead of $.\n"
+                "Ctrl-Button on a text field will open an editor window where text can be entered more comfortably.\n"
+            "\"\n"
+            "$id.hw.text configure -state disabled\n"
+		"}\n"
+
 		"proc flext_copyval {dst src} {\n"
-			"global $src\n"
-			"global $dst\n"
+			"global $src $dst\n"
 			"set $dst [expr $$src]\n"
 		"}\n"
 
@@ -161,24 +195,24 @@ void flext_base::SetAttrEditor(t_classid c)
             "frame $id.w.buttons\n"
             "pack $id.w.buttons -side bottom -fill x -pady 2m\n"
 
-//            "if { $edit != 0 } {set st normal} {set st disabled}\n"
-            "text $id.w.text -relief sunken -bd 2 -yscrollcommand \"$id.w.scroll set\" -setgrid 1 -width 80 -height 20\n"  //  -state $st
+            "text $id.w.text -relief sunken -bd 2 -yscrollcommand \"$id.w.scroll set\" -setgrid 1 -width 80 -height 20\n"
             "scrollbar $id.w.scroll -command \"$id.w.text yview\"\n"
             "pack $id.w.scroll -side right -fill y\n"
             "pack $id.w.text -expand yes -fill both\n"
 
-			"if { $edit != 0 } {\n"
+            "$id.w.text insert 0.0 [expr $$var]\n"
+            "$id.w.text mark set insert 0.0\n"
+
+			"if { $edit != 0 } then {\n"
                 "button $id.w.buttons.ok -text OK -command \"flext_textcopy $id.w $id.w.text $var\"\n"
                 "pack $id.w.buttons.ok -side left -expand 1\n"
 //    			"bind $id.w {<Shift-KeyPress-Return>} \"flext_textcopy $id.w $id.w.text $var\"\n"
-    		"}\n"
+            "} "
+            "else { $id.w.text configure -state disabled }\n"
 
             "button $id.w.buttons.cancel -text Cancel -command \"destroy $id.w\"\n"
             "pack $id.w.buttons.cancel -side left -expand 1\n"
 			"bind $id.w {<KeyPress-Escape>} \"destroy $id.w\"\n"
-
-            "$id.w.text insert 0.0 [expr $$var]\n"
-            "$id.w.text mark set insert 0.0\n"
         "}\n"
 
 		"proc pdtk_flext_dialog {id title attrlist} {\n"
@@ -348,10 +382,12 @@ void flext_base::SetAttrEditor(t_classid c)
 				"button $id.buttonframe.cancel -text {Cancel} -width 20 -command \" flext_cancel $id \"\n"
 				"button $id.buttonframe.apply -text {Apply} -width 20 -command \" flext_apply $id $alen \"\n"
 				"button $id.buttonframe.ok -text {OK} -width 20 -command \" flext_ok $id $alen \"\n"
+				"button $id.buttonframe.help -text {Help} -width 10 -command \" flext_help $id \"\n"
 
 				"pack $id.buttonframe.cancel -side left -expand 1\n"
 				"pack $id.buttonframe.apply -side left -expand 1\n"
 				"pack $id.buttonframe.ok -side left -expand 1\n"
+				"pack $id.buttonframe.help -side left -expand 1\n"
 
 //                "grid rowconfigure $id $row -weight 0\n"
 				"grid config $id.buttonframe -column 0 -columnspan 8 -row $row -pady 5 -sticky {ew}\n"
diff --git a/externals/grill/flext/source/flstdc.h b/externals/grill/flext/source/flstdc.h
index 55f0b80a..4927435c 100644
--- a/externals/grill/flext/source/flstdc.h
+++ b/externals/grill/flext/source/flstdc.h
@@ -199,9 +199,9 @@ typedef t_symbol *t_symptr;
 #endif
 
 #ifdef FLEXT_DEBUG
-#define FLEXT_ASSERT(b) ((void)(!(b)?(error("Assertion failed: " #b " - in " __FILE__ " line %i",(int)__LINE__),0):0)) 
+#define FLEXT_ASSERT(b) (!(b)?(error("Assertion failed: " #b " - in " __FILE__ " line %i",(int)__LINE__),0):1)
 #else
-#define FLEXT_ASSERT(b) ((void)0)
+#define FLEXT_ASSERT(b) (1)
 #endif
 
 #define ERRINTERNAL() error("flext: Internal error in file " __FILE__ ", line %i - please report",(int)__LINE__)
diff --git a/externals/grill/guitest/build-pd-linux.sh b/externals/grill/guitest/build-pd-linux.sh
new file mode 100644
index 00000000..413650f7
--- /dev/null
+++ b/externals/grill/guitest/build-pd-linux.sh
@@ -0,0 +1,11 @@
+#!/bin/sh  
+
+. config-pd-linux.txt
+
+make -f makefile.pd-linux &&
+{ 
+	if [ $INSTPATH != "" ]; then
+		echo Now install as root
+		su -c "make -f makefile.pd-linux install"
+	fi
+}
diff --git a/externals/grill/guitest/config-pd-linux.txt b/externals/grill/guitest/config-pd-linux.txt
new file mode 100644
index 00000000..7a0d3302
--- /dev/null
+++ b/externals/grill/guitest/config-pd-linux.txt
@@ -0,0 +1,27 @@
+# Copyright (c) 2002-2004 Thomas Grill (xovo@gmx.net)
+#
+
+# your c++ compiler (define only if it's different than g++)
+# CXX=g++
+
+# where are the PD header files?
+# leave it blank if it is a system directory (like /usr/local/include), 
+# 	since gcc >= 3.2 complains about it
+PDPATH=/usr/src/pd-0.37-0/src
+
+# where do the flext libraries reside?
+FLEXTPATH=/usr/local/lib/pd/flext
+
+# where should flext libraries be built?
+TARGDIR=./pd-linux
+
+# where should the external be installed?
+# (leave blank to omit installation)
+INSTPATH=/usr/local/lib/pd/extra
+
+# user defined compiler flags
+UFLAGS=
+
+# define for shared build
+# FLEXT_SHARED=1
+
diff --git a/externals/grill/guitest/guitest.dsp b/externals/grill/guitest/guitest.dsp
deleted file mode 100644
index e1f326ce..00000000
--- a/externals/grill/guitest/guitest.dsp
+++ /dev/null
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="guitest" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=guitest - 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 
-!MESSAGE NMAKE /f "guitest.mak".
-!MESSAGE 
-!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 "guitest.mak" CFG="guitest - Win32 Debug"
-!MESSAGE 
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "guitest - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "guitest - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "max/guitest"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "guitest - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "msvc\r"
-# PROP Intermediate_Dir "msvc\r"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GUITEST_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /W3 /GR /O2 /I "F:\prog\pd\pd-cvs\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /YX /FD /c
-# SUBTRACT CPP /Fr
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0xc07 /d "NDEBUG"
-# ADD RSC /l 0xc07 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib pd.lib flext-pdwin.lib /nologo /dll /machine:I386 /libpath:"f:\prog\pd\pd-cvs\bin" /libpath:"f:\prog\max\flext\pd-msvc"
-
-!ELSEIF  "$(CFG)" == "guitest - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "msvc\d"
-# PROP Intermediate_Dir "msvc\d"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GUITEST_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GR /ZI /Od /I "F:\prog\pd\pd-cvs\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "NT" /D "PD" /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0xc07 /d "_DEBUG"
-# ADD RSC /l 0xc07 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib pd.lib flext_d-pdwin.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"f:\prog\pd\pd-cvs\bin" /libpath:"f:\prog\max\flext\pd-msvc"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "guitest - Win32 Release"
-# Name "guitest - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\flgui.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\flgui.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\flguiobj.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\flguiobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\main.cpp
-# End Source File
-# End Target
-# End Project
diff --git a/externals/grill/guitest/make-files.txt b/externals/grill/guitest/make-files.txt
new file mode 100644
index 00000000..f5670fa3
--- /dev/null
+++ b/externals/grill/guitest/make-files.txt
@@ -0,0 +1,7 @@
+# all the source files from the package
+NAME=guitest
+
+SRCDIR=.
+
+SRCS= flgui.cpp flguiobj.cpp main.cpp 
+HDRS= flgui.h flguiobj.h
diff --git a/externals/grill/guitest/makefile.pd-linux b/externals/grill/guitest/makefile.pd-linux
new file mode 100644
index 00000000..3c8632bb
--- /dev/null
+++ b/externals/grill/guitest/makefile.pd-linux
@@ -0,0 +1,87 @@
+# Copyright (C) 2002-2004 Thomas Grill (xovo@gmx.net)
+#
+# Makefile for gcc @ linux
+#
+# usage:
+# to build run "make -f makefile.pd-linux"
+# to install (as root), do "make -f makefile.pd-linux install"
+#
+
+CONFIG=config-pd-linux.txt
+
+include $(CONFIG)
+
+# compiler+linker stuff	
+INCLUDES=$(PDPATH) 
+FLAGS=-DFLEXT_SYS=2 
+CFLAGS=-O2 $(UFLAGS)
+LDFLAGS=$(UFLAGS)  # needed by icc
+LIBS= 
+
+ifdef FLEXT_SHARED
+CFLAGS+=-shared -DFLEXT_SHARED
+LDFLAGS+=-L $(FLEXTPATH)
+
+ifeq ($(CXX),icc)
+LDFLAGS+=-i_dynamic
+else
+LDFLAGS+=-Wl,-Bdynamic
+endif
+
+FLEXTLIB=-lflext
+
+else
+
+FLEXTLIB=$(FLEXTPATH)/libflext.a
+
+endif
+
+
+# ---------------------------------------------
+# the rest can stay untouched
+# ----------------------------------------------
+
+include make-files.txt
+
+
+TARGET=$(TARGDIR)/$(NAME).pd_linux
+
+# default target
+all: $(TARGDIR) $(TARGET)
+
+$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(CONFIG)
+	touch $@
+
+$(TARGDIR):
+	mkdir $(TARGDIR)
+
+$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
+	$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
+
+$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) 
+	$(CXX) -shared $(LDFLAGS) -o $@ $^ $(FLEXTLIB)  $(patsubst %,-l%,$(LIBS))  
+	strip --strip-unneeded $@
+	chmod 755 $@
+
+$(INSTPATH):
+	mkdir $(INSTPATH)
+
+install:: $(INSTPATH)
+
+install:: $(TARGET)
+	cp $^ $(INSTPATH)
+	chown root.root  $(patsubst %,$(INSTPATH)/%,$(notdir $^))
+	chmod 755 $(patsubst %,$(INSTPATH)/%,$(notdir $^))
+
+.PHONY: clean
+clean:
+	rm -f $(TARGDIR)/*.o $(TARGET)
+	
+
+
+
+
+
+
+
+
diff --git a/externals/grill/guitest/pd/guitest1.pd b/externals/grill/guitest/pd/guitest1.pd
new file mode 100644
index 00000000..dab24e77
--- /dev/null
+++ b/externals/grill/guitest/pd/guitest1.pd
@@ -0,0 +1,7 @@
+#N canvas 0 0 456 306 12;

+#X obj 31 87 guitest;

+#X obj 32 47 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1

+-1;

+#X obj 30 231 print OUTPUT;

+#X connect 0 0 2 0;

+#X connect 1 0 0 0;

diff --git a/externals/grill/pool/pool.dsp b/externals/grill/pool/pool.dsp
deleted file mode 100644
index be452ab8..00000000
--- a/externals/grill/pool/pool.dsp
+++ /dev/null
@@ -1,115 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pool" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=pool - 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 
-!MESSAGE NMAKE /f "pool.mak".
-!MESSAGE 
-!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 "pool.mak" CFG="pool - Win32 Debug"
-!MESSAGE 
-!MESSAGE Für die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "pool - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "pool - Win32 Debug" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName "max/pool"
-# PROP Scc_LocalPath "."
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "pool - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "pd-msvc/r"
-# PROP Intermediate_Dir "pd-msvc/r"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "POOL_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "c:\programme\audio\pd\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D FLEXT_SYS=2 /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0xc07 /d "NDEBUG"
-# ADD RSC /l 0xc07 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib pd.lib /nologo /dll /machine:I386 /out:"pd-msvc/pool.dll" /libpath:"c:\programme\audio\pd\bin" /libpath:"f:\prog\max\flext\pd-msvc"
-
-!ELSEIF  "$(CFG)" == "pool - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "pd-msvc/d"
-# PROP Intermediate_Dir "pd-msvc/d"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "POOL_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "c:\programme\audio\pd\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D FLEXT_SYS=2 /FR /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0xc07 /d "_DEBUG"
-# ADD RSC /l 0xc07 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib pd.lib flext_d-pdwin.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"c:\programme\audio\pd\bin" /libpath:"f:\prog\max\flext\pd-msvc"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "pool - Win32 Release"
-# Name "pool - Win32 Debug"
-# Begin Source File
-
-SOURCE=.\data.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\main.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\pool.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\pool.dtd
-# End Source File
-# Begin Source File
-
-SOURCE=.\pool.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\readme.txt
-# End Source File
-# End Target
-# End Project
diff --git a/externals/grill/vasp/vasp.vcproj b/externals/grill/vasp/vasp.vcproj
index bb36f9d9..f806d965 100644
--- a/externals/grill/vasp/vasp.vcproj
+++ b/externals/grill/vasp/vasp.vcproj
@@ -157,8 +157,10 @@
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS"
-				ExceptionHandling="FALSE"
+				StringPooling="TRUE"
+				ExceptionHandling="TRUE"
 				RuntimeLibrary="0"
+				BufferSecurityCheck="FALSE"
 				DisableLanguageExtensions="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="main.h"
diff --git a/externals/grill/xsample/readme.txt b/externals/grill/xsample/readme.txt
index 21c005c0..1b9f5fc0 100644
--- a/externals/grill/xsample/readme.txt
+++ b/externals/grill/xsample/readme.txt
@@ -1,6 +1,6 @@
 xsample - extended sample objects for Max/MSP and pd (pure data)
 
-Copyright (c)2001-2003 Thomas Grill (t.grill@gmx.net)
+Copyright (c)2001-2004 Thomas Grill (t.grill@gmx.net)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
diff --git a/externals/grill/xsample/source/groove.cpp b/externals/grill/xsample/source/groove.cpp
index accfc0d9..fd8bad65 100644
--- a/externals/grill/xsample/source/groove.cpp
+++ b/externals/grill/xsample/source/groove.cpp
@@ -2,7 +2,7 @@
 
 xsample - extended sample objects for Max/MSP and pd (pure data)
 
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
@@ -806,7 +806,7 @@ V xgroove::m_help()
 #ifdef FLEXT_DEBUG
 	post("compiled on " __DATE__ " " __TIME__);
 #endif
-	post("(C) Thomas Grill, 2001-2003");
+	post("(C) Thomas Grill, 2001-2004");
 #if FLEXT_SYS == FLEXT_SYS_MAX
 	post("Arguments: %s [channels=1] [buffer]",thisName());
 #else
diff --git a/externals/grill/xsample/source/inter.cpp b/externals/grill/xsample/source/inter.cpp
index f9d2fe1a..3490044a 100644
--- a/externals/grill/xsample/source/inter.cpp
+++ b/externals/grill/xsample/source/inter.cpp
@@ -2,7 +2,7 @@
 
 xsample - extended sample objects for Max/MSP and pd (pure data)
 
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
diff --git a/externals/grill/xsample/source/inter.h b/externals/grill/xsample/source/inter.h
index a87c4ac1..e3bdd5c8 100755
--- a/externals/grill/xsample/source/inter.h
+++ b/externals/grill/xsample/source/inter.h
@@ -2,7 +2,7 @@
 
 xsample - extended sample objects for Max/MSP and pd (pure data)
 
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
diff --git a/externals/grill/xsample/source/main.cpp b/externals/grill/xsample/source/main.cpp
index 8e6e380f..df2806a6 100644
--- a/externals/grill/xsample/source/main.cpp
+++ b/externals/grill/xsample/source/main.cpp
@@ -2,7 +2,7 @@
 
 xsample - extended sample objects for Max/MSP and pd (pure data)
 
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
@@ -18,7 +18,7 @@ static V xsample_main()
 	flext::post("xsample objects, version " XSAMPLE_VERSION);
     flext::post("");
 	flext::post("  xrecord~, xplay~, xgroove~   ");
-    flext::post("  (C)2001-2003 Thomas Grill    ");
+    flext::post("  (C)2001-2004 Thomas Grill    ");
 #ifdef FLEXT_DEBUG
     flext::post("          DEBUG BUILD          ");
 #endif
diff --git a/externals/grill/xsample/source/main.h b/externals/grill/xsample/source/main.h
index 4bafeeba..fd1b7304 100644
--- a/externals/grill/xsample/source/main.h
+++ b/externals/grill/xsample/source/main.h
@@ -2,7 +2,7 @@
 
 xsample - extended sample objects for Max/MSP and pd (pure data)
 
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
@@ -12,7 +12,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #define __XSAMPLE_H
 
 
-#define XSAMPLE_VERSION "0.3.0pre16"
+#define XSAMPLE_VERSION "0.3.0pre17"
 
 
 #define FLEXT_ATTRIBUTES 1 
@@ -161,7 +161,7 @@ protected:
 
 	BL bufchk();
 
-	V mg_buffer(AtomList &l) { if(buf) { l(1); SetSymbol(l[0],buf->Symbol()); } else l(); }
+	V mg_buffer(AtomList &l) { if(buf && buf->Symbol()) { l(1); SetSymbol(l[0],buf->Symbol()); } else l(); }
 	inline V ms_buffer(const AtomList &l) { m_set(l.Count(),l.Atoms()); }
 
 	inline V mg_min(F &v) const { v = curmin*s2u; }
diff --git a/externals/grill/xsample/source/play.cpp b/externals/grill/xsample/source/play.cpp
index 037bc1bb..d5c9fb94 100644
--- a/externals/grill/xsample/source/play.cpp
+++ b/externals/grill/xsample/source/play.cpp
@@ -2,7 +2,7 @@
 
 xsample - extended sample objects for Max/MSP and pd (pure data)
 
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
@@ -109,7 +109,7 @@ V xplay::m_help()
 #ifdef FLEXT_DEBUG
 	post("compiled on " __DATE__ " " __TIME__);
 #endif
-	post("(C) Thomas Grill, 2001-2003");
+	post("(C) Thomas Grill, 2001-2004");
 #if FLEXT_SYS == FLEXT_SYS_MAX
 	post("Arguments: %s [channels=1] [buffer]",thisName());
 #else
diff --git a/externals/grill/xsample/source/record.cpp b/externals/grill/xsample/source/record.cpp
index cc9e074b..f297b04c 100644
--- a/externals/grill/xsample/source/record.cpp
+++ b/externals/grill/xsample/source/record.cpp
@@ -2,7 +2,7 @@
 
 xsample - extended sample objects for Max/MSP and pd (pure data)
 
-Copyright (c) 2001-2003 Thomas Grill (xovo@gmx.net)
+Copyright (c) 2001-2004 Thomas Grill (xovo@gmx.net)
 For information on usage and redistribution, and for a DISCLAIMER OF ALL
 WARRANTIES, see the file, "license.txt," in this distribution.  
 
@@ -474,7 +474,7 @@ V xrecord::m_help()
 #ifdef FLEXT_DEBUG
 	post("compiled on " __DATE__ " " __TIME__);
 #endif
-	post("(C) Thomas Grill, 2001-2003");
+	post("(C) Thomas Grill, 2001-2004");
 #if FLEXT_SYS == FLEXT_SYS_MAX
 	post("Arguments: %s [channels=1] [buffer]",thisName());
 #else