Removed the AudioFilterStreamer class, and tidied up StandaloneFilterWindow. Updated projects for new plugin file locations.

Builds/MacOSX/Juce.xcodeproj/project.pbxproj

@@ -450,23 +450,21 @@
 		DD3886D45B5988B4DAC2D049 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiMessageSequence.h; path = ../../src/audio/midi/juce_MidiMessageSequence.h; sourceTree = SOURCE_ROOT; };
 		01712FF0A160032FA1DAA8C2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiOutput.cpp; path = ../../src/audio/midi/juce_MidiOutput.cpp; sourceTree = SOURCE_ROOT; };
 		899BD7E18BE1EF7CDF53784C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiOutput.h; path = ../../src/audio/midi/juce_MidiOutput.h; sourceTree = SOURCE_ROOT; };
-		1D420B75C62607886A571698 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AU_Wrapper.mm; path = "../../extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm"; sourceTree = SOURCE_ROOT; };
-		451684777825E63BCAD84F80 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_RTAS_DigiCode_Header.h; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode_Header.h"; sourceTree = SOURCE_ROOT; };
-		34AB1C83D6D5BB468415EF9F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode1.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode1.cpp"; sourceTree = SOURCE_ROOT; };
-		1DF9F1811D91207E3399ED73 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode2.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode2.cpp"; sourceTree = SOURCE_ROOT; };
-		0756D78F534D94A6D21DEB66 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode3.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode3.cpp"; sourceTree = SOURCE_ROOT; };
-		7AA357732543414F6B93B193 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_RTAS_MacUtilities.mm; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_MacUtilities.mm"; sourceTree = SOURCE_ROOT; };
-		E99897FE7C6D6BF9FFDEBC08 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_WinUtilities.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_WinUtilities.cpp"; sourceTree = SOURCE_ROOT; };
-		84BB474B771F9ED7E2267589 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_Wrapper.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_Wrapper.cpp"; sourceTree = SOURCE_ROOT; };
-		8B169373A9223571680BFB71 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VST_Wrapper.cpp; path = "../../extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp"; sourceTree = SOURCE_ROOT; };
-		4238044BB69E2FAEC7B16982 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VST_Wrapper.mm; path = "../../extras/audio plugins/wrapper/VST/juce_VST_Wrapper.mm"; sourceTree = SOURCE_ROOT; };
-		6C5940264E5E38729E74EFD8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioFilterStreamer.cpp; path = "../../extras/audio plugins/wrapper/Standalone/juce_AudioFilterStreamer.cpp"; sourceTree = SOURCE_ROOT; };
-		955532BC480632ECF12F0481 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioFilterStreamer.h; path = "../../extras/audio plugins/wrapper/Standalone/juce_AudioFilterStreamer.h"; sourceTree = SOURCE_ROOT; };
-		235F9F5E2A3113B6B774869C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_StandaloneFilterWindow.cpp; path = "../../extras/audio plugins/wrapper/Standalone/juce_StandaloneFilterWindow.cpp"; sourceTree = SOURCE_ROOT; };
-		014FB7F784D205EC810AAA52 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_StandaloneFilterWindow.h; path = "../../extras/audio plugins/wrapper/Standalone/juce_StandaloneFilterWindow.h"; sourceTree = SOURCE_ROOT; };
-		6B3896A2CB1BB379BCDD9575 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_IncludeCharacteristics.h; path = "../../extras/audio plugins/wrapper/juce_IncludeCharacteristics.h"; sourceTree = SOURCE_ROOT; };
-		6F4941C73B96CE8028AD7999 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHeaders.h; path = "../../extras/audio plugins/wrapper/juce_PluginHeaders.h"; sourceTree = SOURCE_ROOT; };
-		21EAF73E1E8D839ABDF6B1CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHostType.h; path = "../../extras/audio plugins/wrapper/juce_PluginHostType.h"; sourceTree = SOURCE_ROOT; };
+		7B88F6B8E3A10CEAD9B0EE88 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AU_Wrapper.mm; path = ../../src/audio/plugin_client/AU/juce_AU_Wrapper.mm; sourceTree = SOURCE_ROOT; };
+		1101E8CB676FDEEF0A89D921 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_RTAS_DigiCode_Header.h; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_DigiCode_Header.h; sourceTree = SOURCE_ROOT; };
+		F222E5825D83E711C9F1B789 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode1.cpp; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_DigiCode1.cpp; sourceTree = SOURCE_ROOT; };
+		CEAA2B84462EF0B5026EAB0A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode2.cpp; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_DigiCode2.cpp; sourceTree = SOURCE_ROOT; };
+		9A3151864FB90A6A4BCCAE9B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode3.cpp; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_DigiCode3.cpp; sourceTree = SOURCE_ROOT; };
+		BCE37F0D994C0ADF2CCFF796 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_RTAS_MacUtilities.mm; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_MacUtilities.mm; sourceTree = SOURCE_ROOT; };
+		F52ECCD6C02108A2D7F672F5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_WinUtilities.cpp; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_WinUtilities.cpp; sourceTree = SOURCE_ROOT; };
+		833C3F205F05BA4ADC883E53 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_Wrapper.cpp; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_Wrapper.cpp; sourceTree = SOURCE_ROOT; };
+		69C4FF0DD888BA25477561C8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VST_Wrapper.cpp; path = ../../src/audio/plugin_client/VST/juce_VST_Wrapper.cpp; sourceTree = SOURCE_ROOT; };
+		37E1FC756833849B8C7C1215 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VST_Wrapper.mm; path = ../../src/audio/plugin_client/VST/juce_VST_Wrapper.mm; sourceTree = SOURCE_ROOT; };
+		2741189DF800566462E24A14 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_StandaloneFilterWindow.cpp; path = ../../src/audio/plugin_client/Standalone/juce_StandaloneFilterWindow.cpp; sourceTree = SOURCE_ROOT; };
+		FAC43251D74E5140740BEF60 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_StandaloneFilterWindow.h; path = ../../src/audio/plugin_client/Standalone/juce_StandaloneFilterWindow.h; sourceTree = SOURCE_ROOT; };
+		2E96F55074F4EB74171EE6B6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_IncludeCharacteristics.h; path = ../../src/audio/plugin_client/juce_IncludeCharacteristics.h; sourceTree = SOURCE_ROOT; };
+		13F64389F0E25731A98E92CD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHeaders.h; path = ../../src/audio/plugin_client/juce_PluginHeaders.h; sourceTree = SOURCE_ROOT; };
+		7CDC2FA849B7ED73A2638A11 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHostType.h; path = ../../src/audio/plugin_client/juce_PluginHostType.h; sourceTree = SOURCE_ROOT; };
 		D76BDCCF9E1A1F26A8F578F0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioUnitPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.h; sourceTree = SOURCE_ROOT; };
 		50FAF92038EBD0127900AAA1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AudioUnitPluginFormat.mm; path = ../../src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.mm; sourceTree = SOURCE_ROOT; };
 		2073E1A497363200233CD34E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_DirectXPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_DirectXPluginFormat.h; sourceTree = SOURCE_ROOT; };
@@ -1191,31 +1189,29 @@
 				01712FF0A160032FA1DAA8C2,
 				899BD7E18BE1EF7CDF53784C ); name = midi; sourceTree = "<group>"; };
 		844109733F09B5915AF75797 = { isa = PBXGroup; children = (
-				1D420B75C62607886A571698 ); name = AU; sourceTree = "<group>"; };
+				7B88F6B8E3A10CEAD9B0EE88 ); name = AU; sourceTree = "<group>"; };
 		FAA6189E385BD13EFEFE2E08 = { isa = PBXGroup; children = (
-				451684777825E63BCAD84F80,
-				34AB1C83D6D5BB468415EF9F,
-				1DF9F1811D91207E3399ED73,
-				0756D78F534D94A6D21DEB66,
-				7AA357732543414F6B93B193,
-				E99897FE7C6D6BF9FFDEBC08,
-				84BB474B771F9ED7E2267589 ); name = RTAS; sourceTree = "<group>"; };
+				1101E8CB676FDEEF0A89D921,
+				F222E5825D83E711C9F1B789,
+				CEAA2B84462EF0B5026EAB0A,
+				9A3151864FB90A6A4BCCAE9B,
+				BCE37F0D994C0ADF2CCFF796,
+				F52ECCD6C02108A2D7F672F5,
+				833C3F205F05BA4ADC883E53 ); name = RTAS; sourceTree = "<group>"; };
 		EBF4EE8E84A562DE2EBAE6BB = { isa = PBXGroup; children = (
-				8B169373A9223571680BFB71,
-				4238044BB69E2FAEC7B16982 ); name = VST; sourceTree = "<group>"; };
+				69C4FF0DD888BA25477561C8,
+				37E1FC756833849B8C7C1215 ); name = VST; sourceTree = "<group>"; };
 		0F0D49D13522C94A0F37D4AB = { isa = PBXGroup; children = (
-				6C5940264E5E38729E74EFD8,
-				955532BC480632ECF12F0481,
-				235F9F5E2A3113B6B774869C,
-				014FB7F784D205EC810AAA52 ); name = Standalone; sourceTree = "<group>"; };
+				2741189DF800566462E24A14,
+				FAC43251D74E5140740BEF60 ); name = Standalone; sourceTree = "<group>"; };
 		2805C9C796CD7D77C2D662BF = { isa = PBXGroup; children = (
 				844109733F09B5915AF75797,
 				FAA6189E385BD13EFEFE2E08,
 				EBF4EE8E84A562DE2EBAE6BB,
 				0F0D49D13522C94A0F37D4AB,
-				6B3896A2CB1BB379BCDD9575,
-				6F4941C73B96CE8028AD7999,
-				21EAF73E1E8D839ABDF6B1CF ); name = plugin_client; sourceTree = "<group>"; };
+				2E96F55074F4EB74171EE6B6,
+				13F64389F0E25731A98E92CD,
+				7CDC2FA849B7ED73A2638A11 ); name = plugin_client; sourceTree = "<group>"; };
 		B1F82C796B56FCD97D211D8E = { isa = PBXGroup; children = (
 				D76BDCCF9E1A1F26A8F578F0,
 				50FAF92038EBD0127900AAA1,

Builds/VisualStudio2005/Juce.vcproj

@@ -201,11 +201,11 @@
           </Filter>
           <Filter Name="plugin_client">
             <Filter Name="AU">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\AU\juce_AU_Wrapper.mm"/>
+              <File RelativePath="..\..\src\audio\plugin_client\AU\juce_AU_Wrapper.mm"/>
             </Filter>
             <Filter Name="RTAS">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode_Header.h"/>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode1.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode_Header.h"/>
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode1.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -215,7 +215,7 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode2.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode2.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -225,7 +225,7 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode3.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode3.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -235,8 +235,8 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_MacUtilities.mm"/>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_WinUtilities.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_MacUtilities.mm"/>
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_WinUtilities.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -246,7 +246,7 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_Wrapper.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_Wrapper.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -258,7 +258,7 @@
               </File>
             </Filter>
             <Filter Name="VST">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\VST\juce_VST_Wrapper.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -268,10 +268,10 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\VST\juce_VST_Wrapper.mm"/>
+              <File RelativePath="..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.mm"/>
             </Filter>
             <Filter Name="Standalone">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_AudioFilterStreamer.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\Standalone\juce_StandaloneFilterWindow.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -281,22 +281,11 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_AudioFilterStreamer.h"/>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_StandaloneFilterWindow.cpp">
-                <FileConfiguration Name="Debug|Win32"
-                                   ExcludedFromBuild="true">
-                  <Tool Name="VCCLCompilerTool"/>
-                </FileConfiguration>
-                <FileConfiguration Name="Release|Win32"
-                                   ExcludedFromBuild="true">
-                  <Tool Name="VCCLCompilerTool"/>
-                </FileConfiguration>
-              </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_StandaloneFilterWindow.h"/>
+              <File RelativePath="..\..\src\audio\plugin_client\Standalone\juce_StandaloneFilterWindow.h"/>
             </Filter>
-            <File RelativePath="..\..\extras\audio plugins\wrapper\juce_IncludeCharacteristics.h"/>
-            <File RelativePath="..\..\extras\audio plugins\wrapper\juce_PluginHeaders.h"/>
-            <File RelativePath="..\..\extras\audio plugins\wrapper\juce_PluginHostType.h"/>
+            <File RelativePath="..\..\src\audio\plugin_client\juce_IncludeCharacteristics.h"/>
+            <File RelativePath="..\..\src\audio\plugin_client\juce_PluginHeaders.h"/>
+            <File RelativePath="..\..\src\audio\plugin_client\juce_PluginHostType.h"/>
           </Filter>
           <Filter Name="plugin_host">
             <Filter Name="formats">

Builds/VisualStudio2008/Juce.vcproj

@@ -201,11 +201,11 @@
           </Filter>
           <Filter Name="plugin_client">
             <Filter Name="AU">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\AU\juce_AU_Wrapper.mm"/>
+              <File RelativePath="..\..\src\audio\plugin_client\AU\juce_AU_Wrapper.mm"/>
             </Filter>
             <Filter Name="RTAS">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode_Header.h"/>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode1.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode_Header.h"/>
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode1.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -215,7 +215,7 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode2.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode2.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -225,7 +225,7 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode3.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode3.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -235,8 +235,8 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_MacUtilities.mm"/>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_WinUtilities.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_MacUtilities.mm"/>
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_WinUtilities.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -246,7 +246,7 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_Wrapper.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_Wrapper.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -258,7 +258,7 @@
               </File>
             </Filter>
             <Filter Name="VST">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\VST\juce_VST_Wrapper.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -268,10 +268,10 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\VST\juce_VST_Wrapper.mm"/>
+              <File RelativePath="..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.mm"/>
             </Filter>
             <Filter Name="Standalone">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_AudioFilterStreamer.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\Standalone\juce_StandaloneFilterWindow.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -281,22 +281,11 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_AudioFilterStreamer.h"/>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_StandaloneFilterWindow.cpp">
-                <FileConfiguration Name="Debug|Win32"
-                                   ExcludedFromBuild="true">
-                  <Tool Name="VCCLCompilerTool"/>
-                </FileConfiguration>
-                <FileConfiguration Name="Release|Win32"
-                                   ExcludedFromBuild="true">
-                  <Tool Name="VCCLCompilerTool"/>
-                </FileConfiguration>
-              </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_StandaloneFilterWindow.h"/>
+              <File RelativePath="..\..\src\audio\plugin_client\Standalone\juce_StandaloneFilterWindow.h"/>
             </Filter>
-            <File RelativePath="..\..\extras\audio plugins\wrapper\juce_IncludeCharacteristics.h"/>
-            <File RelativePath="..\..\extras\audio plugins\wrapper\juce_PluginHeaders.h"/>
-            <File RelativePath="..\..\extras\audio plugins\wrapper\juce_PluginHostType.h"/>
+            <File RelativePath="..\..\src\audio\plugin_client\juce_IncludeCharacteristics.h"/>
+            <File RelativePath="..\..\src\audio\plugin_client\juce_PluginHeaders.h"/>
+            <File RelativePath="..\..\src\audio\plugin_client\juce_PluginHostType.h"/>
           </Filter>
           <Filter Name="plugin_host">
             <Filter Name="formats">

Builds/VisualStudio2008_DLL/Juce.vcproj

@@ -203,11 +203,11 @@
           </Filter>
           <Filter Name="plugin_client">
             <Filter Name="AU">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\AU\juce_AU_Wrapper.mm"/>
+              <File RelativePath="..\..\src\audio\plugin_client\AU\juce_AU_Wrapper.mm"/>
             </Filter>
             <Filter Name="RTAS">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode_Header.h"/>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode1.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode_Header.h"/>
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode1.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -217,7 +217,7 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode2.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode2.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -227,7 +227,7 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode3.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode3.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -237,8 +237,8 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_MacUtilities.mm"/>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_WinUtilities.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_MacUtilities.mm"/>
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_WinUtilities.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -248,7 +248,7 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_Wrapper.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\RTAS\juce_RTAS_Wrapper.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -260,7 +260,7 @@
               </File>
             </Filter>
             <Filter Name="VST">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\VST\juce_VST_Wrapper.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -270,10 +270,10 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\VST\juce_VST_Wrapper.mm"/>
+              <File RelativePath="..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.mm"/>
             </Filter>
             <Filter Name="Standalone">
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_AudioFilterStreamer.cpp">
+              <File RelativePath="..\..\src\audio\plugin_client\Standalone\juce_StandaloneFilterWindow.cpp">
                 <FileConfiguration Name="Debug|Win32"
                                    ExcludedFromBuild="true">
                   <Tool Name="VCCLCompilerTool"/>
@@ -283,22 +283,11 @@
                   <Tool Name="VCCLCompilerTool"/>
                 </FileConfiguration>
               </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_AudioFilterStreamer.h"/>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_StandaloneFilterWindow.cpp">
-                <FileConfiguration Name="Debug|Win32"
-                                   ExcludedFromBuild="true">
-                  <Tool Name="VCCLCompilerTool"/>
-                </FileConfiguration>
-                <FileConfiguration Name="Release|Win32"
-                                   ExcludedFromBuild="true">
-                  <Tool Name="VCCLCompilerTool"/>
-                </FileConfiguration>
-              </File>
-              <File RelativePath="..\..\extras\audio plugins\wrapper\Standalone\juce_StandaloneFilterWindow.h"/>
+              <File RelativePath="..\..\src\audio\plugin_client\Standalone\juce_StandaloneFilterWindow.h"/>
             </Filter>
-            <File RelativePath="..\..\extras\audio plugins\wrapper\juce_IncludeCharacteristics.h"/>
-            <File RelativePath="..\..\extras\audio plugins\wrapper\juce_PluginHeaders.h"/>
-            <File RelativePath="..\..\extras\audio plugins\wrapper\juce_PluginHostType.h"/>
+            <File RelativePath="..\..\src\audio\plugin_client\juce_IncludeCharacteristics.h"/>
+            <File RelativePath="..\..\src\audio\plugin_client\juce_PluginHeaders.h"/>
+            <File RelativePath="..\..\src\audio\plugin_client\juce_PluginHostType.h"/>
           </Filter>
           <Filter Name="plugin_host">
             <Filter Name="formats">

Builds/VisualStudio2010/Juce.vcxproj

@@ -499,12 +499,11 @@
     <ClInclude Include="..\..\src\audio\midi\juce_MidiMessageCollector.h"/>
     <ClInclude Include="..\..\src\audio\midi\juce_MidiMessageSequence.h"/>
     <ClInclude Include="..\..\src\audio\midi\juce_MidiOutput.h"/>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode_Header.h"/>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\Standalone\juce_AudioFilterStreamer.h"/>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\Standalone\juce_StandaloneFilterWindow.h"/>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\juce_IncludeCharacteristics.h"/>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\juce_PluginHeaders.h"/>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\juce_PluginHostType.h"/>
+    <ClInclude Include="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode_Header.h"/>
+    <ClInclude Include="..\..\src\audio\plugin_client\Standalone\juce_StandaloneFilterWindow.h"/>
+    <ClInclude Include="..\..\src\audio\plugin_client\juce_IncludeCharacteristics.h"/>
+    <ClInclude Include="..\..\src\audio\plugin_client\juce_PluginHeaders.h"/>
+    <ClInclude Include="..\..\src\audio\plugin_client\juce_PluginHostType.h"/>
     <ClInclude Include="..\..\src\audio\plugin_host\formats\juce_AudioUnitPluginFormat.h"/>
     <ClInclude Include="..\..\src\audio\plugin_host\formats\juce_DirectXPluginFormat.h"/>
     <ClInclude Include="..\..\src\audio\plugin_host\formats\juce_LADSPAPluginFormat.h"/>

Builds/VisualStudio2010/Juce.vcxproj.filters

@@ -307,37 +307,34 @@
     <ClCompile Include="..\..\src\audio\midi\juce_MidiOutput.cpp">
       <Filter>Juce\Source\audio\midi</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\AU\juce_AU_Wrapper.mm">
+    <ClCompile Include="..\..\src\audio\plugin_client\AU\juce_AU_Wrapper.mm">
       <Filter>Juce\Source\audio\plugin_client\AU</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode1.cpp">
+    <ClCompile Include="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode1.cpp">
       <Filter>Juce\Source\audio\plugin_client\RTAS</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode2.cpp">
+    <ClCompile Include="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode2.cpp">
       <Filter>Juce\Source\audio\plugin_client\RTAS</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode3.cpp">
+    <ClCompile Include="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode3.cpp">
       <Filter>Juce\Source\audio\plugin_client\RTAS</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_MacUtilities.mm">
+    <ClCompile Include="..\..\src\audio\plugin_client\RTAS\juce_RTAS_MacUtilities.mm">
       <Filter>Juce\Source\audio\plugin_client\RTAS</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_WinUtilities.cpp">
+    <ClCompile Include="..\..\src\audio\plugin_client\RTAS\juce_RTAS_WinUtilities.cpp">
       <Filter>Juce\Source\audio\plugin_client\RTAS</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_Wrapper.cpp">
+    <ClCompile Include="..\..\src\audio\plugin_client\RTAS\juce_RTAS_Wrapper.cpp">
       <Filter>Juce\Source\audio\plugin_client\RTAS</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\VST\juce_VST_Wrapper.cpp">
+    <ClCompile Include="..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.cpp">
       <Filter>Juce\Source\audio\plugin_client\VST</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\VST\juce_VST_Wrapper.mm">
+    <ClCompile Include="..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.mm">
       <Filter>Juce\Source\audio\plugin_client\VST</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\Standalone\juce_AudioFilterStreamer.cpp">
-      <Filter>Juce\Source\audio\plugin_client\Standalone</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\extras\audio plugins\wrapper\Standalone\juce_StandaloneFilterWindow.cpp">
+    <ClCompile Include="..\..\src\audio\plugin_client\Standalone\juce_StandaloneFilterWindow.cpp">
       <Filter>Juce\Source\audio\plugin_client\Standalone</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\audio\plugin_host\formats\juce_AudioUnitPluginFormat.mm">
@@ -1431,22 +1428,19 @@
     <ClInclude Include="..\..\src\audio\midi\juce_MidiOutput.h">
       <Filter>Juce\Source\audio\midi</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\RTAS\juce_RTAS_DigiCode_Header.h">
+    <ClInclude Include="..\..\src\audio\plugin_client\RTAS\juce_RTAS_DigiCode_Header.h">
       <Filter>Juce\Source\audio\plugin_client\RTAS</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\Standalone\juce_AudioFilterStreamer.h">
-      <Filter>Juce\Source\audio\plugin_client\Standalone</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\Standalone\juce_StandaloneFilterWindow.h">
+    <ClInclude Include="..\..\src\audio\plugin_client\Standalone\juce_StandaloneFilterWindow.h">
       <Filter>Juce\Source\audio\plugin_client\Standalone</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\juce_IncludeCharacteristics.h">
+    <ClInclude Include="..\..\src\audio\plugin_client\juce_IncludeCharacteristics.h">
       <Filter>Juce\Source\audio\plugin_client</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\juce_PluginHeaders.h">
+    <ClInclude Include="..\..\src\audio\plugin_client\juce_PluginHeaders.h">
       <Filter>Juce\Source\audio\plugin_client</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\extras\audio plugins\wrapper\juce_PluginHostType.h">
+    <ClInclude Include="..\..\src\audio\plugin_client\juce_PluginHostType.h">
       <Filter>Juce\Source\audio\plugin_client</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\audio\plugin_host\formats\juce_AudioUnitPluginFormat.h">

Builds/iOS/Juce.xcodeproj/project.pbxproj

@@ -450,23 +450,21 @@
 		DD3886D45B5988B4DAC2D049 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiMessageSequence.h; path = ../../src/audio/midi/juce_MidiMessageSequence.h; sourceTree = SOURCE_ROOT; };
 		01712FF0A160032FA1DAA8C2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_MidiOutput.cpp; path = ../../src/audio/midi/juce_MidiOutput.cpp; sourceTree = SOURCE_ROOT; };
 		899BD7E18BE1EF7CDF53784C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_MidiOutput.h; path = ../../src/audio/midi/juce_MidiOutput.h; sourceTree = SOURCE_ROOT; };
-		1D420B75C62607886A571698 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AU_Wrapper.mm; path = "../../extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm"; sourceTree = SOURCE_ROOT; };
-		451684777825E63BCAD84F80 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_RTAS_DigiCode_Header.h; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode_Header.h"; sourceTree = SOURCE_ROOT; };
-		34AB1C83D6D5BB468415EF9F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode1.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode1.cpp"; sourceTree = SOURCE_ROOT; };
-		1DF9F1811D91207E3399ED73 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode2.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode2.cpp"; sourceTree = SOURCE_ROOT; };
-		0756D78F534D94A6D21DEB66 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode3.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_DigiCode3.cpp"; sourceTree = SOURCE_ROOT; };
-		7AA357732543414F6B93B193 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_RTAS_MacUtilities.mm; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_MacUtilities.mm"; sourceTree = SOURCE_ROOT; };
-		E99897FE7C6D6BF9FFDEBC08 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_WinUtilities.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_WinUtilities.cpp"; sourceTree = SOURCE_ROOT; };
-		84BB474B771F9ED7E2267589 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_Wrapper.cpp; path = "../../extras/audio plugins/wrapper/RTAS/juce_RTAS_Wrapper.cpp"; sourceTree = SOURCE_ROOT; };
-		8B169373A9223571680BFB71 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VST_Wrapper.cpp; path = "../../extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp"; sourceTree = SOURCE_ROOT; };
-		4238044BB69E2FAEC7B16982 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VST_Wrapper.mm; path = "../../extras/audio plugins/wrapper/VST/juce_VST_Wrapper.mm"; sourceTree = SOURCE_ROOT; };
-		6C5940264E5E38729E74EFD8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioFilterStreamer.cpp; path = "../../extras/audio plugins/wrapper/Standalone/juce_AudioFilterStreamer.cpp"; sourceTree = SOURCE_ROOT; };
-		955532BC480632ECF12F0481 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioFilterStreamer.h; path = "../../extras/audio plugins/wrapper/Standalone/juce_AudioFilterStreamer.h"; sourceTree = SOURCE_ROOT; };
-		235F9F5E2A3113B6B774869C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_StandaloneFilterWindow.cpp; path = "../../extras/audio plugins/wrapper/Standalone/juce_StandaloneFilterWindow.cpp"; sourceTree = SOURCE_ROOT; };
-		014FB7F784D205EC810AAA52 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_StandaloneFilterWindow.h; path = "../../extras/audio plugins/wrapper/Standalone/juce_StandaloneFilterWindow.h"; sourceTree = SOURCE_ROOT; };
-		6B3896A2CB1BB379BCDD9575 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_IncludeCharacteristics.h; path = "../../extras/audio plugins/wrapper/juce_IncludeCharacteristics.h"; sourceTree = SOURCE_ROOT; };
-		6F4941C73B96CE8028AD7999 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHeaders.h; path = "../../extras/audio plugins/wrapper/juce_PluginHeaders.h"; sourceTree = SOURCE_ROOT; };
-		21EAF73E1E8D839ABDF6B1CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHostType.h; path = "../../extras/audio plugins/wrapper/juce_PluginHostType.h"; sourceTree = SOURCE_ROOT; };
+		7B88F6B8E3A10CEAD9B0EE88 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AU_Wrapper.mm; path = ../../src/audio/plugin_client/AU/juce_AU_Wrapper.mm; sourceTree = SOURCE_ROOT; };
+		1101E8CB676FDEEF0A89D921 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_RTAS_DigiCode_Header.h; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_DigiCode_Header.h; sourceTree = SOURCE_ROOT; };
+		F222E5825D83E711C9F1B789 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode1.cpp; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_DigiCode1.cpp; sourceTree = SOURCE_ROOT; };
+		CEAA2B84462EF0B5026EAB0A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode2.cpp; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_DigiCode2.cpp; sourceTree = SOURCE_ROOT; };
+		9A3151864FB90A6A4BCCAE9B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_DigiCode3.cpp; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_DigiCode3.cpp; sourceTree = SOURCE_ROOT; };
+		BCE37F0D994C0ADF2CCFF796 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_RTAS_MacUtilities.mm; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_MacUtilities.mm; sourceTree = SOURCE_ROOT; };
+		F52ECCD6C02108A2D7F672F5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_WinUtilities.cpp; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_WinUtilities.cpp; sourceTree = SOURCE_ROOT; };
+		833C3F205F05BA4ADC883E53 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_RTAS_Wrapper.cpp; path = ../../src/audio/plugin_client/RTAS/juce_RTAS_Wrapper.cpp; sourceTree = SOURCE_ROOT; };
+		69C4FF0DD888BA25477561C8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VST_Wrapper.cpp; path = ../../src/audio/plugin_client/VST/juce_VST_Wrapper.cpp; sourceTree = SOURCE_ROOT; };
+		37E1FC756833849B8C7C1215 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VST_Wrapper.mm; path = ../../src/audio/plugin_client/VST/juce_VST_Wrapper.mm; sourceTree = SOURCE_ROOT; };
+		2741189DF800566462E24A14 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_StandaloneFilterWindow.cpp; path = ../../src/audio/plugin_client/Standalone/juce_StandaloneFilterWindow.cpp; sourceTree = SOURCE_ROOT; };
+		FAC43251D74E5140740BEF60 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_StandaloneFilterWindow.h; path = ../../src/audio/plugin_client/Standalone/juce_StandaloneFilterWindow.h; sourceTree = SOURCE_ROOT; };
+		2E96F55074F4EB74171EE6B6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_IncludeCharacteristics.h; path = ../../src/audio/plugin_client/juce_IncludeCharacteristics.h; sourceTree = SOURCE_ROOT; };
+		13F64389F0E25731A98E92CD = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHeaders.h; path = ../../src/audio/plugin_client/juce_PluginHeaders.h; sourceTree = SOURCE_ROOT; };
+		7CDC2FA849B7ED73A2638A11 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHostType.h; path = ../../src/audio/plugin_client/juce_PluginHostType.h; sourceTree = SOURCE_ROOT; };
 		D76BDCCF9E1A1F26A8F578F0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioUnitPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.h; sourceTree = SOURCE_ROOT; };
 		50FAF92038EBD0127900AAA1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AudioUnitPluginFormat.mm; path = ../../src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.mm; sourceTree = SOURCE_ROOT; };
 		2073E1A497363200233CD34E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_DirectXPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_DirectXPluginFormat.h; sourceTree = SOURCE_ROOT; };
@@ -1191,31 +1189,29 @@
 				01712FF0A160032FA1DAA8C2,
 				899BD7E18BE1EF7CDF53784C ); name = midi; sourceTree = "<group>"; };
 		844109733F09B5915AF75797 = { isa = PBXGroup; children = (
-				1D420B75C62607886A571698 ); name = AU; sourceTree = "<group>"; };
+				7B88F6B8E3A10CEAD9B0EE88 ); name = AU; sourceTree = "<group>"; };
 		FAA6189E385BD13EFEFE2E08 = { isa = PBXGroup; children = (
-				451684777825E63BCAD84F80,
-				34AB1C83D6D5BB468415EF9F,
-				1DF9F1811D91207E3399ED73,
-				0756D78F534D94A6D21DEB66,
-				7AA357732543414F6B93B193,
-				E99897FE7C6D6BF9FFDEBC08,
-				84BB474B771F9ED7E2267589 ); name = RTAS; sourceTree = "<group>"; };
+				1101E8CB676FDEEF0A89D921,
+				F222E5825D83E711C9F1B789,
+				CEAA2B84462EF0B5026EAB0A,
+				9A3151864FB90A6A4BCCAE9B,
+				BCE37F0D994C0ADF2CCFF796,
+				F52ECCD6C02108A2D7F672F5,
+				833C3F205F05BA4ADC883E53 ); name = RTAS; sourceTree = "<group>"; };
 		EBF4EE8E84A562DE2EBAE6BB = { isa = PBXGroup; children = (
-				8B169373A9223571680BFB71,
-				4238044BB69E2FAEC7B16982 ); name = VST; sourceTree = "<group>"; };
+				69C4FF0DD888BA25477561C8,
+				37E1FC756833849B8C7C1215 ); name = VST; sourceTree = "<group>"; };
 		0F0D49D13522C94A0F37D4AB = { isa = PBXGroup; children = (
-				6C5940264E5E38729E74EFD8,
-				955532BC480632ECF12F0481,
-				235F9F5E2A3113B6B774869C,
-				014FB7F784D205EC810AAA52 ); name = Standalone; sourceTree = "<group>"; };
+				2741189DF800566462E24A14,
+				FAC43251D74E5140740BEF60 ); name = Standalone; sourceTree = "<group>"; };
 		2805C9C796CD7D77C2D662BF = { isa = PBXGroup; children = (
 				844109733F09B5915AF75797,
 				FAA6189E385BD13EFEFE2E08,
 				EBF4EE8E84A562DE2EBAE6BB,
 				0F0D49D13522C94A0F37D4AB,
-				6B3896A2CB1BB379BCDD9575,
-				6F4941C73B96CE8028AD7999,
-				21EAF73E1E8D839ABDF6B1CF ); name = plugin_client; sourceTree = "<group>"; };
+				2E96F55074F4EB74171EE6B6,
+				13F64389F0E25731A98E92CD,
+				7CDC2FA849B7ED73A2638A11 ); name = plugin_client; sourceTree = "<group>"; };
 		B1F82C796B56FCD97D211D8E = { isa = PBXGroup; children = (
 				D76BDCCF9E1A1F26A8F578F0,
 				50FAF92038EBD0127900AAA1,

Juce.jucer

@@ -250,10 +250,6 @@
                   file="src/audio/plugin_client/VST/juce_VST_Wrapper.mm"/>
           </GROUP>
           <GROUP id="hhHHjJZ" name="Standalone">
-            <FILE id="0aPHUJq" name="juce_AudioFilterStreamer.cpp" compile="0"
-                  resource="0" file="src/audio/plugin_client/Standalone/juce_AudioFilterStreamer.cpp"/>
-            <FILE id="6ml8N6N" name="juce_AudioFilterStreamer.h" compile="0" resource="0"
-                  file="src/audio/plugin_client/Standalone/juce_AudioFilterStreamer.h"/>
             <FILE id="l0R8qQC" name="juce_StandaloneFilterWindow.cpp" compile="0"
                   resource="0" file="src/audio/plugin_client/Standalone/juce_StandaloneFilterWindow.cpp"/>
             <FILE id="OZmMutP" name="juce_StandaloneFilterWindow.h" compile="0"

extras/audio plugins/demo/Builds/Linux/Makefile

@@ -49,7 +49,7 @@ OBJECTS := \
   $(OBJDIR)/JuceLibraryCode2_683aaa00.o \
   $(OBJDIR)/JuceLibraryCode3_6848c181.o \
   $(OBJDIR)/JuceLibraryCode4_6856d902.o \
-  $(OBJDIR)/juce_VST_Wrapper_eb4c8b25.o \
+  $(OBJDIR)/juce_VST_Wrapper_f1303484.o \
 
 .PHONY: clean
 
@@ -96,7 +96,7 @@ $(OBJDIR)/JuceLibraryCode4_6856d902.o: ../../JuceLibraryCode/JuceLibraryCode4.cp
 	@echo "Compiling JuceLibraryCode4.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_VST_Wrapper_eb4c8b25.o: ../../../../../../juce/extras/audio\ plugins/wrapper/VST/juce_VST_Wrapper.cpp
+$(OBJDIR)/juce_VST_Wrapper_f1303484.o: ../../../../../../juce/src/audio/plugin_client/VST/juce_VST_Wrapper.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling juce_VST_Wrapper.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"

extras/audio plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj

@@ -26,10 +26,10 @@
 		9551342606A895BB5BA07F2E = { isa = PBXBuildFile; fileRef = 6AE52580AD24BD551DB99758; };
 		A1E844C7D2636CC38585B429 = { isa = PBXBuildFile; fileRef = B31CFE8BBA103078E19D1B97; };
 		BD7E5458BE2F33DBBF5AF834 = { isa = PBXBuildFile; fileRef = FD33B687C6FBA3ABC581AFD7; };
-		21695D03D6CEDD0D4B6A223F = { isa = PBXBuildFile; fileRef = D72A5A33070FDACF8245023C; };
-		8647A1C2DFD0682E5957A448 = { isa = PBXBuildFile; fileRef = BF6A49F4F7A9B9E8054806A8; };
-		862E7F1BC717EC544AA4ABB8 = { isa = PBXBuildFile; fileRef = 78F506C4822524209976CB35; };
-		AC35B322C5633C758F7B07F2 = { isa = PBXBuildFile; fileRef = 2BF67235DA25FD0A85909ADC; };
+		CC853B9E0B1F2B01A3CBE51D = { isa = PBXBuildFile; fileRef = E57935A1B395EC0D476DADFC; };
+		2B0B523A4C3265DA5568C523 = { isa = PBXBuildFile; fileRef = 8FF96124366EA3FF2462CB5D; };
+		37A5CEF9F9B523B2580D3C1E = { isa = PBXBuildFile; fileRef = A2C6C4FD1DCE5EFAA2163E5C; };
+		EB107FBF3FCD101D37454F1E = { isa = PBXBuildFile; fileRef = 7BA88B94922B5480855DD012; };
 		B7D2D2868983939B35532885 = { isa = PBXBuildFile; fileRef = 6C254919C15224D13FE6D174; settings = {COMPILER_FLAGS = "-w"; }; };
 		3723101DD64447FE9A530323 = { isa = PBXBuildFile; fileRef = 38E2002644D5BBC2E88ACB70; settings = {COMPILER_FLAGS = "-w"; }; };
 		EBBDC594F4DF0EF42E017C64 = { isa = PBXBuildFile; fileRef = 616DF8861CA45D7FFE92CA35; settings = {COMPILER_FLAGS = "-w"; }; };
@@ -79,10 +79,10 @@
 		B31CFE8BBA103078E19D1B97 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode3.mm; path = ../../JuceLibraryCode/JuceLibraryCode3.mm; sourceTree = SOURCE_ROOT; };
 		FD33B687C6FBA3ABC581AFD7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode4.mm; path = ../../JuceLibraryCode/JuceLibraryCode4.mm; sourceTree = SOURCE_ROOT; };
 		DF8AD10F6B21858C3378B63F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JucePluginCharacteristics.h; path = ../../JuceLibraryCode/JucePluginCharacteristics.h; sourceTree = SOURCE_ROOT; };
-		D72A5A33070FDACF8245023C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VST_Wrapper.cpp; path = "../../../../../../juce/extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp"; sourceTree = SOURCE_ROOT; };
-		BF6A49F4F7A9B9E8054806A8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VST_Wrapper.mm; path = "../../../../../../juce/extras/audio plugins/wrapper/VST/juce_VST_Wrapper.mm"; sourceTree = SOURCE_ROOT; };
-		78F506C4822524209976CB35 = { isa = PBXFileReference; lastKnownFileType = file.r; name = juce_AU_Resources.r; path = "../../../../../../juce/extras/audio plugins/wrapper/AU/juce_AU_Resources.r"; sourceTree = SOURCE_ROOT; };
-		2BF67235DA25FD0A85909ADC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AU_Wrapper.mm; path = "../../../../../../juce/extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm"; sourceTree = SOURCE_ROOT; };
+		E57935A1B395EC0D476DADFC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VST_Wrapper.cpp; path = ../../../../../../juce/src/audio/plugin_client/VST/juce_VST_Wrapper.cpp; sourceTree = SOURCE_ROOT; };
+		8FF96124366EA3FF2462CB5D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VST_Wrapper.mm; path = ../../../../../../juce/src/audio/plugin_client/VST/juce_VST_Wrapper.mm; sourceTree = SOURCE_ROOT; };
+		A2C6C4FD1DCE5EFAA2163E5C = { isa = PBXFileReference; lastKnownFileType = file.r; name = juce_AU_Resources.r; path = ../../../../../../juce/src/audio/plugin_client/AU/juce_AU_Resources.r; sourceTree = SOURCE_ROOT; };
+		7BA88B94922B5480855DD012 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AU_Wrapper.mm; path = ../../../../../../juce/src/audio/plugin_client/AU/juce_AU_Wrapper.mm; sourceTree = SOURCE_ROOT; };
 		70DC3C63DDDFB1C5A22A8C36 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CADebugMacros.h; path = Extras/CoreAudio/PublicUtility/CADebugMacros.h; sourceTree = DEVELOPER_DIR; };
 		6C254919C15224D13FE6D174 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CAAUParameter.cpp; path = Extras/CoreAudio/PublicUtility/CAAUParameter.cpp; sourceTree = DEVELOPER_DIR; };
 		AEDBCF2FF9E1FBD5B9958FB4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CAAUParameter.h; path = Extras/CoreAudio/PublicUtility/CAAUParameter.h; sourceTree = DEVELOPER_DIR; };
@@ -147,8 +147,8 @@
 				FD33B687C6FBA3ABC581AFD7,
 				DF8AD10F6B21858C3378B63F ); name = "Juce Library Code"; sourceTree = "<group>"; };
 		B7F037957C49AE7943C354C9 = { isa = PBXGroup; children = (
-				D72A5A33070FDACF8245023C,
-				BF6A49F4F7A9B9E8054806A8 ); name = "Juce VST Wrapper"; sourceTree = "<group>"; };
+				E57935A1B395EC0D476DADFC,
+				8FF96124366EA3FF2462CB5D ); name = "Juce VST Wrapper"; sourceTree = "<group>"; };
 		17A9711DC035377B969B90C2 = { isa = PBXGroup; children = (
 				70DC3C63DDDFB1C5A22A8C36,
 				6C254919C15224D13FE6D174,
@@ -201,8 +201,8 @@
 				B50242715BF944E7711A5939,
 				F2595F2DC0235F848F9474E8 ); name = "Apple AU Files"; sourceTree = "<group>"; };
 		5180919A8096CFD082284336 = { isa = PBXGroup; children = (
-				78F506C4822524209976CB35,
-				2BF67235DA25FD0A85909ADC,
+				A2C6C4FD1DCE5EFAA2163E5C,
+				7BA88B94922B5480855DD012,
 				17A9711DC035377B969B90C2 ); name = "Juce AU Wrapper"; sourceTree = "<group>"; };
 		7756687B5FD0903C5F83BB9E = { isa = PBXGroup; children = (
 				81567EBA449466A95492511B ); name = Resources; sourceTree = "<group>"; };
@@ -309,7 +309,7 @@
 				F4B05B483343A2F3C923C6B4 ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; };
 		145D936BBD5425D74172B206 = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = (  ); runOnlyForDeploymentPostprocessing = 0; };
 		A79C4026C596A99BB0ADC224 = { isa = PBXRezBuildPhase; buildActionMask = 2147483647; files = (
-				862E7F1BC717EC544AA4ABB8 ); runOnlyForDeploymentPostprocessing = 0; };
+				37A5CEF9F9B523B2580D3C1E ); runOnlyForDeploymentPostprocessing = 0; };
 		F0F39FCA8C402F34BB74F6B3 = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = (
 				5AF66C048A4815F5A8ECDDCD,
 				209FB8C7F7BE85A70E5D98D7,
@@ -317,9 +317,9 @@
 				9551342606A895BB5BA07F2E,
 				A1E844C7D2636CC38585B429,
 				BD7E5458BE2F33DBBF5AF834,
-				21695D03D6CEDD0D4B6A223F,
-				8647A1C2DFD0682E5957A448,
-				AC35B322C5633C758F7B07F2,
+				CC853B9E0B1F2B01A3CBE51D,
+				2B0B523A4C3265DA5568C523,
+				EB107FBF3FCD101D37454F1E,
 				B7D2D2868983939B35532885,
 				3723101DD64447FE9A530323,
 				EBBDC594F4DF0EF42E017C64,

extras/audio plugins/demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj

@@ -145,7 +145,7 @@
       <File RelativePath="..\..\JuceLibraryCode\JucePluginCharacteristics.h"/>
     </Filter>
     <Filter Name="Juce VST Wrapper">
-      <File RelativePath="..\..\..\..\..\..\juce\extras\audio plugins\wrapper\VST\juce_VST_Wrapper.cpp"/>
+      <File RelativePath="..\..\..\..\..\..\juce\src\audio\plugin_client\VST\juce_VST_Wrapper.cpp"/>
     </Filter>
   </Files>
   <Globals/>

extras/audio plugins/demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj

@@ -145,7 +145,7 @@
       <File RelativePath="..\..\JuceLibraryCode\JucePluginCharacteristics.h"/>
     </Filter>
     <Filter Name="Juce VST Wrapper">
-      <File RelativePath="..\..\..\..\..\..\juce\extras\audio plugins\wrapper\VST\juce_VST_Wrapper.cpp"/>
+      <File RelativePath="..\..\..\..\..\..\juce\src\audio\plugin_client\VST\juce_VST_Wrapper.cpp"/>
     </Filter>
   </Files>
   <Globals/>

juce_amalgamated.cpp

@@ -16547,22 +16547,17 @@ void Thread::stopAllThreads (const int timeOutMilliseconds)
 
 void SpinLock::enter() const noexcept
 {
-	if (! lock.compareAndSetBool (1, 0))
+	if (! tryEnter())
 	{
 		for (int i = 20; --i >= 0;)
-			if (lock.compareAndSetBool (1, 0))
+			if (tryEnter())
 				return;
 
-		while (! lock.compareAndSetBool (1, 0))
+		while (! tryEnter())
 			Thread::yield();
 	}
 }
 
-bool SpinLock::tryEnter() const noexcept
-{
-	return lock.compareAndSetBool (1, 0);
-}
-
 END_JUCE_NAMESPACE
 /*** End of inlined file: juce_Thread.cpp ***/
 
@@ -39078,6 +39073,8 @@ class InternalTimerThread  : private Thread,
 							 private AsyncUpdater
 {
 public:
+	typedef SpinLock LockType;
+
 	InternalTimerThread()
 		: Thread ("Juce Timer"),
 		  firstTimer (nullptr),
@@ -39155,7 +39152,7 @@ public:
 
 	void callTimers()
 	{
-		const SpinLock::ScopedLockType sl (lock);
+		const LockType::ScopedLockType sl (lock);
 
 		while (firstTimer != nullptr && firstTimer->countdownMs <= 0)
 		{
@@ -39165,7 +39162,7 @@ public:
 			removeTimer (t);
 			addTimer (t);
 
-			const SpinLock::ScopedUnlockType ul (lock);
+			const LockType::ScopedUnlockType ul (lock);
 
 			JUCE_TRY
 			{
@@ -39240,7 +39237,7 @@ public:
 private:
 	friend class Timer;
 	static InternalTimerThread* instance;
-	static SpinLock lock;
+	static LockType lock;
 	Timer* volatile firstTimer;
 	Atomic <int> callbackNeeded;
 
@@ -39331,7 +39328,7 @@ private:
 
 	int getTimeUntilFirstTimer (const int numMillisecsElapsed) const
 	{
-		const SpinLock::ScopedLockType sl (lock);
+		const LockType::ScopedLockType sl (lock);
 
 		for (Timer* t = firstTimer; t != nullptr; t = t->next)
 			t->countdownMs -= numMillisecsElapsed;
@@ -39348,7 +39345,7 @@ private:
 };
 
 InternalTimerThread* InternalTimerThread::instance = nullptr;
-SpinLock InternalTimerThread::lock;
+InternalTimerThread::LockType InternalTimerThread::lock;
 
 void juce_callAnyTimersSynchronously()
 {
@@ -39366,7 +39363,7 @@ Timer::Timer() noexcept
 	 next (nullptr)
 {
    #if JUCE_DEBUG
-	const SpinLock::ScopedLockType sl (InternalTimerThread::lock);
+	const InternalTimerThread::LockType::ScopedLockType sl (InternalTimerThread::lock);
 	activeTimers.add (this);
    #endif
 }
@@ -39378,7 +39375,7 @@ Timer::Timer (const Timer&) noexcept
 	 next (nullptr)
 {
    #if JUCE_DEBUG
-	const SpinLock::ScopedLockType sl (InternalTimerThread::lock);
+	const InternalTimerThread::LockType::ScopedLockType sl (InternalTimerThread::lock);
 	activeTimers.add (this);
    #endif
 }
@@ -39394,7 +39391,7 @@ Timer::~Timer()
 
 void Timer::startTimer (const int interval) noexcept
 {
-	const SpinLock::ScopedLockType sl (InternalTimerThread::lock);
+	const InternalTimerThread::LockType::ScopedLockType sl (InternalTimerThread::lock);
 
    #if JUCE_DEBUG
 	// this isn't a valid object! Your timer might be a dangling pointer or something..
@@ -39415,7 +39412,7 @@ void Timer::startTimer (const int interval) noexcept
 
 void Timer::stopTimer() noexcept
 {
-	const SpinLock::ScopedLockType sl (InternalTimerThread::lock);
+	const InternalTimerThread::LockType::ScopedLockType sl (InternalTimerThread::lock);
 
    #if JUCE_DEBUG
 	// this isn't a valid object! Your timer might be a dangling pointer or something..

juce_amalgamated.h

@@ -73,7 +73,7 @@ namespace JuceDummyNamespace {}
 */
 #define JUCE_MAJOR_VERSION	  1
 #define JUCE_MINOR_VERSION	  53
-#define JUCE_BUILDNUMBER	72
+#define JUCE_BUILDNUMBER	73
 
 /** Current Juce version number.
 
@@ -22135,7 +22135,10 @@ public:
 	void enter() const noexcept;
 
 	/** Attempts to acquire the lock, returning true if this was successful. */
-	bool tryEnter() const noexcept;
+	inline bool tryEnter() const noexcept
+	{
+		return lock.compareAndSetBool (1, 0);
+	}
 
 	/** Releases the lock. */
 	inline void exit() const noexcept

src/audio/plugin_client/RTAS/juce_RTAS_WinUtilities.cpp

@@ -23,22 +23,18 @@
   ==============================================================================
 */
 
-#if _MSC_VER
-
 // (these functions are in their own file because of problems including windows.h
 // at the same time as the Digi headers)
 
-#include <windows.h>
+#if _MSC_VER
 
-#ifdef _MSC_VER
-  #pragma pack (push, 8)
-#endif
+#define _DO_NOT_DECLARE_INTERLOCKED_INTRINSICS_IN_MEMORY // (workaround for a VC build problem)
+#include <intrin.h>
+#include <windows.h>
 
+#pragma pack (push, 8)
 #include "../juce_PluginHeaders.h"
-
-#ifdef _MSC_VER
-  #pragma pack (pop)
-#endif
+#pragma pack (pop)
 
 #if JucePlugin_Build_RTAS
 

src/audio/plugin_client/Standalone/juce_AudioFilterStreamer.cpp

@@ -1,54 +0,0 @@
-/*
-  ==============================================================================
-
-   This file is part of the JUCE library - "Jules' Utility Class Extensions"
-   Copyright 2004-11 by Raw Material Software Ltd.
-
-  ------------------------------------------------------------------------------
-
-   JUCE can be redistributed and/or modified under the terms of the GNU General
-   Public License (Version 2), as published by the Free Software Foundation.
-   A copy of the license is included in the JUCE distribution, or can be found
-   online at www.gnu.org/licenses.
-
-   JUCE is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-  ------------------------------------------------------------------------------
-
-   To release a closed-source product which uses JUCE, commercial licenses are
-   available: visit www.rawmaterialsoftware.com/juce for more information.
-
-  ==============================================================================
-*/
-
-#include "juce_AudioFilterStreamer.h"
-#include "../juce_IncludeCharacteristics.h"
-
-
-//==============================================================================
-AudioFilterStreamingDeviceManager::AudioFilterStreamingDeviceManager()
-{
-    player = new AudioProcessorPlayer();
-
-    addAudioCallback (player);
-    addMidiInputCallback (String::empty, player);
-}
-
-AudioFilterStreamingDeviceManager::~AudioFilterStreamingDeviceManager()
-{
-    setFilter (nullptr);
-
-    removeMidiInputCallback (String::empty, player);
-    removeAudioCallback (player);
-
-    clearSingletonInstance();
-}
-
-void AudioFilterStreamingDeviceManager::setFilter (AudioProcessor* filterToStream)
-{
-    player->setProcessor (filterToStream);
-}
-
-juce_ImplementSingleton (AudioFilterStreamingDeviceManager);

src/audio/plugin_client/Standalone/juce_AudioFilterStreamer.h

@@ -1,69 +0,0 @@
-/*
-  ==============================================================================
-
-   This file is part of the JUCE library - "Jules' Utility Class Extensions"
-   Copyright 2004-11 by Raw Material Software Ltd.
-
-  ------------------------------------------------------------------------------
-
-   JUCE can be redistributed and/or modified under the terms of the GNU General
-   Public License (Version 2), as published by the Free Software Foundation.
-   A copy of the license is included in the JUCE distribution, or can be found
-   online at www.gnu.org/licenses.
-
-   JUCE is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-  ------------------------------------------------------------------------------
-
-   To release a closed-source product which uses JUCE, commercial licenses are
-   available: visit www.rawmaterialsoftware.com/juce for more information.
-
-  ==============================================================================
-*/
-
-#ifndef __JUCE_AUDIOFILTERSTREAMER_JUCEHEADER__
-#define __JUCE_AUDIOFILTERSTREAMER_JUCEHEADER__
-
-#include "../juce_PluginHeaders.h"
-
-
-//==============================================================================
-/**
-    Wraps an AudioFilterStreamer in an AudioDeviceManager to make it easy to
-    create a standalone filter.
-
-    This simply acts as a singleton AudioDeviceManager, which continuously
-    streams audio from the filter you give it with the setFilter() method.
-
-    To use it, simply create an instance of it (or use getInstance() if you're
-    using it as a singleton), initialise it like you would a normal
-    AudioDeviceManager, and call setFilter() to start it running your plugin.
-
-*/
-class AudioFilterStreamingDeviceManager  : public AudioDeviceManager
-{
-public:
-    //==============================================================================
-    AudioFilterStreamingDeviceManager();
-    ~AudioFilterStreamingDeviceManager();
-
-    juce_DeclareSingleton (AudioFilterStreamingDeviceManager, true);
-
-    //==============================================================================
-    /** Tells the device which filter to stream audio through.
-
-        Pass in 0 to deselect the current filter.
-    */
-    void setFilter (AudioProcessor* filterToStream);
-
-private:
-    //==============================================================================
-    ScopedPointer <AudioProcessorPlayer> player;
-
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioFilterStreamingDeviceManager);
-};
-
-
-#endif   // __JUCE_AUDIOFILTERSTREAMER_JUCEHEADER__

src/audio/plugin_client/Standalone/juce_StandaloneFilterWindow.cpp

@@ -24,7 +24,7 @@
 */
 
 #include "juce_StandaloneFilterWindow.h"
-#include "../juce_PluginHeaders.h"
+
 
 //==============================================================================
 /** Somewhere in the codebase of your plugin, you need to implement this function
@@ -50,57 +50,57 @@ StandaloneFilterWindow::StandaloneFilterWindow (const String& title,
     JUCE_TRY
     {
         filter = createPluginFilter();
+    }
+    JUCE_CATCH_ALL
 
-        if (filter != nullptr)
-        {
-            filter->setPlayConfigDetails (JucePlugin_MaxNumInputChannels,
-                                          JucePlugin_MaxNumOutputChannels,
-                                          44100, 512);
-
-            PropertySet* const globalSettings = getGlobalSettings();
+    if (filter == nullptr)
+    {
+        jassertfalse    // Your filter didn't create correctly! In a standalone app that's not too great.
+        JUCEApplication::quit();
+    }
 
-            deviceManager = new AudioFilterStreamingDeviceManager();
-            deviceManager->setFilter (filter);
+    filter->setPlayConfigDetails (JucePlugin_MaxNumInputChannels,
+                                  JucePlugin_MaxNumOutputChannels,
+                                  44100, 512);
 
-            ScopedPointer<XmlElement> savedState;
+    PropertySet* const globalSettings = getGlobalSettings();
 
-            if (globalSettings != nullptr)
-                savedState = globalSettings->getXmlValue ("audioSetup");
+    deviceManager = new AudioDeviceManager();
+    deviceManager->addAudioCallback (&player);
+    deviceManager->addMidiInputCallback (String::empty, &player);
 
-            deviceManager->initialise (filter->getNumInputChannels(),
-                                       filter->getNumOutputChannels(),
-                                       savedState,
-                                       true);
+    player.setProcessor (filter);
 
-            if (globalSettings != nullptr)
-            {
-                MemoryBlock data;
+    ScopedPointer<XmlElement> savedState;
 
-                if (data.fromBase64Encoding (globalSettings->getValue ("filterState"))
-                     && data.getSize() > 0)
-                {
-                    filter->setStateInformation (data.getData(), data.getSize());
-                }
-            }
+    if (globalSettings != nullptr)
+        savedState = globalSettings->getXmlValue ("audioSetup");
 
-            setContentOwned (filter->createEditorIfNeeded(), true);
+    deviceManager->initialise (filter->getNumInputChannels(),
+                               filter->getNumOutputChannels(),
+                               savedState,
+                               true);
 
-            const int x = globalSettings->getIntValue ("windowX", -100);
-            const int y = globalSettings->getIntValue ("windowY", -100);
+    if (globalSettings != nullptr)
+    {
+        MemoryBlock data;
 
-            if (x != -100 && y != -100)
-                setBoundsConstrained (Rectangle<int> (x, y, getWidth(), getHeight()));
-            else
-                centreWithSize (getWidth(), getHeight());
+        if (data.fromBase64Encoding (globalSettings->getValue ("filterState"))
+             && data.getSize() > 0)
+        {
+            filter->setStateInformation (data.getData(), data.getSize());
         }
     }
-    JUCE_CATCH_ALL
 
-    if (deviceManager == nullptr)
-    {
-        jassertfalse    // Your filter didn't create correctly! In a standalone app that's not too great.
-        JUCEApplication::quit();
-    }
+    setContentOwned (filter->createEditorIfNeeded(), true);
+
+    const int x = globalSettings->getIntValue ("windowX", -100);
+    const int y = globalSettings->getIntValue ("windowY", -100);
+
+    if (x != -100 && y != -100)
+        setBoundsConstrained (Rectangle<int> (x, y, getWidth(), getHeight()));
+    else
+        centreWithSize (getWidth(), getHeight());
 }
 
 StandaloneFilterWindow::~StandaloneFilterWindow()
@@ -119,6 +119,8 @@ StandaloneFilterWindow::~StandaloneFilterWindow()
         }
     }
 
+    deviceManager->removeMidiInputCallback (String::empty, &player);
+    deviceManager->removeAudioCallback (&player);
     deviceManager = nullptr;
 
     if (globalSettings != nullptr && filter != nullptr)
@@ -135,8 +137,7 @@ StandaloneFilterWindow::~StandaloneFilterWindow()
 //==============================================================================
 void StandaloneFilterWindow::deleteFilter()
 {
-    if (deviceManager != nullptr)
-        deviceManager->setFilter (nullptr);
+    player.setProcessor (nullptr);
 
     if (filter != nullptr && getContentComponent() != nullptr)
     {
@@ -156,7 +157,7 @@ void StandaloneFilterWindow::resetFilter()
     if (filter != nullptr)
     {
         if (deviceManager != nullptr)
-            deviceManager->setFilter (filter);
+            player.setProcessor (filter);
 
         setContentOwned (filter->createEditorIfNeeded(), true);
     }
@@ -258,36 +259,23 @@ void StandaloneFilterWindow::resized()
 
 void StandaloneFilterWindow::buttonClicked (Button*)
 {
-    if (filter == nullptr)
-        return;
-
-    PopupMenu m;
-    m.addItem (1, TRANS("Audio Settings..."));
-    m.addSeparator();
-    m.addItem (2, TRANS("Save current state..."));
-    m.addItem (3, TRANS("Load a saved state..."));
-    m.addSeparator();
-    m.addItem (4, TRANS("Reset to default state"));
-
-    switch (m.showAt (&optionsButton))
+    if (filter != nullptr)
     {
-    case 1:
-        showAudioSettingsDialog();
-        break;
-
-    case 2:
-        saveState();
-        break;
-
-    case 3:
-        loadState();
-        break;
-
-    case 4:
-        resetFilter();
-        break;
-
-    default:
-        break;
+        PopupMenu m;
+        m.addItem (1, TRANS("Audio Settings..."));
+        m.addSeparator();
+        m.addItem (2, TRANS("Save current state..."));
+        m.addItem (3, TRANS("Load a saved state..."));
+        m.addSeparator();
+        m.addItem (4, TRANS("Reset to default state"));
+
+        switch (m.showAt (&optionsButton))
+        {
+            case 1:  showAudioSettingsDialog(); break;
+            case 2:  saveState(); break;
+            case 3:  loadState(); break;
+            case 4:  resetFilter(); break;
+            default: break;
+        }
     }
 }

src/audio/plugin_client/Standalone/juce_StandaloneFilterWindow.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_STANDALONEFILTERWINDOW_JUCEHEADER__
 #define __JUCE_STANDALONEFILTERWINDOW_JUCEHEADER__
 
-#include "juce_AudioFilterStreamer.h"
+#include "../juce_PluginHeaders.h"
 
 
 //==============================================================================
@@ -76,7 +76,8 @@ public:
 
 private:
     ScopedPointer<AudioProcessor> filter;
-    ScopedPointer<AudioFilterStreamingDeviceManager> deviceManager;
+    ScopedPointer<AudioDeviceManager> deviceManager;
+    AudioProcessorPlayer player;
     TextButton optionsButton;
 
     void deleteFilter();

src/audio/plugin_client/juce_IncludeCharacteristics.h

@@ -2,7 +2,7 @@
   ==============================================================================
 
    This file is part of the JUCE library - "Jules' Utility Class Extensions"
-   Copyright 2004-9 by Raw Material Software Ltd.
+   Copyright 2004-11 by Raw Material Software Ltd.
 
   ------------------------------------------------------------------------------
 

src/audio/plugin_client/juce_PluginHeaders.h

@@ -2,7 +2,7 @@
   ==============================================================================
 
    This file is part of the JUCE library - "Jules' Utility Class Extensions"
-   Copyright 2004-9 by Raw Material Software Ltd.
+   Copyright 2004-11 by Raw Material Software Ltd.
 
   ------------------------------------------------------------------------------
 
@@ -24,7 +24,7 @@
 */
 
 #include "juce_IncludeCharacteristics.h"
-#include "../../../juce_amalgamated.h"
+#include "../../../juce.h"
 
 #ifndef __JUCE_PLUGINHEADERS_JUCEHEADER__
 #define __JUCE_PLUGINHEADERS_JUCEHEADER__
@@ -121,10 +121,10 @@ static void removeWindowHidingHooks (Component* comp)
                               comp->getProperties() ["carbonEventRef"].toString().getHexValue64());
 }
 
-#else
+#elif JUCE_MAC
  static void attachWindowHidingHooks (void*, void*, void*) {}
  static void removeWindowHidingHooks (void*) {}
 #endif
 
 
-#endif
+#endif   // __JUCE_PLUGINHEADERS_JUCEHEADER__

src/audio/plugin_client/juce_PluginHostType.h

@@ -2,7 +2,7 @@
   ==============================================================================
 
    This file is part of the JUCE library - "Jules' Utility Class Extensions"
-   Copyright 2004-9 by Raw Material Software Ltd.
+   Copyright 2004-11 by Raw Material Software Ltd.
 
   ------------------------------------------------------------------------------
 
@@ -23,7 +23,6 @@
   ==============================================================================
 */
 
-
 //==============================================================================
 class PluginHostType
 {

src/core/juce_StandardHeader.h

@@ -33,7 +33,7 @@
 */
 #define JUCE_MAJOR_VERSION      1
 #define JUCE_MINOR_VERSION      53
-#define JUCE_BUILDNUMBER        72
+#define JUCE_BUILDNUMBER        73
 
 /** Current Juce version number.
 

src/events/juce_Timer.cpp

@@ -44,6 +44,8 @@ class InternalTimerThread  : private Thread,
                              private AsyncUpdater
 {
 public:
+    typedef SpinLock LockType;
+
     InternalTimerThread()
         : Thread ("Juce Timer"),
           firstTimer (nullptr),
@@ -121,7 +123,7 @@ public:
 
     void callTimers()
     {
-        const SpinLock::ScopedLockType sl (lock);
+        const LockType::ScopedLockType sl (lock);
 
         while (firstTimer != nullptr && firstTimer->countdownMs <= 0)
         {
@@ -131,7 +133,7 @@ public:
             removeTimer (t);
             addTimer (t);
 
-            const SpinLock::ScopedUnlockType ul (lock);
+            const LockType::ScopedUnlockType ul (lock);
 
             JUCE_TRY
             {
@@ -206,7 +208,7 @@ public:
 private:
     friend class Timer;
     static InternalTimerThread* instance;
-    static SpinLock lock;
+    static LockType lock;
     Timer* volatile firstTimer;
     Atomic <int> callbackNeeded;
 
@@ -298,7 +300,7 @@ private:
 
     int getTimeUntilFirstTimer (const int numMillisecsElapsed) const
     {
-        const SpinLock::ScopedLockType sl (lock);
+        const LockType::ScopedLockType sl (lock);
 
         for (Timer* t = firstTimer; t != nullptr; t = t->next)
             t->countdownMs -= numMillisecsElapsed;
@@ -315,7 +317,7 @@ private:
 };
 
 InternalTimerThread* InternalTimerThread::instance = nullptr;
-SpinLock InternalTimerThread::lock;
+InternalTimerThread::LockType InternalTimerThread::lock;
 
 void juce_callAnyTimersSynchronously()
 {
@@ -334,7 +336,7 @@ Timer::Timer() noexcept
      next (nullptr)
 {
    #if JUCE_DEBUG
-    const SpinLock::ScopedLockType sl (InternalTimerThread::lock);
+    const InternalTimerThread::LockType::ScopedLockType sl (InternalTimerThread::lock);
     activeTimers.add (this);
    #endif
 }
@@ -346,7 +348,7 @@ Timer::Timer (const Timer&) noexcept
      next (nullptr)
 {
    #if JUCE_DEBUG
-    const SpinLock::ScopedLockType sl (InternalTimerThread::lock);
+    const InternalTimerThread::LockType::ScopedLockType sl (InternalTimerThread::lock);
     activeTimers.add (this);
    #endif
 }
@@ -362,7 +364,7 @@ Timer::~Timer()
 
 void Timer::startTimer (const int interval) noexcept
 {
-    const SpinLock::ScopedLockType sl (InternalTimerThread::lock);
+    const InternalTimerThread::LockType::ScopedLockType sl (InternalTimerThread::lock);
 
    #if JUCE_DEBUG
     // this isn't a valid object! Your timer might be a dangling pointer or something..
@@ -383,7 +385,7 @@ void Timer::startTimer (const int interval) noexcept
 
 void Timer::stopTimer() noexcept
 {
-    const SpinLock::ScopedLockType sl (InternalTimerThread::lock);
+    const InternalTimerThread::LockType::ScopedLockType sl (InternalTimerThread::lock);
 
    #if JUCE_DEBUG
     // this isn't a valid object! Your timer might be a dangling pointer or something..