Introjucer refactoring, moving more functionality from the ProjectExporters and into the ProjectTypes. Slightly altered the structure of nested groups that is generated, and tweaked the demo projects to reflect this. Couple of minor fixes to symbol exporting and CoreAudioFormat.

14 years ago · e130af03ec
--- a/Builds/MacOSX/Juce.xcodeproj/project.pbxproj
+++ b/Builds/MacOSX/Juce.xcodeproj/project.pbxproj
@@ -1973,7 +1973,7 @@
 				ADE5F12AA5AD969E2C7002B3,
 				75700D13513346310CEAC30D,
 				AAC585C4648559DD713F28FE ); name = utilities; sourceTree = "<group>"; };
 		9AA3D660772E3D4C64EC7859 = { isa = PBXGroup; children = (
 		992526B83B6AA618A4FAECEB = { isa = PBXGroup; children = (
 				D443FD24B52106986FC8A531,
 				F2B0E44A08E127FD31184241,
 				1CC2889DB696E12FC34E3F50,
@@ -1989,13 +1989,13 @@
 				723AC5B999F1EC8F4A101AAF,
 				281D6856FAC3B07634AD1C32,
 				2FD5C998952BE08F8ED3F262,
 				01778F26212AECCBF2452804 ); name = Source; sourceTree = "<group>"; };
 				01778F26212AECCBF2452804 ); name = Juce; sourceTree = "<group>"; };
 		1076A9F8D71BFFF9E9975FB6 = { isa = PBXGroup; children = (  ); name = Resources; sourceTree = "<group>"; };
 		23256FCDBD84A2E259E40908 = { isa = PBXGroup; children = (  ); name = Frameworks; sourceTree = "<group>"; };
 		3E3A3D491CB40D2943E95E64 = { isa = PBXGroup; children = (
 				389351359BA78C682E1931A6 ); name = Products; sourceTree = "<group>"; };
 		992526B83B6AA618A4FAECEB = { isa = PBXGroup; children = (
 				9AA3D660772E3D4C64EC7859,
 		25F381A264FFB3735F124DCC = { isa = PBXGroup; children = (
 				992526B83B6AA618A4FAECEB,
 				1076A9F8D71BFFF9E9975FB6,
 				23256FCDBD84A2E259E40908,
 				3E3A3D491CB40D2943E95E64 ); name = Source; sourceTree = "<group>"; };
@@ -2436,7 +2436,7 @@
 				55EDB4D9B702B469DB4655C3 ); runOnlyForDeploymentPostprocessing = 0; };
 		01555BA382FAED280FF5F58A = { isa = PBXNativeTarget; buildConfigurationList = D14EC3F0DC5861E37D35E15A; buildPhases = (
 				8914D147048B9EE245989ACB ); buildRules = ( ); dependencies = ( ); name = Juce; productName = Juce; productReference = 389351359BA78C682E1931A6; productType = "com.apple.product-type.library.static"; };
 		FCFFEDFC83101B196BFA2AE2 = { isa = PBXProject; buildConfigurationList = 3A1CB6B5ECF4A79CDE35CC66; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 992526B83B6AA618A4FAECEB; projectDirPath = ""; projectRoot = ""; targets = ( 01555BA382FAED280FF5F58A ); };
 		FCFFEDFC83101B196BFA2AE2 = { isa = PBXProject; buildConfigurationList = 3A1CB6B5ECF4A79CDE35CC66; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 25F381A264FFB3735F124DCC; projectDirPath = ""; projectRoot = ""; targets = ( 01555BA382FAED280FF5F58A ); };
 	};
 	rootObject = FCFFEDFC83101B196BFA2AE2;
 }
--- a/Builds/VisualStudio2005/Juce.vcproj
+++ b/Builds/VisualStudio2005/Juce.vcproj
--- a/Builds/VisualStudio2008/Juce.vcproj
+++ b/Builds/VisualStudio2008/Juce.vcproj
--- a/Builds/VisualStudio2008_DLL/Juce.vcproj
+++ b/Builds/VisualStudio2008_DLL/Juce.vcproj
--- a/Builds/VisualStudio2010/Juce.vcxproj
+++ b/Builds/VisualStudio2010/Juce.vcxproj
@@ -54,7 +54,7 @@
      <Optimization>Disabled</Optimization>
      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;_LIB;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions>_LIB;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
@@ -92,7 +92,7 @@
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_LIB;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions>_LIB;WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
--- a/Builds/VisualStudio2010/Juce.vcxproj.filters
+++ b/Builds/VisualStudio2010/Juce.vcxproj.filters
--- a/Builds/iOS/Juce.xcodeproj/project.pbxproj
+++ b/Builds/iOS/Juce.xcodeproj/project.pbxproj
@@ -1973,7 +1973,7 @@
 				ADE5F12AA5AD969E2C7002B3,
 				75700D13513346310CEAC30D,
 				AAC585C4648559DD713F28FE ); name = utilities; sourceTree = "<group>"; };
 		9AA3D660772E3D4C64EC7859 = { isa = PBXGroup; children = (
 		992526B83B6AA618A4FAECEB = { isa = PBXGroup; children = (
 				D443FD24B52106986FC8A531,
 				F2B0E44A08E127FD31184241,
 				1CC2889DB696E12FC34E3F50,
@@ -1989,13 +1989,13 @@
 				723AC5B999F1EC8F4A101AAF,
 				281D6856FAC3B07634AD1C32,
 				2FD5C998952BE08F8ED3F262,
 				01778F26212AECCBF2452804 ); name = Source; sourceTree = "<group>"; };
 				01778F26212AECCBF2452804 ); name = Juce; sourceTree = "<group>"; };
 		1076A9F8D71BFFF9E9975FB6 = { isa = PBXGroup; children = (  ); name = Resources; sourceTree = "<group>"; };
 		23256FCDBD84A2E259E40908 = { isa = PBXGroup; children = (  ); name = Frameworks; sourceTree = "<group>"; };
 		3E3A3D491CB40D2943E95E64 = { isa = PBXGroup; children = (
 				389351359BA78C682E1931A6 ); name = Products; sourceTree = "<group>"; };
 		992526B83B6AA618A4FAECEB = { isa = PBXGroup; children = (
 				9AA3D660772E3D4C64EC7859,
 		25F381A264FFB3735F124DCC = { isa = PBXGroup; children = (
 				992526B83B6AA618A4FAECEB,
 				1076A9F8D71BFFF9E9975FB6,
 				23256FCDBD84A2E259E40908,
 				3E3A3D491CB40D2943E95E64 ); name = Source; sourceTree = "<group>"; };
@@ -2440,7 +2440,7 @@
 				55EDB4D9B702B469DB4655C3 ); runOnlyForDeploymentPostprocessing = 0; };
 		01555BA382FAED280FF5F58A = { isa = PBXNativeTarget; buildConfigurationList = D14EC3F0DC5861E37D35E15A; buildPhases = (
 				8914D147048B9EE245989ACB ); buildRules = ( ); dependencies = ( ); name = Juce; productName = Juce; productReference = 389351359BA78C682E1931A6; productType = "com.apple.product-type.library.static"; };
 		FCFFEDFC83101B196BFA2AE2 = { isa = PBXProject; buildConfigurationList = 3A1CB6B5ECF4A79CDE35CC66; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 992526B83B6AA618A4FAECEB; projectDirPath = ""; projectRoot = ""; targets = ( 01555BA382FAED280FF5F58A ); };
 		FCFFEDFC83101B196BFA2AE2 = { isa = PBXProject; buildConfigurationList = 3A1CB6B5ECF4A79CDE35CC66; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 25F381A264FFB3735F124DCC; projectDirPath = ""; projectRoot = ""; targets = ( 01555BA382FAED280FF5F58A ); };
 	};
 	rootObject = FCFFEDFC83101B196BFA2AE2;
 }
--- a/Juce.jucer
+++ b/Juce.jucer
--- a/Introjucer.xcodeproj/project.pbxproj
+++ b/Introjucer.xcodeproj/project.pbxproj
@@ -6,18 +6,18 @@
 	objectVersion = 45;
 	objects = {

 		7BDFF9F0E16DF33A980F46DC = { isa = PBXBuildFile; fileRef = 046FA2877C08618339161EE2; };
 		1FD6A59398E3618F79475867 = { isa = PBXBuildFile; fileRef = 55A5264E336AEDD1495796F5; };
 		B703C44375C75E5AB099E74A = { isa = PBXBuildFile; fileRef = 43A5218D223AA21E0A55D986; };
 		022036CBB0FBE47C417A6222 = { isa = PBXBuildFile; fileRef = 151135F18422E2B1368D7BC2; };
 		7BDFF9F0E16DF33A980F46DC = { isa = PBXBuildFile; fileRef = 046FA2877C08618339161EE2; };
 		52A4EFC1F732A9D5BBB61AF5 = { isa = PBXBuildFile; fileRef = B36C44190E6AEEBFA3DB3046; };
 		C65112B26E0BB0BB8DBD3F3C = { isa = PBXBuildFile; fileRef = FB3773F08466794F949B0AFF; };
 		E63745F5956C698352A2ACA0 = { isa = PBXBuildFile; fileRef = 74125C6A6DE28C538A518C3C; };
 		2C3270317859BA6DF8EC1458 = { isa = PBXBuildFile; fileRef = A5A4B15B9F5C3D32C82DFDC6; };
 		022036CBB0FBE47C417A6222 = { isa = PBXBuildFile; fileRef = 151135F18422E2B1368D7BC2; };
 		AA7B50F22523465B07D4A25B = { isa = PBXBuildFile; fileRef = 6E1144678BD61868D73EF1FB; };
 		DBE3CE9482B19CF1AE700805 = { isa = PBXBuildFile; fileRef = 23CF69B4C644D1E6E61E5C82; };
 		93C9F3F27602A33DDC9C2250 = { isa = PBXBuildFile; fileRef = 2767E1D082874D301D5D5F43; };
 		DBE3CE9482B19CF1AE700805 = { isa = PBXBuildFile; fileRef = 23CF69B4C644D1E6E61E5C82; };
 		2E6836738CE7EB452FDC7E9A = { isa = PBXBuildFile; fileRef = D9FB1A5365FEEB854A0FF7BF; };
 		1FD6A59398E3618F79475867 = { isa = PBXBuildFile; fileRef = 55A5264E336AEDD1495796F5; };
 		E63745F5956C698352A2ACA0 = { isa = PBXBuildFile; fileRef = 74125C6A6DE28C538A518C3C; };
 		AADBA9EB828F8C6A5E38593B = { isa = PBXBuildFile; fileRef = 3417A0C1AE7900A7E07C1CA1; };
 		D6D0659F3F3504012246F13D = { isa = PBXBuildFile; fileRef = AA3CBE4A2AC3E9411426F630; };
 		8BAE4D8EA7F247DA0A4D3A5C = { isa = PBXBuildFile; fileRef = F617CE0630ADB0628A34D6BF; };
@@ -47,18 +47,18 @@
 		08C0959668FFC1A90B4BA8E6 = { isa = PBXBuildFile; fileRef = DD6476FF0F8BE833CD54C01F; };
 		1457A52734BA97A13610ECF1 = { isa = PBXBuildFile; fileRef = 268B4FFB1C675B679138545F; };
 		20EDB5C810855EB960F520FC = { isa = PBXBuildFile; fileRef = 60A217F62952DE8A752BD79F; };
 		046FA2877C08618339161EE2 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		55A5264E336AEDD1495796F5 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		43A5218D223AA21E0A55D986 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		151135F18422E2B1368D7BC2 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		046FA2877C08618339161EE2 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		B36C44190E6AEEBFA3DB3046 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
 		FB3773F08466794F949B0AFF = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
 		74125C6A6DE28C538A518C3C = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		A5A4B15B9F5C3D32C82DFDC6 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; };
 		151135F18422E2B1368D7BC2 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		6E1144678BD61868D73EF1FB = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		23CF69B4C644D1E6E61E5C82 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		2767E1D082874D301D5D5F43 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
 		23CF69B4C644D1E6E61E5C82 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		D9FB1A5365FEEB854A0FF7BF = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
 		55A5264E336AEDD1495796F5 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		74125C6A6DE28C538A518C3C = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		12E1601866B3489844AFD645 = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Introjucer.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		F4C5CF1AA7EB9298043D89D3 = { isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = "SOURCE_ROOT"; };
 		3417A0C1AE7900A7E07C1CA1 = { isa = PBXFileReference; lastKnownFileType = file.icns; name = Icon.icns; path = Icon.icns; sourceTree = "SOURCE_ROOT"; };
@@ -217,6 +217,12 @@
 				B4F88060202011416CB3278B,
 				1C26D9DA0B2D0FF8F2CEC721,
 				31B5EB3CEA43BE4B473DCC85 ); name = BinaryData; sourceTree = "<group>"; };
 		B01AA6CC1327A5DBCB35B7BF = { isa = PBXGroup; children = (
 				65EDE353CFC4C222043C80AB,
 				644797EB12AAB2529ED6786E,
 				38883F6AABCF4D47FC02B11F,
 				EB77B261C62447EE22D136DD,
 				2436CB32D02E7E3293665601 ); name = "The Introjucer"; sourceTree = "<group>"; };
 		265749F75DBA86EC3F19FE34 = { isa = PBXGroup; children = (
 				C86084A495B96EA215958914,
 				D02830A908A07FD46F7387DA,
@@ -230,26 +236,22 @@
 				F4C5CF1AA7EB9298043D89D3,
 				3417A0C1AE7900A7E07C1CA1 ); name = Resources; sourceTree = "<group>"; };
 		0D737FA088906E13707BAEB7 = { isa = PBXGroup; children = (
 				046FA2877C08618339161EE2,
 				55A5264E336AEDD1495796F5,
 				43A5218D223AA21E0A55D986,
 				151135F18422E2B1368D7BC2,
 				046FA2877C08618339161EE2,
 				B36C44190E6AEEBFA3DB3046,
 				FB3773F08466794F949B0AFF,
 				74125C6A6DE28C538A518C3C,
 				A5A4B15B9F5C3D32C82DFDC6,
 				151135F18422E2B1368D7BC2,
 				6E1144678BD61868D73EF1FB,
 				23CF69B4C644D1E6E61E5C82,
 				2767E1D082874D301D5D5F43,
 				23CF69B4C644D1E6E61E5C82,
 				D9FB1A5365FEEB854A0FF7BF,
 				55A5264E336AEDD1495796F5 ); name = Frameworks; sourceTree = "<group>"; };
 				74125C6A6DE28C538A518C3C ); name = Frameworks; sourceTree = "<group>"; };
 		18794C3CE7D0C95A5A70F213 = { isa = PBXGroup; children = (
 				12E1601866B3489844AFD645 ); name = Products; sourceTree = "<group>"; };
 		B01AA6CC1327A5DBCB35B7BF = { isa = PBXGroup; children = (
 				65EDE353CFC4C222043C80AB,
 				644797EB12AAB2529ED6786E,
 				38883F6AABCF4D47FC02B11F,
 				EB77B261C62447EE22D136DD,
 				2436CB32D02E7E3293665601,
 		F03291953F0A7EA46599E27B = { isa = PBXGroup; children = (
 				B01AA6CC1327A5DBCB35B7BF,
 				265749F75DBA86EC3F19FE34,
 				EAC5B9DBB227CB2A002EF355,
 				0D737FA088906E13707BAEB7,
@@ -354,23 +356,23 @@
 				1457A52734BA97A13610ECF1,
 				20EDB5C810855EB960F520FC ); runOnlyForDeploymentPostprocessing = 0; };
 		08881173C882953BE5F11D6C = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = (
 				7BDFF9F0E16DF33A980F46DC,
 				1FD6A59398E3618F79475867,
 				B703C44375C75E5AB099E74A,
 				022036CBB0FBE47C417A6222,
 				7BDFF9F0E16DF33A980F46DC,
 				52A4EFC1F732A9D5BBB61AF5,
 				C65112B26E0BB0BB8DBD3F3C,
 				E63745F5956C698352A2ACA0,
 				2C3270317859BA6DF8EC1458,
 				022036CBB0FBE47C417A6222,
 				AA7B50F22523465B07D4A25B,
 				DBE3CE9482B19CF1AE700805,
 				93C9F3F27602A33DDC9C2250,
 				DBE3CE9482B19CF1AE700805,
 				2E6836738CE7EB452FDC7E9A,
 				1FD6A59398E3618F79475867 ); runOnlyForDeploymentPostprocessing = 0; };
 				E63745F5956C698352A2ACA0 ); runOnlyForDeploymentPostprocessing = 0; };
 		EB946A866C16B958168C9A39 = { isa = PBXNativeTarget; buildConfigurationList = AC9DE3D3A6632D0494CC8609; buildPhases = (
 				87CCE4CB1FAB40B6F21DEACE,
 				5362E03ADF975A126C1F2F7B,
 				08881173C882953BE5F11D6C ); buildRules = ( ); dependencies = ( ); name = "The Introjucer"; productName = "The Introjucer"; productReference = 12E1601866B3489844AFD645; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
 		D64DFDDF5D2CD74A8171CF81 = { isa = PBXProject; buildConfigurationList = 045AC698C60073CCF5CC6116; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = B01AA6CC1327A5DBCB35B7BF; projectDirPath = ""; projectRoot = ""; targets = ( EB946A866C16B958168C9A39 ); };
 		D64DFDDF5D2CD74A8171CF81 = { isa = PBXProject; buildConfigurationList = 045AC698C60073CCF5CC6116; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = F03291953F0A7EA46599E27B; projectDirPath = ""; projectRoot = ""; targets = ( EB946A866C16B958168C9A39 ); };
 	};
 	rootObject = D64DFDDF5D2CD74A8171CF81;
 }
--- a/extras/Introjucer/Source/Application/jucer_CommonHeaders.h
+++ b/extras/Introjucer/Source/Application/jucer_CommonHeaders.h
@@ -48,9 +48,4 @@ const char* const sourceFileExtensions          = "cpp;mm;m;c;cc;cxx";
 const char* const headerFileExtensions          = "h;hpp;hxx";
 const char* const sourceOrHeaderFileExtensions  = "cpp;mm;m;c;cc;cxx;h;hpp;hxx";

 #define JUCE_PLUGINS_ROOT       "src/audio/plugin_client/"
 #define JUCE_PLUGINS_PATH_VST   JUCE_PLUGINS_ROOT "VST/"
 #define JUCE_PLUGINS_PATH_RTAS  JUCE_PLUGINS_ROOT "RTAS/"
 #define JUCE_PLUGINS_PATH_AU    JUCE_PLUGINS_ROOT "AU/"

 #endif
--- a/extras/Introjucer/Source/Project/jucer_Project.cpp
+++ b/extras/Introjucer/Source/Project/jucer_Project.cpp
@@ -523,6 +523,8 @@ Project::Item::~Item()
 {
 }

 Project::Item Project::Item::createCopy()         { Item i (*this); i.node = i.node.createCopy(); return i; }

 String Project::Item::getID() const               { return node [Ids::id_]; }
 void Project::Item::setID (const String& newID)   { node.setProperty (Ids::id_, newID, nullptr); }

--- a/extras/Introjucer/Source/Project/jucer_Project.h
+++ b/extras/Introjucer/Source/Project/jucer_Project.h
@@ -206,6 +206,7 @@ public:
        Item findItemForFile (const File& file) const;

        Item getParent() const;
        Item createCopy();

        const Drawable* getIcon() const;

--- a/extras/Introjucer/Source/Project/jucer_ProjectExport_Android.h
+++ b/extras/Introjucer/Source/Project/jucer_ProjectExport_Android.h
@@ -208,10 +208,9 @@ private:
    void writeAndroidMk (const File& file)
    {
        Array<RelativePath> files;
        findAllFilesToCompile (getMainGroup(), files);

        for (int i = 0; i < generatedGroups.size(); ++i)
            findAllFilesToCompile (generatedGroups.getReference(i), files);
        for (int i = 0; i < groups.size(); ++i)
            findAllFilesToCompile (groups.getReference(i), files);

        MemoryOutputStream mo;
        writeAndroidMk (mo, files);
--- a/extras/Introjucer/Source/Project/jucer_ProjectExport_MSVC.h
+++ b/extras/Introjucer/Source/Project/jucer_ProjectExport_MSVC.h
@@ -27,7 +27,7 @@
 #define __JUCER_PROJECTEXPORT_MSVC_JUCEHEADER__

 #include "jucer_ProjectExporter.h"

 #include "jucer_ProjectSaver.h"

 //==============================================================================
 class MSVCProjectExporterBase   : public ProjectExporter
@@ -102,21 +102,9 @@ protected:
                             .toWindowsStyle();
    }

    String getTargetBinarySuffix() const
    {
        if (projectType.isLibrary())
            return ".lib";
        else if (isRTAS())
            return ".dpm";
        else if (projectType.isAudioPlugin() || projectType.isBrowserPlugin())
            return ".dll";

        return ".exe";
    }

    String getPreprocessorDefs (const Project::BuildConfiguration& config, const String& joinString) const
    {
        StringPairArray defines;
        StringPairArray defines (msvcExtraPreprocessorDefs);
        defines.set ("WIN32", "");
        defines.set ("_WINDOWS", "");

@@ -130,19 +118,6 @@ protected:
            defines.set ("NDEBUG", "");
        }

        if (projectType.isCommandLineApp())
            defines.set ("_CONSOLE", "");

        if (projectType.isLibrary())
            defines.set ("_LIB", "");

        if (isRTAS())
        {
            RelativePath rtasFolder (getRTASFolder().toString(), RelativePath::unknown);
            defines.set ("JucePlugin_WinBag_path", CodeHelpers::addEscapeChars (rtasFolder.getChildFile ("WinBag")
                                                                                .toWindowsStyle().quoted()));
        }

        defines = mergePreprocessorDefs (defines, getAllPreprocessorDefs (config));

        StringArray result;
@@ -176,7 +151,7 @@ protected:
        if (targetBinary.isNotEmpty())
            return targetBinary;

        return config.getTargetBinaryName().toString() + getTargetBinarySuffix();
        return config.getTargetBinaryName().toString() + msvcTargetSuffix;
    }

    static String createConfigName (const Project::BuildConfiguration& config)
@@ -400,11 +375,20 @@ public:

        if (hasIcon)
        {
            generatedGroups.getReference(0).addFile (iconFile, -1);
            generatedGroups.getReference(0).addFile (rcFile, -1);
            for (int i = 0; i < groups.size(); ++i)
            {
                Project::Item& group = groups.getReference(i);

            generatedGroups.getReference(0).findItemForFile (iconFile).getShouldAddToResourceValue() = false;
            generatedGroups.getReference(0).findItemForFile (rcFile).getShouldAddToResourceValue() = false;
                if (group.getID() == ProjectSaver::getGeneratedGroupID())
                {
                    group.addFile (iconFile, -1);
                    group.addFile (rcFile, -1);

                    group.findItemForFile (iconFile).getShouldAddToResourceValue() = false;
                    group.findItemForFile (rcFile).getShouldAddToResourceValue() = false;
                    break;
                }
            }
        }

        {
@@ -522,11 +506,9 @@ protected:

    void createFiles (XmlElement& files)
    {
        addFiles (getMainGroup(), files, false);

        for (int i = 0; i < generatedGroups.size(); ++i)
            if (generatedGroups.getReference(i).getNumChildren() > 0)
                addFiles (generatedGroups.getReference(i), files, false);
        for (int i = 0; i < groups.size(); ++i)
            if (groups.getReference(i).getNumChildren() > 0)
                addFiles (groups.getReference(i), files, false);
    }

    //==============================================================================
@@ -547,8 +529,7 @@ protected:
        xml.setAttribute ("Name", createConfigName (config));
        xml.setAttribute ("OutputDirectory", FileHelpers::windowsStylePath (binariesPath));
        xml.setAttribute ("IntermediateDirectory", FileHelpers::windowsStylePath (intermediatesPath));
        xml.setAttribute ("ConfigurationType", (projectType.isAudioPlugin() || projectType.isBrowserPlugin() || isLibraryDLL())
                                                    ? "2" : (projectType.isLibrary() ? "4" : "1"));
        xml.setAttribute ("ConfigurationType", (msvcIsDLL || isLibraryDLL()) ? "2" : (projectType.isLibrary() ? "4" : "1"));
        xml.setAttribute ("UseOfMFC", "0");
        xml.setAttribute ("ATLMinimizesCRunTimeLibraryUsage", "false");
        xml.setAttribute ("CharacterSet", "2");
@@ -560,13 +541,11 @@ protected:

        XmlElement* customBuild = createToolElement (xml, "VCCustomBuildTool");

        if (isRTAS())
        {
            RelativePath rsrFile (getJucePathFromTargetFolder().getChildFile (JUCE_PLUGINS_PATH_RTAS "juce_RTAS_WinResources.rsr"));
        if (msvcPostBuildCommand.isNotEmpty())
            customBuild->setAttribute ("CommandLine", msvcPostBuildCommand);

            customBuild->setAttribute ("CommandLine", "copy /Y \"" + rsrFile.toWindowsStyle() + "\" \"$(TargetPath)\".rsr");
            customBuild->setAttribute ("Outputs", "\"$(TargetPath)\".rsr");
        }
        if (msvcPostBuildOutputs.isNotEmpty())
            customBuild->setAttribute ("Outputs", msvcPostBuildOutputs);

        createToolElement (xml, "VCXMLDataGeneratorTool");
        createToolElement (xml, "VCWebServiceProxyGeneratorTool");
@@ -601,8 +580,8 @@ protected:

            compiler->setAttribute ("AdditionalIncludeDirectories", replacePreprocessorTokens (config, getHeaderSearchPaths (config).joinIntoString (";")));
            compiler->setAttribute ("PreprocessorDefinitions", getPreprocessorDefs (config, ";"));
            compiler->setAttribute ("RuntimeLibrary", isRTAS() ? (isDebug ? 3 : 2) // MT DLL
                                                               : (isDebug ? 1 : 0)); // MT static
            compiler->setAttribute ("RuntimeLibrary", msvcNeedsDLLRuntimeLib ? (isDebug ? 3 : 2) // MT DLL
                                                                             : (isDebug ? 1 : 0)); // MT static
            compiler->setAttribute ("RuntimeTypeInfo", "true");
            compiler->setAttribute ("UsePrecompiledHeader", "0");
            compiler->setAttribute ("PrecompiledHeaderFile", FileHelpers::windowsStylePath (intermediatesPath + "/" + binaryName + ".pch"));
@@ -641,7 +620,7 @@ protected:
            linker->setAttribute ("IgnoreDefaultLibraryNames", isDebug ? "libcmt.lib, msvcrt.lib" : "");
            linker->setAttribute ("GenerateDebugInformation", isDebug ? "true" : "false");
            linker->setAttribute ("ProgramDatabaseFile", FileHelpers::windowsStylePath (intermediatesPath + "/" + binaryName + ".pdb"));
            linker->setAttribute ("SubSystem", projectType.isCommandLineApp() ? "1" : "2");
            linker->setAttribute ("SubSystem", msvcIsWindowsSubsystem ? "2" : "1");

            if (! isDebug)
            {
@@ -652,16 +631,16 @@ protected:

            linker->setAttribute ("TargetMachine", "1"); // (64-bit build = 5)

            if (msvcDelayLoadedDLLs.isNotEmpty())
                linker->setAttribute ("DelayLoadDLLs", msvcDelayLoadedDLLs);

            if (msvcModuleDefinitionFile.isNotEmpty())
                linker->setAttribute ("ModuleDefinitionFile", msvcModuleDefinitionFile);

            String extraLinkerOptions (getExtraLinkerFlags().toString());

            if (isRTAS())
            {
                extraLinkerOptions += " /FORCE:multiple";
                linker->setAttribute ("DelayLoadDLLs", "DAE.dll; DigiExt.dll; DSI.dll; PluginLib.dll; DSPManager.dll");
                linker->setAttribute ("ModuleDefinitionFile", getJucePathFromTargetFolder()
                                            .getChildFile (JUCE_PLUGINS_PATH_RTAS "juce_RTAS_WinExports.def")
                                            .toWindowsStyle());
            }
            if (msvcExtraLinkerOptions.isNotEmpty())
                extraLinkerOptions << ' ' << msvcExtraLinkerOptions;

            if (extraLinkerOptions.isNotEmpty())
                linker->setAttribute ("AdditionalOptions", replacePreprocessorTokens (config, extraLinkerOptions).trim());
@@ -818,10 +797,9 @@ private:
    {
        const String defaultConfigName (createConfigName (configs.getReference(0)));

        const bool isDLL = projectType.isAudioPlugin() || projectType.isBrowserPlugin();
        String targetType, targetCode;

        if (isDLL)                                 { targetType = "\"Win32 (x86) Dynamic-Link Library\"";  targetCode = "0x0102"; }
        if (msvcIsDLL)                             { targetType = "\"Win32 (x86) Dynamic-Link Library\"";  targetCode = "0x0102"; }
        else if (projectType.isLibrary())          { targetType = "\"Win32 (x86) Static Library\"";        targetCode = "0x0104"; }
        else if (projectType.isCommandLineApp())   { targetType = "\"Win32 (x86) Console Application\"";   targetCode = "0x0103"; }
        else                                       { targetType = "\"Win32 (x86) Application\"";           targetCode = "0x0101"; }
@@ -919,8 +897,8 @@ private:
                    << "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "
                    << (isDebug ? " /debug" : "")
                    << " /nologo /machine:I386 /out:\"" << targetBinary << "\" "
                    << (isDLL ? "/dll" : (projectType.isCommandLineApp() ? "/subsystem:console "
                                                                         : "/subsystem:windows "))
                    << (msvcIsDLL ? "/dll" : (msvcIsWindowsSubsystem ? "/subsystem:windows "
                                                                     : "/subsystem:console "))
                    << replacePreprocessorTokens (config, getExtraLinkerFlags().toString()).trim() << newLine;
            }
        }
@@ -929,11 +907,9 @@ private:
            << "# Begin Target"  << newLine
            << targetList;

        writeFiles (out, getMainGroup());

        for (int i = 0; i < generatedGroups.size(); ++i)
            if (generatedGroups.getReference(i).getNumChildren() > 0)
                writeFiles (out, generatedGroups.getReference(i));
        for (int i = 0; i < groups.size(); ++i)
            if (groups.getReference(i).getNumChildren() > 0)
                writeFiles (out, groups.getReference(i));

        out << "# End Target" << newLine
            << "# End Project" << newLine;
@@ -1227,8 +1203,8 @@ protected:
                includePaths.add ("%(AdditionalIncludeDirectories)");
                cl->createNewChildElement ("AdditionalIncludeDirectories")->addTextElement (includePaths.joinIntoString (";"));
                cl->createNewChildElement ("PreprocessorDefinitions")->addTextElement (getPreprocessorDefs (config, ";") + ";%(PreprocessorDefinitions)");
                cl->createNewChildElement ("RuntimeLibrary")->addTextElement (isRTAS() ? (isDebug ? "MultiThreadedDLLDebug" : "MultiThreadedDLL")
                                                                                       : (isDebug ? "MultiThreadedDebug" : "MultiThreaded"));
                cl->createNewChildElement ("RuntimeLibrary")->addTextElement (msvcNeedsDLLRuntimeLib ? (isDebug ? "MultiThreadedDLLDebug" : "MultiThreadedDLL")
                                                                                                     : (isDebug ? "MultiThreadedDebug" : "MultiThreaded"));
                cl->createNewChildElement ("RuntimeTypeInfo")->addTextElement ("true");
                cl->createNewChildElement ("PrecompiledHeader");
                cl->createNewChildElement ("AssemblerListingLocation")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
@@ -1256,7 +1232,7 @@ protected:
                                                                                                        : "%(IgnoreSpecificDefaultLibraries)");
                link->createNewChildElement ("GenerateDebugInformation")->addTextElement (isDebug ? "true" : "false");
                link->createNewChildElement ("ProgramDatabaseFile")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/" + binaryName + ".pdb"));
                link->createNewChildElement ("SubSystem")->addTextElement (projectType.isCommandLineApp() ? "Console" : "Windows");
                link->createNewChildElement ("SubSystem")->addTextElement (msvcIsWindowsSubsystem ? "Windows" : "Console");
                link->createNewChildElement ("TargetMachine")->addTextElement ("MachineX86");

                if (! isDebug)
@@ -1282,11 +1258,9 @@ protected:
            XmlElement* cppFiles = projectXml.createNewChildElement ("ItemGroup");
            XmlElement* headerFiles = projectXml.createNewChildElement ("ItemGroup");

            addFilesToCompile (getMainGroup(), *cppFiles, *headerFiles, false);

            for (int i = 0; i < generatedGroups.size(); ++i)
                if (generatedGroups.getReference(i).getNumChildren() > 0)
                    addFilesToCompile (generatedGroups.getReference(i), *cppFiles, *headerFiles, false);
            for (int i = 0; i < groups.size(); ++i)
                if (groups.getReference(i).getNumChildren() > 0)
                    addFilesToCompile (groups.getReference(i), *cppFiles, *headerFiles, false);
        }

        if (hasIcon)
@@ -1318,7 +1292,7 @@ protected:
    String getProjectType() const
    {
        if (projectType.isGUIApplication() || projectType.isCommandLineApp())   return "Application";
        else if (projectType.isAudioPlugin() || projectType.isBrowserPlugin())  return "DynamicLibrary";
        else if (msvcIsDLL)                                                     return "DynamicLibrary";
        else if (projectType.isLibrary())                                       return "StaticLibrary";

        jassertfalse;
@@ -1433,15 +1407,13 @@ protected:
        filterXml.setAttribute ("ToolsVersion", "4.0");
        filterXml.setAttribute ("xmlns", "http://schemas.microsoft.com/developer/msbuild/2003");

        XmlElement* groups  = filterXml.createNewChildElement ("ItemGroup");
        XmlElement* cpps    = filterXml.createNewChildElement ("ItemGroup");
        XmlElement* headers = filterXml.createNewChildElement ("ItemGroup");

        addFilesToFilter (getMainGroup(), projectName, *cpps, *headers, *groups);
        XmlElement* groupsXml  = filterXml.createNewChildElement ("ItemGroup");
        XmlElement* cpps       = filterXml.createNewChildElement ("ItemGroup");
        XmlElement* headers    = filterXml.createNewChildElement ("ItemGroup");

        for (int i = 0; i < generatedGroups.size(); ++i)
            if (generatedGroups.getReference(i).getNumChildren() > 0)
                addFilesToFilter (generatedGroups.getReference(i), project.getJuceCodeGroupName(), *cpps, *headers, *groups);
        for (int i = 0; i < groups.size(); ++i)
            if (groups.getReference(i).getNumChildren() > 0)
                addFilesToFilter (groups.getReference(i), groups.getReference(i).getName().toString(), *cpps, *headers, *groupsXml);

        if (iconFile.exists())
        {
--- a/extras/Introjucer/Source/Project/jucer_ProjectExport_Make.h
+++ b/extras/Introjucer/Source/Project/jucer_ProjectExport_Make.h
@@ -87,10 +87,8 @@ public:
    void create()
    {
        Array<RelativePath> files;
        findAllFilesToCompile (getMainGroup(), files);

        for (int i = 0; i < generatedGroups.size(); ++i)
            findAllFilesToCompile (generatedGroups.getReference(i), files);
        for (int i = 0; i < groups.size(); ++i)
            findAllFilesToCompile (groups.getReference(i), files);

        MemoryOutputStream mo;
        writeMakefile (mo, files);
@@ -157,7 +155,7 @@ private:
    {
        out << "  LDFLAGS += -L$(BINDIR) -L$(LIBDIR)";

        if (projectType.isAudioPlugin())
        if (makefileIsDLL)
            out << " -shared";

        {
@@ -207,7 +205,7 @@ private:
        if (config.isDebug().getValue())
            out << " -g -ggdb";

        if (projectType.isAudioPlugin())
        if (makefileIsDLL)
            out << " -fPIC";

        out << " -O" << config.getGCCOptimisationFlag() << newLine;
@@ -226,8 +224,8 @@ private:

        if (projectType.isLibrary())
            targetName = getLibbedFilename (targetName);
        else if (isVST())
            targetName = targetName.upToLastOccurrenceOf (".", false, false) + ".so";
        else
            targetName = targetName.upToLastOccurrenceOf (".", false, false) + makefileTargetSuffix;

        out << "  TARGET := " << escapeSpaces (targetName) << newLine;

--- a/extras/Introjucer/Source/Project/jucer_ProjectExport_XCode.h
+++ b/extras/Introjucer/Source/Project/jucer_ProjectExport_XCode.h
@@ -147,7 +147,7 @@ public:
    }

 private:
    OwnedArray<ValueTree> pbxBuildFiles, pbxFileReferences, groups, misc, projectConfigs, targetConfigs;
    OwnedArray<ValueTree> pbxBuildFiles, pbxFileReferences, pbxGroups, misc, projectConfigs, targetConfigs;
    StringArray buildPhaseIDs, resourceIDs, sourceIDs, frameworkIDs;
    StringArray frameworkFileIDs, rezFileIDs, resourceFileRefs;
    File infoPlistFile, iconFile;
@@ -164,25 +164,13 @@ private:

    File getProjectBundle() const                 { return getTargetFolder().getChildFile (project.getProjectFilenameRoot()).withFileExtension (".xcodeproj"); }

    bool hasPList() const                         { return ! (projectType.isLibrary() || projectType.isCommandLineApp()); }
    String getAudioPluginBundleExtension() const  { return "component"; }

    //==============================================================================
    void createObjects()
    {
        if (! projectType.isLibrary())
            addFrameworks();

        const String productName (configs.getReference(0).getTargetBinaryName().toString());

        if (projectType.isGUIApplication())         addBuildProduct ("wrapper.application", productName + ".app");
        else if (projectType.isCommandLineApp())    addBuildProduct ("compiled.mach-o.executable", productName);
        else if (projectType.isLibrary())           addBuildProduct ("archive.ar", getLibbedFilename (productName));
        else if (projectType.isAudioPlugin())       addBuildProduct ("wrapper.cfbundle", productName + "." + getAudioPluginBundleExtension());
        else if (projectType.isBrowserPlugin())     addBuildProduct ("wrapper.cfbundle", productName + ".plugin");
        else jassert (productName.isEmpty());
        addFrameworks();
        addMainBuildProduct();

        if (hasPList())
        if (xcodeCreatePList)
        {
            RelativePath plistPath (infoPlistFile, getTargetFolder(), RelativePath::buildTargetFolder);
            addFileReference (plistPath.toUnixStyle());
@@ -197,7 +185,35 @@ private:
            resourceFileRefs.add (createID (iconPath));
        }

        addProjectItem (getMainGroup());
        {
            StringArray topLevelGroupIDs;

            for (int i = 0; i < groups.size(); ++i)
                if (groups.getReference(i).getNumChildren() > 0)
                    topLevelGroupIDs.add (addProjectItem (groups.getReference(i)));

            { // Add 'resources' group
                String resourcesGroupID (createID ("__resources"));
                addGroup (resourcesGroupID, "Resources", resourceFileRefs);
                topLevelGroupIDs.add (resourcesGroupID);
            }

            { // Add 'frameworks' group
                String frameworksGroupID (createID ("__frameworks"));
                addGroup (frameworksGroupID, "Frameworks", frameworkFileIDs);
                topLevelGroupIDs.add (frameworksGroupID);
            }

            { // Add 'products' group
                String productsGroupID (createID ("__products"));
                StringArray products;
                products.add (createID ("__productFileID"));
                addGroup (productsGroupID, "Products", products);
                topLevelGroupIDs.add (productsGroupID);
            }

            addGroup (createID ("__mainsourcegroup"), "Source", topLevelGroupIDs);
        }

        for (int i = 0; i < configs.size(); ++i)
        {
@@ -221,8 +237,7 @@ private:
        if (! projectType.isLibrary())
            addBuildPhase ("PBXFrameworksBuildPhase", frameworkIDs);

        if (projectType.isAudioPlugin())
            addPluginShellScriptPhase();
        addShellScriptPhase();

        addTargetObject();
        addProjectObject();
@@ -333,7 +348,7 @@ private:

    void writeInfoPlistFile()
    {
        if (! hasPList())
        if (! xcodeCreatePList)
            return;

        XmlElement plist ("plist");
@@ -346,18 +361,8 @@ private:
        addPlistDictionaryKey (dict, "CFBundleIconFile",            iconFile.exists() ? iconFile.getFileName() : String::empty);
        addPlistDictionaryKey (dict, "CFBundleIdentifier",          project.getBundleIdentifier().toString());
        addPlistDictionaryKey (dict, "CFBundleName",                projectName);

        if (projectType.isAudioPlugin())
        {
            addPlistDictionaryKey (dict, "CFBundlePackageType",     "TDMw");
            addPlistDictionaryKey (dict, "CFBundleSignature",       "PTul");
        }
        else
        {
            addPlistDictionaryKey (dict, "CFBundlePackageType",     "APPL");
            addPlistDictionaryKey (dict, "CFBundleSignature",       "????");
        }

        addPlistDictionaryKey (dict, "CFBundlePackageType",         xcodePackageType);
        addPlistDictionaryKey (dict, "CFBundleSignature",           xcodeBundleSignature);
        addPlistDictionaryKey (dict, "CFBundleShortVersionString",  project.getVersion().toString());
        addPlistDictionaryKey (dict, "CFBundleVersion",             project.getVersion().toString());

@@ -408,7 +413,7 @@ private:
        return searchPaths;
    }

    void getLinkerFlagsForStaticLibrary (const RelativePath& library, StringArray& flags, StringArray& librarySearchPaths)
    static void getLinkerFlagsForStaticLibrary (const RelativePath& library, StringArray& flags, StringArray& librarySearchPaths)
    {
        jassert (library.getFileNameWithoutExtension().substring (0, 3) == "lib");

@@ -423,18 +428,14 @@ private:

    void getLinkerFlags (const Project::BuildConfiguration& config, StringArray& flags, StringArray& librarySearchPaths)
    {
        if (projectType.isAudioPlugin())
        {
        if (xcodeIsBundle)
            flags.add ("-bundle");

            if (isRTAS() && getRTASFolder().toString().isNotEmpty())
            {
                getLinkerFlagsForStaticLibrary (RelativePath (getRTASFolder().toString(), RelativePath::buildTargetFolder)
                                                    .getChildFile (config.isDebug().getValue() ? "MacBag/Libs/Debug/libPluginLibrary.a"
                                                                                               : "MacBag/Libs/Release/libPluginLibrary.a"),
                                                flags, librarySearchPaths);
            }
        }
        const Array<RelativePath>& extraLibs = config.isDebug().getValue() ? xcodeExtraLibrariesDebug
                                                                           : xcodeExtraLibrariesRelease;

        for (int i = 0; i < extraLibs.size(); ++i)
            getLinkerFlagsForStaticLibrary (extraLibs.getReference(i), flags, librarySearchPaths);

        if (project.getJuceLinkageMode() == Project::useLinkedJuce)
        {
@@ -480,7 +481,7 @@ private:

        s.add ("ZERO_LINK = NO");

        if (! isRTAS())   // (dwarf seems to be incompatible with the RTAS libs)
        if (xcodeCanUseDwarf)
            s.add ("DEBUG_INFORMATION_FORMAT = \"dwarf\"");

        s.add ("PRODUCT_NAME = \"" + config.getTargetBinaryName().toString() + "\"");
@@ -506,26 +507,20 @@ private:
        if (extraFlags.isNotEmpty())
            s.add ("OTHER_CPLUSPLUSFLAGS = " + extraFlags);

        if (projectType.isGUIApplication())
        {
            s.add ("INSTALL_PATH = \"$(HOME)/Applications\"");
        }
        else if (projectType.isAudioPlugin())
        if (xcodeProductInstallPath.isNotEmpty())
            s.add ("INSTALL_PATH = \"" + xcodeProductInstallPath + "\"");

        if (xcodeIsBundle)
        {
            s.add ("LIBRARY_STYLE = Bundle");
            s.add ("INSTALL_PATH = \"$(HOME)/Library/Audio/Plug-Ins/Components/\"");
            s.add ("WRAPPER_EXTENSION = " + getAudioPluginBundleExtension());
            s.add ("WRAPPER_EXTENSION = " + xcodeBundleExtension.substring (1));
            s.add ("GENERATE_PKGINFO_FILE = YES");
            s.add ("OTHER_REZFLAGS = \"-d ppc_$ppc -d i386_$i386 -d ppc64_$ppc64 -d x86_64_$x86_64"
                   " -I /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Versions/A/Headers"
                   " -I \\\"$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase\\\"\"");
        }
        else if (projectType.isBrowserPlugin())
        {
            s.add ("LIBRARY_STYLE = Bundle");
            s.add ("INSTALL_PATH = \"/Library/Internet Plug-Ins/\"");
        }
        else if (projectType.isLibrary())

        if (xcodeOtherRezFlags.isNotEmpty())
            s.add ("OTHER_REZFLAGS = \"" + xcodeOtherRezFlags + "\"");

        if (projectType.isLibrary())
        {
            if (config.getTargetBinaryRelativePath().toString().isNotEmpty())
            {
@@ -539,13 +534,6 @@ private:
            s.add ("CONFIGURATION_BUILD_DIR = \"$(BUILD_DIR)\"");
            s.add ("DEPLOYMENT_LOCATION = YES");
        }
        else if (projectType.isCommandLineApp())
        {
        }
        else
        {
            jassertfalse;
        }

        if (! iPhone)
        {
@@ -639,24 +627,19 @@ private:

    void addFrameworks()
    {
        StringArray s;

        if (iPhone)
        {
            s.addTokens ("UIKit Foundation CoreGraphics CoreText AudioToolbox QuartzCore OpenGLES", false);
        }
        else
        if (! projectType.isLibrary())
        {
            s.addTokens ("Cocoa Carbon IOKit CoreAudio CoreMIDI WebKit DiscRecording OpenGL QuartzCore QTKit QuickTime AudioToolbox", false);
            StringArray s (xcodeFrameworks);

            if (isAU())
                s.addTokens ("AudioUnit CoreAudioKit AudioToolbox", false);
            else if (project.getConfigFlag ("JUCE_PLUGINHOST_AU").toString() == Project::configFlagEnabled)
                s.addTokens ("AudioUnit CoreAudioKit", false);
        }
            s.addTokens (iPhone ? "UIKit Foundation CoreGraphics CoreText AudioToolbox QuartzCore OpenGLES"
                                : "Cocoa Carbon IOKit CoreAudio CoreMIDI WebKit DiscRecording OpenGL QuartzCore QTKit QuickTime AudioToolbox", false);

            s.removeDuplicates (true);
            s.sort (true);

        for (int i = 0; i < s.size(); ++i)
            addFramework (s[i]);
            for (int i = 0; i < s.size(); ++i)
                addFramework (s[i]);
        }
    }

    //==============================================================================
@@ -671,7 +654,7 @@ private:
        Array <ValueTree*> objects;
        objects.addArray (pbxBuildFiles);
        objects.addArray (pbxFileReferences);
        objects.addArray (groups);
        objects.addArray (pbxGroups);
        objects.addArray (targetConfigs);
        objects.addArray (projectConfigs);
        objects.addArray (misc);
@@ -850,47 +833,31 @@ private:
        v->setProperty ("children", "(" + indentList (childIDs, ",") + " )", 0);
        v->setProperty (Ids::name, groupName, 0);
        v->setProperty ("sourceTree", "<group>", 0);
        groups.add (v);
        pbxGroups.add (v);
    }

    String addGroup (const Project::Item& item, StringArray& childIDs)
    {
        String groupName (item.getName().toString());

        if (item.isMainGroup())
        {
            groupName = "Source";

            for (int i = 0; i < generatedGroups.size(); ++i)
                if (generatedGroups.getReference(i).getNumChildren() > 0)
                    childIDs.add (addProjectItem (generatedGroups.getReference(i)));

            { // Add 'resources' group
                String resourcesGroupID (createID ("__resources"));
                addGroup (resourcesGroupID, "Resources", resourceFileRefs);
                childIDs.add (resourcesGroupID);
            }

            { // Add 'frameworks' group
                String frameworksGroupID (createID ("__frameworks"));
                addGroup (frameworksGroupID, "Frameworks", frameworkFileIDs);
                childIDs.add (frameworksGroupID);
            }

            { // Add 'products' group
                String productsGroupID (createID ("__products"));
                StringArray products;
                products.add (createID ("__productFileID"));
                addGroup (productsGroupID, "Products", products);
                childIDs.add (productsGroupID);
            }
        }

        const String groupName (item.getName().toString());
        const String groupID (getIDForGroup (item));
        addGroup (groupID, groupName, childIDs);
        return groupID;
    }

    void addMainBuildProduct()
    {
        jassert (xcodeFileType.isNotEmpty());
        jassert (xcodeBundleExtension.isEmpty() || xcodeBundleExtension.startsWithChar('.'));
        String productName (configs.getReference(0).getTargetBinaryName().toString());

        if (xcodeFileType == "archive.ar")
            productName = getLibbedFilename (productName);
        else
            productName += xcodeBundleExtension;

        addBuildProduct (xcodeFileType, productName);
    }

    void addBuildProduct (const String& fileType, const String& binaryName)
    {
        ValueTree* v = new ValueTree (createID ("__productFileID"));
@@ -954,7 +921,7 @@ private:

    void addTargetObject()
    {
        ValueTree* v = new ValueTree (createID ("__target"));
        ValueTree* const v = new ValueTree (createID ("__target"));
        v->setProperty ("isa", "PBXNativeTarget", 0);
        v->setProperty ("buildConfigurationList", createID ("__configList"), 0);
        v->setProperty ("buildPhases", "(" + indentList (buildPhaseIDs, ",") + " )", 0);
@@ -964,55 +931,41 @@ private:
        v->setProperty ("productName", projectName, 0);
        v->setProperty ("productReference", createID ("__productFileID"), 0);

        if (projectType.isGUIApplication())
        {
            v->setProperty ("productInstallPath", "$(HOME)/Applications", 0);
            v->setProperty ("productType", "com.apple.product-type.application", 0);
        }
        else if (projectType.isCommandLineApp())
        {
            v->setProperty ("productInstallPath", "/usr/bin", 0);
            v->setProperty ("productType", "com.apple.product-type.tool", 0);
        }
        else if (projectType.isAudioPlugin() || projectType.isBrowserPlugin())
        {
            v->setProperty ("productInstallPath", "$(HOME)/Library/Audio/Plug-Ins/Components/", 0);
            v->setProperty ("productType", "com.apple.product-type.bundle", 0);
        }
        else if (projectType.isLibrary())
        {
            v->setProperty ("productType", "com.apple.product-type.library.static", 0);
        }
        else
            jassertfalse; //xxx
        if (xcodeProductInstallPath.isNotEmpty())
            v->setProperty ("productInstallPath", xcodeProductInstallPath, 0);

        jassert (xcodeProductType.isNotEmpty());
        v->setProperty ("productType", xcodeProductType, 0);

        misc.add (v);
    }

    void addProjectObject()
    {
        ValueTree* v = new ValueTree (createID ("__root"));
        ValueTree* const v = new ValueTree (createID ("__root"));
        v->setProperty ("isa", "PBXProject", 0);
        v->setProperty ("buildConfigurationList", createID ("__projList"), 0);
        v->setProperty ("compatibilityVersion", "Xcode 3.1", 0);
        v->setProperty ("hasScannedForEncodings", (int) 0, 0);
        v->setProperty ("mainGroup", getIDForGroup (getMainGroup()), 0);
        v->setProperty ("mainGroup", createID ("__mainsourcegroup"), 0);
        v->setProperty ("projectDirPath", "\"\"", 0);
        v->setProperty ("projectRoot", "\"\"", 0);
        v->setProperty ("targets", "( " + createID ("__target") + " )", 0);
        misc.add (v);
    }

    void addPluginShellScriptPhase()
    void addShellScriptPhase()
    {
        ValueTree* v = addBuildPhase ("PBXShellScriptBuildPhase", StringArray());
        v->setProperty (Ids::name, "Copy to the different plugin folders", 0);
        v->setProperty ("shellPath", "/bin/sh", 0);
        v->setProperty ("shellScript", String::fromUTF8 (BinaryData::AudioPluginXCodeScript_txt, BinaryData::AudioPluginXCodeScript_txtSize)
                                            .replace ("\\", "\\\\")
                                            .replace ("\"", "\\\"")
                                            .replace ("\r\n", "\\n")
                                            .replace ("\n", "\\n"), 0);
        if (xcodeShellScript.isNotEmpty())
        {
            ValueTree* const v = addBuildPhase ("PBXShellScriptBuildPhase", StringArray());
            v->setProperty (Ids::name, xcodeShellScriptTitle, 0);
            v->setProperty ("shellPath", "/bin/sh", 0);
            v->setProperty ("shellScript", xcodeShellScript.replace ("\\", "\\\\")
                                                           .replace ("\"", "\\\"")
                                                           .replace ("\r\n", "\\n")
                                                           .replace ("\n", "\\n"), 0);
        }
    }

    //==============================================================================
--- a/extras/Introjucer/Source/Project/jucer_ProjectExporter.cpp
+++ b/extras/Introjucer/Source/Project/jucer_ProjectExporter.cpp
@@ -117,7 +117,14 @@ ProjectExporter* ProjectExporter::createPlatformDefaultExporter (Project& projec

 //==============================================================================
 ProjectExporter::ProjectExporter (Project& project_, const ValueTree& settings_)
    : project (project_),
    : xcodeIsBundle (false),
      xcodeCreatePList (false),
      xcodeCanUseDwarf (true),
      makefileIsDLL (false),
      msvcIsDLL (false),
      msvcIsWindowsSubsystem (true),
      msvcNeedsDLLRuntimeLib (false),
      project (project_),
      projectType (project_.getProjectType()),
      projectName (project_.getProjectName().toString()),
      projectFolder (project_.getFile().getParentDirectory()),
@@ -125,6 +132,8 @@ ProjectExporter::ProjectExporter (Project& project_, const ValueTree& settings_)
 {
    for (int i = 0; i < jmax (1, project.getNumConfigurations()); ++i)
        configs.add (project.getConfiguration (i));

    groups.add (project.getMainGroup().createCopy());
 }

 ProjectExporter::~ProjectExporter()
--- a/extras/Introjucer/Source/Project/jucer_ProjectExporter.h
+++ b/extras/Introjucer/Source/Project/jucer_ProjectExporter.h
@@ -79,10 +79,6 @@ public:
    Value getRTASFolder() const             { return getSetting (Ids::rtasFolder); }
    Value getAUFolder() const               { return getSetting (Ids::auFolder); }

    bool isVST() const                      { return (bool) project.getProjectType().isAudioPlugin() && (bool) project.shouldBuildVST().getValue(); }
    bool isRTAS() const                     { return (bool) project.getProjectType().isAudioPlugin() && (bool) project.shouldBuildRTAS().getValue(); }
    bool isAU() const                       { return (bool) project.getProjectType().isAudioPlugin() && (bool) project.shouldBuildAU().getValue(); }

    Value getExtraCompilerFlags() const     { return getSetting (Ids::extraCompilerFlags); }
    Value getExtraLinkerFlags() const       { return getSetting (Ids::extraLinkerFlags); }

@@ -121,14 +117,33 @@ public:
        String message;
    };

    Project::Item getMainGroup()           { return project.getMainGroup(); }

    RelativePath getJucePathFromTargetFolder() const;
    RelativePath getJucePathFromProjectFolder() const;

    Array<Project::Item> generatedGroups;
    //==============================================================================
    Array<Project::Item> groups;
    OwnedArray<LibraryModule> libraryModules;

    //==============================================================================
    String xcodePackageType, xcodeBundleSignature, xcodeBundleExtension;
    String xcodeProductType, xcodeProductInstallPath, xcodeFileType;
    String xcodeShellScript, xcodeShellScriptTitle, xcodeOtherRezFlags;
    bool xcodeIsBundle, xcodeCreatePList, xcodeCanUseDwarf;
    StringArray xcodeFrameworks;
    Array<RelativePath> xcodeExtraLibrariesDebug, xcodeExtraLibrariesRelease;

    //==============================================================================
    String makefileTargetSuffix;
    bool makefileIsDLL;

    //==============================================================================
    String msvcTargetSuffix;
    StringPairArray msvcExtraPreprocessorDefs;
    bool msvcIsDLL, msvcIsWindowsSubsystem, msvcNeedsDLLRuntimeLib;
    String msvcExtraLinkerOptions, msvcDelayLoadedDLLs, msvcModuleDefinitionFile;
    String msvcPostBuildCommand, msvcPostBuildOutputs;

    //==============================================================================
    void createLibraryModules();

 protected:
--- a/extras/Introjucer/Source/Project/jucer_ProjectSaver.h
+++ b/extras/Introjucer/Source/Project/jucer_ProjectSaver.h
@@ -37,7 +37,7 @@ public:
        : project (project_), projectFile (projectFile_),
          generatedFilesGroup (Project::Item::createGroup (project, project.getJuceCodeGroupName()))
    {
          generatedFilesGroup.setID ("__jucelibfiles");
        generatedFilesGroup.setID (getGeneratedGroupID());
    }

    Project& getProject() noexcept      { return project; }
@@ -95,6 +95,8 @@ public:
            << newLine;
    }

    static const char* getGeneratedGroupID() noexcept       { return "__jucelibfiles"; }

 private:
    Project& project;
    const File projectFile;
@@ -312,17 +314,15 @@ private:

            if (exporter->getTargetFolder().createDirectory())
            {
                project.getProjectType().prepareExporter (*exporter);

                // start with a copy of the basic files, as each exporter may modify it.
                const ValueTree generatedGroupCopy (generatedFilesGroup.getNode().createCopy());

                int j;
                for (j = 0; j < exporter->libraryModules.size(); ++j)
                    exporter->libraryModules.getUnchecked(j)->createFiles (*exporter, *this);

                exporter->generatedGroups.add (generatedFilesGroup);
                for (int j = 0; j < exporter->libraryModules.size(); ++j)
                    exporter->libraryModules.getUnchecked(j)->prepareExporter (*exporter, *this);

                for (j = 0; j < exporter->libraryModules.size(); ++j)
                    exporter->libraryModules.getUnchecked(j)->addExtraCodeGroups (*exporter, exporter->generatedGroups);
                exporter->groups.add (generatedFilesGroup);

                try
                {
--- a/extras/Introjucer/Source/Project/jucer_ProjectType.cpp
+++ b/extras/Introjucer/Source/Project/jucer_ProjectType.cpp
@@ -152,7 +152,7 @@ public:
        }
    }

    void createFiles (const ProjectExporter& exporter, ProjectSaver& projectSaver) const
    void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver) const
    {
        const Project& project = exporter.getProject();

@@ -195,10 +195,9 @@ public:
                project.getGeneratedCodeFolder().getChildFile (sourceWrapper).deleteFile();
            }
        }
    }

    void addExtraCodeGroups (const ProjectExporter& exporter, Array<Project::Item>& groups) const
    {
        if (project.isConfigFlagEnabled ("JUCE_PLUGINHOST_AU"))
            exporter.xcodeFrameworks.addTokens ("AudioUnit CoreAudioKit", false);
    }

    void addExtraSearchPaths (const ProjectExporter& exporter, StringArray& paths) const
@@ -213,7 +212,7 @@ public:
            createVSTPathEditor (exporter, props);
    }

    void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags)
    void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags) const
    {
        if (project.getJuceLinkageMode() == Project::notLinkedToJuce)
            return;
@@ -327,23 +326,28 @@ private:
    }
 };

 //==============================================================================
 #define JUCE_PLUGINS_ROOT       "src/audio/plugin_client/"
 #define JUCE_PLUGINS_PATH_VST   JUCE_PLUGINS_ROOT "VST/"
 #define JUCE_PLUGINS_PATH_RTAS  JUCE_PLUGINS_ROOT "RTAS/"
 #define JUCE_PLUGINS_PATH_AU    JUCE_PLUGINS_ROOT "AU/"

 //==============================================================================
 class VSTLibraryModule  : public LibraryModule
 {
 public:
    VSTLibraryModule() {}

    void createFiles (const ProjectExporter& exporter, ProjectSaver& projectSaver) const
    {
        writePluginCharacteristicsFile (projectSaver);
    }

    void getHeaderFiles (Project& project, StringArray& includePaths, StringArray& headerGuards)
    {
    }

    void addExtraCodeGroups (const ProjectExporter& exporter, Array<Project::Item>& groups) const
    void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver) const
    {
        writePluginCharacteristicsFile (projectSaver);

        exporter.makefileTargetSuffix = ".so";

        Project::Item group (Project::Item::createGroup (const_cast<ProjectExporter&> (exporter).getProject(), "Juce VST Wrapper"));
        group.setID ("__jucevstfiles");

@@ -355,7 +359,7 @@ public:
        for (const char** f = (exporter.isXcode() ? osxFiles : winFiles); *f != 0; ++f)
            group.addRelativeFile (exporter.getJucePathFromProjectFolder().getChildFile (*f), -1, true);

        groups.add (group);
        exporter.groups.add (group);
    }

    void addExtraSearchPaths (const ProjectExporter& exporter, StringArray& paths) const
@@ -376,7 +380,7 @@ public:
        createVSTPathEditor (exporter, props);
    }

    void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags)
    void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags) const
    {
    }
 };
@@ -387,17 +391,39 @@ class RTASLibraryModule  : public LibraryModule
 public:
    RTASLibraryModule() {}

    void createFiles (const ProjectExporter& exporter, ProjectSaver& projectSaver) const
    {
        writePluginCharacteristicsFile (projectSaver);
    }

    void getHeaderFiles (Project& project, StringArray& includePaths, StringArray& headerGuards)
    {
    }

    void addExtraCodeGroups (const ProjectExporter& exporter, Array<Project::Item>& groups) const
    void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver) const
    {
        exporter.xcodeCanUseDwarf = false;

        exporter.msvcTargetSuffix = ".dpm";
        exporter.msvcNeedsDLLRuntimeLib = true;

        RelativePath rtasFolder (exporter.getRTASFolder().toString(), RelativePath::projectFolder);
        exporter.msvcExtraPreprocessorDefs.set ("JucePlugin_WinBag_path", CodeHelpers::addEscapeChars (rtasFolder.getChildFile ("WinBag")
                                                                                .toWindowsStyle().quoted()));

        exporter.msvcExtraLinkerOptions = "/FORCE:multiple";
        exporter.msvcDelayLoadedDLLs = "DAE.dll; DigiExt.dll; DSI.dll; PluginLib.dll; DSPManager.dll";
        exporter.msvcModuleDefinitionFile = exporter.getJucePathFromTargetFolder()
                                                    .getChildFile (JUCE_PLUGINS_PATH_RTAS "juce_RTAS_WinExports.def")
                                                    .toWindowsStyle();

        exporter.msvcPostBuildOutputs = "\"$(TargetPath)\".rsr";
        exporter.msvcPostBuildCommand = "copy /Y \"" + exporter.getJucePathFromTargetFolder()
                                                               .getChildFile (JUCE_PLUGINS_PATH_RTAS "juce_RTAS_WinResources.rsr")
                                                               .toWindowsStyle()
                                           + "\" \"$(TargetPath)\".rsr";


        exporter.xcodeExtraLibrariesDebug.add   (rtasFolder.getChildFile ("MacBag/Libs/Debug/libPluginLibrary.a"));
        exporter.xcodeExtraLibrariesRelease.add (rtasFolder.getChildFile ("MacBag/Libs/Release/libPluginLibrary.a"));

        writePluginCharacteristicsFile (projectSaver);

        if (exporter.isXcode() || exporter.isVisualStudio())
        {
            Project::Item group (Project::Item::createGroup (const_cast<ProjectExporter&> (exporter).getProject(), "Juce RTAS Wrapper"));
@@ -422,15 +448,16 @@ public:
            {
                const RelativePath file (exporter.getJucePathFromProjectFolder().getChildFile (*f));
                group.addRelativeFile (file, -1, file.hasFileExtension ("cpp;mm;r"));
                group.getChild (group.getNumChildren() - 1).getShouldInhibitWarningsValue() = true;
            }

            groups.add (group);
            exporter.groups.add (group);
        }
    }

    void addExtraSearchPaths (const ProjectExporter& exporter, StringArray& paths) const
    {
        RelativePath sdkFolder (exporter.getRTASFolder().toString(), RelativePath::projectFolder);
        RelativePath rtasFolder (exporter.getRTASFolder().toString(), RelativePath::projectFolder);

        if (exporter.isVisualStudio())
        {
@@ -465,7 +492,7 @@ public:
                                "xplat/AVX/avx2/avx2sdk/inc" };

            for (int i = 0; i < numElementsInArray (p); ++i)
                paths.add (exporter.rebaseFromProjectFolderToBuildTarget (sdkFolder.getChildFile (p[i])).toWindowsStyle());
                paths.add (exporter.rebaseFromProjectFolderToBuildTarget (rtasFolder.getChildFile (p[i])).toWindowsStyle());
        }
        else if (exporter.isXcode())
        {
@@ -502,7 +529,7 @@ public:
                                "xplat/AVX/avx2/avx2sdk/utils" };

            for (int i = 0; i < numElementsInArray (p); ++i)
                paths.add (exporter.rebaseFromProjectFolderToBuildTarget (sdkFolder.getChildFile (p[i])).toUnixStyle());
                paths.add (exporter.rebaseFromProjectFolderToBuildTarget (rtasFolder.getChildFile (p[i])).toUnixStyle());
        }
    }

@@ -515,7 +542,7 @@ public:
        }
    }

    void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags)
    void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags) const
    {
    }
 };
@@ -526,19 +553,18 @@ class AULibraryModule  : public LibraryModule
 public:
    AULibraryModule() {}

    void createFiles (const ProjectExporter& exporter, ProjectSaver& projectSaver) const
    {
        writePluginCharacteristicsFile (projectSaver);
    }

    void getHeaderFiles (Project& project, StringArray& includePaths, StringArray& headerGuards)
    {
    }

    void addExtraCodeGroups (const ProjectExporter& exporter, Array<Project::Item>& groups) const
    void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver) const
    {
        writePluginCharacteristicsFile (projectSaver);

        if (exporter.isXcode())
        {
            exporter.xcodeFrameworks.addTokens ("AudioUnit CoreAudioKit", false);

            Project::Item group (Project::Item::createGroup (const_cast<ProjectExporter&> (exporter).getProject(), "Juce AU Wrapper"));
            group.setID ("__juceaufiles");

@@ -616,7 +642,7 @@ public:
                }
            }

            groups.add (group);
            exporter.groups.add (group);
        }
    }

@@ -633,7 +659,7 @@ public:
    {
    }

    void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags)
    void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags) const
    {
    }
 };
@@ -670,6 +696,10 @@ const ProjectType* ProjectType::findType (const String& typeCode)
    return nullptr;
 }

 void ProjectType::prepareExporter (ProjectExporter& exporter) const
 {
 }

 void ProjectType::createRequiredModules (Project& project, OwnedArray<LibraryModule>& modules) const
 {
    modules.add (new JuceLibraryModule());
@@ -684,6 +714,20 @@ public:
    static const char* getTypeName() noexcept   { return "guiapp"; }
    bool isGUIApplication() const               { return true; }

    void prepareExporter (ProjectExporter& exporter) const
    {
        exporter.xcodePackageType = "APPL";
        exporter.xcodeBundleSignature = "????";
        exporter.xcodeCreatePList = true;
        exporter.xcodeFileType = "wrapper.application";
        exporter.xcodeBundleExtension = ".app";
        exporter.xcodeProductType = "com.apple.product-type.application";
        exporter.xcodeProductInstallPath = "$(HOME)/Applications";

        exporter.msvcIsWindowsSubsystem = true;
        exporter.msvcTargetSuffix = ".exe";
    }

    void createRequiredModules (Project& project, OwnedArray<LibraryModule>& modules) const
    {
        ProjectType::createRequiredModules (project, modules);
@@ -699,6 +743,19 @@ public:
    static const char* getTypeName() noexcept   { return "consoleapp"; }
    bool isCommandLineApp() const               { return true; }

    void prepareExporter (ProjectExporter& exporter) const
    {
        exporter.xcodeCreatePList = false;
        exporter.xcodeFileType = "compiled.mach-o.executable";
        exporter.xcodeBundleExtension = String::empty;
        exporter.xcodeProductType = "com.apple.product-type.tool";
        exporter.xcodeProductInstallPath = "/usr/bin";

        exporter.msvcIsWindowsSubsystem = false;
        exporter.msvcTargetSuffix = ".exe";
        exporter.msvcExtraPreprocessorDefs.set ("_CONSOLE", "");
    }

    void createRequiredModules (Project& project, OwnedArray<LibraryModule>& modules) const
    {
        ProjectType::createRequiredModules (project, modules);
@@ -714,6 +771,19 @@ public:
    static const char* getTypeName() noexcept   { return "library"; }
    bool isLibrary() const                      { return true; }

    void prepareExporter (ProjectExporter& exporter) const
    {
        exporter.xcodeCreatePList = false;
        exporter.xcodeFileType = "archive.ar";
        exporter.xcodeProductType = "com.apple.product-type.library.static";
        exporter.xcodeProductInstallPath = String::empty;

        exporter.makefileTargetSuffix = ".so";

        exporter.msvcTargetSuffix = ".lib";
        exporter.msvcExtraPreprocessorDefs.set ("_LIB", "");
    }

    void createRequiredModules (Project& project, OwnedArray<LibraryModule>& modules) const
    {
        ProjectType::createRequiredModules (project, modules);
@@ -729,6 +799,30 @@ public:
    static const char* getTypeName() noexcept   { return "audioplug"; }
    bool isAudioPlugin() const                  { return true; }

    void prepareExporter (ProjectExporter& exporter) const
    {
        exporter.xcodeIsBundle = true;
        exporter.xcodeCreatePList = true;
        exporter.xcodePackageType = "TDMw";
        exporter.xcodeBundleSignature = "PTul";
        exporter.xcodeFileType = "wrapper.cfbundle";
        exporter.xcodeBundleExtension = ".component";
        exporter.xcodeProductType = "com.apple.product-type.bundle";
        exporter.xcodeProductInstallPath = "$(HOME)/Library/Audio/Plug-Ins/Components/";

        exporter.xcodeShellScriptTitle = "Copy to the different plugin folders";
        exporter.xcodeShellScript = String::fromUTF8 (BinaryData::AudioPluginXCodeScript_txt, BinaryData::AudioPluginXCodeScript_txtSize);

        exporter.xcodeOtherRezFlags = "-d ppc_$ppc -d i386_$i386 -d ppc64_$ppc64 -d x86_64_$x86_64"
                                      " -I /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Versions/A/Headers"
                                      " -I \\\"$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase\\\"";

        exporter.msvcTargetSuffix = ".dll";
        exporter.msvcIsDLL = true;

        exporter.makefileIsDLL = true;
    }

    void createRequiredModules (Project& project, OwnedArray<LibraryModule>& modules) const
    {
        ProjectType::createRequiredModules (project, modules);
@@ -745,10 +839,40 @@ public:
 };

 //==============================================================================
 static ProjectType_GUIApp guiType;
 static ProjectType_ConsoleApp consoleType;
 static ProjectType_Library staticLibType;
 static ProjectType_AudioPlugin audioPluginType;
 class ProjectType_BrowserPlugin  : public ProjectType
 {
 public:
    ProjectType_BrowserPlugin()  : ProjectType (getTypeName(), "Browser Plug-in") {}

    static const char* getTypeName() noexcept   { return "browserplug"; }
    bool isBrowserPlugin() const                { return true; }

    void prepareExporter (ProjectExporter& exporter) const
    {
        exporter.xcodeIsBundle = true;
        exporter.xcodeCreatePList = true;
        exporter.xcodeFileType = "wrapper.cfbundle";
        exporter.xcodeBundleExtension = ".plugin";
        exporter.xcodeProductType = "com.apple.product-type.bundle";
        exporter.xcodeProductInstallPath = "$(HOME)/Library/Internet Plug-Ins//";

        exporter.msvcTargetSuffix = ".dll";
        exporter.msvcIsDLL = true;

        exporter.makefileIsDLL = true;
    }

    void createRequiredModules (Project& project, OwnedArray<LibraryModule>& modules) const
    {
        ProjectType::createRequiredModules (project, modules);
    }
 };

 //==============================================================================
 static ProjectType_GUIApp       guiType;
 static ProjectType_ConsoleApp   consoleType;
 static ProjectType_Library      libraryType;
 static ProjectType_AudioPlugin  audioPluginType;

 //==============================================================================
 const char* ProjectType::getGUIAppTypeName()        { return ProjectType_GUIApp::getTypeName(); }
--- a/extras/Introjucer/Source/Project/jucer_ProjectType.h
+++ b/extras/Introjucer/Source/Project/jucer_ProjectType.h
@@ -38,12 +38,11 @@ public:
    LibraryModule();
    virtual ~LibraryModule() {}

    virtual void addExtraCodeGroups (const ProjectExporter& exporter, Array<Project::Item>& groups) const = 0;
    virtual void createFiles (const ProjectExporter& exporter, ProjectSaver& projectSaver) const = 0;
    virtual void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver) const = 0;
    virtual void getHeaderFiles (Project& project, StringArray& includePaths, StringArray& headerGuards) = 0;
    virtual void addExtraSearchPaths (const ProjectExporter& exporter, StringArray& paths) const = 0;
    virtual void createPropertyEditors (const ProjectExporter& exporter, Array <PropertyComponent*>& props) const = 0;
    virtual void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags) = 0;
    virtual void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags) const = 0;
 };


@@ -72,6 +71,7 @@ public:
    static const char* getConsoleAppTypeName();
    static const char* getAudioPluginTypeName();

    virtual void prepareExporter (ProjectExporter& exporter) const;
    virtual void createRequiredModules (Project& project, OwnedArray<LibraryModule>& modules) const;

 protected:
--- a/extras/JuceDemo/Builds/MacOSX/Juce
+++ b/extras/JuceDemo/Builds/MacOSX/Juce
@@ -6,18 +6,18 @@
 	objectVersion = 45;
 	objects = {

 		92A7143821252FB13891CC53 = { isa = PBXBuildFile; fileRef = 2B37CDCFCBC0AC0AEAA9A479; };
 		36AEC0EAE7AB9D061AD9EFEF = { isa = PBXBuildFile; fileRef = 7B6D428682221857EAEA1C7D; };
 		DEDBEF9AC48F8AD1502B6DC2 = { isa = PBXBuildFile; fileRef = 6A7D4DC561F2DD95ABD76F0D; };
 		29F75103FFB220F2E10CF9A9 = { isa = PBXBuildFile; fileRef = 3CE85049C3E91E38E71FF149; };
 		92A7143821252FB13891CC53 = { isa = PBXBuildFile; fileRef = 2B37CDCFCBC0AC0AEAA9A479; };
 		687BFA1946EAD55C5C39907C = { isa = PBXBuildFile; fileRef = DA3360514D221A36446DC6DE; };
 		ED283D0ABEC2EC312E40C6B4 = { isa = PBXBuildFile; fileRef = 010E9F48D32EA5C5451D8086; };
 		0CFE603DE523940AF3352227 = { isa = PBXBuildFile; fileRef = 9BE978B2BDA9B7DA3BE403B4; };
 		420A9C88B711F5E4997FAAD0 = { isa = PBXBuildFile; fileRef = CB7CDD93EE1469B969AF844E; };
 		29F75103FFB220F2E10CF9A9 = { isa = PBXBuildFile; fileRef = 3CE85049C3E91E38E71FF149; };
 		C1437C4A64EB72D2A86729D3 = { isa = PBXBuildFile; fileRef = 85E860BFDA9D53EF77C08873; };
 		F1BAE9DCD179C8784FF28F8D = { isa = PBXBuildFile; fileRef = 4A96850C150C1C6D87A0D21A; };
 		B9911F3AC6CADFB47D1EA8D7 = { isa = PBXBuildFile; fileRef = 4D3E0D18D24F78B6BDE0E5DA; };
 		F1BAE9DCD179C8784FF28F8D = { isa = PBXBuildFile; fileRef = 4A96850C150C1C6D87A0D21A; };
 		452052BBDBAF17DCC06EF521 = { isa = PBXBuildFile; fileRef = E0C3359BB4B5260CEB917D46; };
 		36AEC0EAE7AB9D061AD9EFEF = { isa = PBXBuildFile; fileRef = 7B6D428682221857EAEA1C7D; };
 		0CFE603DE523940AF3352227 = { isa = PBXBuildFile; fileRef = 9BE978B2BDA9B7DA3BE403B4; };
 		C0A3C433D146C7E1FFCADFB2 = { isa = PBXBuildFile; fileRef = 4ADECB09FD213B2E910EA229; };
 		78A66C2F9A9E2E6D011D8E5E = { isa = PBXBuildFile; fileRef = 885A20D277AD743C21C822B5; };
 		CE5C46E66485B7D77B5ADB4E = { isa = PBXBuildFile; fileRef = 42291DB48BF81754D90FE200; };
@@ -46,18 +46,18 @@
 		2E98B1DEA8B7FC20ACCD2E6D = { isa = PBXBuildFile; fileRef = F42C91375F3314CA6EE65697; };
 		3A2EC17F8472C338D6A26278 = { isa = PBXBuildFile; fileRef = 4D526A336B2E97ED42CADAD7; };
 		36B5D100604D9A300187B773 = { isa = PBXBuildFile; fileRef = 8679333E781A0A0116AE5D26; };
 		2B37CDCFCBC0AC0AEAA9A479 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		7B6D428682221857EAEA1C7D = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		6A7D4DC561F2DD95ABD76F0D = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		3CE85049C3E91E38E71FF149 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		2B37CDCFCBC0AC0AEAA9A479 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		DA3360514D221A36446DC6DE = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
 		010E9F48D32EA5C5451D8086 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
 		9BE978B2BDA9B7DA3BE403B4 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		CB7CDD93EE1469B969AF844E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; };
 		3CE85049C3E91E38E71FF149 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		85E860BFDA9D53EF77C08873 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		4A96850C150C1C6D87A0D21A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		4D3E0D18D24F78B6BDE0E5DA = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
 		4A96850C150C1C6D87A0D21A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		E0C3359BB4B5260CEB917D46 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
 		7B6D428682221857EAEA1C7D = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		9BE978B2BDA9B7DA3BE403B4 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		39B98C60B57B831FE5215CDD = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JuceDemo.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		1A9DEA62F6A3CD1FB5CF105B = { isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = "SOURCE_ROOT"; };
 		4ADECB09FD213B2E910EA229 = { isa = PBXFileReference; lastKnownFileType = file.icns; name = Icon.icns; path = Icon.icns; sourceTree = "SOURCE_ROOT"; };
@@ -141,13 +141,13 @@
 				013E12213AD7B4BEB28A31BE,
 				3369CDF7AFD79D6F3B3744B1,
 				C7327AD5191A22C1FBD4F5F9 ); name = "Binary Data"; sourceTree = "<group>"; };
 		A10CCE1B2A215D5AE12386E3 = { isa = PBXGroup; children = (
 		D6A4B94A747BFCF299B17932 = { isa = PBXGroup; children = (
 				885A20D277AD743C21C822B5,
 				42291DB48BF81754D90FE200,
 				49138F5652E637AA67CD4B70,
 				18BDC68F9701862603871A7A,
 				1045A435754FDEACC6D7259C,
 				7B2518B268DCBBF7B74F2B1D ); name = Source; sourceTree = "<group>"; };
 				7B2518B268DCBBF7B74F2B1D ); name = "Juce Demo"; sourceTree = "<group>"; };
 		4C2E644EAC72C263D09C74BB = { isa = PBXGroup; children = (
 				EE37A0ECE471A928C6170F9B,
 				E6EF5CE04768BA5B10050D51,
@@ -161,22 +161,22 @@
 				1A9DEA62F6A3CD1FB5CF105B,
 				4ADECB09FD213B2E910EA229 ); name = Resources; sourceTree = "<group>"; };
 		244B9AF7D858999910FD243E = { isa = PBXGroup; children = (
 				2B37CDCFCBC0AC0AEAA9A479,
 				7B6D428682221857EAEA1C7D,
 				6A7D4DC561F2DD95ABD76F0D,
 				3CE85049C3E91E38E71FF149,
 				2B37CDCFCBC0AC0AEAA9A479,
 				DA3360514D221A36446DC6DE,
 				010E9F48D32EA5C5451D8086,
 				9BE978B2BDA9B7DA3BE403B4,
 				CB7CDD93EE1469B969AF844E,
 				3CE85049C3E91E38E71FF149,
 				85E860BFDA9D53EF77C08873,
 				4A96850C150C1C6D87A0D21A,
 				4D3E0D18D24F78B6BDE0E5DA,
 				4A96850C150C1C6D87A0D21A,
 				E0C3359BB4B5260CEB917D46,
 				7B6D428682221857EAEA1C7D ); name = Frameworks; sourceTree = "<group>"; };
 				9BE978B2BDA9B7DA3BE403B4 ); name = Frameworks; sourceTree = "<group>"; };
 		3F406773369804D0FBF2789A = { isa = PBXGroup; children = (
 				39B98C60B57B831FE5215CDD ); name = Products; sourceTree = "<group>"; };
 		D6A4B94A747BFCF299B17932 = { isa = PBXGroup; children = (
 				A10CCE1B2A215D5AE12386E3,
 		1609BCDD8EC2BA2A162B68F3 = { isa = PBXGroup; children = (
 				D6A4B94A747BFCF299B17932,
 				4C2E644EAC72C263D09C74BB,
 				019CD423F1EFF7A1A0A079DD,
 				244B9AF7D858999910FD243E,
@@ -282,23 +282,23 @@
 				3A2EC17F8472C338D6A26278,
 				36B5D100604D9A300187B773 ); runOnlyForDeploymentPostprocessing = 0; };
 		2E5F3CCB074AC0B18683A4F3 = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = (
 				92A7143821252FB13891CC53,
 				36AEC0EAE7AB9D061AD9EFEF,
 				DEDBEF9AC48F8AD1502B6DC2,
 				29F75103FFB220F2E10CF9A9,
 				92A7143821252FB13891CC53,
 				687BFA1946EAD55C5C39907C,
 				ED283D0ABEC2EC312E40C6B4,
 				0CFE603DE523940AF3352227,
 				420A9C88B711F5E4997FAAD0,
 				29F75103FFB220F2E10CF9A9,
 				C1437C4A64EB72D2A86729D3,
 				F1BAE9DCD179C8784FF28F8D,
 				B9911F3AC6CADFB47D1EA8D7,
 				F1BAE9DCD179C8784FF28F8D,
 				452052BBDBAF17DCC06EF521,
 				36AEC0EAE7AB9D061AD9EFEF ); runOnlyForDeploymentPostprocessing = 0; };
 				0CFE603DE523940AF3352227 ); runOnlyForDeploymentPostprocessing = 0; };
 		F26B86DEACDEE5DFB60E10B1 = { isa = PBXNativeTarget; buildConfigurationList = C264FE1BF62B589B345E0C81; buildPhases = (
 				AE930F136F638C3C939F7146,
 				7A3A0C722E5F96990CA1B5F2,
 				2E5F3CCB074AC0B18683A4F3 ); buildRules = ( ); dependencies = ( ); name = "Juce Demo"; productName = "Juce Demo"; productReference = 39B98C60B57B831FE5215CDD; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
 		FD051827ADE403C022034508 = { isa = PBXProject; buildConfigurationList = 2B22E1D006C8AF43954EE79D; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = D6A4B94A747BFCF299B17932; projectDirPath = ""; projectRoot = ""; targets = ( F26B86DEACDEE5DFB60E10B1 ); };
 		FD051827ADE403C022034508 = { isa = PBXProject; buildConfigurationList = 2B22E1D006C8AF43954EE79D; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 1609BCDD8EC2BA2A162B68F3; projectDirPath = ""; projectRoot = ""; targets = ( F26B86DEACDEE5DFB60E10B1 ); };
 	};
 	rootObject = FD051827ADE403C022034508;
 }
--- a/extras/JuceDemo/Builds/VisualStudio2005/Juce
+++ b/extras/JuceDemo/Builds/VisualStudio2005/Juce
@@ -128,93 +128,91 @@
  <References/>
  <Files>
    <Filter Name="Juce Demo">
      <Filter Name="Source">
        <File RelativePath="..\..\Source\ApplicationStartup.cpp"/>
        <File RelativePath="..\..\Source\MainDemoWindow.cpp"/>
        <File RelativePath="..\..\Source\MainDemoWindow.h"/>
        <File RelativePath="..\..\Source\jucedemo_headers.h"/>
        <Filter Name="Demos">
          <File RelativePath="..\..\Source\demos\AudioDemoLatencyPage.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoLatencyPage.h"/>
          <File RelativePath="..\..\Source\demos\AudioDemoPlaybackPage.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoPlaybackPage.h"/>
          <File RelativePath="..\..\Source\demos\AudioDemoRecordPage.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoRecordPage.h"/>
          <File RelativePath="..\..\Source\demos\AudioDemoSetupPage.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoSetupPage.h"/>
          <File RelativePath="..\..\Source\demos\AudioDemoSynthPage.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoSynthPage.h"/>
          <File RelativePath="..\..\Source\demos\AudioDemoTabComponent.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoTabComponent.h"/>
          <File RelativePath="..\..\Source\demos\CameraDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\CodeEditorDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\DirectShowDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\DragAndDropDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\FontsAndTextDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\InterprocessCommsDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\OpenGLDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\QuickTimeDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\RenderingTestComponent.cpp"/>
          <File RelativePath="..\..\Source\demos\RenderingTestComponent.h"/>
          <File RelativePath="..\..\Source\demos\TableDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\ThreadingDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\TreeViewDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\WebBrowserDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\WidgetsDemo.cpp"/>
        </Filter>
        <Filter Name="Binary Data">
          <File RelativePath="..\..\Binary Data\cello.wav">
            <FileConfiguration Name="Debug|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
            <FileConfiguration Name="Release|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
          </File>
          <File RelativePath="..\..\Binary Data\demo table data.xml">
            <FileConfiguration Name="Debug|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
            <FileConfiguration Name="Release|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
          </File>
          <File RelativePath="..\..\Binary Data\icons.zip">
            <FileConfiguration Name="Debug|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
            <FileConfiguration Name="Release|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
          </File>
          <File RelativePath="..\..\Binary Data\juce.png">
            <FileConfiguration Name="Debug|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
            <FileConfiguration Name="Release|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
          </File>
          <File RelativePath="..\..\Binary Data\juce_icon.png"/>
          <File RelativePath="..\..\Binary Data\treedemo.xml">
            <FileConfiguration Name="Debug|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
            <FileConfiguration Name="Release|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
          </File>
        </Filter>
      <File RelativePath="..\..\Source\ApplicationStartup.cpp"/>
      <File RelativePath="..\..\Source\MainDemoWindow.cpp"/>
      <File RelativePath="..\..\Source\MainDemoWindow.h"/>
      <File RelativePath="..\..\Source\jucedemo_headers.h"/>
      <Filter Name="Demos">
        <File RelativePath="..\..\Source\demos\AudioDemoLatencyPage.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoLatencyPage.h"/>
        <File RelativePath="..\..\Source\demos\AudioDemoPlaybackPage.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoPlaybackPage.h"/>
        <File RelativePath="..\..\Source\demos\AudioDemoRecordPage.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoRecordPage.h"/>
        <File RelativePath="..\..\Source\demos\AudioDemoSetupPage.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoSetupPage.h"/>
        <File RelativePath="..\..\Source\demos\AudioDemoSynthPage.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoSynthPage.h"/>
        <File RelativePath="..\..\Source\demos\AudioDemoTabComponent.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoTabComponent.h"/>
        <File RelativePath="..\..\Source\demos\CameraDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\CodeEditorDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\DirectShowDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\DragAndDropDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\FontsAndTextDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\InterprocessCommsDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\OpenGLDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\QuickTimeDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\RenderingTestComponent.cpp"/>
        <File RelativePath="..\..\Source\demos\RenderingTestComponent.h"/>
        <File RelativePath="..\..\Source\demos\TableDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\ThreadingDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\TreeViewDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\WebBrowserDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\WidgetsDemo.cpp"/>
      </Filter>
      <Filter Name="Binary Data">
        <File RelativePath="..\..\Binary Data\cello.wav">
          <FileConfiguration Name="Debug|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
          <FileConfiguration Name="Release|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\Binary Data\demo table data.xml">
          <FileConfiguration Name="Debug|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
          <FileConfiguration Name="Release|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\Binary Data\icons.zip">
          <FileConfiguration Name="Debug|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
          <FileConfiguration Name="Release|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\Binary Data\juce.png">
          <FileConfiguration Name="Debug|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
          <FileConfiguration Name="Release|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\Binary Data\juce_icon.png"/>
        <File RelativePath="..\..\Binary Data\treedemo.xml">
          <FileConfiguration Name="Debug|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
          <FileConfiguration Name="Release|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
        </File>
      </Filter>
    </Filter>
    <Filter Name="Juce Library Code">
--- a/extras/JuceDemo/Builds/VisualStudio2008/Juce
+++ b/extras/JuceDemo/Builds/VisualStudio2008/Juce
@@ -128,93 +128,91 @@
  <References/>
  <Files>
    <Filter Name="Juce Demo">
      <Filter Name="Source">
        <File RelativePath="..\..\Source\ApplicationStartup.cpp"/>
        <File RelativePath="..\..\Source\MainDemoWindow.cpp"/>
        <File RelativePath="..\..\Source\MainDemoWindow.h"/>
        <File RelativePath="..\..\Source\jucedemo_headers.h"/>
        <Filter Name="Demos">
          <File RelativePath="..\..\Source\demos\AudioDemoLatencyPage.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoLatencyPage.h"/>
          <File RelativePath="..\..\Source\demos\AudioDemoPlaybackPage.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoPlaybackPage.h"/>
          <File RelativePath="..\..\Source\demos\AudioDemoRecordPage.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoRecordPage.h"/>
          <File RelativePath="..\..\Source\demos\AudioDemoSetupPage.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoSetupPage.h"/>
          <File RelativePath="..\..\Source\demos\AudioDemoSynthPage.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoSynthPage.h"/>
          <File RelativePath="..\..\Source\demos\AudioDemoTabComponent.cpp"/>
          <File RelativePath="..\..\Source\demos\AudioDemoTabComponent.h"/>
          <File RelativePath="..\..\Source\demos\CameraDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\CodeEditorDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\DirectShowDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\DragAndDropDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\FontsAndTextDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\InterprocessCommsDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\OpenGLDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\QuickTimeDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\RenderingTestComponent.cpp"/>
          <File RelativePath="..\..\Source\demos\RenderingTestComponent.h"/>
          <File RelativePath="..\..\Source\demos\TableDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\ThreadingDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\TreeViewDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\WebBrowserDemo.cpp"/>
          <File RelativePath="..\..\Source\demos\WidgetsDemo.cpp"/>
        </Filter>
        <Filter Name="Binary Data">
          <File RelativePath="..\..\Binary Data\cello.wav">
            <FileConfiguration Name="Debug|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
            <FileConfiguration Name="Release|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
          </File>
          <File RelativePath="..\..\Binary Data\demo table data.xml">
            <FileConfiguration Name="Debug|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
            <FileConfiguration Name="Release|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
          </File>
          <File RelativePath="..\..\Binary Data\icons.zip">
            <FileConfiguration Name="Debug|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
            <FileConfiguration Name="Release|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
          </File>
          <File RelativePath="..\..\Binary Data\juce.png">
            <FileConfiguration Name="Debug|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
            <FileConfiguration Name="Release|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
          </File>
          <File RelativePath="..\..\Binary Data\juce_icon.png"/>
          <File RelativePath="..\..\Binary Data\treedemo.xml">
            <FileConfiguration Name="Debug|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
            <FileConfiguration Name="Release|Win32"
                               ExcludedFromBuild="true">
              <Tool Name="VCCLCompilerTool"/>
            </FileConfiguration>
          </File>
        </Filter>
      <File RelativePath="..\..\Source\ApplicationStartup.cpp"/>
      <File RelativePath="..\..\Source\MainDemoWindow.cpp"/>
      <File RelativePath="..\..\Source\MainDemoWindow.h"/>
      <File RelativePath="..\..\Source\jucedemo_headers.h"/>
      <Filter Name="Demos">
        <File RelativePath="..\..\Source\demos\AudioDemoLatencyPage.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoLatencyPage.h"/>
        <File RelativePath="..\..\Source\demos\AudioDemoPlaybackPage.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoPlaybackPage.h"/>
        <File RelativePath="..\..\Source\demos\AudioDemoRecordPage.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoRecordPage.h"/>
        <File RelativePath="..\..\Source\demos\AudioDemoSetupPage.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoSetupPage.h"/>
        <File RelativePath="..\..\Source\demos\AudioDemoSynthPage.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoSynthPage.h"/>
        <File RelativePath="..\..\Source\demos\AudioDemoTabComponent.cpp"/>
        <File RelativePath="..\..\Source\demos\AudioDemoTabComponent.h"/>
        <File RelativePath="..\..\Source\demos\CameraDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\CodeEditorDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\DirectShowDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\DragAndDropDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\FontsAndTextDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\InterprocessCommsDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\OpenGLDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\QuickTimeDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\RenderingTestComponent.cpp"/>
        <File RelativePath="..\..\Source\demos\RenderingTestComponent.h"/>
        <File RelativePath="..\..\Source\demos\TableDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\ThreadingDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\TreeViewDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\WebBrowserDemo.cpp"/>
        <File RelativePath="..\..\Source\demos\WidgetsDemo.cpp"/>
      </Filter>
      <Filter Name="Binary Data">
        <File RelativePath="..\..\Binary Data\cello.wav">
          <FileConfiguration Name="Debug|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
          <FileConfiguration Name="Release|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\Binary Data\demo table data.xml">
          <FileConfiguration Name="Debug|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
          <FileConfiguration Name="Release|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\Binary Data\icons.zip">
          <FileConfiguration Name="Debug|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
          <FileConfiguration Name="Release|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\Binary Data\juce.png">
          <FileConfiguration Name="Debug|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
          <FileConfiguration Name="Release|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
        </File>
        <File RelativePath="..\..\Binary Data\juce_icon.png"/>
        <File RelativePath="..\..\Binary Data\treedemo.xml">
          <FileConfiguration Name="Debug|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
          <FileConfiguration Name="Release|Win32"
                             ExcludedFromBuild="true">
            <Tool Name="VCCLCompilerTool"/>
          </FileConfiguration>
        </File>
      </Filter>
    </Filter>
    <Filter Name="Juce Library Code">
--- a/extras/JuceDemo/Builds/VisualStudio2010/Juce
+++ b/extras/JuceDemo/Builds/VisualStudio2010/Juce
@@ -5,14 +5,11 @@
    <Filter Include="Juce Demo">
      <UniqueIdentifier>{D3C1BE7C-161D-78D2-AA4A-AE5B28A49DC5}</UniqueIdentifier>
    </Filter>
    <Filter Include="Juce Demo\Source">
      <UniqueIdentifier>{D4BFDBA1-04DA-1AF7-BEDF-7A5C63D00D65}</UniqueIdentifier>
    <Filter Include="Juce Demo\Demos">
      <UniqueIdentifier>{0F706C6E-4C56-28CC-6E17-621CE5C94904}</UniqueIdentifier>
    </Filter>
    <Filter Include="Juce Demo\Source\Demos">
      <UniqueIdentifier>{383A10E9-7C30-CC23-0554-D95AC593AAFC}</UniqueIdentifier>
    </Filter>
    <Filter Include="Juce Demo\Source\Binary Data">
      <UniqueIdentifier>{6E0A4587-C5D5-BB9D-A788-42A182380C69}</UniqueIdentifier>
    <Filter Include="Juce Demo\Binary Data">
      <UniqueIdentifier>{2AA5AF01-B73D-17DA-570C-25BCC6A2DE34}</UniqueIdentifier>
    </Filter>
    <Filter Include="Juce Library Code">
      <UniqueIdentifier>{F7048EA6-F4B2-F31B-E402-E05D678A1111}</UniqueIdentifier>
@@ -20,88 +17,88 @@
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\Source\ApplicationStartup.cpp">
      <Filter>Juce Demo\Source</Filter>
      <Filter>Juce Demo</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\MainDemoWindow.cpp">
      <Filter>Juce Demo\Source</Filter>
      <Filter>Juce Demo</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\AudioDemoLatencyPage.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\AudioDemoPlaybackPage.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\AudioDemoRecordPage.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\AudioDemoSetupPage.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\AudioDemoSynthPage.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\AudioDemoTabComponent.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\CameraDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\CodeEditorDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\DirectShowDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\DragAndDropDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\FontsAndTextDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\InterprocessCommsDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\OpenGLDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\QuickTimeDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\RenderingTestComponent.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\TableDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\ThreadingDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\TreeViewDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\WebBrowserDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Source\demos\WidgetsDemo.cpp">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Binary Data\cello.wav">
      <Filter>Juce Demo\Source\Binary Data</Filter>
      <Filter>Juce Demo\Binary Data</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Binary Data\demo table data.xml">
      <Filter>Juce Demo\Source\Binary Data</Filter>
      <Filter>Juce Demo\Binary Data</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Binary Data\icons.zip">
      <Filter>Juce Demo\Source\Binary Data</Filter>
      <Filter>Juce Demo\Binary Data</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Binary Data\juce.png">
      <Filter>Juce Demo\Source\Binary Data</Filter>
      <Filter>Juce Demo\Binary Data</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Binary Data\juce_icon.png">
      <Filter>Juce Demo\Source\Binary Data</Filter>
      <Filter>Juce Demo\Binary Data</Filter>
    </ClCompile>
    <ClCompile Include="..\..\Binary Data\treedemo.xml">
      <Filter>Juce Demo\Source\Binary Data</Filter>
      <Filter>Juce Demo\Binary Data</Filter>
    </ClCompile>
    <ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
      <Filter>Juce Library Code</Filter>
@@ -121,31 +118,31 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\Source\MainDemoWindow.h">
      <Filter>Juce Demo\Source</Filter>
      <Filter>Juce Demo</Filter>
    </ClInclude>
    <ClInclude Include="..\..\Source\jucedemo_headers.h">
      <Filter>Juce Demo\Source</Filter>
      <Filter>Juce Demo</Filter>
    </ClInclude>
    <ClInclude Include="..\..\Source\demos\AudioDemoLatencyPage.h">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClInclude>
    <ClInclude Include="..\..\Source\demos\AudioDemoPlaybackPage.h">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClInclude>
    <ClInclude Include="..\..\Source\demos\AudioDemoRecordPage.h">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClInclude>
    <ClInclude Include="..\..\Source\demos\AudioDemoSetupPage.h">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClInclude>
    <ClInclude Include="..\..\Source\demos\AudioDemoSynthPage.h">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClInclude>
    <ClInclude Include="..\..\Source\demos\AudioDemoTabComponent.h">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClInclude>
    <ClInclude Include="..\..\Source\demos\RenderingTestComponent.h">
      <Filter>Juce Demo\Source\Demos</Filter>
      <Filter>Juce Demo\Demos</Filter>
    </ClInclude>
    <ClInclude Include="..\..\JuceLibraryCode\AppConfig.h">
      <Filter>Juce Library Code</Filter>
--- a/extras/JuceDemo/Builds/iOS/Juce
+++ b/extras/JuceDemo/Builds/iOS/Juce
@@ -6,13 +6,13 @@
 	objectVersion = 45;
 	objects = {

 		1DF18F6B9CCFF7BD07C36AC2 = { isa = PBXBuildFile; fileRef = CE3A43E4FB4D61350C000764; };
 		3BE296F09A47C0ECE4D91CF5 = { isa = PBXBuildFile; fileRef = 90E63FC1333F952D526FF194; };
 		36AEC0EAE7AB9D061AD9EFEF = { isa = PBXBuildFile; fileRef = 7B6D428682221857EAEA1C7D; };
 		7938A4501BDD574C4121B988 = { isa = PBXBuildFile; fileRef = 0D376A9686DFA1EAF983841C; };
 		8223C2805B1A9ECA27926EB5 = { isa = PBXBuildFile; fileRef = 1CFED196602026EF91937A0E; };
 		36AEC0EAE7AB9D061AD9EFEF = { isa = PBXBuildFile; fileRef = 7B6D428682221857EAEA1C7D; };
 		F1BAE9DCD179C8784FF28F8D = { isa = PBXBuildFile; fileRef = 4A96850C150C1C6D87A0D21A; };
 		3BE296F09A47C0ECE4D91CF5 = { isa = PBXBuildFile; fileRef = 90E63FC1333F952D526FF194; };
 		268F2BF480CF9844E2F2B974 = { isa = PBXBuildFile; fileRef = B72353F9624D99DB6F93E400; };
 		F1BAE9DCD179C8784FF28F8D = { isa = PBXBuildFile; fileRef = 4A96850C150C1C6D87A0D21A; };
 		1DF18F6B9CCFF7BD07C36AC2 = { isa = PBXBuildFile; fileRef = CE3A43E4FB4D61350C000764; };
 		C0A3C433D146C7E1FFCADFB2 = { isa = PBXBuildFile; fileRef = 4ADECB09FD213B2E910EA229; };
 		78A66C2F9A9E2E6D011D8E5E = { isa = PBXBuildFile; fileRef = 885A20D277AD743C21C822B5; };
 		CE5C46E66485B7D77B5ADB4E = { isa = PBXBuildFile; fileRef = 42291DB48BF81754D90FE200; };
@@ -41,13 +41,13 @@
 		2E98B1DEA8B7FC20ACCD2E6D = { isa = PBXBuildFile; fileRef = F42C91375F3314CA6EE65697; };
 		3A2EC17F8472C338D6A26278 = { isa = PBXBuildFile; fileRef = 4D526A336B2E97ED42CADAD7; };
 		36B5D100604D9A300187B773 = { isa = PBXBuildFile; fileRef = 8679333E781A0A0116AE5D26; };
 		CE3A43E4FB4D61350C000764 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		90E63FC1333F952D526FF194 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		7B6D428682221857EAEA1C7D = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		0D376A9686DFA1EAF983841C = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		1CFED196602026EF91937A0E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
 		7B6D428682221857EAEA1C7D = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		4A96850C150C1C6D87A0D21A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		90E63FC1333F952D526FF194 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		B72353F9624D99DB6F93E400 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
 		4A96850C150C1C6D87A0D21A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		CE3A43E4FB4D61350C000764 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		39B98C60B57B831FE5215CDD = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JuceDemo.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		1A9DEA62F6A3CD1FB5CF105B = { isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = "SOURCE_ROOT"; };
 		4ADECB09FD213B2E910EA229 = { isa = PBXFileReference; lastKnownFileType = file.icns; name = Icon.icns; path = Icon.icns; sourceTree = "SOURCE_ROOT"; };
@@ -131,13 +131,13 @@
 				013E12213AD7B4BEB28A31BE,
 				3369CDF7AFD79D6F3B3744B1,
 				C7327AD5191A22C1FBD4F5F9 ); name = "Binary Data"; sourceTree = "<group>"; };
 		A10CCE1B2A215D5AE12386E3 = { isa = PBXGroup; children = (
 		D6A4B94A747BFCF299B17932 = { isa = PBXGroup; children = (
 				885A20D277AD743C21C822B5,
 				42291DB48BF81754D90FE200,
 				49138F5652E637AA67CD4B70,
 				18BDC68F9701862603871A7A,
 				1045A435754FDEACC6D7259C,
 				7B2518B268DCBBF7B74F2B1D ); name = Source; sourceTree = "<group>"; };
 				7B2518B268DCBBF7B74F2B1D ); name = "Juce Demo"; sourceTree = "<group>"; };
 		4C2E644EAC72C263D09C74BB = { isa = PBXGroup; children = (
 				EE37A0ECE471A928C6170F9B,
 				E6EF5CE04768BA5B10050D51,
@@ -151,17 +151,17 @@
 				1A9DEA62F6A3CD1FB5CF105B,
 				4ADECB09FD213B2E910EA229 ); name = Resources; sourceTree = "<group>"; };
 		244B9AF7D858999910FD243E = { isa = PBXGroup; children = (
 				CE3A43E4FB4D61350C000764,
 				90E63FC1333F952D526FF194,
 				7B6D428682221857EAEA1C7D,
 				0D376A9686DFA1EAF983841C,
 				1CFED196602026EF91937A0E,
 				7B6D428682221857EAEA1C7D,
 				90E63FC1333F952D526FF194,
 				B72353F9624D99DB6F93E400,
 				4A96850C150C1C6D87A0D21A,
 				B72353F9624D99DB6F93E400 ); name = Frameworks; sourceTree = "<group>"; };
 				CE3A43E4FB4D61350C000764 ); name = Frameworks; sourceTree = "<group>"; };
 		3F406773369804D0FBF2789A = { isa = PBXGroup; children = (
 				39B98C60B57B831FE5215CDD ); name = Products; sourceTree = "<group>"; };
 		D6A4B94A747BFCF299B17932 = { isa = PBXGroup; children = (
 				A10CCE1B2A215D5AE12386E3,
 		1609BCDD8EC2BA2A162B68F3 = { isa = PBXGroup; children = (
 				D6A4B94A747BFCF299B17932,
 				4C2E644EAC72C263D09C74BB,
 				019CD423F1EFF7A1A0A079DD,
 				244B9AF7D858999910FD243E,
@@ -270,18 +270,18 @@
 				3A2EC17F8472C338D6A26278,
 				36B5D100604D9A300187B773 ); runOnlyForDeploymentPostprocessing = 0; };
 		2E5F3CCB074AC0B18683A4F3 = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = (
 				1DF18F6B9CCFF7BD07C36AC2,
 				3BE296F09A47C0ECE4D91CF5,
 				36AEC0EAE7AB9D061AD9EFEF,
 				7938A4501BDD574C4121B988,
 				8223C2805B1A9ECA27926EB5,
 				36AEC0EAE7AB9D061AD9EFEF,
 				3BE296F09A47C0ECE4D91CF5,
 				268F2BF480CF9844E2F2B974,
 				F1BAE9DCD179C8784FF28F8D,
 				268F2BF480CF9844E2F2B974 ); runOnlyForDeploymentPostprocessing = 0; };
 				1DF18F6B9CCFF7BD07C36AC2 ); runOnlyForDeploymentPostprocessing = 0; };
 		F26B86DEACDEE5DFB60E10B1 = { isa = PBXNativeTarget; buildConfigurationList = C264FE1BF62B589B345E0C81; buildPhases = (
 				AE930F136F638C3C939F7146,
 				7A3A0C722E5F96990CA1B5F2,
 				2E5F3CCB074AC0B18683A4F3 ); buildRules = ( ); dependencies = ( ); name = "Juce Demo"; productName = "Juce Demo"; productReference = 39B98C60B57B831FE5215CDD; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
 		FD051827ADE403C022034508 = { isa = PBXProject; buildConfigurationList = 2B22E1D006C8AF43954EE79D; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = D6A4B94A747BFCF299B17932; projectDirPath = ""; projectRoot = ""; targets = ( F26B86DEACDEE5DFB60E10B1 ); };
 		FD051827ADE403C022034508 = { isa = PBXProject; buildConfigurationList = 2B22E1D006C8AF43954EE79D; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 1609BCDD8EC2BA2A162B68F3; projectDirPath = ""; projectRoot = ""; targets = ( F26B86DEACDEE5DFB60E10B1 ); };
 	};
 	rootObject = FD051827ADE403C022034508;
 }
--- a/extras/JuceDemo/Juce
+++ b/extras/JuceDemo/Juce
@@ -34,80 +34,78 @@
                   osxArchitecture="32BitUniversal"/>
  </CONFIGURATIONS>
  <MAINGROUP id="0bU7ypLe" name="Juce Demo">
    <GROUP id="BEJsSEFfF" name="Source">
      <FILE id="Bnqll1Mk0" name="ApplicationStartup.cpp" compile="1" resource="0"
            file="Source/ApplicationStartup.cpp"/>
      <FILE id="GQ8NUhTaA" name="MainDemoWindow.cpp" compile="1" resource="0"
            file="Source/MainDemoWindow.cpp"/>
      <FILE id="uZ5W4Yi3v" name="MainDemoWindow.h" compile="0" resource="0"
            file="Source/MainDemoWindow.h"/>
      <FILE id="2tLjAaxrV" name="jucedemo_headers.h" compile="0" resource="0"
            file="Source/jucedemo_headers.h"/>
      <GROUP id="p0ZeP0Wn6" name="Demos">
        <FILE id="0K60nXdM0" name="AudioDemoLatencyPage.cpp" compile="1" resource="0"
              file="Source/demos/AudioDemoLatencyPage.cpp"/>
        <FILE id="gBbGRs0kH" name="AudioDemoLatencyPage.h" compile="0" resource="0"
              file="Source/demos/AudioDemoLatencyPage.h"/>
        <FILE id="xhvfKtgZG" name="AudioDemoPlaybackPage.cpp" compile="1" resource="0"
              file="Source/demos/AudioDemoPlaybackPage.cpp"/>
        <FILE id="29brslcz" name="AudioDemoPlaybackPage.h" compile="0" resource="0"
              file="Source/demos/AudioDemoPlaybackPage.h"/>
        <FILE id="YGjfPIjR" name="AudioDemoRecordPage.cpp" compile="1" resource="0"
              file="Source/demos/AudioDemoRecordPage.cpp"/>
        <FILE id="VM1ZV45Pm" name="AudioDemoRecordPage.h" compile="0" resource="0"
              file="Source/demos/AudioDemoRecordPage.h"/>
        <FILE id="EYUlG624y" name="AudioDemoSetupPage.cpp" compile="1" resource="0"
              file="Source/demos/AudioDemoSetupPage.cpp"/>
        <FILE id="MnvCR6oN" name="AudioDemoSetupPage.h" compile="0" resource="0"
              file="Source/demos/AudioDemoSetupPage.h"/>
        <FILE id="oAwxdfki8" name="AudioDemoSynthPage.cpp" compile="1" resource="0"
              file="Source/demos/AudioDemoSynthPage.cpp"/>
        <FILE id="oB7yiS4Hk" name="AudioDemoSynthPage.h" compile="0" resource="0"
              file="Source/demos/AudioDemoSynthPage.h"/>
        <FILE id="jzvMAq8mg" name="AudioDemoTabComponent.cpp" compile="1" resource="0"
              file="Source/demos/AudioDemoTabComponent.cpp"/>
        <FILE id="gP6sEczjE" name="AudioDemoTabComponent.h" compile="0" resource="0"
              file="Source/demos/AudioDemoTabComponent.h"/>
        <FILE id="obpkMZ2g" name="CameraDemo.cpp" compile="1" resource="0"
              file="Source/demos/CameraDemo.cpp"/>
        <FILE id="VrH9xEBt4" name="CodeEditorDemo.cpp" compile="1" resource="0"
              file="Source/demos/CodeEditorDemo.cpp"/>
        <FILE id="Biv7Wl" name="DirectShowDemo.cpp" compile="1" resource="0"
              file="Source/demos/DirectShowDemo.cpp"/>
        <FILE id="LQxkyT31Q" name="DragAndDropDemo.cpp" compile="1" resource="0"
              file="Source/demos/DragAndDropDemo.cpp"/>
        <FILE id="WlmBspVQo" name="FontsAndTextDemo.cpp" compile="1" resource="0"
              file="Source/demos/FontsAndTextDemo.cpp"/>
        <FILE id="5NTST47xi" name="InterprocessCommsDemo.cpp" compile="1" resource="0"
              file="Source/demos/InterprocessCommsDemo.cpp"/>
        <FILE id="xoi5BuVvv" name="OpenGLDemo.cpp" compile="1" resource="0"
              file="Source/demos/OpenGLDemo.cpp"/>
        <FILE id="WkWbYNoZ0" name="QuickTimeDemo.cpp" compile="1" resource="0"
              file="Source/demos/QuickTimeDemo.cpp"/>
        <FILE id="hzPv7BR9U" name="RenderingTestComponent.cpp" compile="1"
              resource="0" file="Source/demos/RenderingTestComponent.cpp"/>
        <FILE id="EQv4ZsR78" name="RenderingTestComponent.h" compile="0" resource="0"
              file="Source/demos/RenderingTestComponent.h"/>
        <FILE id="ReJoO2H9u" name="TableDemo.cpp" compile="1" resource="0"
              file="Source/demos/TableDemo.cpp"/>
        <FILE id="6MwRgCUkn" name="ThreadingDemo.cpp" compile="1" resource="0"
              file="Source/demos/ThreadingDemo.cpp"/>
        <FILE id="c5Wy6zXol" name="TreeViewDemo.cpp" compile="1" resource="0"
              file="Source/demos/TreeViewDemo.cpp"/>
        <FILE id="5ee1NoTnc" name="WebBrowserDemo.cpp" compile="1" resource="0"
              file="Source/demos/WebBrowserDemo.cpp"/>
        <FILE id="F6gqyNSim" name="WidgetsDemo.cpp" compile="1" resource="0"
              file="Source/demos/WidgetsDemo.cpp"/>
      </GROUP>
      <GROUP id="BR14NOf0" name="Binary Data">
        <FILE id="X5sIZFkN" name="cello.wav" compile="0" resource="1" file="Binary Data/cello.wav"/>
        <FILE id="BAqnjOqfe" name="demo table data.xml" compile="0" resource="1"
              file="Binary Data/demo table data.xml"/>
        <FILE id="lEVfO5KTK" name="icons.zip" compile="0" resource="1" file="Binary Data/icons.zip"/>
        <FILE id="Duj062Top" name="juce.png" compile="0" resource="1" file="Binary Data/juce.png"/>
        <FILE id="f4hwldS" name="juce_icon.png" compile="0" resource="0" file="Binary Data/juce_icon.png"/>
        <FILE id="UvweoM7iM" name="treedemo.xml" compile="0" resource="1" file="Binary Data/treedemo.xml"/>
      </GROUP>
    <FILE id="Bnqll1Mk0" name="ApplicationStartup.cpp" compile="1" resource="0"
          file="Source/ApplicationStartup.cpp"/>
    <FILE id="GQ8NUhTaA" name="MainDemoWindow.cpp" compile="1" resource="0"
          file="Source/MainDemoWindow.cpp"/>
    <FILE id="uZ5W4Yi3v" name="MainDemoWindow.h" compile="0" resource="0"
          file="Source/MainDemoWindow.h"/>
    <FILE id="2tLjAaxrV" name="jucedemo_headers.h" compile="0" resource="0"
          file="Source/jucedemo_headers.h"/>
    <GROUP id="p0ZeP0Wn6" name="Demos">
      <FILE id="0K60nXdM0" name="AudioDemoLatencyPage.cpp" compile="1" resource="0"
            file="Source/demos/AudioDemoLatencyPage.cpp"/>
      <FILE id="gBbGRs0kH" name="AudioDemoLatencyPage.h" compile="0" resource="0"
            file="Source/demos/AudioDemoLatencyPage.h"/>
      <FILE id="xhvfKtgZG" name="AudioDemoPlaybackPage.cpp" compile="1" resource="0"
            file="Source/demos/AudioDemoPlaybackPage.cpp"/>
      <FILE id="29brslcz" name="AudioDemoPlaybackPage.h" compile="0" resource="0"
            file="Source/demos/AudioDemoPlaybackPage.h"/>
      <FILE id="YGjfPIjR" name="AudioDemoRecordPage.cpp" compile="1" resource="0"
            file="Source/demos/AudioDemoRecordPage.cpp"/>
      <FILE id="VM1ZV45Pm" name="AudioDemoRecordPage.h" compile="0" resource="0"
            file="Source/demos/AudioDemoRecordPage.h"/>
      <FILE id="EYUlG624y" name="AudioDemoSetupPage.cpp" compile="1" resource="0"
            file="Source/demos/AudioDemoSetupPage.cpp"/>
      <FILE id="MnvCR6oN" name="AudioDemoSetupPage.h" compile="0" resource="0"
            file="Source/demos/AudioDemoSetupPage.h"/>
      <FILE id="oAwxdfki8" name="AudioDemoSynthPage.cpp" compile="1" resource="0"
            file="Source/demos/AudioDemoSynthPage.cpp"/>
      <FILE id="oB7yiS4Hk" name="AudioDemoSynthPage.h" compile="0" resource="0"
            file="Source/demos/AudioDemoSynthPage.h"/>
      <FILE id="jzvMAq8mg" name="AudioDemoTabComponent.cpp" compile="1" resource="0"
            file="Source/demos/AudioDemoTabComponent.cpp"/>
      <FILE id="gP6sEczjE" name="AudioDemoTabComponent.h" compile="0" resource="0"
            file="Source/demos/AudioDemoTabComponent.h"/>
      <FILE id="obpkMZ2g" name="CameraDemo.cpp" compile="1" resource="0"
            file="Source/demos/CameraDemo.cpp"/>
      <FILE id="VrH9xEBt4" name="CodeEditorDemo.cpp" compile="1" resource="0"
            file="Source/demos/CodeEditorDemo.cpp"/>
      <FILE id="Biv7Wl" name="DirectShowDemo.cpp" compile="1" resource="0"
            file="Source/demos/DirectShowDemo.cpp"/>
      <FILE id="LQxkyT31Q" name="DragAndDropDemo.cpp" compile="1" resource="0"
            file="Source/demos/DragAndDropDemo.cpp"/>
      <FILE id="WlmBspVQo" name="FontsAndTextDemo.cpp" compile="1" resource="0"
            file="Source/demos/FontsAndTextDemo.cpp"/>
      <FILE id="5NTST47xi" name="InterprocessCommsDemo.cpp" compile="1" resource="0"
            file="Source/demos/InterprocessCommsDemo.cpp"/>
      <FILE id="xoi5BuVvv" name="OpenGLDemo.cpp" compile="1" resource="0"
            file="Source/demos/OpenGLDemo.cpp"/>
      <FILE id="WkWbYNoZ0" name="QuickTimeDemo.cpp" compile="1" resource="0"
            file="Source/demos/QuickTimeDemo.cpp"/>
      <FILE id="hzPv7BR9U" name="RenderingTestComponent.cpp" compile="1"
            resource="0" file="Source/demos/RenderingTestComponent.cpp"/>
      <FILE id="EQv4ZsR78" name="RenderingTestComponent.h" compile="0" resource="0"
            file="Source/demos/RenderingTestComponent.h"/>
      <FILE id="ReJoO2H9u" name="TableDemo.cpp" compile="1" resource="0"
            file="Source/demos/TableDemo.cpp"/>
      <FILE id="6MwRgCUkn" name="ThreadingDemo.cpp" compile="1" resource="0"
            file="Source/demos/ThreadingDemo.cpp"/>
      <FILE id="c5Wy6zXol" name="TreeViewDemo.cpp" compile="1" resource="0"
            file="Source/demos/TreeViewDemo.cpp"/>
      <FILE id="5ee1NoTnc" name="WebBrowserDemo.cpp" compile="1" resource="0"
            file="Source/demos/WebBrowserDemo.cpp"/>
      <FILE id="F6gqyNSim" name="WidgetsDemo.cpp" compile="1" resource="0"
            file="Source/demos/WidgetsDemo.cpp"/>
    </GROUP>
    <GROUP id="BR14NOf0" name="Binary Data">
      <FILE id="X5sIZFkN" name="cello.wav" compile="0" resource="1" file="Binary Data/cello.wav"/>
      <FILE id="BAqnjOqfe" name="demo table data.xml" compile="0" resource="1"
            file="Binary Data/demo table data.xml"/>
      <FILE id="lEVfO5KTK" name="icons.zip" compile="0" resource="1" file="Binary Data/icons.zip"/>
      <FILE id="Duj062Top" name="juce.png" compile="0" resource="1" file="Binary Data/juce.png"/>
      <FILE id="f4hwldS" name="juce_icon.png" compile="0" resource="0" file="Binary Data/juce_icon.png"/>
      <FILE id="UvweoM7iM" name="treedemo.xml" compile="0" resource="1" file="Binary Data/treedemo.xml"/>
    </GROUP>
  </MAINGROUP>
  <JUCEOPTIONS JUCE_FORCE_DEBUG="default" JUCE_LOG_ASSERTIONS="default" JUCE_ASIO="default"
--- a/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj
+++ b/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj
@@ -6,32 +6,32 @@
 	objectVersion = 45;
 	objects = {

 		519A1FD5D107BA064C820D19 = { isa = PBXBuildFile; fileRef = EA2AB86C7C92284FED89D52F; };
 		F5A1BB88887D285B1DBA1FA4 = { isa = PBXBuildFile; fileRef = 3B604C2333F4A4ACEDDA5D33; };
 		9DCEEA3865611526540CAE87 = { isa = PBXBuildFile; fileRef = 3960376212D469EABEC890C3; };
 		F8EB5CA1A095AB47E5FD296F = { isa = PBXBuildFile; fileRef = FBDB5BE674CCA98DEAFF320F; };
 		519A1FD5D107BA064C820D19 = { isa = PBXBuildFile; fileRef = EA2AB86C7C92284FED89D52F; };
 		376EF5B6F7CC60A16F29D132 = { isa = PBXBuildFile; fileRef = A9275AFEFE04A58B574DF783; };
 		AC1C38A76EA577862230F779 = { isa = PBXBuildFile; fileRef = D00199E68400301A480EC13C; };
 		CBF16BDB96F6205FF62563ED = { isa = PBXBuildFile; fileRef = 6ADD725F5D8C431F3ED44379; };
 		02FD972668E37139AC6FDB95 = { isa = PBXBuildFile; fileRef = 9A6FC8308FE6F40E6D90B404; };
 		F8EB5CA1A095AB47E5FD296F = { isa = PBXBuildFile; fileRef = FBDB5BE674CCA98DEAFF320F; };
 		804677E715BD0D17AB576A99 = { isa = PBXBuildFile; fileRef = 44DC6A5C8B7FDF348BB1B939; };
 		B1AED479824B53CD42E2CF43 = { isa = PBXBuildFile; fileRef = 099980A9C6DE98B28A9113C0; };
 		88941AD8669C6AF9710FE99D = { isa = PBXBuildFile; fileRef = 0D21F7B58311040CB1C01680; };
 		B1AED479824B53CD42E2CF43 = { isa = PBXBuildFile; fileRef = 099980A9C6DE98B28A9113C0; };
 		14235D597C71A211C34E35D7 = { isa = PBXBuildFile; fileRef = BFB630386598A251EE72BEFC; };
 		F5A1BB88887D285B1DBA1FA4 = { isa = PBXBuildFile; fileRef = 3B604C2333F4A4ACEDDA5D33; };
 		CBF16BDB96F6205FF62563ED = { isa = PBXBuildFile; fileRef = 6ADD725F5D8C431F3ED44379; };
 		E88444FD7BDE1A966EC392A5 = { isa = PBXBuildFile; fileRef = 195A51222E92C3A93F2D6FFA; };
 		4D2A24E908E9A226C5A3D259 = { isa = PBXBuildFile; fileRef = F4A7A8C689EAE11C52879AFF; };
 		EA2AB86C7C92284FED89D52F = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		3B604C2333F4A4ACEDDA5D33 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		3960376212D469EABEC890C3 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		FBDB5BE674CCA98DEAFF320F = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		EA2AB86C7C92284FED89D52F = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		A9275AFEFE04A58B574DF783 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
 		D00199E68400301A480EC13C = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
 		6ADD725F5D8C431F3ED44379 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		9A6FC8308FE6F40E6D90B404 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; };
 		FBDB5BE674CCA98DEAFF320F = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		44DC6A5C8B7FDF348BB1B939 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		099980A9C6DE98B28A9113C0 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		0D21F7B58311040CB1C01680 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
 		099980A9C6DE98B28A9113C0 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		BFB630386598A251EE72BEFC = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
 		3B604C2333F4A4ACEDDA5D33 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		6ADD725F5D8C431F3ED44379 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		F8AC870D665D0F64E9129D83 = { isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = amalgamator; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		195A51222E92C3A93F2D6FFA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Main.cpp; path = ../../Source/Main.cpp; sourceTree = "SOURCE_ROOT"; };
 		AE2AAA898543257DC9074051 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; };
@@ -39,28 +39,30 @@
 		F4A7A8C689EAE11C52879AFF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode.mm; path = ../../JuceLibraryCode/JuceLibraryCode.mm; sourceTree = "SOURCE_ROOT"; };
 		412B173788F325BD8BA9D522 = { isa = PBXGroup; children = (
 				195A51222E92C3A93F2D6FFA ); name = Source; sourceTree = "<group>"; };
 		5DCB99F3A59154C29483AE9B = { isa = PBXGroup; children = (
 				412B173788F325BD8BA9D522 ); name = Amalgamator; sourceTree = "<group>"; };
 		1B116FEC4D544DB8E38CB571 = { isa = PBXGroup; children = (
 				AE2AAA898543257DC9074051,
 				65A77136970E59DD3E14B4B1,
 				F4A7A8C689EAE11C52879AFF ); name = "Juce Library Code"; sourceTree = "<group>"; };
 		C08FDFC0A2B182F6A490BA93 = { isa = PBXGroup; children = (  ); name = Resources; sourceTree = "<group>"; };
 		E33E9595882A25EE14ED65F4 = { isa = PBXGroup; children = (
 				EA2AB86C7C92284FED89D52F,
 				3B604C2333F4A4ACEDDA5D33,
 				3960376212D469EABEC890C3,
 				FBDB5BE674CCA98DEAFF320F,
 				EA2AB86C7C92284FED89D52F,
 				A9275AFEFE04A58B574DF783,
 				D00199E68400301A480EC13C,
 				6ADD725F5D8C431F3ED44379,
 				9A6FC8308FE6F40E6D90B404,
 				FBDB5BE674CCA98DEAFF320F,
 				44DC6A5C8B7FDF348BB1B939,
 				099980A9C6DE98B28A9113C0,
 				0D21F7B58311040CB1C01680,
 				099980A9C6DE98B28A9113C0,
 				BFB630386598A251EE72BEFC,
 				3B604C2333F4A4ACEDDA5D33 ); name = Frameworks; sourceTree = "<group>"; };
 				6ADD725F5D8C431F3ED44379 ); name = Frameworks; sourceTree = "<group>"; };
 		FE436211E76A80250EE3B950 = { isa = PBXGroup; children = (
 				F8AC870D665D0F64E9129D83 ); name = Products; sourceTree = "<group>"; };
 		5DCB99F3A59154C29483AE9B = { isa = PBXGroup; children = (
 				412B173788F325BD8BA9D522,
 		E50CA77A2F94357F191CA9B8 = { isa = PBXGroup; children = (
 				5DCB99F3A59154C29483AE9B,
 				1B116FEC4D544DB8E38CB571,
 				C08FDFC0A2B182F6A490BA93,
 				E33E9595882A25EE14ED65F4,
@@ -70,6 +72,7 @@
 				HEADER_SEARCH_PATHS = " $(inherited)";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "/usr/bin";
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
 				ONLY_ACTIVE_ARCH = YES;
 				COPY_PHASE_STRIP = NO;
@@ -85,6 +88,7 @@
 				HEADER_SEARCH_PATHS = " $(inherited)";
 				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "/usr/bin";
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
@@ -134,23 +138,23 @@
 				E88444FD7BDE1A966EC392A5,
 				4D2A24E908E9A226C5A3D259 ); runOnlyForDeploymentPostprocessing = 0; };
 		ED422768B82C5C079964D4A9 = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = (
 				519A1FD5D107BA064C820D19,
 				F5A1BB88887D285B1DBA1FA4,
 				9DCEEA3865611526540CAE87,
 				F8EB5CA1A095AB47E5FD296F,
 				519A1FD5D107BA064C820D19,
 				376EF5B6F7CC60A16F29D132,
 				AC1C38A76EA577862230F779,
 				CBF16BDB96F6205FF62563ED,
 				02FD972668E37139AC6FDB95,
 				F8EB5CA1A095AB47E5FD296F,
 				804677E715BD0D17AB576A99,
 				B1AED479824B53CD42E2CF43,
 				88941AD8669C6AF9710FE99D,
 				B1AED479824B53CD42E2CF43,
 				14235D597C71A211C34E35D7,
 				F5A1BB88887D285B1DBA1FA4 ); runOnlyForDeploymentPostprocessing = 0; };
 				CBF16BDB96F6205FF62563ED ); runOnlyForDeploymentPostprocessing = 0; };
 		C15E717C5DA07024CAFE5177 = { isa = PBXNativeTarget; buildConfigurationList = 9257F9B896FDE4D0483F4D47; buildPhases = (
 				6D960AB00F450781A680A10C,
 				492D061FDF3111EE0092E6B8,
 				ED422768B82C5C079964D4A9 ); buildRules = ( ); dependencies = ( ); name = Amalgamator; productName = Amalgamator; productReference = F8AC870D665D0F64E9129D83; productInstallPath = /usr/bin; productType = "com.apple.product-type.tool"; };
 		BC0813C44DC69E1626F486CE = { isa = PBXProject; buildConfigurationList = FA25EC7DB69A3A88993F2853; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 5DCB99F3A59154C29483AE9B; projectDirPath = ""; projectRoot = ""; targets = ( C15E717C5DA07024CAFE5177 ); };
 		BC0813C44DC69E1626F486CE = { isa = PBXProject; buildConfigurationList = FA25EC7DB69A3A88993F2853; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = E50CA77A2F94357F191CA9B8; projectDirPath = ""; projectRoot = ""; targets = ( C15E717C5DA07024CAFE5177 ); };
 	};
 	rootObject = BC0813C44DC69E1626F486CE;
 }
--- a/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj
+++ b/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj
@@ -33,7 +33,7 @@
            BufferSecurityCheck=""
            DebugInformationFormat="4"
            AdditionalIncludeDirectories=""
            PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_CONSOLE;JUCER_VS2005_78A5003=1"
            PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1"
            RuntimeLibrary="1"
            RuntimeTypeInfo="true"
            UsePrecompiledHeader="0"
@@ -89,7 +89,7 @@
            InlineFunctionExpansion="1"
            StringPooling="true"
            AdditionalIncludeDirectories=""
            PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE;JUCER_VS2005_78A5003=1"
            PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1"
            RuntimeLibrary="0"
            RuntimeTypeInfo="true"
            UsePrecompiledHeader="0"
--- a/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj
+++ b/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj
@@ -33,7 +33,7 @@
            BufferSecurityCheck=""
            DebugInformationFormat="4"
            AdditionalIncludeDirectories=""
            PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_CONSOLE;JUCER_VS2008_78A5006=1"
            PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1"
            RuntimeLibrary="1"
            RuntimeTypeInfo="true"
            UsePrecompiledHeader="0"
@@ -89,7 +89,7 @@
            InlineFunctionExpansion="1"
            StringPooling="true"
            AdditionalIncludeDirectories=""
            PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE;JUCER_VS2008_78A5006=1"
            PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1"
            RuntimeLibrary="0"
            RuntimeTypeInfo="true"
            UsePrecompiledHeader="0"
--- a/Host.xcodeproj/project.pbxproj
+++ b/Host.xcodeproj/project.pbxproj
@@ -6,20 +6,20 @@
 	objectVersion = 45;
 	objects = {

 		A43062AA3FCA13D950980A9D = { isa = PBXBuildFile; fileRef = 3DC11B31DA65802201AFD1A3; };
 		48371E4CE630812E31DF1C28 = { isa = PBXBuildFile; fileRef = 8D069FF891B70C7001E05AB7; };
 		F653CD6DB1550002BFB3EE47 = { isa = PBXBuildFile; fileRef = 77964D54171CB8F24F616C9F; };
 		E0643DFCC2247EF97821AA0B = { isa = PBXBuildFile; fileRef = 7C069A377097C1BEC2EE9D47; };
 		3B81AE750E57041B090236E3 = { isa = PBXBuildFile; fileRef = 3E72AEABD28E02510E153F83; };
 		A43062AA3FCA13D950980A9D = { isa = PBXBuildFile; fileRef = 3DC11B31DA65802201AFD1A3; };
 		7A05588B558FC974734FDEB6 = { isa = PBXBuildFile; fileRef = ECCDBDC35CC70E5E6B63F407; };
 		71D47E0ED5F6A90682A5707C = { isa = PBXBuildFile; fileRef = BFD865C4B317E01BDD319AB0; };
 		FFB28B6CCC67D05A4656F3FD = { isa = PBXBuildFile; fileRef = 13A8ECBAE1C399EE6C23CEB0; };
 		0E98BEAFF3B888221A3B6F61 = { isa = PBXBuildFile; fileRef = AD73C514CB4EABF252FA40FD; };
 		5494E9EAC6A5D90CB085D819 = { isa = PBXBuildFile; fileRef = DD062A05EDA95DD281B5B188; };
 		3B81AE750E57041B090236E3 = { isa = PBXBuildFile; fileRef = 3E72AEABD28E02510E153F83; };
 		C3ECD9BC737066FACF7D661D = { isa = PBXBuildFile; fileRef = 9772BD11E93247079FC6B5BD; };
 		0344374EE00EBC906608CCB7 = { isa = PBXBuildFile; fileRef = 4C20D27E2491F086AEA71044; };
 		CB3A6CACC45FC3DD9525E611 = { isa = PBXBuildFile; fileRef = 4FC85A8AE0D46CDFD5E61304; };
 		0344374EE00EBC906608CCB7 = { isa = PBXBuildFile; fileRef = 4C20D27E2491F086AEA71044; };
 		57CAAF2DDA340BF5E764325B = { isa = PBXBuildFile; fileRef = F25D830DC35A0A240297BA70; };
 		48371E4CE630812E31DF1C28 = { isa = PBXBuildFile; fileRef = 8D069FF891B70C7001E05AB7; };
 		F653CD6DB1550002BFB3EE47 = { isa = PBXBuildFile; fileRef = 77964D54171CB8F24F616C9F; };
 		71D47E0ED5F6A90682A5707C = { isa = PBXBuildFile; fileRef = BFD865C4B317E01BDD319AB0; };
 		0E98BEAFF3B888221A3B6F61 = { isa = PBXBuildFile; fileRef = AD73C514CB4EABF252FA40FD; };
 		A778E9C39DD11828306AF2E8 = { isa = PBXBuildFile; fileRef = 178E79E571E8D29BCC89FDD8; };
 		54F2AD58B5CEB3D743C1A169 = { isa = PBXBuildFile; fileRef = 7565EF27C95F512D4DD8649E; };
 		6DADD6A4866E2583BD197095 = { isa = PBXBuildFile; fileRef = F2999E9EF2E02C240DEAA0C6; };
@@ -29,20 +29,20 @@
 		30210E40B65CE048C4D36CA7 = { isa = PBXBuildFile; fileRef = 06C5EFA95DD808E386ED84D1; };
 		4CB81ED19217B750FEB8A0B2 = { isa = PBXBuildFile; fileRef = 4FECB7A56AC38B066AC01710; };
 		484E2E726ED27E58288DE4BD = { isa = PBXBuildFile; fileRef = 980380A077AFFE293EB49B50; };
 		3DC11B31DA65802201AFD1A3 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		8D069FF891B70C7001E05AB7 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		77964D54171CB8F24F616C9F = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
 		7C069A377097C1BEC2EE9D47 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		3E72AEABD28E02510E153F83 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		3DC11B31DA65802201AFD1A3 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		ECCDBDC35CC70E5E6B63F407 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
 		BFD865C4B317E01BDD319AB0 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; };
 		13A8ECBAE1C399EE6C23CEB0 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
 		AD73C514CB4EABF252FA40FD = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		DD062A05EDA95DD281B5B188 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; };
 		3E72AEABD28E02510E153F83 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		9772BD11E93247079FC6B5BD = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		4C20D27E2491F086AEA71044 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		4FC85A8AE0D46CDFD5E61304 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
 		4C20D27E2491F086AEA71044 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		F25D830DC35A0A240297BA70 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
 		8D069FF891B70C7001E05AB7 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		77964D54171CB8F24F616C9F = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
 		BFD865C4B317E01BDD319AB0 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; };
 		AD73C514CB4EABF252FA40FD = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		3B43D9C2C41077380D379A07 = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Plugin Host.app"; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		1C2637C4F538B137DDC54D95 = { isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = "SOURCE_ROOT"; };
 		178E79E571E8D29BCC89FDD8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = FilterGraph.cpp; path = ../../Source/FilterGraph.cpp; sourceTree = "SOURCE_ROOT"; };
@@ -60,7 +60,7 @@
 		06C5EFA95DD808E386ED84D1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode2.mm; path = ../../JuceLibraryCode/JuceLibraryCode2.mm; sourceTree = "SOURCE_ROOT"; };
 		4FECB7A56AC38B066AC01710 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode3.mm; path = ../../JuceLibraryCode/JuceLibraryCode3.mm; sourceTree = "SOURCE_ROOT"; };
 		980380A077AFFE293EB49B50 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode4.mm; path = ../../JuceLibraryCode/JuceLibraryCode4.mm; sourceTree = "SOURCE_ROOT"; };
 		6DAAFEB816B9B5A45D93450B = { isa = PBXGroup; children = (
 		E1B7497DFD48F160861E53A2 = { isa = PBXGroup; children = (
 				178E79E571E8D29BCC89FDD8,
 				57EB1EA963753DC3D960E9CA,
 				7565EF27C95F512D4DD8649E,
@@ -69,7 +69,7 @@
 				BA4959517392DBED76630DC2,
 				AFF6B72723C927C80459D99A,
 				218167B6F2BD95AC7FEC31D5,
 				B6A31D39CA31260F86D45CB4 ); name = Source; sourceTree = "<group>"; };
 				B6A31D39CA31260F86D45CB4 ); name = "Plugin Host"; sourceTree = "<group>"; };
 		5EB8B2B0AB17B68CF7A2B2F5 = { isa = PBXGroup; children = (
 				E0C1FD5EE3068D41ED2D4DD5,
 				A84DC40BF5D1B2A14239B035,
@@ -80,24 +80,24 @@
 		132622950074EBC9C8B6B717 = { isa = PBXGroup; children = (
 				1C2637C4F538B137DDC54D95 ); name = Resources; sourceTree = "<group>"; };
 		26D5E869E6FD8DB238036278 = { isa = PBXGroup; children = (
 				3DC11B31DA65802201AFD1A3,
 				8D069FF891B70C7001E05AB7,
 				77964D54171CB8F24F616C9F,
 				7C069A377097C1BEC2EE9D47,
 				3E72AEABD28E02510E153F83,
 				3DC11B31DA65802201AFD1A3,
 				ECCDBDC35CC70E5E6B63F407,
 				BFD865C4B317E01BDD319AB0,
 				13A8ECBAE1C399EE6C23CEB0,
 				AD73C514CB4EABF252FA40FD,
 				DD062A05EDA95DD281B5B188,
 				3E72AEABD28E02510E153F83,
 				9772BD11E93247079FC6B5BD,
 				4C20D27E2491F086AEA71044,
 				4FC85A8AE0D46CDFD5E61304,
 				4C20D27E2491F086AEA71044,
 				F25D830DC35A0A240297BA70,
 				8D069FF891B70C7001E05AB7,
 				77964D54171CB8F24F616C9F,
 				BFD865C4B317E01BDD319AB0 ); name = Frameworks; sourceTree = "<group>"; };
 				AD73C514CB4EABF252FA40FD ); name = Frameworks; sourceTree = "<group>"; };
 		31DAB5E5452DF8F91208B6C4 = { isa = PBXGroup; children = (
 				3B43D9C2C41077380D379A07 ); name = Products; sourceTree = "<group>"; };
 		E1B7497DFD48F160861E53A2 = { isa = PBXGroup; children = (
 				6DAAFEB816B9B5A45D93450B,
 		28930A4F8D67AE433D31A53C = { isa = PBXGroup; children = (
 				E1B7497DFD48F160861E53A2,
 				5EB8B2B0AB17B68CF7A2B2F5,
 				132622950074EBC9C8B6B717,
 				26D5E869E6FD8DB238036278,
@@ -182,25 +182,25 @@
 				4CB81ED19217B750FEB8A0B2,
 				484E2E726ED27E58288DE4BD ); runOnlyForDeploymentPostprocessing = 0; };
 		30E98A3D15EFB4DAAD89D12D = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = (
 				A43062AA3FCA13D950980A9D,
 				48371E4CE630812E31DF1C28,
 				F653CD6DB1550002BFB3EE47,
 				E0643DFCC2247EF97821AA0B,
 				3B81AE750E57041B090236E3,
 				A43062AA3FCA13D950980A9D,
 				7A05588B558FC974734FDEB6,
 				71D47E0ED5F6A90682A5707C,
 				FFB28B6CCC67D05A4656F3FD,
 				0E98BEAFF3B888221A3B6F61,
 				5494E9EAC6A5D90CB085D819,
 				3B81AE750E57041B090236E3,
 				C3ECD9BC737066FACF7D661D,
 				0344374EE00EBC906608CCB7,
 				CB3A6CACC45FC3DD9525E611,
 				0344374EE00EBC906608CCB7,
 				57CAAF2DDA340BF5E764325B,
 				48371E4CE630812E31DF1C28,
 				F653CD6DB1550002BFB3EE47,
 				71D47E0ED5F6A90682A5707C ); runOnlyForDeploymentPostprocessing = 0; };
 				0E98BEAFF3B888221A3B6F61 ); runOnlyForDeploymentPostprocessing = 0; };
 		04F5D340BA63D9F8DE145DFB = { isa = PBXNativeTarget; buildConfigurationList = D4FE5C8CF4B04CB35C5449CB; buildPhases = (
 				B02D5D856D086055BAA5AE80,
 				8CC459E43DF37AB224B7E23C,
 				30E98A3D15EFB4DAAD89D12D ); buildRules = ( ); dependencies = ( ); name = "Plugin Host"; productName = "Plugin Host"; productReference = 3B43D9C2C41077380D379A07; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
 		FFAE6699AB89F7E949098342 = { isa = PBXProject; buildConfigurationList = 3DBB3F42145D936BBD5425D7; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = E1B7497DFD48F160861E53A2; projectDirPath = ""; projectRoot = ""; targets = ( 04F5D340BA63D9F8DE145DFB ); };
 		FFAE6699AB89F7E949098342 = { isa = PBXProject; buildConfigurationList = 3DBB3F42145D936BBD5425D7; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 28930A4F8D67AE433D31A53C; projectDirPath = ""; projectRoot = ""; targets = ( 04F5D340BA63D9F8DE145DFB ); };
 	};
 	rootObject = FFAE6699AB89F7E949098342;
 }
--- a/host/Builds/VisualStudio2005/Plugin
+++ b/host/Builds/VisualStudio2005/Plugin
@@ -128,17 +128,15 @@
  <References/>
  <Files>
    <Filter Name="Plugin Host">
      <Filter Name="Source">
        <File RelativePath="..\..\Source\FilterGraph.cpp"/>
        <File RelativePath="..\..\Source\FilterGraph.h"/>
        <File RelativePath="..\..\Source\GraphEditorPanel.cpp"/>
        <File RelativePath="..\..\Source\GraphEditorPanel.h"/>
        <File RelativePath="..\..\Source\HostStartup.cpp"/>
        <File RelativePath="..\..\Source\InternalFilters.cpp"/>
        <File RelativePath="..\..\Source\InternalFilters.h"/>
        <File RelativePath="..\..\Source\MainHostWindow.cpp"/>
        <File RelativePath="..\..\Source\MainHostWindow.h"/>
      </Filter>
      <File RelativePath="..\..\Source\FilterGraph.cpp"/>
      <File RelativePath="..\..\Source\FilterGraph.h"/>
      <File RelativePath="..\..\Source\GraphEditorPanel.cpp"/>
      <File RelativePath="..\..\Source\GraphEditorPanel.h"/>
      <File RelativePath="..\..\Source\HostStartup.cpp"/>
      <File RelativePath="..\..\Source\InternalFilters.cpp"/>
      <File RelativePath="..\..\Source\InternalFilters.h"/>
      <File RelativePath="..\..\Source\MainHostWindow.cpp"/>
      <File RelativePath="..\..\Source\MainHostWindow.h"/>
    </Filter>
    <Filter Name="Juce Library Code">
      <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
--- a/host/Builds/VisualStudio2008/Plugin
+++ b/host/Builds/VisualStudio2008/Plugin
@@ -128,17 +128,15 @@
  <References/>
  <Files>
    <Filter Name="Plugin Host">
      <Filter Name="Source">
        <File RelativePath="..\..\Source\FilterGraph.cpp"/>
        <File RelativePath="..\..\Source\FilterGraph.h"/>
        <File RelativePath="..\..\Source\GraphEditorPanel.cpp"/>
        <File RelativePath="..\..\Source\GraphEditorPanel.h"/>
        <File RelativePath="..\..\Source\HostStartup.cpp"/>
        <File RelativePath="..\..\Source\InternalFilters.cpp"/>
        <File RelativePath="..\..\Source\InternalFilters.h"/>
        <File RelativePath="..\..\Source\MainHostWindow.cpp"/>
        <File RelativePath="..\..\Source\MainHostWindow.h"/>
      </Filter>
      <File RelativePath="..\..\Source\FilterGraph.cpp"/>
      <File RelativePath="..\..\Source\FilterGraph.h"/>
      <File RelativePath="..\..\Source\GraphEditorPanel.cpp"/>
      <File RelativePath="..\..\Source\GraphEditorPanel.h"/>
      <File RelativePath="..\..\Source\HostStartup.cpp"/>
      <File RelativePath="..\..\Source\InternalFilters.cpp"/>
      <File RelativePath="..\..\Source\InternalFilters.h"/>
      <File RelativePath="..\..\Source\MainHostWindow.cpp"/>
      <File RelativePath="..\..\Source\MainHostWindow.h"/>
    </Filter>
    <Filter Name="Juce Library Code">
      <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
--- a/extras/audio
+++ b/extras/audio
@@ -27,26 +27,24 @@
                   osxSDK="default" osxCompatibility="10.5 SDK" osxArchitecture="32BitUniversal"/>
  </CONFIGURATIONS>
  <MAINGROUP id="YdWL7hi7p" name="Plugin Host">
    <GROUP id="uhHLubiaQ" name="Source">
      <FILE id="8tLeuntR4" name="FilterGraph.cpp" compile="1" resource="0"
            file="Source/FilterGraph.cpp"/>
      <FILE id="auGSxnlTU" name="FilterGraph.h" compile="0" resource="0"
            file="Source/FilterGraph.h"/>
      <FILE id="2b09bSUt" name="GraphEditorPanel.cpp" compile="1" resource="0"
            file="Source/GraphEditorPanel.cpp"/>
      <FILE id="sj8Yug8cu" name="GraphEditorPanel.h" compile="0" resource="0"
            file="Source/GraphEditorPanel.h"/>
      <FILE id="nehnGjkrX" name="HostStartup.cpp" compile="1" resource="0"
            file="Source/HostStartup.cpp"/>
      <FILE id="J6HWWSQP1" name="InternalFilters.cpp" compile="1" resource="0"
            file="Source/InternalFilters.cpp"/>
      <FILE id="AplCcJ0La" name="InternalFilters.h" compile="0" resource="0"
            file="Source/InternalFilters.h"/>
      <FILE id="mFVSjbHfN" name="MainHostWindow.cpp" compile="1" resource="0"
            file="Source/MainHostWindow.cpp"/>
      <FILE id="h1kpxyzHi" name="MainHostWindow.h" compile="0" resource="0"
            file="Source/MainHostWindow.h"/>
    </GROUP>
    <FILE id="8tLeuntR4" name="FilterGraph.cpp" compile="1" resource="0"
          file="Source/FilterGraph.cpp"/>
    <FILE id="auGSxnlTU" name="FilterGraph.h" compile="0" resource="0"
          file="Source/FilterGraph.h"/>
    <FILE id="2b09bSUt" name="GraphEditorPanel.cpp" compile="1" resource="0"
          file="Source/GraphEditorPanel.cpp"/>
    <FILE id="sj8Yug8cu" name="GraphEditorPanel.h" compile="0" resource="0"
          file="Source/GraphEditorPanel.h"/>
    <FILE id="nehnGjkrX" name="HostStartup.cpp" compile="1" resource="0"
          file="Source/HostStartup.cpp"/>
    <FILE id="J6HWWSQP1" name="InternalFilters.cpp" compile="1" resource="0"
          file="Source/InternalFilters.cpp"/>
    <FILE id="AplCcJ0La" name="InternalFilters.h" compile="0" resource="0"
          file="Source/InternalFilters.h"/>
    <FILE id="mFVSjbHfN" name="MainHostWindow.cpp" compile="1" resource="0"
          file="Source/MainHostWindow.cpp"/>
    <FILE id="h1kpxyzHi" name="MainHostWindow.h" compile="0" resource="0"
          file="Source/MainHostWindow.h"/>
  </MAINGROUP>
  <JUCEOPTIONS JUCE_FORCE_DEBUG="default" JUCE_LOG_ASSERTIONS="default" JUCE_ASIO="default"
               JUCE_WASAPI="enabled" JUCE_DIRECTSOUND="enabled" JUCE_ALSA="enabled"
--- a/plugins/demo/Builds/Linux/Makefile
+++ b/plugins/demo/Builds/Linux/Makefile
@@ -45,11 +45,11 @@ endif
 OBJECTS := \
  $(OBJDIR)/PluginProcessor_a059e380.o \
  $(OBJDIR)/PluginEditor_94d4fb09.o \
  $(OBJDIR)/juce_VST_Wrapper_812bffb1.o \
  $(OBJDIR)/JuceLibraryCode1_682c927f.o \
  $(OBJDIR)/JuceLibraryCode2_683aaa00.o \
  $(OBJDIR)/JuceLibraryCode3_6848c181.o \
  $(OBJDIR)/JuceLibraryCode4_6856d902.o \
  $(OBJDIR)/juce_VST_Wrapper_812bffb1.o \

 .PHONY: clean

@@ -76,6 +76,11 @@ $(OBJDIR)/PluginEditor_94d4fb09.o: ../../Source/PluginEditor.cpp
 	@echo "Compiling PluginEditor.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"

 $(OBJDIR)/juce_VST_Wrapper_812bffb1.o: ../../../../../src/audio/plugin_client/VST/juce_VST_Wrapper.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling juce_VST_Wrapper.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"

 $(OBJDIR)/JuceLibraryCode1_682c927f.o: ../../JuceLibraryCode/JuceLibraryCode1.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling JuceLibraryCode1.cpp"
@@ -96,9 +101,4 @@ $(OBJDIR)/JuceLibraryCode4_6856d902.o: ../../JuceLibraryCode/JuceLibraryCode4.cp
 	@echo "Compiling JuceLibraryCode4.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"

 $(OBJDIR)/juce_VST_Wrapper_812bffb1.o: ../../../../../src/audio/plugin_client/VST/juce_VST_Wrapper.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling juce_VST_Wrapper.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"

 -include $(OBJECTS:%.o=%.d)
--- a/plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj
+++ b/plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj
@@ -6,27 +6,22 @@
 	objectVersion = 45;
 	objects = {

 		0860A8808F16C84CE7641D04 = { isa = PBXBuildFile; fileRef = 91F0411829B13595887CE52A; };
 		AC674433358C3691C8AC20AF = { isa = PBXBuildFile; fileRef = E226D5DEE103B1E298BD6E3E; };
 		5B83F34400A1B5844680E1CE = { isa = PBXBuildFile; fileRef = DBC6733A66786D64D63E7016; };
 		449473E31270237B0FFEBE72 = { isa = PBXBuildFile; fileRef = D036C01DC0E376205ABAA0CE; };
 		AFB1D55C5DA4C99D90DF3A6A = { isa = PBXBuildFile; fileRef = A2A2E49121DBB7C395E2420A; };
 		0860A8808F16C84CE7641D04 = { isa = PBXBuildFile; fileRef = 91F0411829B13595887CE52A; };
 		EF358E6194DB7EE60A1CE13D = { isa = PBXBuildFile; fileRef = 41FDE3A9AC13B3D1F230088E; };
 		E504A4E425435E78197183F3 = { isa = PBXBuildFile; fileRef = 2307ABAB0264959E640E9E37; };
 		53E2C1531CB485CCDD230774 = { isa = PBXBuildFile; fileRef = 88C8229131104E50F4F0D137; };
 		73B8F48633153DA5A10873E8 = { isa = PBXBuildFile; fileRef = 01A30B0A0B9B5064D9B75474; };
 		B9C31FD116F29E7E4752EB90 = { isa = PBXBuildFile; fileRef = 423550EB3CF502541882C50E; };
 		AFB1D55C5DA4C99D90DF3A6A = { isa = PBXBuildFile; fileRef = A2A2E49121DBB7C395E2420A; };
 		370C0F92C3CC1B6C563A7A94 = { isa = PBXBuildFile; fileRef = FBA2E307398FFC8A2693C933; };
 		68746D242F6A6102FDD5D03D = { isa = PBXBuildFile; fileRef = B050085463EEB5F8367314CB; };
 		205AA28314AC784F2CF1FA98 = { isa = PBXBuildFile; fileRef = B4F88060202011416CB3278B; };
 		68746D242F6A6102FDD5D03D = { isa = PBXBuildFile; fileRef = B050085463EEB5F8367314CB; };
 		CBE9E6042991B0677E3136D2 = { isa = PBXBuildFile; fileRef = 678CC9E413A7CF979964CEF7; };
 		AC674433358C3691C8AC20AF = { isa = PBXBuildFile; fileRef = E226D5DEE103B1E298BD6E3E; };
 		5B83F34400A1B5844680E1CE = { isa = PBXBuildFile; fileRef = DBC6733A66786D64D63E7016; };
 		E504A4E425435E78197183F3 = { isa = PBXBuildFile; fileRef = 2307ABAB0264959E640E9E37; };
 		AC674433358C3691C8AC20AF = { isa = PBXBuildFile; fileRef = E226D5DEE103B1E298BD6E3E; };
 		73B8F48633153DA5A10873E8 = { isa = PBXBuildFile; fileRef = 01A30B0A0B9B5064D9B75474; };
 		5AF66C048A4815F5A8ECDDCD = { isa = PBXBuildFile; fileRef = B50846B34831C2C28007BE7D; };
 		209FB8C7F7BE85A70E5D98D7 = { isa = PBXBuildFile; fileRef = 2C001306D198F8B21ABA7375; };
 		99CB24952ADDDFA320CB3B23 = { isa = PBXBuildFile; fileRef = 21CE5C9490494A2139D61408; };
 		9551342606A895BB5BA07F2E = { isa = PBXBuildFile; fileRef = 6AE52580AD24BD551DB99758; };
 		A1E844C7D2636CC38585B429 = { isa = PBXBuildFile; fileRef = B31CFE8BBA103078E19D1B97; };
 		BD7E5458BE2F33DBBF5AF834 = { isa = PBXBuildFile; fileRef = FD33B687C6FBA3ABC581AFD7; };
 		3DFA294CC79D06F066723396 = { isa = PBXBuildFile; fileRef = 94A977DEE6BE2081CA0213FE; };
 		7C5B1DFA35A2EA8DFB2A40C9 = { isa = PBXBuildFile; fileRef = 00E2C89A148A2491288DF242; };
 		6FC7ABF9C15FE51D4073E3D2 = { isa = PBXBuildFile; fileRef = 4751785A8DF8E6DA39550E63; };
@@ -53,34 +48,30 @@
 		4BB4B93E0E58FC0D5FE82292 = { isa = PBXBuildFile; fileRef = 6EC9B05A43174FFF25BA3382; settings = {COMPILER_FLAGS = "-w"; }; };
 		EE224227E577BA498E98DC9A = { isa = PBXBuildFile; fileRef = 257FA3A7290842556A7377A4; settings = {COMPILER_FLAGS = "-w"; }; };
 		F0BEF1392277DBDC409A06A3 = { isa = PBXBuildFile; fileRef = 55D565AF7527BA71D7ADC2D4; settings = {COMPILER_FLAGS = "-w"; }; };
 		91F0411829B13595887CE52A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		99CB24952ADDDFA320CB3B23 = { isa = PBXBuildFile; fileRef = 21CE5C9490494A2139D61408; };
 		9551342606A895BB5BA07F2E = { isa = PBXBuildFile; fileRef = 6AE52580AD24BD551DB99758; };
 		A1E844C7D2636CC38585B429 = { isa = PBXBuildFile; fileRef = B31CFE8BBA103078E19D1B97; };
 		BD7E5458BE2F33DBBF5AF834 = { isa = PBXBuildFile; fileRef = FD33B687C6FBA3ABC581AFD7; };
 		E226D5DEE103B1E298BD6E3E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		DBC6733A66786D64D63E7016 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
 		D036C01DC0E376205ABAA0CE = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		A2A2E49121DBB7C395E2420A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		91F0411829B13595887CE52A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		41FDE3A9AC13B3D1F230088E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
 		2307ABAB0264959E640E9E37 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; };
 		88C8229131104E50F4F0D137 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
 		01A30B0A0B9B5064D9B75474 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		423550EB3CF502541882C50E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; };
 		A2A2E49121DBB7C395E2420A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		FBA2E307398FFC8A2693C933 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		B050085463EEB5F8367314CB = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		B4F88060202011416CB3278B = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
 		B050085463EEB5F8367314CB = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		678CC9E413A7CF979964CEF7 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
 		E226D5DEE103B1E298BD6E3E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		DBC6733A66786D64D63E7016 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
 		2307ABAB0264959E640E9E37 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; };
 		E226D5DEE103B1E298BD6E3E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		01A30B0A0B9B5064D9B75474 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		AF721FB8136D2CAA9404AD8D = { isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JuceDemoPlugin.component; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		81567EBA449466A95492511B = { isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = "SOURCE_ROOT"; };
 		B50846B34831C2C28007BE7D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PluginProcessor.cpp; path = ../../Source/PluginProcessor.cpp; sourceTree = "SOURCE_ROOT"; };
 		CF304FBE4BC66783833C4B59 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PluginProcessor.h; path = ../../Source/PluginProcessor.h; sourceTree = "SOURCE_ROOT"; };
 		2C001306D198F8B21ABA7375 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PluginEditor.cpp; path = ../../Source/PluginEditor.cpp; sourceTree = "SOURCE_ROOT"; };
 		662507104D05B579BB68F391 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PluginEditor.h; path = ../../Source/PluginEditor.h; sourceTree = "SOURCE_ROOT"; };
 		55F13334336342B374FA505C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; };
 		1C7D0AE1352D6713D906C4AB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; };
 		21CE5C9490494A2139D61408 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode1.mm; path = ../../JuceLibraryCode/JuceLibraryCode1.mm; sourceTree = "SOURCE_ROOT"; };
 		6AE52580AD24BD551DB99758 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode2.mm; path = ../../JuceLibraryCode/JuceLibraryCode2.mm; sourceTree = "SOURCE_ROOT"; };
 		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"; };
 		94A977DEE6BE2081CA0213FE = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_VST_Wrapper.cpp"; path = "../../../../../src/audio/plugin_client/VST/juce_VST_Wrapper.cpp"; sourceTree = "SOURCE_ROOT"; };
 		00E2C89A148A2491288DF242 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_VST_Wrapper.mm"; path = "../../../../../src/audio/plugin_client/VST/juce_VST_Wrapper.mm"; sourceTree = "SOURCE_ROOT"; };
 		4751785A8DF8E6DA39550E63 = { isa = PBXFileReference; lastKnownFileType = file.r; name = "juce_AU_Resources.r"; path = "../../../../../src/audio/plugin_client/AU/juce_AU_Resources.r"; sourceTree = "SOURCE_ROOT"; };
@@ -135,19 +126,18 @@
 		8E41015AF77D494DDAB5546F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUInputFormatConverter.h; path = Extras/CoreAudio/AudioUnits/AUPublic/Utility/AUInputFormatConverter.h; sourceTree = "DEVELOPER_DIR"; };
 		B50242715BF944E7711A5939 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUSilentTimeout.h; path = Extras/CoreAudio/AudioUnits/AUPublic/Utility/AUSilentTimeout.h; sourceTree = "DEVELOPER_DIR"; };
 		F2595F2DC0235F848F9474E8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AUTimestampGenerator.h; path = Extras/CoreAudio/AudioUnits/AUPublic/Utility/AUTimestampGenerator.h; sourceTree = "DEVELOPER_DIR"; };
 		7B366D238FBBC31D17A18D2C = { isa = PBXGroup; children = (
 		55F13334336342B374FA505C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; };
 		1C7D0AE1352D6713D906C4AB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; };
 		21CE5C9490494A2139D61408 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode1.mm; path = ../../JuceLibraryCode/JuceLibraryCode1.mm; sourceTree = "SOURCE_ROOT"; };
 		6AE52580AD24BD551DB99758 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode2.mm; path = ../../JuceLibraryCode/JuceLibraryCode2.mm; sourceTree = "SOURCE_ROOT"; };
 		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"; };
 		E1C5E3C67B4A2621AD2D3E05 = { isa = PBXGroup; children = (
 				B50846B34831C2C28007BE7D,
 				CF304FBE4BC66783833C4B59,
 				2C001306D198F8B21ABA7375,
 				662507104D05B579BB68F391 ); name = Source; sourceTree = "<group>"; };
 		C3E8F897FB646B0E8E7FC67C = { isa = PBXGroup; children = (
 				55F13334336342B374FA505C,
 				1C7D0AE1352D6713D906C4AB,
 				21CE5C9490494A2139D61408,
 				6AE52580AD24BD551DB99758,
 				B31CFE8BBA103078E19D1B97,
 				FD33B687C6FBA3ABC581AFD7,
 				DF8AD10F6B21858C3378B63F ); name = "Juce Library Code"; sourceTree = "<group>"; };
 				662507104D05B579BB68F391 ); name = JuceDemoPlugin; sourceTree = "<group>"; };
 		B7F037957C49AE7943C354C9 = { isa = PBXGroup; children = (
 				94A977DEE6BE2081CA0213FE,
 				00E2C89A148A2491288DF242 ); name = "Juce VST Wrapper"; sourceTree = "<group>"; };
@@ -206,31 +196,38 @@
 				4751785A8DF8E6DA39550E63,
 				3EF0D861DF9DE96DDAAE0951,
 				17A9711DC035377B969B90C2 ); name = "Juce AU Wrapper"; sourceTree = "<group>"; };
 		C3E8F897FB646B0E8E7FC67C = { isa = PBXGroup; children = (
 				55F13334336342B374FA505C,
 				1C7D0AE1352D6713D906C4AB,
 				21CE5C9490494A2139D61408,
 				6AE52580AD24BD551DB99758,
 				B31CFE8BBA103078E19D1B97,
 				FD33B687C6FBA3ABC581AFD7,
 				DF8AD10F6B21858C3378B63F ); name = "Juce Library Code"; sourceTree = "<group>"; };
 		7756687B5FD0903C5F83BB9E = { isa = PBXGroup; children = (
 				81567EBA449466A95492511B ); name = Resources; sourceTree = "<group>"; };
 		9B041E4036493224CFD075FF = { isa = PBXGroup; children = (
 				91F0411829B13595887CE52A,
 				E226D5DEE103B1E298BD6E3E,
 				DBC6733A66786D64D63E7016,
 				D036C01DC0E376205ABAA0CE,
 				A2A2E49121DBB7C395E2420A,
 				91F0411829B13595887CE52A,
 				41FDE3A9AC13B3D1F230088E,
 				2307ABAB0264959E640E9E37,
 				88C8229131104E50F4F0D137,
 				01A30B0A0B9B5064D9B75474,
 				423550EB3CF502541882C50E,
 				A2A2E49121DBB7C395E2420A,
 				FBA2E307398FFC8A2693C933,
 				B050085463EEB5F8367314CB,
 				B4F88060202011416CB3278B,
 				B050085463EEB5F8367314CB,
 				678CC9E413A7CF979964CEF7,
 				E226D5DEE103B1E298BD6E3E,
 				DBC6733A66786D64D63E7016,
 				2307ABAB0264959E640E9E37,
 				E226D5DEE103B1E298BD6E3E ); name = Frameworks; sourceTree = "<group>"; };
 				01A30B0A0B9B5064D9B75474 ); name = Frameworks; sourceTree = "<group>"; };
 		A60AEBCC9579AD6BA9D5CA4B = { isa = PBXGroup; children = (
 				AF721FB8136D2CAA9404AD8D ); name = Products; sourceTree = "<group>"; };
 		E1C5E3C67B4A2621AD2D3E05 = { isa = PBXGroup; children = (
 				7B366D238FBBC31D17A18D2C,
 				C3E8F897FB646B0E8E7FC67C,
 		9DC33026DCB453C5B40EA9B3 = { isa = PBXGroup; children = (
 				E1C5E3C67B4A2621AD2D3E05,
 				B7F037957C49AE7943C354C9,
 				5180919A8096CFD082284336,
 				C3E8F897FB646B0E8E7FC67C,
 				7756687B5FD0903C5F83BB9E,
 				9B041E4036493224CFD075FF,
 				A60AEBCC9579AD6BA9D5CA4B ); name = Source; sourceTree = "<group>"; };
@@ -239,8 +236,8 @@
 				HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 $(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility $(inherited)";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_STYLE = Bundle;
 				INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/";
 				LIBRARY_STYLE = Bundle;
 				WRAPPER_EXTENSION = component;
 				GENERATE_PKGINFO_FILE = YES;
 				OTHER_REZFLAGS = "-d ppc_$ppc -d i386_$i386 -d ppc64_$ppc64 -d x86_64_$x86_64 -I /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Versions/A/Headers -I \"$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase\"";
@@ -260,8 +257,8 @@
 				HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 $(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility $(inherited)";
 				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = Info.plist;
 				LIBRARY_STYLE = Bundle;
 				INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/";
 				LIBRARY_STYLE = Bundle;
 				WRAPPER_EXTENSION = component;
 				GENERATE_PKGINFO_FILE = YES;
 				OTHER_REZFLAGS = "-d ppc_$ppc -d i386_$i386 -d ppc64_$ppc64 -d x86_64_$x86_64 -I /System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Versions/A/Headers -I \"$(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase\"";
@@ -316,10 +313,6 @@
 		F0F39FCA8C402F34BB74F6B3 = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = (
 				5AF66C048A4815F5A8ECDDCD,
 				209FB8C7F7BE85A70E5D98D7,
 				99CB24952ADDDFA320CB3B23,
 				9551342606A895BB5BA07F2E,
 				A1E844C7D2636CC38585B429,
 				BD7E5458BE2F33DBBF5AF834,
 				3DFA294CC79D06F066723396,
 				7C5B1DFA35A2EA8DFB2A40C9,
 				CC35AB7C8D157D7211320179,
@@ -344,23 +337,26 @@
 				A2718BCD8261456359155ABE,
 				4BB4B93E0E58FC0D5FE82292,
 				EE224227E577BA498E98DC9A,
 				F0BEF1392277DBDC409A06A3 ); runOnlyForDeploymentPostprocessing = 0; };
 				F0BEF1392277DBDC409A06A3,
 				99CB24952ADDDFA320CB3B23,
 				9551342606A895BB5BA07F2E,
 				A1E844C7D2636CC38585B429,
 				BD7E5458BE2F33DBBF5AF834 ); runOnlyForDeploymentPostprocessing = 0; };
 		9519B014653C694C3456E5A4 = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = (
 				0860A8808F16C84CE7641D04,
 				AC674433358C3691C8AC20AF,
 				5B83F34400A1B5844680E1CE,
 				449473E31270237B0FFEBE72,
 				AFB1D55C5DA4C99D90DF3A6A,
 				0860A8808F16C84CE7641D04,
 				EF358E6194DB7EE60A1CE13D,
 				E504A4E425435E78197183F3,
 				53E2C1531CB485CCDD230774,
 				73B8F48633153DA5A10873E8,
 				B9C31FD116F29E7E4752EB90,
 				AFB1D55C5DA4C99D90DF3A6A,
 				370C0F92C3CC1B6C563A7A94,
 				68746D242F6A6102FDD5D03D,
 				205AA28314AC784F2CF1FA98,
 				68746D242F6A6102FDD5D03D,
 				CBE9E6042991B0677E3136D2,
 				AC674433358C3691C8AC20AF,
 				5B83F34400A1B5844680E1CE,
 				E504A4E425435E78197183F3,
 				AC674433358C3691C8AC20AF ); runOnlyForDeploymentPostprocessing = 0; };
 				73B8F48633153DA5A10873E8 ); runOnlyForDeploymentPostprocessing = 0; };
 		06539322921079C10A447670 = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = (  ); runOnlyForDeploymentPostprocessing = 0; name = "Copy to the different plugin folders"; shellPath = /bin/sh; shellScript = "\n# This script takes the build product and copies it to the AU, VST, and RTAS folders, depending on \n# which plugin types you've built\n\noriginal=$CONFIGURATION_BUILD_DIR/$FULL_PRODUCT_NAME\n\n# this looks inside the binary to detect which platforms are needed.. \ncopyAU=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'AudioUnit' | wc -l`\ncopyVST=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'VSTPlugin' | wc -l`\ncopyRTAS=`nm -g \"$CONFIGURATION_BUILD_DIR/$EXECUTABLE_PATH\" | grep -i 'CProcess' | wc -l`\n\nif [ $copyAU -gt 0 ]; then\n  echo \"Copying to AudioUnit folder...\"\n  AU=~/Library/Audio/Plug-Ins/Components/$PRODUCT_NAME.component\n  if [ -d \"$AU\" ]; then \n    rm -r \"$AU\"\n  fi\n\n  cp -r \"$original\" \"$AU\"\n  sed -i \"\" -e 's/TDMwPTul/BNDLPTul/g' \"$AU/Contents/PkgInfo\"\n  sed -i \"\" -e 's/TDMw/BNDL/g' \"$AU/Contents/$INFOPLIST_FILE\"\nfi\n\nif [ $copyVST -gt 0 ]; then\n  echo \"Copying to VST folder...\"\n  VST=~/Library/Audio/Plug-Ins/VST/$PRODUCT_NAME.vst\n  if [ -d \"$VST\" ]; then \n    rm -r \"$VST\"\n  fi\n\n  cp -r \"$original\" \"$VST\"\n  sed -i \"\" -e 's/TDMwPTul/BNDLPTul/g' \"$VST/Contents/PkgInfo\"\n  sed -i \"\" -e 's/TDMw/BNDL/g' \"$VST/Contents/$INFOPLIST_FILE\"\nfi\n\nif [ $copyRTAS -gt 0 ]; then\n  echo \"Copying to RTAS folder...\"\n  RTAS=/Library/Application\\ Support/Digidesign/Plug-Ins/$PRODUCT_NAME.dpm\n  if [ -d \"$RTAS\" ]; then\n    rm -r \"$RTAS\"\n  fi\n\n  cp -r \"$original\" \"$RTAS\"\nfi\n"; };
 		792509270ABF8E6A65E16172 = { isa = PBXNativeTarget; buildConfigurationList = 392E8263441DF125E3215D42; buildPhases = (
 				145D936BBD5425D74172B206,
@@ -368,7 +364,7 @@
 				F0F39FCA8C402F34BB74F6B3,
 				9519B014653C694C3456E5A4,
 				06539322921079C10A447670 ); buildRules = ( ); dependencies = ( ); name = JuceDemoPlugin; productName = JuceDemoPlugin; productReference = AF721FB8136D2CAA9404AD8D; productInstallPath = "$(HOME)/Library/Audio/Plug-Ins/Components/"; productType = "com.apple.product-type.bundle"; };
 		64CEAC70FBD5AC5BD1D686C9 = { isa = PBXProject; buildConfigurationList = 91EB753864A948DE4421285E; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = E1C5E3C67B4A2621AD2D3E05; projectDirPath = ""; projectRoot = ""; targets = ( 792509270ABF8E6A65E16172 ); };
 		64CEAC70FBD5AC5BD1D686C9 = { isa = PBXProject; buildConfigurationList = 91EB753864A948DE4421285E; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 9DC33026DCB453C5B40EA9B3; projectDirPath = ""; projectRoot = ""; targets = ( 792509270ABF8E6A65E16172 ); };
 	};
 	rootObject = 64CEAC70FBD5AC5BD1D686C9;
 }
--- a/plugins/demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj
+++ b/plugins/demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj
@@ -128,12 +128,13 @@
  <References/>
  <Files>
    <Filter Name="JuceDemoPlugin">
      <Filter Name="Source">
        <File RelativePath="..\..\Source\PluginProcessor.cpp"/>
        <File RelativePath="..\..\Source\PluginProcessor.h"/>
        <File RelativePath="..\..\Source\PluginEditor.cpp"/>
        <File RelativePath="..\..\Source\PluginEditor.h"/>
      </Filter>
      <File RelativePath="..\..\Source\PluginProcessor.cpp"/>
      <File RelativePath="..\..\Source\PluginProcessor.h"/>
      <File RelativePath="..\..\Source\PluginEditor.cpp"/>
      <File RelativePath="..\..\Source\PluginEditor.h"/>
    </Filter>
    <Filter Name="Juce VST Wrapper">
      <File RelativePath="..\..\..\..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.cpp"/>
    </Filter>
    <Filter Name="Juce Library Code">
      <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
@@ -144,9 +145,6 @@
      <File RelativePath="..\..\JuceLibraryCode\JuceLibraryCode4.cpp"/>
      <File RelativePath="..\..\JuceLibraryCode\JucePluginCharacteristics.h"/>
    </Filter>
    <Filter Name="Juce VST Wrapper">
      <File RelativePath="..\..\..\..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.cpp"/>
    </Filter>
  </Files>
  <Globals/>
 </VisualStudioProject>
--- a/plugins/demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj
+++ b/plugins/demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj
@@ -128,12 +128,13 @@
  <References/>
  <Files>
    <Filter Name="JuceDemoPlugin">
      <Filter Name="Source">
        <File RelativePath="..\..\Source\PluginProcessor.cpp"/>
        <File RelativePath="..\..\Source\PluginProcessor.h"/>
        <File RelativePath="..\..\Source\PluginEditor.cpp"/>
        <File RelativePath="..\..\Source\PluginEditor.h"/>
      </Filter>
      <File RelativePath="..\..\Source\PluginProcessor.cpp"/>
      <File RelativePath="..\..\Source\PluginProcessor.h"/>
      <File RelativePath="..\..\Source\PluginEditor.cpp"/>
      <File RelativePath="..\..\Source\PluginEditor.h"/>
    </Filter>
    <Filter Name="Juce VST Wrapper">
      <File RelativePath="..\..\..\..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.cpp"/>
    </Filter>
    <Filter Name="Juce Library Code">
      <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
@@ -144,9 +145,6 @@
      <File RelativePath="..\..\JuceLibraryCode\JuceLibraryCode4.cpp"/>
      <File RelativePath="..\..\JuceLibraryCode\JucePluginCharacteristics.h"/>
    </Filter>
    <Filter Name="Juce VST Wrapper">
      <File RelativePath="..\..\..\..\..\src\audio\plugin_client\VST\juce_VST_Wrapper.cpp"/>
    </Filter>
  </Files>
  <Globals/>
 </VisualStudioProject>
--- a/plugins/demo/JuceDemoPlugin.jucer
+++ b/plugins/demo/JuceDemoPlugin.jucer
@@ -25,16 +25,14 @@
                   osxSDK="default" osxCompatibility="default"/>
  </CONFIGURATIONS>
  <MAINGROUP id="dYAMo6Ykd" name="JuceDemoPlugin">
    <GROUP id="enRTGyDMs" name="Source">
      <FILE id="gFFr0hbSp" name="PluginProcessor.cpp" compile="1" resource="0"
            file="Source/PluginProcessor.cpp"/>
      <FILE id="PkpMNdnIr" name="PluginProcessor.h" compile="0" resource="0"
            file="Source/PluginProcessor.h"/>
      <FILE id="RCFlkTAef" name="PluginEditor.cpp" compile="1" resource="0"
            file="Source/PluginEditor.cpp"/>
      <FILE id="Iif5nfHL" name="PluginEditor.h" compile="0" resource="0"
            file="Source/PluginEditor.h"/>
    </GROUP>
    <FILE id="gFFr0hbSp" name="PluginProcessor.cpp" compile="1" resource="0"
          file="Source/PluginProcessor.cpp"/>
    <FILE id="PkpMNdnIr" name="PluginProcessor.h" compile="0" resource="0"
          file="Source/PluginProcessor.h"/>
    <FILE id="RCFlkTAef" name="PluginEditor.cpp" compile="1" resource="0"
          file="Source/PluginEditor.cpp"/>
    <FILE id="Iif5nfHL" name="PluginEditor.h" compile="0" resource="0"
          file="Source/PluginEditor.h"/>
  </MAINGROUP>
  <JUCEOPTIONS JUCE_QUICKTIME="disabled" JUCE_FORCE_DEBUG="default" JUCE_LOG_ASSERTIONS="default"
               JUCE_ASIO="default" JUCE_WASAPI="default" JUCE_DIRECTSOUND="default"
--- a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj
+++ b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj
@@ -6,32 +6,32 @@
 	objectVersion = 45;
 	objects = {

 		E8996D80686F2B3EC62DBDBB = { isa = PBXBuildFile; fileRef = 7119161802FA9887683494D0; };
 		8C9019232ED599839765DF56 = { isa = PBXBuildFile; fileRef = C25FAADEC95C14D468751DD4; };
 		24BD48D3FBC9865DDEB76D29 = { isa = PBXBuildFile; fileRef = B06F951EA83CD91239635064; };
 		7FE9AA5C36FD1C7F6F98E900 = { isa = PBXBuildFile; fileRef = 72DAB9810A241AB5649BF2B0; };
 		E8996D80686F2B3EC62DBDBB = { isa = PBXBuildFile; fileRef = 7119161802FA9887683494D0; };
 		BF6D53618D24D1D9EAC491D3 = { isa = PBXBuildFile; fileRef = 2125B8A9846C15B3D1F8B735; };
 		330A9643F50DE8BEACDBB61B = { isa = PBXBuildFile; fileRef = 58F0F7911A68A142C3A981ED; };
 		53E0B9862C5E908771C0228F = { isa = PBXBuildFile; fileRef = E1CBD0FBF4E4B347B87F031B; };
 		99FCE4C1FE4BE160260A9B37 = { isa = PBXBuildFile; fileRef = 125E25EB254E6536E73B74A5; };
 		7FE9AA5C36FD1C7F6F98E900 = { isa = PBXBuildFile; fileRef = 72DAB9810A241AB5649BF2B0; };
 		0735D492AB157E5F26F2293A = { isa = PBXBuildFile; fileRef = DBDAB8F811D84F6C055C78DA; };
 		489C322518A3C4F4DC8E8FE4 = { isa = PBXBuildFile; fileRef = 9088DD545C3708EA053CC371; };
 		008367830DF5DB21FBAAA93F = { isa = PBXBuildFile; fileRef = 94105561197974333B7BD632; };
 		489C322518A3C4F4DC8E8FE4 = { isa = PBXBuildFile; fileRef = 9088DD545C3708EA053CC371; };
 		9B12BA0402DA13494DFAE588 = { isa = PBXBuildFile; fileRef = 36A58EE4FBF01289682D7DAD; };
 		8C9019232ED599839765DF56 = { isa = PBXBuildFile; fileRef = C25FAADEC95C14D468751DD4; };
 		53E0B9862C5E908771C0228F = { isa = PBXBuildFile; fileRef = E1CBD0FBF4E4B347B87F031B; };
 		707392A801368BCEE86E5256 = { isa = PBXBuildFile; fileRef = 9049BFDEB4FA33D1BAC82FAC; };
 		D51982959E41125E4F4E92FA = { isa = PBXBuildFile; fileRef = 8B9506611F425243DD224A90; };
 		7119161802FA9887683494D0 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		C25FAADEC95C14D468751DD4 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		B06F951EA83CD91239635064 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		72DAB9810A241AB5649BF2B0 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		7119161802FA9887683494D0 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		2125B8A9846C15B3D1F8B735 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
 		58F0F7911A68A142C3A981ED = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
 		E1CBD0FBF4E4B347B87F031B = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		125E25EB254E6536E73B74A5 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; };
 		72DAB9810A241AB5649BF2B0 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		DBDAB8F811D84F6C055C78DA = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		9088DD545C3708EA053CC371 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		94105561197974333B7BD632 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
 		9088DD545C3708EA053CC371 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		36A58EE4FBF01289682D7DAD = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
 		C25FAADEC95C14D468751DD4 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		E1CBD0FBF4E4B347B87F031B = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		7FABD4A9FCB57F9C63BD5D34 = { isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = BinaryBuilder; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		9049BFDEB4FA33D1BAC82FAC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Main.cpp; path = ../../Source/Main.cpp; sourceTree = "SOURCE_ROOT"; };
 		351908352BAB95A544A300F2 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; };
@@ -39,28 +39,30 @@
 		8B9506611F425243DD224A90 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = JuceLibraryCode.mm; path = ../../JuceLibraryCode/JuceLibraryCode.mm; sourceTree = "SOURCE_ROOT"; };
 		B7B714F1BC580B5898069A1D = { isa = PBXGroup; children = (
 				9049BFDEB4FA33D1BAC82FAC ); name = Source; sourceTree = "<group>"; };
 		07E3546C6DFA9084D23A33E9 = { isa = PBXGroup; children = (
 				B7B714F1BC580B5898069A1D ); name = BinaryBuilder; sourceTree = "<group>"; };
 		9310BD97E4BDBEE06D277513 = { isa = PBXGroup; children = (
 				351908352BAB95A544A300F2,
 				FC95DFE22E66CA05B8BF7352,
 				8B9506611F425243DD224A90 ); name = "Juce Library Code"; sourceTree = "<group>"; };
 		578E3D7C3819F32E2E3C6A34 = { isa = PBXGroup; children = (  ); name = Resources; sourceTree = "<group>"; };
 		6A2DE3401F8295169E892596 = { isa = PBXGroup; children = (
 				7119161802FA9887683494D0,
 				C25FAADEC95C14D468751DD4,
 				B06F951EA83CD91239635064,
 				72DAB9810A241AB5649BF2B0,
 				7119161802FA9887683494D0,
 				2125B8A9846C15B3D1F8B735,
 				58F0F7911A68A142C3A981ED,
 				E1CBD0FBF4E4B347B87F031B,
 				125E25EB254E6536E73B74A5,
 				72DAB9810A241AB5649BF2B0,
 				DBDAB8F811D84F6C055C78DA,
 				9088DD545C3708EA053CC371,
 				94105561197974333B7BD632,
 				9088DD545C3708EA053CC371,
 				36A58EE4FBF01289682D7DAD,
 				C25FAADEC95C14D468751DD4 ); name = Frameworks; sourceTree = "<group>"; };
 				E1CBD0FBF4E4B347B87F031B ); name = Frameworks; sourceTree = "<group>"; };
 		8532B0CC7DC2F05D888E79F2 = { isa = PBXGroup; children = (
 				7FABD4A9FCB57F9C63BD5D34 ); name = Products; sourceTree = "<group>"; };
 		07E3546C6DFA9084D23A33E9 = { isa = PBXGroup; children = (
 				B7B714F1BC580B5898069A1D,
 		6DFB0526C5FDA6A794B7585A = { isa = PBXGroup; children = (
 				07E3546C6DFA9084D23A33E9,
 				9310BD97E4BDBEE06D277513,
 				578E3D7C3819F32E2E3C6A34,
 				6A2DE3401F8295169E892596,
@@ -70,6 +72,7 @@
 				HEADER_SEARCH_PATHS = " $(inherited)";
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "/usr/bin";
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
 				ONLY_ACTIVE_ARCH = YES;
 				COPY_PHASE_STRIP = NO;
@@ -85,6 +88,7 @@
 				HEADER_SEARCH_PATHS = " $(inherited)";
 				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "/usr/bin";
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
@@ -134,23 +138,23 @@
 				707392A801368BCEE86E5256,
 				D51982959E41125E4F4E92FA ); runOnlyForDeploymentPostprocessing = 0; };
 		753185144E84CC3E130F945B = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = (
 				E8996D80686F2B3EC62DBDBB,
 				8C9019232ED599839765DF56,
 				24BD48D3FBC9865DDEB76D29,
 				7FE9AA5C36FD1C7F6F98E900,
 				E8996D80686F2B3EC62DBDBB,
 				BF6D53618D24D1D9EAC491D3,
 				330A9643F50DE8BEACDBB61B,
 				53E0B9862C5E908771C0228F,
 				99FCE4C1FE4BE160260A9B37,
 				7FE9AA5C36FD1C7F6F98E900,
 				0735D492AB157E5F26F2293A,
 				489C322518A3C4F4DC8E8FE4,
 				008367830DF5DB21FBAAA93F,
 				489C322518A3C4F4DC8E8FE4,
 				9B12BA0402DA13494DFAE588,
 				8C9019232ED599839765DF56 ); runOnlyForDeploymentPostprocessing = 0; };
 				53E0B9862C5E908771C0228F ); runOnlyForDeploymentPostprocessing = 0; };
 		495DDE27E308E15C44991018 = { isa = PBXNativeTarget; buildConfigurationList = 195657633D555407C2EA0CE8; buildPhases = (
 				F485685C969D78B9212B61AD,
 				C02C54CA659982168A3DA559,
 				753185144E84CC3E130F945B ); buildRules = ( ); dependencies = ( ); name = BinaryBuilder; productName = BinaryBuilder; productReference = 7FABD4A9FCB57F9C63BD5D34; productInstallPath = /usr/bin; productType = "com.apple.product-type.tool"; };
 		33F77160E42E0F4DA09F3660 = { isa = PBXProject; buildConfigurationList = 71143A294DF2ABC013DAD8F4; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 07E3546C6DFA9084D23A33E9; projectDirPath = ""; projectRoot = ""; targets = ( 495DDE27E308E15C44991018 ); };
 		33F77160E42E0F4DA09F3660 = { isa = PBXProject; buildConfigurationList = 71143A294DF2ABC013DAD8F4; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 6DFB0526C5FDA6A794B7585A; projectDirPath = ""; projectRoot = ""; targets = ( 495DDE27E308E15C44991018 ); };
 	};
 	rootObject = 33F77160E42E0F4DA09F3660;
 }
--- a/extras/binarybuilder/Builds/VisualStudio2005/BinaryBuilder.vcproj
+++ b/extras/binarybuilder/Builds/VisualStudio2005/BinaryBuilder.vcproj
@@ -33,7 +33,7 @@
            BufferSecurityCheck=""
            DebugInformationFormat="4"
            AdditionalIncludeDirectories=""
            PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_CONSOLE;JUCER_VS2005_78A5003=1"
            PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1"
            RuntimeLibrary="1"
            RuntimeTypeInfo="true"
            UsePrecompiledHeader="0"
@@ -89,7 +89,7 @@
            InlineFunctionExpansion="1"
            StringPooling="true"
            AdditionalIncludeDirectories=""
            PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE;JUCER_VS2005_78A5003=1"
            PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1"
            RuntimeLibrary="0"
            RuntimeTypeInfo="true"
            UsePrecompiledHeader="0"
--- a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj
+++ b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj
@@ -33,7 +33,7 @@
            BufferSecurityCheck=""
            DebugInformationFormat="4"
            AdditionalIncludeDirectories=""
            PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_CONSOLE;JUCER_VS2008_78A5006=1"
            PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1"
            RuntimeLibrary="1"
            RuntimeTypeInfo="true"
            UsePrecompiledHeader="0"
@@ -89,7 +89,7 @@
            InlineFunctionExpansion="1"
            StringPooling="true"
            AdditionalIncludeDirectories=""
            PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE;JUCER_VS2008_78A5006=1"
            PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1"
            RuntimeLibrary="0"
            RuntimeTypeInfo="true"
            UsePrecompiledHeader="0"
--- a/projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj
+++ b/projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj
@@ -6,36 +6,36 @@
 	objectVersion = 45;
 	objects = {

 		3F902D2C41E0C1FFC90C2724 = { isa = PBXBuildFile; fileRef = C820D5B3DC8B4E486B13FF4A; };
 		D397D8CEF8663F449B4439C0 = { isa = PBXBuildFile; fileRef = 18665A7A93EDBA956B64774E; };
 		7BC4087FD54A2C1ED196C892 = { isa = PBXBuildFile; fileRef = 076655B982BD7FD33C52BAEE; };
 		C5E169F7107EC2306276438A = { isa = PBXBuildFile; fileRef = D9D2682DE4A5B07668895C2A; };
 		3F902D2C41E0C1FFC90C2724 = { isa = PBXBuildFile; fileRef = C820D5B3DC8B4E486B13FF4A; };
 		056513FD57B5879AEDB3FB4D = { isa = PBXBuildFile; fileRef = 772D78456EEEBC74C5D711AE; };
 		891256EECE8E8E7FAFCA1185 = { isa = PBXBuildFile; fileRef = AE08A72CF4EA4703C698EB57; };
 		A9F87921F5EF364874BF8D08 = { isa = PBXBuildFile; fileRef = 38D39096CD656A18BC6E6D85; };
 		EFF4A46CD8DC98212AF9F5A0 = { isa = PBXBuildFile; fileRef = 6866E587FFD01BF7EA2ADE1F; };
 		C5E169F7107EC2306276438A = { isa = PBXBuildFile; fileRef = D9D2682DE4A5B07668895C2A; };
 		6D3C942E85A6141029E184A4 = { isa = PBXBuildFile; fileRef = 22D27893FB59F52DF84AD344; };
 		9EA4F1C0E2356AB5C07CE95E = { isa = PBXBuildFile; fileRef = E6809DE026C8BEAB082B3DEB; };
 		569A272ED68671F2FE9903B8 = { isa = PBXBuildFile; fileRef = EA28150CE20A1AF43E5A30AB; };
 		9EA4F1C0E2356AB5C07CE95E = { isa = PBXBuildFile; fileRef = E6809DE026C8BEAB082B3DEB; };
 		E12A6AAFEC6BB91A41D85FF2 = { isa = PBXBuildFile; fileRef = 8DBD4D8FD571C84A6C0CD817; };
 		D397D8CEF8663F449B4439C0 = { isa = PBXBuildFile; fileRef = 18665A7A93EDBA956B64774E; };
 		A9F87921F5EF364874BF8D08 = { isa = PBXBuildFile; fileRef = 38D39096CD656A18BC6E6D85; };
 		C67B5243DBC7218FEC5DBCC0 = { isa = PBXBuildFile; fileRef = E7507E799D8BDA92BDB78915; };
 		9B11A7532637EC12F1DC4B2E = { isa = PBXBuildFile; fileRef = 0DB195C2B3538434D7D20B51; };
 		CFFBB821ECB7D85603624533 = { isa = PBXBuildFile; fileRef = 57FFE120531343D50B7D2D28; };
 		CB81C9C2C8729E6E3D47894E = { isa = PBXBuildFile; fileRef = 9025A92B6F0FB6F8EF51A168; };
 		D718D953943D6576572CCD49 = { isa = PBXBuildFile; fileRef = EA4C72277CEA392BC33435A7; };
 		D3AEE9F470093C7E82F10144 = { isa = PBXBuildFile; fileRef = 23634B2289D5AC4EA728B8F7; };
 		C820D5B3DC8B4E486B13FF4A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		18665A7A93EDBA956B64774E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		076655B982BD7FD33C52BAEE = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		D9D2682DE4A5B07668895C2A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		C820D5B3DC8B4E486B13FF4A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		772D78456EEEBC74C5D711AE = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
 		AE08A72CF4EA4703C698EB57 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; };
 		38D39096CD656A18BC6E6D85 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		6866E587FFD01BF7EA2ADE1F = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; };
 		D9D2682DE4A5B07668895C2A = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
 		22D27893FB59F52DF84AD344 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		E6809DE026C8BEAB082B3DEB = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		EA28150CE20A1AF43E5A30AB = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = System/Library/Frameworks/QTKit.framework; sourceTree = SDKROOT; };
 		E6809DE026C8BEAB082B3DEB = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		8DBD4D8FD571C84A6C0CD817 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; };
 		18665A7A93EDBA956B64774E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		38D39096CD656A18BC6E6D85 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		D5A29444C637255D66ACB7AE = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloWorld.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		B786F246076E6F5D363A6A2C = { isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = "SOURCE_ROOT"; };
 		E7507E799D8BDA92BDB78915 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Main.cpp; path = ../../Source/Main.cpp; sourceTree = "SOURCE_ROOT"; };
@@ -51,6 +51,8 @@
 				E7507E799D8BDA92BDB78915,
 				0DB195C2B3538434D7D20B51,
 				A1E4765345FA980DAFA5BDE3 ); name = Source; sourceTree = "<group>"; };
 		4297D3C9A6348BA224516847 = { isa = PBXGroup; children = (
 				A0C5DD7F69DC35BF462718E4 ); name = HelloWorld; sourceTree = "<group>"; };
 		E9187C22BD3E64A16116DF8C = { isa = PBXGroup; children = (
 				8B21C8D0F53D4B6647916A6C,
 				43AD9F8DF7F760C6BBADDECC,
@@ -61,22 +63,22 @@
 		AE86EC0712AA99EF212AD4AE = { isa = PBXGroup; children = (
 				B786F246076E6F5D363A6A2C ); name = Resources; sourceTree = "<group>"; };
 		C134A2DBF8134BD791778F0F = { isa = PBXGroup; children = (
 				C820D5B3DC8B4E486B13FF4A,
 				18665A7A93EDBA956B64774E,
 				076655B982BD7FD33C52BAEE,
 				D9D2682DE4A5B07668895C2A,
 				C820D5B3DC8B4E486B13FF4A,
 				772D78456EEEBC74C5D711AE,
 				AE08A72CF4EA4703C698EB57,
 				38D39096CD656A18BC6E6D85,
 				6866E587FFD01BF7EA2ADE1F,
 				D9D2682DE4A5B07668895C2A,
 				22D27893FB59F52DF84AD344,
 				E6809DE026C8BEAB082B3DEB,
 				EA28150CE20A1AF43E5A30AB,
 				E6809DE026C8BEAB082B3DEB,
 				8DBD4D8FD571C84A6C0CD817,
 				18665A7A93EDBA956B64774E ); name = Frameworks; sourceTree = "<group>"; };
 				38D39096CD656A18BC6E6D85 ); name = Frameworks; sourceTree = "<group>"; };
 		DC3A70675753A61E8C7CD36B = { isa = PBXGroup; children = (
 				D5A29444C637255D66ACB7AE ); name = Products; sourceTree = "<group>"; };
 		4297D3C9A6348BA224516847 = { isa = PBXGroup; children = (
 				A0C5DD7F69DC35BF462718E4,
 		B3F3C4C19F8E5C6897A5B3C3 = { isa = PBXGroup; children = (
 				4297D3C9A6348BA224516847,
 				E9187C22BD3E64A16116DF8C,
 				AE86EC0712AA99EF212AD4AE,
 				C134A2DBF8134BD791778F0F,
@@ -156,23 +158,23 @@
 				D718D953943D6576572CCD49,
 				D3AEE9F470093C7E82F10144 ); runOnlyForDeploymentPostprocessing = 0; };
 		CB4944AF280662FF07FEFEC4 = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = (
 				3F902D2C41E0C1FFC90C2724,
 				D397D8CEF8663F449B4439C0,
 				7BC4087FD54A2C1ED196C892,
 				C5E169F7107EC2306276438A,
 				3F902D2C41E0C1FFC90C2724,
 				056513FD57B5879AEDB3FB4D,
 				891256EECE8E8E7FAFCA1185,
 				A9F87921F5EF364874BF8D08,
 				EFF4A46CD8DC98212AF9F5A0,
 				C5E169F7107EC2306276438A,
 				6D3C942E85A6141029E184A4,
 				9EA4F1C0E2356AB5C07CE95E,
 				569A272ED68671F2FE9903B8,
 				9EA4F1C0E2356AB5C07CE95E,
 				E12A6AAFEC6BB91A41D85FF2,
 				D397D8CEF8663F449B4439C0 ); runOnlyForDeploymentPostprocessing = 0; };
 				A9F87921F5EF364874BF8D08 ); runOnlyForDeploymentPostprocessing = 0; };
 		9F559EB2CC99871D47887B82 = { isa = PBXNativeTarget; buildConfigurationList = 6F5E160F06E7FAD8B5C96752; buildPhases = (
 				4B8D17F77F2E2E7A2419CB17,
 				172414663F1A38D78D2B00C3,
 				CB4944AF280662FF07FEFEC4 ); buildRules = ( ); dependencies = ( ); name = HelloWorld; productName = HelloWorld; productReference = D5A29444C637255D66ACB7AE; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
 		9A0E300BBDAFA50EA37EA0D9 = { isa = PBXProject; buildConfigurationList = C71BF9C42683418116C8426E; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 4297D3C9A6348BA224516847; projectDirPath = ""; projectRoot = ""; targets = ( 9F559EB2CC99871D47887B82 ); };
 		9A0E300BBDAFA50EA37EA0D9 = { isa = PBXProject; buildConfigurationList = C71BF9C42683418116C8426E; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = B3F3C4C19F8E5C6897A5B3C3; projectDirPath = ""; projectRoot = ""; targets = ( 9F559EB2CC99871D47887B82 ); };
 	};
 	rootObject = 9A0E300BBDAFA50EA37EA0D9;
 }
--- a/projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj
+++ b/projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj
@@ -6,26 +6,26 @@
 	objectVersion = 45;
 	objects = {

 		BAEB975FAD8A99FA884DC593 = { isa = PBXBuildFile; fileRef = 6B236CD90C0803738D7B5235; };
 		D8DBAED4AB03622A655367C6 = { isa = PBXBuildFile; fileRef = 3DE047A554FB376BE3DA4C65; };
 		D397D8CEF8663F449B4439C0 = { isa = PBXBuildFile; fileRef = 18665A7A93EDBA956B64774E; };
 		1622BC343C98F98AC2AC0459 = { isa = PBXBuildFile; fileRef = AA21728A979A53287A0DEFED; };
 		2F1CDA747BD63008A80CB986 = { isa = PBXBuildFile; fileRef = B9E8EA7A70EBC92D121DD5EF; };
 		D397D8CEF8663F449B4439C0 = { isa = PBXBuildFile; fileRef = 18665A7A93EDBA956B64774E; };
 		9EA4F1C0E2356AB5C07CE95E = { isa = PBXBuildFile; fileRef = E6809DE026C8BEAB082B3DEB; };
 		D8DBAED4AB03622A655367C6 = { isa = PBXBuildFile; fileRef = 3DE047A554FB376BE3DA4C65; };
 		C37934E8A18A3A82637C1445 = { isa = PBXBuildFile; fileRef = 541D7BED72093B09E01E3FD1; };
 		9EA4F1C0E2356AB5C07CE95E = { isa = PBXBuildFile; fileRef = E6809DE026C8BEAB082B3DEB; };
 		BAEB975FAD8A99FA884DC593 = { isa = PBXBuildFile; fileRef = 6B236CD90C0803738D7B5235; };
 		C67B5243DBC7218FEC5DBCC0 = { isa = PBXBuildFile; fileRef = E7507E799D8BDA92BDB78915; };
 		9B11A7532637EC12F1DC4B2E = { isa = PBXBuildFile; fileRef = 0DB195C2B3538434D7D20B51; };
 		CFFBB821ECB7D85603624533 = { isa = PBXBuildFile; fileRef = 57FFE120531343D50B7D2D28; };
 		CB81C9C2C8729E6E3D47894E = { isa = PBXBuildFile; fileRef = 9025A92B6F0FB6F8EF51A168; };
 		D718D953943D6576572CCD49 = { isa = PBXBuildFile; fileRef = EA4C72277CEA392BC33435A7; };
 		D3AEE9F470093C7E82F10144 = { isa = PBXBuildFile; fileRef = 23634B2289D5AC4EA728B8F7; };
 		6B236CD90C0803738D7B5235 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		3DE047A554FB376BE3DA4C65 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		18665A7A93EDBA956B64774E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		AA21728A979A53287A0DEFED = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		B9E8EA7A70EBC92D121DD5EF = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
 		18665A7A93EDBA956B64774E = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		E6809DE026C8BEAB082B3DEB = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		3DE047A554FB376BE3DA4C65 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		541D7BED72093B09E01E3FD1 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
 		E6809DE026C8BEAB082B3DEB = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		6B236CD90C0803738D7B5235 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		D5A29444C637255D66ACB7AE = { isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloWorld.app; sourceTree = "BUILT_PRODUCTS_DIR"; };
 		B786F246076E6F5D363A6A2C = { isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Info.plist; sourceTree = "SOURCE_ROOT"; };
 		E7507E799D8BDA92BDB78915 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Main.cpp; path = ../../Source/Main.cpp; sourceTree = "SOURCE_ROOT"; };
@@ -41,6 +41,8 @@
 				E7507E799D8BDA92BDB78915,
 				0DB195C2B3538434D7D20B51,
 				A1E4765345FA980DAFA5BDE3 ); name = Source; sourceTree = "<group>"; };
 		4297D3C9A6348BA224516847 = { isa = PBXGroup; children = (
 				A0C5DD7F69DC35BF462718E4 ); name = HelloWorld; sourceTree = "<group>"; };
 		E9187C22BD3E64A16116DF8C = { isa = PBXGroup; children = (
 				8B21C8D0F53D4B6647916A6C,
 				43AD9F8DF7F760C6BBADDECC,
@@ -51,17 +53,17 @@
 		AE86EC0712AA99EF212AD4AE = { isa = PBXGroup; children = (
 				B786F246076E6F5D363A6A2C ); name = Resources; sourceTree = "<group>"; };
 		C134A2DBF8134BD791778F0F = { isa = PBXGroup; children = (
 				6B236CD90C0803738D7B5235,
 				3DE047A554FB376BE3DA4C65,
 				18665A7A93EDBA956B64774E,
 				AA21728A979A53287A0DEFED,
 				B9E8EA7A70EBC92D121DD5EF,
 				18665A7A93EDBA956B64774E,
 				3DE047A554FB376BE3DA4C65,
 				541D7BED72093B09E01E3FD1,
 				E6809DE026C8BEAB082B3DEB,
 				541D7BED72093B09E01E3FD1 ); name = Frameworks; sourceTree = "<group>"; };
 				6B236CD90C0803738D7B5235 ); name = Frameworks; sourceTree = "<group>"; };
 		DC3A70675753A61E8C7CD36B = { isa = PBXGroup; children = (
 				D5A29444C637255D66ACB7AE ); name = Products; sourceTree = "<group>"; };
 		4297D3C9A6348BA224516847 = { isa = PBXGroup; children = (
 				A0C5DD7F69DC35BF462718E4,
 		B3F3C4C19F8E5C6897A5B3C3 = { isa = PBXGroup; children = (
 				4297D3C9A6348BA224516847,
 				E9187C22BD3E64A16116DF8C,
 				AE86EC0712AA99EF212AD4AE,
 				C134A2DBF8134BD791778F0F,
@@ -145,18 +147,18 @@
 				D718D953943D6576572CCD49,
 				D3AEE9F470093C7E82F10144 ); runOnlyForDeploymentPostprocessing = 0; };
 		CB4944AF280662FF07FEFEC4 = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = (
 				BAEB975FAD8A99FA884DC593,
 				D8DBAED4AB03622A655367C6,
 				D397D8CEF8663F449B4439C0,
 				1622BC343C98F98AC2AC0459,
 				2F1CDA747BD63008A80CB986,
 				D397D8CEF8663F449B4439C0,
 				D8DBAED4AB03622A655367C6,
 				C37934E8A18A3A82637C1445,
 				9EA4F1C0E2356AB5C07CE95E,
 				C37934E8A18A3A82637C1445 ); runOnlyForDeploymentPostprocessing = 0; };
 				BAEB975FAD8A99FA884DC593 ); runOnlyForDeploymentPostprocessing = 0; };
 		9F559EB2CC99871D47887B82 = { isa = PBXNativeTarget; buildConfigurationList = 6F5E160F06E7FAD8B5C96752; buildPhases = (
 				4B8D17F77F2E2E7A2419CB17,
 				172414663F1A38D78D2B00C3,
 				CB4944AF280662FF07FEFEC4 ); buildRules = ( ); dependencies = ( ); name = HelloWorld; productName = HelloWorld; productReference = D5A29444C637255D66ACB7AE; productInstallPath = "$(HOME)/Applications"; productType = "com.apple.product-type.application"; };
 		9A0E300BBDAFA50EA37EA0D9 = { isa = PBXProject; buildConfigurationList = C71BF9C42683418116C8426E; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = 4297D3C9A6348BA224516847; projectDirPath = ""; projectRoot = ""; targets = ( 9F559EB2CC99871D47887B82 ); };
 		9A0E300BBDAFA50EA37EA0D9 = { isa = PBXProject; buildConfigurationList = C71BF9C42683418116C8426E; compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 0; mainGroup = B3F3C4C19F8E5C6897A5B3C3; projectDirPath = ""; projectRoot = ""; targets = ( 9F559EB2CC99871D47887B82 ); };
 	};
 	rootObject = 9A0E300BBDAFA50EA37EA0D9;
 }
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -34551,7 +34551,7 @@ private:
 static void _clearfp() {}
 #endif

 extern void juce_callAnyTimersSynchronously();
 extern void JUCE_API juce_callAnyTimersSynchronously();

 const int fxbVersionNum = 1;

@@ -41438,7 +41438,7 @@ private:
 InternalTimerThread* InternalTimerThread::instance = nullptr;
 InternalTimerThread::LockType InternalTimerThread::lock;

 void juce_callAnyTimersSynchronously()
 void JUCE_API juce_callAnyTimersSynchronously()
 {
 	InternalTimerThread::callAnyTimersSynchronously();
 }
@@ -108779,32 +108779,40 @@ public:
 		if (status != noErr)
 			return false;

 		const int numBytes = numSamples * sizeof (float);
 		audioDataBlock.ensureSize (numBytes * numChannels, false);
 		float* data = static_cast<float*> (audioDataBlock.getData());

 		for (int j = numChannels; --j >= 0;)
 		while (numSamples > 0)
 		{
 			bufferList->mBuffers[j].mNumberChannels = 1;
 			bufferList->mBuffers[j].mDataByteSize = numBytes;
 			bufferList->mBuffers[j].mData = data;
 			data += numSamples;
 		}
 			const int numThisTime = jmin (8192, numSamples);
 			const int numBytes = numThisTime * sizeof (float);

 		UInt32 numFramesToRead = numSamples;
 		status = ExtAudioFileRead (audioFileRef, &numFramesToRead, bufferList);
 		if (status != noErr)
 			return false;
 			audioDataBlock.ensureSize (numBytes * numChannels, false);
 			float* data = static_cast<float*> (audioDataBlock.getData());

 		for (int i = numDestChannels; --i >= 0;)
 		{
 			if (destSamples[i] != nullptr)
 			for (int j = numChannels; --j >= 0;)
 			{
 				if (i < numChannels)
 					memcpy (destSamples[i] + startOffsetInDestBuffer, bufferList->mBuffers[i].mData, numBytes);
 				else
 					zeromem (destSamples[i] + startOffsetInDestBuffer, numBytes);
 				bufferList->mBuffers[j].mNumberChannels = 1;
 				bufferList->mBuffers[j].mDataByteSize = numBytes;
 				bufferList->mBuffers[j].mData = data;
 				data += numThisTime;
 			}

 			UInt32 numFramesToRead = numThisTime;
 			status = ExtAudioFileRead (audioFileRef, &numFramesToRead, bufferList);
 			if (status != noErr)
 				return false;

 			for (int i = numDestChannels; --i >= 0;)
 			{
 				if (destSamples[i] != nullptr)
 				{
 					if (i < numChannels)
 						memcpy (destSamples[i] + startOffsetInDestBuffer, bufferList->mBuffers[i].mData, numBytes);
 					else
 						zeromem (destSamples[i] + startOffsetInDestBuffer, numBytes);
 				}
 			}

 			startOffsetInDestBuffer += numThisTime;
 			numSamples -= numThisTime;
 		}

 		return true;
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -73,7 +73,7 @@ namespace JuceDummyNamespace {}
 */
 #define JUCE_MAJOR_VERSION	  1
 #define JUCE_MINOR_VERSION	  54
 #define JUCE_BUILDNUMBER	22
 #define JUCE_BUILDNUMBER	23

 /** Current Juce version number.

@@ -42749,7 +42749,7 @@ public:

 	/** This structure is filled-in by the AudioPlayHead::getCurrentPosition() method.
 	*/
 	struct CurrentPositionInfo
 	struct JUCE_API  CurrentPositionInfo
 	{
 		/** The tempo in BPM */
 		double bpm;
--- a/src/audio/audio_file_formats/juce_CoreAudioFormat.cpp
+++ b/src/audio/audio_file_formats/juce_CoreAudioFormat.cpp
@@ -155,32 +155,40 @@ public:
        if (status != noErr)
            return false;

        const int numBytes = numSamples * sizeof (float);
        audioDataBlock.ensureSize (numBytes * numChannels, false);
        float* data = static_cast<float*> (audioDataBlock.getData());

        for (int j = numChannels; --j >= 0;)
        while (numSamples > 0)
        {
            bufferList->mBuffers[j].mNumberChannels = 1;
            bufferList->mBuffers[j].mDataByteSize = numBytes;
            bufferList->mBuffers[j].mData = data;
            data += numSamples;
        }
            const int numThisTime = jmin (8192, numSamples);
            const int numBytes = numThisTime * sizeof (float);

        UInt32 numFramesToRead = numSamples;
        status = ExtAudioFileRead (audioFileRef, &numFramesToRead, bufferList);
        if (status != noErr)
            return false;
            audioDataBlock.ensureSize (numBytes * numChannels, false);
            float* data = static_cast<float*> (audioDataBlock.getData());

        for (int i = numDestChannels; --i >= 0;)
        {
            if (destSamples[i] != nullptr)
            for (int j = numChannels; --j >= 0;)
            {
                bufferList->mBuffers[j].mNumberChannels = 1;
                bufferList->mBuffers[j].mDataByteSize = numBytes;
                bufferList->mBuffers[j].mData = data;
                data += numThisTime;
            }

            UInt32 numFramesToRead = numThisTime;
            status = ExtAudioFileRead (audioFileRef, &numFramesToRead, bufferList);
            if (status != noErr)
                return false;

            for (int i = numDestChannels; --i >= 0;)
            {
                if (i < numChannels)
                    memcpy (destSamples[i] + startOffsetInDestBuffer, bufferList->mBuffers[i].mData, numBytes);
                else
                    zeromem (destSamples[i] + startOffsetInDestBuffer, numBytes);
                if (destSamples[i] != nullptr)
                {
                    if (i < numChannels)
                        memcpy (destSamples[i] + startOffsetInDestBuffer, bufferList->mBuffers[i].mData, numBytes);
                    else
                        zeromem (destSamples[i] + startOffsetInDestBuffer, numBytes);
                }
            }

            startOffsetInDestBuffer += numThisTime;
            numSamples -= numThisTime;
        }

        return true;
--- a/src/audio/plugin_client/RTAS/juce_RTAS_DigiCode3.cpp
+++ b/src/audio/plugin_client/RTAS/juce_RTAS_DigiCode3.cpp
@@ -51,22 +51,22 @@

 #if JucePlugin_Build_VST

 #define DllMain DllMainRTAS
 #include <DLLMain.cpp>
 #undef DllMain

 extern BOOL WINAPI DllMainVST (HINSTANCE instance, DWORD dwReason, LPVOID);

 // This overloaded DllMain can work as either an RTAS or a VST..
 extern "C" BOOL WINAPI DllMain (HINSTANCE hInstance, DWORD ul_reason_for_call, LPVOID lpReserved)
 {
    if (GetModuleHandle (_T("DAE.DLL")) != 0)
        return DllMainRTAS (hInstance, ul_reason_for_call, lpReserved);
    else
        return DllMainVST (hInstance, ul_reason_for_call, lpReserved);
 }
  #define DllMain DllMainRTAS
  #include <DLLMain.cpp>
  #undef DllMain

  extern BOOL WINAPI DllMainVST (HINSTANCE instance, DWORD dwReason, LPVOID);

  // This overloaded DllMain can work as either an RTAS or a VST..
  extern "C" BOOL WINAPI DllMain (HINSTANCE hInstance, DWORD ul_reason_for_call, LPVOID lpReserved)
  {
     if (GetModuleHandleA ("DAE.DLL") != 0)
         return DllMainRTAS (hInstance, ul_reason_for_call, lpReserved);
     else
         return DllMainVST (hInstance, ul_reason_for_call, lpReserved);
  }
 #else
 #include <DLLMain.cpp>
  #include <DLLMain.cpp>
 #endif

 #include <DefaultSwap.cpp>
@@ -80,8 +80,6 @@
 #else

 #if _MSC_VER
 // (defining these stubs just makes it easier to quickly turn off the RTAS build without removing
 // the exports table from your project settings)
 short __stdcall NewPlugIn (void*)                          { return 0; }
 short __stdcall _PI_GetRoutineDescriptor (long, void*)     { return 0; }
 #endif
--- a/src/audio/plugin_client/RTAS/juce_RTAS_Wrapper.cpp
+++ b/src/audio/plugin_client/RTAS/juce_RTAS_Wrapper.cpp
@@ -85,6 +85,7 @@
 //==============================================================================
 #ifdef _MSC_VER
  #pragma pack (push, 8)
  #pragma warning (disable: 4263 4264)
 #endif

 #include "../juce_PluginHeaders.h"
--- a/src/audio/plugin_client/VST/juce_VST_Wrapper.cpp
+++ b/src/audio/plugin_client/VST/juce_VST_Wrapper.cpp
@@ -147,7 +147,7 @@ static bool recursionCheck = false;
 static JUCE_NAMESPACE::uint32 lastMasterIdleCall = 0;

 BEGIN_JUCE_NAMESPACE
 extern void juce_callAnyTimersSynchronously();
 extern void JUCE_API juce_callAnyTimersSynchronously();

 #if JUCE_MAC
  extern void initialiseMac();
--- a/src/audio/plugin_host/formats/juce_VSTPluginFormat.cpp
+++ b/src/audio/plugin_host/formats/juce_VSTPluginFormat.cpp
@@ -122,7 +122,7 @@ BEGIN_JUCE_NAMESPACE
 static void _clearfp() {}
 #endif

 extern void juce_callAnyTimersSynchronously();
 extern void JUCE_API juce_callAnyTimersSynchronously();


 //==============================================================================
--- a/src/audio/processors/juce_AudioPlayHead.h
+++ b/src/audio/processors/juce_AudioPlayHead.h
@@ -62,7 +62,7 @@ public:
    //==============================================================================
    /** This structure is filled-in by the AudioPlayHead::getCurrentPosition() method.
    */
    struct CurrentPositionInfo
    struct JUCE_API  CurrentPositionInfo
    {
        /** The tempo in BPM */
        double bpm;
--- a/src/core/juce_StandardHeader.h
+++ b/src/core/juce_StandardHeader.h
@@ -33,7 +33,7 @@
 */
 #define JUCE_MAJOR_VERSION      1
 #define JUCE_MINOR_VERSION      54
 #define JUCE_BUILDNUMBER        22
 #define JUCE_BUILDNUMBER        23

 /** Current Juce version number.

--- a/src/events/juce_Timer.cpp
+++ b/src/events/juce_Timer.cpp
@@ -319,7 +319,7 @@ private:
 InternalTimerThread* InternalTimerThread::instance = nullptr;
 InternalTimerThread::LockType InternalTimerThread::lock;

 void juce_callAnyTimersSynchronously()
 void JUCE_API juce_callAnyTimersSynchronously()
 {
    InternalTimerThread::callAnyTimersSynchronously();
 }