""

svn path=/trunk/; revision=704

3 files changed, 38 insertions, 32 deletions

diff --git a/externals/grill/vst/pd/vst~.pd b/externals/grill/vst/pd/vst~.pd
index a956992d..6bbceff8 100644
--- a/externals/grill/vst/pd/vst~.pd
+++ b/externals/grill/vst/pd/vst~.pd
@@ -1,19 +1,19 @@
-#N canvas 108 26 872 654 12;

-#X obj 26 207 dac~;

-#X obj 26 107 noise~;

+#N canvas 108 26 874 656 12;

+#X obj 26 190 dac~;

+#X obj 26 94 noise~;

 #X obj 444 172 hsl 128 15 0 1 0 0 empty empty empty -2 -6 0 8 -225271

 -1 -1 0 1;

 #X msg 441 189 param 2 \$1;

-#X obj 133 204 print A;

+#X obj 133 191 print A;

 #X obj 27 451 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1

 ;

 #X msg 26 473 vis \$1;

-#X obj 27 367 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1

+#X obj 27 367 tgl 15 0 empty empty empty 0 -6 0 8 -225271 -1 -1 1 1

 ;

 #X msg 26 389 edit \$1;

 #X msg 94 389 getedit;

 #X msg 89 473 getvis;

-#N canvas 367 122 544 451 info 0;

+#N canvas 367 122 546 453 info 0;

 #X msg 94 130 getversion;

 #X msg 94 75 getname;

 #X msg 95 153 getvendor;

@@ -52,7 +52,7 @@
 #X connect 19 0 7 0;

 #X connect 21 0 7 0;

 #X restore 414 561 pd info;

-#X obj 96 109 r \$0-vst;

+#X obj 96 96 r \$0-vst;

 #X obj 25 416 s \$0-vst;

 #X obj 25 499 s \$0-vst;

 #X text 52 366 display edit window;

@@ -70,11 +70,11 @@
 #X obj 26 323 s \$0-vst;

 #X text 175 294 set/get plugin;

 #X text 480 561 further information;

-#X obj 23 15 cnv 15 550 58 empty empty vst~ 10 32 0 24 -260818 -1 0

+#X obj 23 15 cnv 15 700 58 empty empty vst~ 10 32 0 24 -260818 -1 0

 ;

 #X text 134 53 http://www.parasitaere-kapazitaeten.net;

-#X text 140 182 attribute outlet;

-#X text 143 153 inlets outlets [plugname];

+#X text 140 169 attribute outlet;

+#X text 143 140 inlets outlets [plugname];

 #N canvas 367 122 480 335 win 0;

 #X obj 14 187 s \$0-vst;

 #X msg 94 84 getx;

@@ -118,17 +118,16 @@
 #X msg 440 236 param gain 0;

 #X text 503 133 get parameter name;

 #X msg 550 236 getparam gain;

-#X text 134 33 based on the work of mark@junklight.com;

 #X msg 545 283 getptext gain;

-#X text 455 310 get value in textual representation;

+#X text 451 300 get value in textual representation;

 #X msg 440 283 getptext 2;

 #X text 466 211 set/get parameter (0-based);

 #X text 469 496 set/get program (0-based);

-#X text 487 251 NOT IMPLEMENTED;

-#X text 544 270 NOT IMPLEMENTED;

+#X text 487 254 NOT IMPLEMENTED;

+#X text 484 315 NOT IMPLEMENTED;

 #X text 133 14 VST plugins for PD \, (C)2003 Thomas Grill;

 #X msg 28 296 plug \$1;

-#X obj 28 252 bng 15 250 50 0 empty empty empty 0 -6 0 8 -225271 -1

+#X obj 27 240 bng 25 250 50 0 empty empty empty 0 -6 0 8 -225271 -1

 -1;

 #X obj 27 271 openpanel;

 #N canvas 0 0 460 310 midi 0;

@@ -157,8 +156,10 @@
 #X text 93 582 midi messages for vst synths;

 #X msg 414 442 getprogcats;

 #X text 509 439 get number of program categories;

-#X obj 26 153 vst~ 1 2 SIR;

-#X connect 1 0 56 0;

+#X obj 26 140 vst~ 1 2 SIR;

+#X text 134 33 based on the work of Jarno Seppanen and Mark Williamson

+;

+#X connect 1 0 55 0;

 #X connect 2 0 3 0;

 #X connect 3 0 17 0;

 #X connect 5 0 6 0;

@@ -167,7 +168,7 @@
 #X connect 8 0 13 0;

 #X connect 9 0 13 0;

 #X connect 10 0 14 0;

-#X connect 12 0 56 0;

+#X connect 12 0 55 0;

 #X connect 19 0 18 0;

 #X connect 20 0 18 0;

 #X connect 21 0 17 0;

@@ -177,12 +178,12 @@
 #X connect 36 0 17 0;

 #X connect 37 0 17 0;

 #X connect 39 0 17 0;

-#X connect 41 0 17 0;

-#X connect 43 0 17 0;

-#X connect 49 0 27 0;

-#X connect 50 0 51 0;

-#X connect 51 0 49 0;

-#X connect 54 0 18 0;

-#X connect 56 0 0 0;

-#X connect 56 1 0 1;

-#X connect 56 2 4 0;

+#X connect 40 0 17 0;

+#X connect 42 0 17 0;

+#X connect 48 0 27 0;

+#X connect 49 0 50 0;

+#X connect 50 0 48 0;

+#X connect 53 0 18 0;

+#X connect 55 0 0 0;

+#X connect 55 1 0 1;

+#X connect 55 2 4 0;

diff --git a/externals/grill/vst/src/main.cpp b/externals/grill/vst/src/main.cpp
index 5cacb80a..9130b894 100644
--- a/externals/grill/vst/src/main.cpp
+++ b/externals/grill/vst/src/main.cpp
@@ -243,7 +243,7 @@ V vst::InitPlug()
 {
     FLEXT_ASSERT(plug);
 
-    vstfun = plug->replace()?plug->processReplacing:plug->process;
+	vstfun = plug->replace()?VSTPlugin::processReplacing:VSTPlugin::process;
     sigmatch = plug->getNumInputs() == CntInSig() && plug->getNumOutputs() == CntOutSig();
 
     InitBuf();
diff --git a/externals/grill/vst/vst.vcproj b/externals/grill/vst/vst.vcproj
index fd004748..210a6654 100644
--- a/externals/grill/vst/vst.vcproj
+++ b/externals/grill/vst/vst.vcproj
@@ -23,10 +23,13 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="TRUE"
 				AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
@@ -48,6 +51,7 @@
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="c:\programme\audio\pd\bin,f:\prog\max\flext\pd-msvc"
 				ProgramDatabaseFile=".\pd-msvc/r/vst~.pdb"
+				OptimizeReferences="2"
 				ImportLibrary=".\pd-msvc/r/vst~.lib"
 				TargetMachine="1"/>
 			<Tool
@@ -91,7 +95,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="c:\programme\audio\pd\src,f:\prog\max\flext\source"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS;FLEXT_LOGGING"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;_USRDLL;FLEXT_SYS=2;FLEXT_THREADS;FLEXT_LOGGING"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
@@ -115,6 +119,7 @@
 				AdditionalLibraryDirectories="c:\programme\audio\pd\bin,f:\prog\max\flext\pd-msvc"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\pd-msvc/d/vst~.pdb"
+				OptimizeReferences="2"
 				ImportLibrary=".\pd-msvc/d/vst~.lib"
 				TargetMachine="1"/>
 			<Tool