""

svn path=/trunk/; revision=608

12 files changed, 65 insertions, 38 deletions

diff --git a/externals/grill/deljoin/deljoin.cw b/externals/grill/deljoin/deljoin.cw
index 09908078..d5aaf6f1 100755
--- a/externals/grill/deljoin/deljoin.cw
+++ b/externals/grill/deljoin/deljoin.cw
diff --git a/externals/grill/dyn/dyn.dsp b/externals/grill/dyn/dyn.dsp
index 6624e5af..5814d4e8 100644
--- a/externals/grill/dyn/dyn.dsp
+++ b/externals/grill/dyn/dyn.dsp
@@ -69,7 +69,7 @@ LINK32=link.exe
 # 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 "DYN_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /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 "PD" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "c:\programme\audio\pd-0.37\src" /I "f:\prog\max\flext\source" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /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"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # 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 pd.lib flext_d-pdwin.lib pthreadVC.lib /nologo /dll /debug /machine:I386 /out:"pd-msvc/d/dyn~.dll" /pdbtype:sept /libpath:"f:\prog\pd\pd-cvs/bin" /libpath:"..\flext\pd-msvc"
+# ADD LINK32 kernel32.lib user32.lib pd.lib flext_d-pdwin.lib pthreadVC.lib /nologo /dll /debug /machine:I386 /out:"pd-msvc/d/dyn~.dll" /pdbtype:sept /libpath:"c:\programme\audio\pd-0.37/bin" /libpath:"..\flext\pd-msvc"
 
 !ENDIF 
 
diff --git a/externals/grill/dyn/pd/dyn~.pd b/externals/grill/dyn/pd/dyn~.pd
index f65c7052..f34cc218 100644
--- a/externals/grill/dyn/pd/dyn~.pd
+++ b/externals/grill/dyn/pd/dyn~.pd
@@ -1,5 +1,5 @@
-#N canvas 195 68 751 577 12;

-#N canvas 218 20 570 669 examples 0;

+#N canvas 195 68 753 579 12;

+#N canvas 41 57 572 671 examples 0;

 #X floatatom 153 276 5 0 0 0 - - -;

 #X floatatom 110 353 5 0 0 0 - - -;

 #X floatatom 111 576 5 0 0 0 - - -;

@@ -19,11 +19,11 @@
 #X obj 101 117 dyn~ 0 1 0 1;

 #X obj 111 315 dyn~ 0 2 0 1;

 #X obj 111 543 dyn~ 0 3 0 1;

-#X msg 34 34 reset \, newobj a f \, conn 0 a 0 \, conn a 0 0;

-#X msg 42 234 reset \, newobj a + \, conn 0 a 0 \, conn 1 a 1 \, conn

-a 0 0;

-#X msg 35 443 reset \, newobj a * 2 \, newobj b + 1 \, conn 0 a 0 \,

-conn 1 a 1 \, conn a 0 b 0 \, conn 2 b 1 \, conn b 0 0;

+#X msg 36 34 reset \, newobj . a f \, conn 0 a 0 \, conn a 0 0;

+#X msg 42 234 reset \, newobj . a + \, conn 0 a 0 \, conn 1 a 1 \,

+conn a 0 0;

+#X msg 35 443 reset \, newobj . a * 2 \, newobj . b + 1 \, conn 0 a

+0 \, conn 1 a 1 \, conn a 0 b 0 \, conn 2 b 1 \, conn b 0 0;

 #X connect 0 0 3 0;

 #X connect 0 0 17 1;

 #X connect 3 0 4 0;

@@ -66,7 +66,7 @@ conn 1 a 1 \, conn a 0 b 0 \, conn 2 b 1 \, conn b 0 0;
 #X obj 54 468 dyn~ 0 1 0 2;

 #X text 156 467 dyn sig/msg inlets sig/msg outlets;

 #X msg 165 421 vis \$1;

-#X obj 129 421 tgl 20 0 empty empty empty 0 -6 0 8 -262144 -1 -1 1

+#X obj 129 421 tgl 20 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0

 1;

 #X text 222 417 make patch visible/invisible;

 #X msg 129 323 dis x 2 y 3;

@@ -74,33 +74,42 @@ conn 1 a 1 \, conn a 0 b 0 \, conn 2 b 1 \, conn b 0 0;
 #X text 187 98 reload all objects (keep connections);

 #X msg 127 98 reload;

 #X text 218 432 (connections are not drawn at the moment!);

-#N canvas 178 192 571 385 dsp-ex 0;

-#X obj 77 345 dac~;

-#X obj 143 281 hsl 128 15 0 1000 0 1 empty empty empty -2 -6 0 8 -261681

--1 -1 6000 1;

-#X obj 155 306 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0

-10 -262144 -1 -1 472.441 256;

-#X msg 66 101 reset;

+#N canvas 178 192 570 426 dsp-ex 0;

+#X obj 73 380 dac~;

+#X obj 144 258 hsl 128 15 0 1000 0 0 empty empty empty -2 -6 0 8 -261681

+-1 -1 2800 1;

+#X obj 155 283 nbx 5 14 -1e+037 1e+037 0 0 empty empty empty 0 -6 0

+10 -262144 -1 -1 220.472 256;

+#X msg 66 78 reset;

 #X obj 482 19 loadbang;

 #X msg 481 43 \; pd dsp 1;

-#X text 65 79 clear all;

-#X obj 47 301 dyn~ 0 1 2 0;

-#X text 70 130 make an oscillator (left);

-#X text 66 190 add an oscillator (double frq \, right);

+#X text 65 56 clear all;

+#X obj 47 278 dyn~ 0 1 2 0;

+#X text 70 107 make an oscillator (left);

+#X text 66 167 add an oscillator (double frq \, right);

 #X text 24 17 signals passing through dyn~ are delayed by one block

 ;

-#X text 67 261 select frequency;

-#X msg 64 152 newobj o1 osc~ \, conn 0 o1 0 \, conn o1 0 0;

-#X msg 67 210 newobj m * 2 \, newobj o2 osc~ \, conn 0 m 0 \, conn

-m 0 o2 0 \, conn o2 0 1;

+#X text 74 239 select frequency;

+#X obj 57 341 *~ 0.2;

+#X obj 112 341 *~ 0.2;

+#X obj 140 314 hsl 128 15 0.001 1 1 0 empty empty empty -2 -6 0 8 -262131

+-1 -1 9100 1;

+#X text 277 310 gain;

+#X msg 64 129 newobj . o1 osc~ 220 \, conn 0 o1 0 \, conn o1 0 0;

+#X msg 67 187 newobj . m * 1.5 \, newobj . o2 osc~ 330 \, conn 0 m

+0 \, conn m 0 o2 0 \, conn o2 0 1;

 #X connect 1 0 2 0;

 #X connect 1 0 7 1;

 #X connect 3 0 7 0;

 #X connect 4 0 5 0;

-#X connect 7 0 0 0;

-#X connect 7 1 0 1;

-#X connect 12 0 7 0;

-#X connect 13 0 7 0;

+#X connect 7 0 12 0;

+#X connect 7 1 13 0;

+#X connect 12 0 0 0;

+#X connect 13 0 0 1;

+#X connect 14 0 12 1;

+#X connect 14 0 13 1;

+#X connect 16 0 7 0;

+#X connect 17 0 7 0;

 #X restore 514 487 pd dsp-ex;

 #X msg 129 156 newmsg . b Hello;

 #X msg 128 124 newobj . a + 1;

diff --git a/externals/grill/dyn/readme.txt b/externals/grill/dyn/readme.txt
index 5e288928..a757e55a 100644
--- a/externals/grill/dyn/readme.txt
+++ b/externals/grill/dyn/readme.txt
@@ -41,7 +41,8 @@ BUGS:
 CHANGES:
 --------
 
-0.0.3:
+0.1.0:
+- first release: PD 0.37 supports all necessary functionality
 - cleaner message-based object creation
 - also messages and comments can be created now
 - handle sub-canvases
@@ -63,5 +64,4 @@ CHANGES:
 
 TODO:
 --------
-- support message boxes (do we need them?)
 - Hash table for object tags
diff --git a/externals/grill/dyn/src/main.cpp b/externals/grill/dyn/src/main.cpp
index f60e9587..6b5e962c 100644
--- a/externals/grill/dyn/src/main.cpp
+++ b/externals/grill/dyn/src/main.cpp
@@ -17,7 +17,7 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 #error You need at least flext version 0.4.2
 #endif
 
-#define DYN_VERSION "0.0.4"
+#define DYN_VERSION "0.1.0"
 
 
 #if FLEXT_SYS != FLEXT_SYS_PD
diff --git a/externals/grill/flext/changes.txt b/externals/grill/flext/changes.txt
index 8d72e4b1..21777ed2 100644
--- a/externals/grill/flext/changes.txt
+++ b/externals/grill/flext/changes.txt
@@ -20,6 +20,7 @@ Version history:
 - added flext_base::ToSelf* methods for queued (deferred) self messaging
 - deleted flext::buffer console outputs for undefined arrays/buffer~s: should be done by externals
 - a few changes for the flext shared library
+- tiny update for PD 0.37 header usage
 
 0.4.3:
 - added forgotten flext_base::ToQueueString method
diff --git a/externals/grill/flext/flext.cw b/externals/grill/flext/flext.cw
index 80912ff9..ba92d4ea 100644
--- a/externals/grill/flext/flext.cw
+++ b/externals/grill/flext/flext.cw
diff --git a/externals/grill/flext/source/flbase.cpp b/externals/grill/flext/source/flbase.cpp
index 516be430..aa6b66ea 100644
--- a/externals/grill/flext/source/flbase.cpp
+++ b/externals/grill/flext/source/flbase.cpp
@@ -55,7 +55,9 @@ flext_obj :: flext_obj()
 // Destructor
 //
 /////////////////////////////////////////////////////////
-flext_obj :: ~flext_obj() {}
+flext_obj :: ~flext_obj() {
+	x_obj = NULL;
+}
 
 
 bool flext_obj::Init() { return true; }
diff --git a/externals/grill/flext/source/fldsp.cpp b/externals/grill/flext/source/fldsp.cpp
index 9ee2f00c..2c33387f 100644
--- a/externals/grill/flext/source/fldsp.cpp
+++ b/externals/grill/flext/source/fldsp.cpp
@@ -91,6 +91,13 @@ void flext_dsp::dspmeth(fts_word_t *w)
 t_int *flext_dsp::dspmeth(t_int *w) 
 { 
 	flext_dsp *obj = (flext_dsp *)w[1];
+#ifdef FLEXT_DEBUG
+	if(!obj->thisHdr()) {
+		// object is already deleted!
+		ERRINTERNAL();
+		return w+3;
+	}
+#endif
 #if FLEXT_SYS == FLEXT_SYS_MAX
 	if(!obj->thisHdr()->z_disabled) 
 #else
diff --git a/externals/grill/flext/source/flstdc.h b/externals/grill/flext/source/flstdc.h
index 8f53bb96..6c13a9c4 100644
--- a/externals/grill/flext/source/flstdc.h
+++ b/externals/grill/flext/source/flstdc.h
@@ -36,9 +36,17 @@ WARRANTIES, see the file, "license.txt," in this distribution.
 extern "C" {	    	    	    
 	// Include the relevant PD header files
 	#ifdef FLEXT_DEBUG
-		#include <m_imp.h>  // for easier debugging
-	#else
-		#include <m_pd.h>
+        /*  PD header file structure has changed with version 0.37
+            from then on m_imp.h needs m_pd.h to be included before
+            on the other hand versions < 0.37 don't like that....
+            (they want m_imp.h solely)
+            So better use the m_pd.h here also for the debug version.
+            Change that if really needed for debugging PD internals...
+        */
+        #include <m_pd.h>
+//		#include <m_imp.h>  // for easier debugging
+    #else
+		#include <m_pd.h>  // for easier debugging
 	#endif
 }
 
@@ -165,7 +173,7 @@ typedef t_symbol *t_symptr;
 
 #ifdef FLEXT_LOGGING
 
-/* If _LOG is defined implement logging */
+/* If FLEXT_LOGGING is defined implement logging */
 #define FLEXT_LOG(s) post(s)
 #define FLEXT_LOG1(s,v1) post(s,v1)
 #define FLEXT_LOG2(s,v1,v2) post(s,v1,v2)
@@ -176,7 +184,7 @@ typedef t_symbol *t_symptr;
 
 #else
 
-/* If _LOG is not defined avoid logging */
+/* If FLEXT_LOGGING is not defined avoid logging */
 #define FLEXT_LOG(s) ((void)0)
 #define FLEXT_LOG1(s,v1) ((void)0)
 #define FLEXT_LOG2(s,v1,v2) ((void)0)
diff --git a/externals/grill/vasp/vasp.cw b/externals/grill/vasp/vasp.cw
index 550f2cb6..4d44555f 100644
--- a/externals/grill/vasp/vasp.cw
+++ b/externals/grill/vasp/vasp.cw
diff --git a/externals/grill/xsample/xsample.cw b/externals/grill/xsample/xsample.cw
index 7d44bbe2..c26c417f 100755
--- a/externals/grill/xsample/xsample.cw
+++ b/externals/grill/xsample/xsample.cw