Tidied up some filenames, cleaned up some code. Removed VoidArray class (just use Array<void*> instead)

.gitignore

@@ -18,11 +18,32 @@
 .DS_Store
 .svn
 profile
-extras/juce demo/build/macosx/build
-extras/juce demo/build/iphone/build
-extras/juce demo/build/linux/build
-extras/juce demo/build/win32_vc8/Debug
-extras/juce demo/build/win32_vc8/Release
+extras/juce demo/Builds/MacOSX/build
+extras/juce demo/Builds/Linux/build
+extras/juce demo/Builds/VisualStudio2005/Debug
+extras/juce demo/Builds/VisualStudio2005/Release
+extras/juce demo/Builds/VisualStudio2008/Debug
+extras/juce demo/Builds/VisualStudio2008/Release
+extras/juce demo/Builds/iPhone/build
+extras/audio plugins/demo/Builds/MacOSX/build
+extras/audio plugins/demo/Builds/Linux/build
+extras/audio plugins/demo/Builds/VisualStudio2005/Debug
+extras/audio plugins/demo/Builds/VisualStudio2005/Release
+extras/audio plugins/demo/Builds/VisualStudio2008/Debug
+extras/audio plugins/demo/Builds/VisualStudio2008/Release
+extras/audio plugin host/Builds/MacOSX/build
+extras/audio plugin host/Builds/Linux/build
+extras/audio plugin host/Builds/VisualStudio2005/Debug
+extras/audio plugin host/Builds/VisualStudio2005/Release
+extras/audio plugin host/Builds/VisualStudio2008/Debug
+extras/audio plugin host/Builds/VisualStudio2008/Release
+extras/Jucer (experimental)/Builds/MacOSX/build
+extras/Jucer (experimental)/Builds/Linux/build
+extras/Jucer (experimental)/Builds/VisualStudio2005/Debug
+extras/Jucer (experimental)/Builds/VisualStudio2005/Release
+extras/Jucer (experimental)/Builds/VisualStudio2008/Debug
+extras/Jucer (experimental)/Builds/VisualStudio2008/Release
+extras/Jucer (experimental)/Builds/iPhone/build
 extras/the jucer/build/mac/build
 extras/audio plugin host/build/mac/build
 extras/binarybuilder/mac/build
@@ -33,3 +54,5 @@ bin/intermediate*
 bin/lib*
 bin/jucelib*
 bin/JUCE*
+Builds/VisualStudio2008_DLL/Debug
+Builds/VisualStudio2008_DLL/Release

Builds/Linux/Makefile

@@ -45,7 +45,6 @@ OBJECTS := \
   $(OBJDIR)/juce_ApplicationCommandTarget.o \
   $(OBJDIR)/juce_ApplicationProperties.o \
   $(OBJDIR)/juce_AiffAudioFormat.o \
-  $(OBJDIR)/juce_AudioCDReader.o \
   $(OBJDIR)/juce_AudioFormat.o \
   $(OBJDIR)/juce_AudioFormatManager.o \
   $(OBJDIR)/juce_AudioSubsectionReader.o \
@@ -92,7 +91,7 @@ OBJECTS := \
   $(OBJDIR)/juce_GenericAudioProcessorEditor.o \
   $(OBJDIR)/juce_Sampler.o \
   $(OBJDIR)/juce_Synthesiser.o \
-  $(OBJDIR)/juce_BitArray.o \
+  $(OBJDIR)/juce_BigInteger.o \
   $(OBJDIR)/juce_DynamicObject.o \
   $(OBJDIR)/juce_MemoryBlock.o \
   $(OBJDIR)/juce_NamedValueSet.o \
@@ -246,7 +245,6 @@ OBJECTS := \
   $(OBJDIR)/juce_Typeface.o \
   $(OBJDIR)/juce_AffineTransform.o \
   $(OBJDIR)/juce_BorderSize.o \
-  $(OBJDIR)/juce_Line.o \
   $(OBJDIR)/juce_Path.o \
   $(OBJDIR)/juce_PathIterator.o \
   $(OBJDIR)/juce_PathStrokeType.o \
@@ -381,11 +379,6 @@ $(OBJDIR)/juce_AiffAudioFormat.o: ../../src/audio/audio_file_formats/juce_AiffAu
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_AudioCDReader.o: ../../src/audio/audio_file_formats/juce_AudioCDReader.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_AudioFormat.o: ../../src/audio/audio_file_formats/juce_AudioFormat.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo $(notdir $<)
@@ -616,7 +609,7 @@ $(OBJDIR)/juce_Synthesiser.o: ../../src/audio/synthesisers/juce_Synthesiser.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_BitArray.o: ../../src/containers/juce_BitArray.cpp
+$(OBJDIR)/juce_BigInteger.o: ../../src/containers/juce_BigInteger.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -1386,11 +1379,6 @@ $(OBJDIR)/juce_BorderSize.o: ../../src/gui/graphics/geometry/juce_BorderSize.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_Line.o: ../../src/gui/graphics/geometry/juce_Line.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/juce_Path.o: ../../src/gui/graphics/geometry/juce_Path.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo $(notdir $<)

Builds/MacOSX/Juce.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		CD59C8E60146B04575CD61E6 = { isa = PBXBuildFile; fileRef = 415BD77DF4B2F4760D138735; };
 		76890501626BFFF310A94F15 = { isa = PBXBuildFile; fileRef = BA97FEDA576503A21D971F1E; };
 		46151070FA7D3426EC35280F = { isa = PBXBuildFile; fileRef = 1AA8BE2D76E153874FB08197; };
-		983FCD60625A60993546F850 = { isa = PBXBuildFile; fileRef = 0877D5750D6F21C5231687CA; };
 		416D6F00E88DC74879B4DF2B = { isa = PBXBuildFile; fileRef = 7D85530D76756C33795ECCE9; };
 		9C709BC2F4F0EE60BF52FACA = { isa = PBXBuildFile; fileRef = 93006D32B18174D9FE0A5E9E; };
 		FB21B7E6A7CE55D3C0E3C37E = { isa = PBXBuildFile; fileRef = 59597FA0A88A08937801D198; };
@@ -61,7 +60,7 @@
 		D1407BB28C169F5E1CAC3CC7 = { isa = PBXBuildFile; fileRef = 096CF2243648F17E1BF5421B; };
 		07E6E11A658930554FF0C56A = { isa = PBXBuildFile; fileRef = ED5966B95F865C586A3CE08F; };
 		E8DFABC1603D55B97429A8E4 = { isa = PBXBuildFile; fileRef = 35668D8EEA19957C6C9AC83A; };
-		F263F3DE818BB387676615F7 = { isa = PBXBuildFile; fileRef = CED52F0CC8C92E6F614294A9; };
+		BE25871C34D79FEFFD1B94B6 = { isa = PBXBuildFile; fileRef = 895D742F49DA9F100990879C; };
 		4AB5E55BDF79028F82F83D8E = { isa = PBXBuildFile; fileRef = F77C9170829579FABA5679AD; };
 		21BA256CBCC9C15265928A23 = { isa = PBXBuildFile; fileRef = FF40DA899AE16A5E1D8AA54A; };
 		9D2D1BA65C27BDA1F7C44769 = { isa = PBXBuildFile; fileRef = 70E5409425A76782B6188B31; };
@@ -215,7 +214,6 @@
 		F0556B3AD9D388177E26B90D = { isa = PBXBuildFile; fileRef = AF66A9951377E2D04C54CADD; };
 		0558FFF11AED944C6B3E5FB5 = { isa = PBXBuildFile; fileRef = 2ED8CC539A9D9BE611F67A9A; };
 		11109DE27B3E3E3863360113 = { isa = PBXBuildFile; fileRef = 4B550E0887AA76BBAF8BA5BF; };
-		71E2910A22BF9C53041A1C04 = { isa = PBXBuildFile; fileRef = 2CEB96F1BD38D0F453FEF750; };
 		CF73FAC91E319C464F07C966 = { isa = PBXBuildFile; fileRef = 29BC53FEE9BC27F44534C909; };
 		B6D3EDA0F2E3516F3922F23F = { isa = PBXBuildFile; fileRef = 312F208B501E0D7764C6B613; };
 		E7C9FAA5F8A4AEDAD8A8CC1D = { isa = PBXBuildFile; fileRef = 9D3F1BAB1D48DDECB9F35916; };
@@ -271,6 +269,7 @@
 		90D5A45E67E1E8A03167346E = { isa = PBXBuildFile; fileRef = 0EAE8B0F92F23D0CB6EABF2B; };
 		7A86E411B55E15DA7AF1FE67 = { isa = PBXBuildFile; fileRef = 8280AA34B23B4D366711A9E7; };
 		BD86381924AE45021246ABA3 = { isa = PBXBuildFile; fileRef = C9561A66310DAD5EEB4A9462; };
+		306AB64E97A05B800349E7E2 = { isa = PBXBuildFile; fileRef = B62991F8AEE7327BA8A5070F; };
 		E7A5418175B23C794421441C = { isa = PBXBuildFile; fileRef = 013F753639A6350C8DC602AD; };
 		51F5844EAE455D51BDB17228 = { isa = PBXBuildFile; fileRef = 72524FE185FF48DC1F954341; };
 		C99F35ABEC13F58C27C1D303 = { isa = PBXBuildFile; fileRef = BF5307F364AC9250D8625168; };
@@ -344,7 +343,6 @@
 		1AA8BE2D76E153874FB08197 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AiffAudioFormat.cpp; path = ../../src/audio/audio_file_formats/juce_AiffAudioFormat.cpp; sourceTree = SOURCE_ROOT; };
 		05C5C546E12C6422D865D864 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AiffAudioFormat.h; path = ../../src/audio/audio_file_formats/juce_AiffAudioFormat.h; sourceTree = SOURCE_ROOT; };
 		1F5A667524FB005D872340E1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioCDBurner.h; path = ../../src/audio/audio_file_formats/juce_AudioCDBurner.h; sourceTree = SOURCE_ROOT; };
-		0877D5750D6F21C5231687CA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioCDReader.cpp; path = ../../src/audio/audio_file_formats/juce_AudioCDReader.cpp; sourceTree = SOURCE_ROOT; };
 		1BBE03BB0D71FEEEA440682B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioCDReader.h; path = ../../src/audio/audio_file_formats/juce_AudioCDReader.h; sourceTree = SOURCE_ROOT; };
 		7D85530D76756C33795ECCE9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioFormat.cpp; path = ../../src/audio/audio_file_formats/juce_AudioFormat.cpp; sourceTree = SOURCE_ROOT; };
 		013E8938EE1C6B4F63016B55 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioFormat.h; path = ../../src/audio/audio_file_formats/juce_AudioFormat.h; sourceTree = SOURCE_ROOT; };
@@ -453,8 +451,8 @@
 		9E6C206F95245BCDE38FB2B5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Synthesiser.h; path = ../../src/audio/synthesisers/juce_Synthesiser.h; sourceTree = SOURCE_ROOT; };
 		839BE8047CF2F8EBE43ED34F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Array.h; path = ../../src/containers/juce_Array.h; sourceTree = SOURCE_ROOT; };
 		EDF52FDF87ACD33FE933142C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ArrayAllocationBase.h; path = ../../src/containers/juce_ArrayAllocationBase.h; sourceTree = SOURCE_ROOT; };
-		CED52F0CC8C92E6F614294A9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_BitArray.cpp; path = ../../src/containers/juce_BitArray.cpp; sourceTree = SOURCE_ROOT; };
-		57248C0972C9FCA8BE506131 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_BitArray.h; path = ../../src/containers/juce_BitArray.h; sourceTree = SOURCE_ROOT; };
+		895D742F49DA9F100990879C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_BigInteger.cpp; path = ../../src/containers/juce_BigInteger.cpp; sourceTree = SOURCE_ROOT; };
+		96DDC0A32624DA76036824D3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_BigInteger.h; path = ../../src/containers/juce_BigInteger.h; sourceTree = SOURCE_ROOT; };
 		F77C9170829579FABA5679AD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_DynamicObject.cpp; path = ../../src/containers/juce_DynamicObject.cpp; sourceTree = SOURCE_ROOT; };
 		34C402EF9ADCAD34FB657D43 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_DynamicObject.h; path = ../../src/containers/juce_DynamicObject.h; sourceTree = SOURCE_ROOT; };
 		7DA9AC75A4D9227C8FC4B2F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ElementComparator.h; path = ../../src/containers/juce_ElementComparator.h; sourceTree = SOURCE_ROOT; };
@@ -478,7 +476,6 @@
 		7CABDD863B47D8ADC900A4D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ValueTree.h; path = ../../src/containers/juce_ValueTree.h; sourceTree = SOURCE_ROOT; };
 		4DF9D333038A442870668D31 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Variant.cpp; path = ../../src/containers/juce_Variant.cpp; sourceTree = SOURCE_ROOT; };
 		A81B4FC81A75E21E5B96E506 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Variant.h; path = ../../src/containers/juce_Variant.h; sourceTree = SOURCE_ROOT; };
-		3EA2B10D5A197C9BDA80C5CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_VoidArray.h; path = ../../src/containers/juce_VoidArray.h; sourceTree = SOURCE_ROOT; };
 		149E6ECBA264A264C7BB3FB3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Atomic.h; path = ../../src/core/juce_Atomic.h; sourceTree = SOURCE_ROOT; };
 		45AFA4791D59FBB1B548FB2C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ByteOrder.h; path = ../../src/core/juce_ByteOrder.h; sourceTree = SOURCE_ROOT; };
 		D66C00E06B06EAD3B5257DD6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_FileLogger.cpp; path = ../../src/core/juce_FileLogger.cpp; sourceTree = SOURCE_ROOT; };
@@ -802,7 +799,6 @@
 		5CD42FFF9F1A509D117BD0CB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AffineTransform.h; path = ../../src/gui/graphics/geometry/juce_AffineTransform.h; sourceTree = SOURCE_ROOT; };
 		4B550E0887AA76BBAF8BA5BF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_BorderSize.cpp; path = ../../src/gui/graphics/geometry/juce_BorderSize.cpp; sourceTree = SOURCE_ROOT; };
 		C18F342C087F69D141B3FAF5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_BorderSize.h; path = ../../src/gui/graphics/geometry/juce_BorderSize.h; sourceTree = SOURCE_ROOT; };
-		2CEB96F1BD38D0F453FEF750 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Line.cpp; path = ../../src/gui/graphics/geometry/juce_Line.cpp; sourceTree = SOURCE_ROOT; };
 		4011751B9EFCA7B9345D7D7C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Line.h; path = ../../src/gui/graphics/geometry/juce_Line.h; sourceTree = SOURCE_ROOT; };
 		29BC53FEE9BC27F44534C909 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Path.cpp; path = ../../src/gui/graphics/geometry/juce_Path.cpp; sourceTree = SOURCE_ROOT; };
 		795E2BD2D39A3A6E36C26CBF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Path.h; path = ../../src/gui/graphics/geometry/juce_Path.h; sourceTree = SOURCE_ROOT; };
@@ -894,6 +890,7 @@
 		0EAE8B0F92F23D0CB6EABF2B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_iphone_UIViewComponentPeer.mm; path = ../../src/native/mac/juce_iphone_UIViewComponentPeer.mm; sourceTree = SOURCE_ROOT; };
 		8280AA34B23B4D366711A9E7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_AppleRemote.mm; path = ../../src/native/mac/juce_mac_AppleRemote.mm; sourceTree = SOURCE_ROOT; };
 		C9561A66310DAD5EEB4A9462 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_AudioCDBurner.mm; path = ../../src/native/mac/juce_mac_AudioCDBurner.mm; sourceTree = SOURCE_ROOT; };
+		B62991F8AEE7327BA8A5070F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_AudioCDReader.mm; path = ../../src/native/mac/juce_mac_AudioCDReader.mm; sourceTree = SOURCE_ROOT; };
 		013F753639A6350C8DC602AD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_CameraDevice.mm; path = ../../src/native/mac/juce_mac_CameraDevice.mm; sourceTree = SOURCE_ROOT; };
 		6B46AB1931E43DAFB278D23D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_mac_CarbonViewWrapperComponent.h; path = ../../src/native/mac/juce_mac_CarbonViewWrapperComponent.h; sourceTree = SOURCE_ROOT; };
 		72524FE185FF48DC1F954341 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_mac_CoreAudio.cpp; path = ../../src/native/mac/juce_mac_CoreAudio.cpp; sourceTree = SOURCE_ROOT; };
@@ -1003,7 +1000,6 @@
 				1AA8BE2D76E153874FB08197,
 				05C5C546E12C6422D865D864,
 				1F5A667524FB005D872340E1,
-				0877D5750D6F21C5231687CA,
 				1BBE03BB0D71FEEEA440682B,
 				7D85530D76756C33795ECCE9,
 				013E8938EE1C6B4F63016B55,
@@ -1131,8 +1127,8 @@
 		1CC2889DB696E12FC34E3F50 = { isa = PBXGroup; children = (
 				839BE8047CF2F8EBE43ED34F,
 				EDF52FDF87ACD33FE933142C,
-				CED52F0CC8C92E6F614294A9,
-				57248C0972C9FCA8BE506131,
+				895D742F49DA9F100990879C,
+				96DDC0A32624DA76036824D3,
 				F77C9170829579FABA5679AD,
 				34C402EF9ADCAD34FB657D43,
 				7DA9AC75A4D9227C8FC4B2F7,
@@ -1155,8 +1151,7 @@
 				5D27EE211D9BFF6A58C4DC42,
 				7CABDD863B47D8ADC900A4D8,
 				4DF9D333038A442870668D31,
-				A81B4FC81A75E21E5B96E506,
-				3EA2B10D5A197C9BDA80C5CF ); name = containers; sourceTree = "<group>"; };
+				A81B4FC81A75E21E5B96E506 ); name = containers; sourceTree = "<group>"; };
 		1AF37A533ABDD889670F9349 = { isa = PBXGroup; children = (
 				149E6ECBA264A264C7BB3FB3,
 				45AFA4791D59FBB1B548FB2C,
@@ -1514,7 +1509,6 @@
 				5CD42FFF9F1A509D117BD0CB,
 				4B550E0887AA76BBAF8BA5BF,
 				C18F342C087F69D141B3FAF5,
-				2CEB96F1BD38D0F453FEF750,
 				4011751B9EFCA7B9345D7D7C,
 				29BC53FEE9BC27F44534C909,
 				795E2BD2D39A3A6E36C26CBF,
@@ -1627,6 +1621,7 @@
 				0EAE8B0F92F23D0CB6EABF2B,
 				8280AA34B23B4D366711A9E7,
 				C9561A66310DAD5EEB4A9462,
+				B62991F8AEE7327BA8A5070F,
 				013F753639A6350C8DC602AD,
 				6B46AB1931E43DAFB278D23D,
 				72524FE185FF48DC1F954341,
@@ -1829,7 +1824,6 @@
 				CD59C8E60146B04575CD61E6,
 				76890501626BFFF310A94F15,
 				46151070FA7D3426EC35280F,
-				983FCD60625A60993546F850,
 				416D6F00E88DC74879B4DF2B,
 				9C709BC2F4F0EE60BF52FACA,
 				FB21B7E6A7CE55D3C0E3C37E,
@@ -1878,7 +1872,7 @@
 				D1407BB28C169F5E1CAC3CC7,
 				07E6E11A658930554FF0C56A,
 				E8DFABC1603D55B97429A8E4,
-				F263F3DE818BB387676615F7,
+				BE25871C34D79FEFFD1B94B6,
 				4AB5E55BDF79028F82F83D8E,
 				21BA256CBCC9C15265928A23,
 				9D2D1BA65C27BDA1F7C44769,
@@ -2032,7 +2026,6 @@
 				F0556B3AD9D388177E26B90D,
 				0558FFF11AED944C6B3E5FB5,
 				11109DE27B3E3E3863360113,
-				71E2910A22BF9C53041A1C04,
 				CF73FAC91E319C464F07C966,
 				B6D3EDA0F2E3516F3922F23F,
 				E7C9FAA5F8A4AEDAD8A8CC1D,
@@ -2088,6 +2081,7 @@
 				90D5A45E67E1E8A03167346E,
 				7A86E411B55E15DA7AF1FE67,
 				BD86381924AE45021246ABA3,
+				306AB64E97A05B800349E7E2,
 				E7A5418175B23C794421441C,
 				51F5844EAE455D51BDB17228,
 				C99F35ABEC13F58C27C1D303,

Builds/VisualStudio2005/Juce.vcproj

@@ -24,7 +24,7 @@
       <Tool Name="VCCLCompilerTool"
             Optimization="0"
             BufferSecurityCheck=""
-            DebugInformationFormat="4"
+            DebugInformationFormat="3"
             AdditionalIncludeDirectories=""
             PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_LIB"
             RuntimeLibrary="1"
@@ -34,14 +34,14 @@
             AssemblerListingLocation=".\Debug\"
             ObjectFile=".\Debug\"
             ProgramDataBaseFileName=".\Debug\"
-            WarningLevel="3"
+            WarningLevel="4"
             SuppressStartupBanner="true"/>
       <Tool Name="VCManagedResourceCompilerTool"/>
       <Tool Name="VCResourceCompilerTool"
             PreprocessorDefinitions="_DEBUG"/>
       <Tool Name="VCPreLinkEventTool"/>
       <Tool Name="VCLibrarianTool"
-            OutputFile=".\..\..\bin\jucedebug.lib"
+            OutputFile=".\..\..\bin\jucelib_static_Win32_debug.lib"
             IgnoreDefaultLibraryNames="libcmt.lib, msvcrt.lib"/>
       <Tool Name="VCALinkTool"/>
       <Tool Name="VCManifestTool"/>
@@ -77,14 +77,14 @@
             AssemblerListingLocation=".\Release\"
             ObjectFile=".\Release\"
             ProgramDataBaseFileName=".\Release\"
-            WarningLevel="3"
+            WarningLevel="4"
             SuppressStartupBanner="true"/>
       <Tool Name="VCManagedResourceCompilerTool"/>
       <Tool Name="VCResourceCompilerTool"
             PreprocessorDefinitions="NDEBUG"/>
       <Tool Name="VCPreLinkEventTool"/>
       <Tool Name="VCLibrarianTool"
-            OutputFile=".\..\..\bin\juce.lib"
+            OutputFile=".\..\..\bin\jucelib_static_Win32.lib"
             IgnoreDefaultLibraryNames=""/>
       <Tool Name="VCALinkTool"/>
       <Tool Name="VCManifestTool"/>
@@ -118,7 +118,6 @@
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AiffAudioFormat.cpp"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AiffAudioFormat.h"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioCDBurner.h"/>
-            <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioCDReader.cpp"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioCDReader.h"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioFormat.cpp"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioFormat.h"/>
@@ -246,8 +245,8 @@
         <Filter Name="containers">
           <File RelativePath="..\..\src\containers\juce_Array.h"/>
           <File RelativePath="..\..\src\containers\juce_ArrayAllocationBase.h"/>
-          <File RelativePath="..\..\src\containers\juce_BitArray.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_BitArray.h"/>
+          <File RelativePath="..\..\src\containers\juce_BigInteger.cpp"/>
+          <File RelativePath="..\..\src\containers\juce_BigInteger.h"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.cpp"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.h"/>
           <File RelativePath="..\..\src\containers\juce_ElementComparator.h"/>
@@ -271,7 +270,6 @@
           <File RelativePath="..\..\src\containers\juce_ValueTree.h"/>
           <File RelativePath="..\..\src\containers\juce_Variant.cpp"/>
           <File RelativePath="..\..\src\containers\juce_Variant.h"/>
-          <File RelativePath="..\..\src\containers\juce_VoidArray.h"/>
         </Filter>
         <Filter Name="core">
           <File RelativePath="..\..\src\core\juce_Atomic.h"/>
@@ -641,7 +639,6 @@
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_AffineTransform.h"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_BorderSize.cpp"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_BorderSize.h"/>
-              <File RelativePath="..\..\src\gui\graphics\geometry\juce_Line.cpp"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_Line.h"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_Path.cpp"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_Path.h"/>
@@ -754,6 +751,7 @@
             <File RelativePath="..\..\src\native\mac\juce_iphone_UIViewComponentPeer.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AppleRemote.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDBurner.mm"/>
+            <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDReader.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_CameraDevice.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_CarbonViewWrapperComponent.h"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_CoreAudio.cpp"/>

Builds/VisualStudio2008/Juce.vcproj

@@ -24,7 +24,7 @@
       <Tool Name="VCCLCompilerTool"
             Optimization="0"
             BufferSecurityCheck=""
-            DebugInformationFormat="4"
+            DebugInformationFormat="3"
             AdditionalIncludeDirectories=""
             PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_LIB"
             RuntimeLibrary="1"
@@ -34,14 +34,14 @@
             AssemblerListingLocation=".\Debug\"
             ObjectFile=".\Debug\"
             ProgramDataBaseFileName=".\Debug\"
-            WarningLevel="3"
+            WarningLevel="4"
             SuppressStartupBanner="true"/>
       <Tool Name="VCManagedResourceCompilerTool"/>
       <Tool Name="VCResourceCompilerTool"
             PreprocessorDefinitions="_DEBUG"/>
       <Tool Name="VCPreLinkEventTool"/>
       <Tool Name="VCLibrarianTool"
-            OutputFile=".\..\..\bin\jucedebug.lib"
+            OutputFile=".\..\..\bin\jucelib_static_Win32_debug.lib"
             IgnoreDefaultLibraryNames="libcmt.lib, msvcrt.lib"/>
       <Tool Name="VCALinkTool"/>
       <Tool Name="VCManifestTool"/>
@@ -77,14 +77,14 @@
             AssemblerListingLocation=".\Release\"
             ObjectFile=".\Release\"
             ProgramDataBaseFileName=".\Release\"
-            WarningLevel="3"
+            WarningLevel="4"
             SuppressStartupBanner="true"/>
       <Tool Name="VCManagedResourceCompilerTool"/>
       <Tool Name="VCResourceCompilerTool"
             PreprocessorDefinitions="NDEBUG"/>
       <Tool Name="VCPreLinkEventTool"/>
       <Tool Name="VCLibrarianTool"
-            OutputFile=".\..\..\bin\juce.lib"
+            OutputFile=".\..\..\bin\jucelib_static_Win32.lib"
             IgnoreDefaultLibraryNames=""/>
       <Tool Name="VCALinkTool"/>
       <Tool Name="VCManifestTool"/>
@@ -118,7 +118,6 @@
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AiffAudioFormat.cpp"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AiffAudioFormat.h"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioCDBurner.h"/>
-            <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioCDReader.cpp"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioCDReader.h"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioFormat.cpp"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioFormat.h"/>
@@ -246,8 +245,8 @@
         <Filter Name="containers">
           <File RelativePath="..\..\src\containers\juce_Array.h"/>
           <File RelativePath="..\..\src\containers\juce_ArrayAllocationBase.h"/>
-          <File RelativePath="..\..\src\containers\juce_BitArray.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_BitArray.h"/>
+          <File RelativePath="..\..\src\containers\juce_BigInteger.cpp"/>
+          <File RelativePath="..\..\src\containers\juce_BigInteger.h"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.cpp"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.h"/>
           <File RelativePath="..\..\src\containers\juce_ElementComparator.h"/>
@@ -271,7 +270,6 @@
           <File RelativePath="..\..\src\containers\juce_ValueTree.h"/>
           <File RelativePath="..\..\src\containers\juce_Variant.cpp"/>
           <File RelativePath="..\..\src\containers\juce_Variant.h"/>
-          <File RelativePath="..\..\src\containers\juce_VoidArray.h"/>
         </Filter>
         <Filter Name="core">
           <File RelativePath="..\..\src\core\juce_Atomic.h"/>
@@ -641,7 +639,6 @@
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_AffineTransform.h"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_BorderSize.cpp"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_BorderSize.h"/>
-              <File RelativePath="..\..\src\gui\graphics\geometry\juce_Line.cpp"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_Line.h"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_Path.cpp"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_Path.h"/>
@@ -754,6 +751,7 @@
             <File RelativePath="..\..\src\native\mac\juce_iphone_UIViewComponentPeer.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AppleRemote.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDBurner.mm"/>
+            <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDReader.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_CameraDevice.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_CarbonViewWrapperComponent.h"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_CoreAudio.cpp"/>

Builds/VisualStudio2008_DLL/Juce.vcproj

@@ -13,7 +13,7 @@
     <Configuration Name="Debug&#124;Win32"
                    OutputDirectory=".\..\..\bin"
                    IntermediateDirectory=".\Debug"
-                   ConfigurationType="4"
+                   ConfigurationType="2"
                    UseOfMFC="0"
                    ATLMinimizesCRunTimeLibraryUsage="false"
                    CharacterSet="2">
@@ -24,9 +24,9 @@
       <Tool Name="VCCLCompilerTool"
             Optimization="0"
             BufferSecurityCheck=""
-            DebugInformationFormat="4"
+            DebugInformationFormat="3"
             AdditionalIncludeDirectories=""
-            PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_LIB"
+            PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_LIB;JUCE_DLL_BUILD=1;JUCE_DLL=1"
             RuntimeLibrary="1"
             RuntimeTypeInfo="true"
             UsePrecompiledHeader="0"
@@ -34,14 +34,15 @@
             AssemblerListingLocation=".\Debug\"
             ObjectFile=".\Debug\"
             ProgramDataBaseFileName=".\Debug\"
-            WarningLevel="3"
+            WarningLevel="4"
             SuppressStartupBanner="true"/>
       <Tool Name="VCManagedResourceCompilerTool"/>
       <Tool Name="VCResourceCompilerTool"
             PreprocessorDefinitions="_DEBUG"/>
       <Tool Name="VCPreLinkEventTool"/>
-      <Tool Name="VCLibrarianTool"
-            OutputFile=".\..\..\bin\jucedebug.lib"
+      <Tool Name="VCLinkerTool"
+            AdditionalOptions="/IMPLIB:.\..\..\bin\JUCE_debug.lib"
+            OutputFile=".\..\..\bin\JUCE_debug.dll"
             IgnoreDefaultLibraryNames="libcmt.lib, msvcrt.lib"/>
       <Tool Name="VCALinkTool"/>
       <Tool Name="VCManifestTool"/>
@@ -55,7 +56,7 @@
     <Configuration Name="Release&#124;Win32"
                    OutputDirectory=".\..\..\bin"
                    IntermediateDirectory=".\Release"
-                   ConfigurationType="4"
+                   ConfigurationType="2"
                    UseOfMFC="0"
                    ATLMinimizesCRunTimeLibraryUsage="false"
                    CharacterSet="2"
@@ -69,7 +70,7 @@
             InlineFunctionExpansion="1"
             StringPooling="true"
             AdditionalIncludeDirectories=""
-            PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB"
+            PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB;JUCE_DLL_BUILD=1;JUCE_DLL=1"
             RuntimeLibrary="0"
             RuntimeTypeInfo="true"
             UsePrecompiledHeader="0"
@@ -77,14 +78,15 @@
             AssemblerListingLocation=".\Release\"
             ObjectFile=".\Release\"
             ProgramDataBaseFileName=".\Release\"
-            WarningLevel="3"
+            WarningLevel="4"
             SuppressStartupBanner="true"/>
       <Tool Name="VCManagedResourceCompilerTool"/>
       <Tool Name="VCResourceCompilerTool"
             PreprocessorDefinitions="NDEBUG"/>
       <Tool Name="VCPreLinkEventTool"/>
-      <Tool Name="VCLibrarianTool"
-            OutputFile=".\..\..\bin\juce.lib"
+      <Tool Name="VCLinkerTool"
+            AdditionalOptions="/IMPLIB:.\..\..\bin\JUCE.lib"
+            OutputFile=".\..\..\bin\JUCE.dll"
             IgnoreDefaultLibraryNames=""/>
       <Tool Name="VCALinkTool"/>
       <Tool Name="VCManifestTool"/>
@@ -118,7 +120,6 @@
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AiffAudioFormat.cpp"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AiffAudioFormat.h"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioCDBurner.h"/>
-            <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioCDReader.cpp"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioCDReader.h"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioFormat.cpp"/>
             <File RelativePath="..\..\src\audio\audio_file_formats\juce_AudioFormat.h"/>
@@ -246,8 +247,8 @@
         <Filter Name="containers">
           <File RelativePath="..\..\src\containers\juce_Array.h"/>
           <File RelativePath="..\..\src\containers\juce_ArrayAllocationBase.h"/>
-          <File RelativePath="..\..\src\containers\juce_BitArray.cpp"/>
-          <File RelativePath="..\..\src\containers\juce_BitArray.h"/>
+          <File RelativePath="..\..\src\containers\juce_BigInteger.cpp"/>
+          <File RelativePath="..\..\src\containers\juce_BigInteger.h"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.cpp"/>
           <File RelativePath="..\..\src\containers\juce_DynamicObject.h"/>
           <File RelativePath="..\..\src\containers\juce_ElementComparator.h"/>
@@ -271,7 +272,6 @@
           <File RelativePath="..\..\src\containers\juce_ValueTree.h"/>
           <File RelativePath="..\..\src\containers\juce_Variant.cpp"/>
           <File RelativePath="..\..\src\containers\juce_Variant.h"/>
-          <File RelativePath="..\..\src\containers\juce_VoidArray.h"/>
         </Filter>
         <Filter Name="core">
           <File RelativePath="..\..\src\core\juce_Atomic.h"/>
@@ -641,7 +641,6 @@
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_AffineTransform.h"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_BorderSize.cpp"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_BorderSize.h"/>
-              <File RelativePath="..\..\src\gui\graphics\geometry\juce_Line.cpp"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_Line.h"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_Path.cpp"/>
               <File RelativePath="..\..\src\gui\graphics\geometry\juce_Path.h"/>
@@ -754,6 +753,7 @@
             <File RelativePath="..\..\src\native\mac\juce_iphone_UIViewComponentPeer.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AppleRemote.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDBurner.mm"/>
+            <File RelativePath="..\..\src\native\mac\juce_mac_AudioCDReader.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_CameraDevice.mm"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_CarbonViewWrapperComponent.h"/>
             <File RelativePath="..\..\src\native\mac\juce_mac_CoreAudio.cpp"/>

Builds/iPhone/Juce.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		CD59C8E60146B04575CD61E6 = { isa = PBXBuildFile; fileRef = 415BD77DF4B2F4760D138735; };
 		76890501626BFFF310A94F15 = { isa = PBXBuildFile; fileRef = BA97FEDA576503A21D971F1E; };
 		46151070FA7D3426EC35280F = { isa = PBXBuildFile; fileRef = 1AA8BE2D76E153874FB08197; };
-		983FCD60625A60993546F850 = { isa = PBXBuildFile; fileRef = 0877D5750D6F21C5231687CA; };
 		416D6F00E88DC74879B4DF2B = { isa = PBXBuildFile; fileRef = 7D85530D76756C33795ECCE9; };
 		9C709BC2F4F0EE60BF52FACA = { isa = PBXBuildFile; fileRef = 93006D32B18174D9FE0A5E9E; };
 		FB21B7E6A7CE55D3C0E3C37E = { isa = PBXBuildFile; fileRef = 59597FA0A88A08937801D198; };
@@ -61,7 +60,7 @@
 		D1407BB28C169F5E1CAC3CC7 = { isa = PBXBuildFile; fileRef = 096CF2243648F17E1BF5421B; };
 		07E6E11A658930554FF0C56A = { isa = PBXBuildFile; fileRef = ED5966B95F865C586A3CE08F; };
 		E8DFABC1603D55B97429A8E4 = { isa = PBXBuildFile; fileRef = 35668D8EEA19957C6C9AC83A; };
-		F263F3DE818BB387676615F7 = { isa = PBXBuildFile; fileRef = CED52F0CC8C92E6F614294A9; };
+		BE25871C34D79FEFFD1B94B6 = { isa = PBXBuildFile; fileRef = 895D742F49DA9F100990879C; };
 		4AB5E55BDF79028F82F83D8E = { isa = PBXBuildFile; fileRef = F77C9170829579FABA5679AD; };
 		21BA256CBCC9C15265928A23 = { isa = PBXBuildFile; fileRef = FF40DA899AE16A5E1D8AA54A; };
 		9D2D1BA65C27BDA1F7C44769 = { isa = PBXBuildFile; fileRef = 70E5409425A76782B6188B31; };
@@ -215,7 +214,6 @@
 		F0556B3AD9D388177E26B90D = { isa = PBXBuildFile; fileRef = AF66A9951377E2D04C54CADD; };
 		0558FFF11AED944C6B3E5FB5 = { isa = PBXBuildFile; fileRef = 2ED8CC539A9D9BE611F67A9A; };
 		11109DE27B3E3E3863360113 = { isa = PBXBuildFile; fileRef = 4B550E0887AA76BBAF8BA5BF; };
-		71E2910A22BF9C53041A1C04 = { isa = PBXBuildFile; fileRef = 2CEB96F1BD38D0F453FEF750; };
 		CF73FAC91E319C464F07C966 = { isa = PBXBuildFile; fileRef = 29BC53FEE9BC27F44534C909; };
 		B6D3EDA0F2E3516F3922F23F = { isa = PBXBuildFile; fileRef = 312F208B501E0D7764C6B613; };
 		E7C9FAA5F8A4AEDAD8A8CC1D = { isa = PBXBuildFile; fileRef = 9D3F1BAB1D48DDECB9F35916; };
@@ -271,6 +269,7 @@
 		90D5A45E67E1E8A03167346E = { isa = PBXBuildFile; fileRef = 0EAE8B0F92F23D0CB6EABF2B; };
 		7A86E411B55E15DA7AF1FE67 = { isa = PBXBuildFile; fileRef = 8280AA34B23B4D366711A9E7; };
 		BD86381924AE45021246ABA3 = { isa = PBXBuildFile; fileRef = C9561A66310DAD5EEB4A9462; };
+		306AB64E97A05B800349E7E2 = { isa = PBXBuildFile; fileRef = B62991F8AEE7327BA8A5070F; };
 		E7A5418175B23C794421441C = { isa = PBXBuildFile; fileRef = 013F753639A6350C8DC602AD; };
 		51F5844EAE455D51BDB17228 = { isa = PBXBuildFile; fileRef = 72524FE185FF48DC1F954341; };
 		C99F35ABEC13F58C27C1D303 = { isa = PBXBuildFile; fileRef = BF5307F364AC9250D8625168; };
@@ -344,7 +343,6 @@
 		1AA8BE2D76E153874FB08197 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AiffAudioFormat.cpp; path = ../../src/audio/audio_file_formats/juce_AiffAudioFormat.cpp; sourceTree = SOURCE_ROOT; };
 		05C5C546E12C6422D865D864 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AiffAudioFormat.h; path = ../../src/audio/audio_file_formats/juce_AiffAudioFormat.h; sourceTree = SOURCE_ROOT; };
 		1F5A667524FB005D872340E1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioCDBurner.h; path = ../../src/audio/audio_file_formats/juce_AudioCDBurner.h; sourceTree = SOURCE_ROOT; };
-		0877D5750D6F21C5231687CA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioCDReader.cpp; path = ../../src/audio/audio_file_formats/juce_AudioCDReader.cpp; sourceTree = SOURCE_ROOT; };
 		1BBE03BB0D71FEEEA440682B = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioCDReader.h; path = ../../src/audio/audio_file_formats/juce_AudioCDReader.h; sourceTree = SOURCE_ROOT; };
 		7D85530D76756C33795ECCE9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioFormat.cpp; path = ../../src/audio/audio_file_formats/juce_AudioFormat.cpp; sourceTree = SOURCE_ROOT; };
 		013E8938EE1C6B4F63016B55 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioFormat.h; path = ../../src/audio/audio_file_formats/juce_AudioFormat.h; sourceTree = SOURCE_ROOT; };
@@ -453,8 +451,8 @@
 		9E6C206F95245BCDE38FB2B5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Synthesiser.h; path = ../../src/audio/synthesisers/juce_Synthesiser.h; sourceTree = SOURCE_ROOT; };
 		839BE8047CF2F8EBE43ED34F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Array.h; path = ../../src/containers/juce_Array.h; sourceTree = SOURCE_ROOT; };
 		EDF52FDF87ACD33FE933142C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ArrayAllocationBase.h; path = ../../src/containers/juce_ArrayAllocationBase.h; sourceTree = SOURCE_ROOT; };
-		CED52F0CC8C92E6F614294A9 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_BitArray.cpp; path = ../../src/containers/juce_BitArray.cpp; sourceTree = SOURCE_ROOT; };
-		57248C0972C9FCA8BE506131 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_BitArray.h; path = ../../src/containers/juce_BitArray.h; sourceTree = SOURCE_ROOT; };
+		895D742F49DA9F100990879C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_BigInteger.cpp; path = ../../src/containers/juce_BigInteger.cpp; sourceTree = SOURCE_ROOT; };
+		96DDC0A32624DA76036824D3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_BigInteger.h; path = ../../src/containers/juce_BigInteger.h; sourceTree = SOURCE_ROOT; };
 		F77C9170829579FABA5679AD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_DynamicObject.cpp; path = ../../src/containers/juce_DynamicObject.cpp; sourceTree = SOURCE_ROOT; };
 		34C402EF9ADCAD34FB657D43 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_DynamicObject.h; path = ../../src/containers/juce_DynamicObject.h; sourceTree = SOURCE_ROOT; };
 		7DA9AC75A4D9227C8FC4B2F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ElementComparator.h; path = ../../src/containers/juce_ElementComparator.h; sourceTree = SOURCE_ROOT; };
@@ -478,7 +476,6 @@
 		7CABDD863B47D8ADC900A4D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ValueTree.h; path = ../../src/containers/juce_ValueTree.h; sourceTree = SOURCE_ROOT; };
 		4DF9D333038A442870668D31 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Variant.cpp; path = ../../src/containers/juce_Variant.cpp; sourceTree = SOURCE_ROOT; };
 		A81B4FC81A75E21E5B96E506 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Variant.h; path = ../../src/containers/juce_Variant.h; sourceTree = SOURCE_ROOT; };
-		3EA2B10D5A197C9BDA80C5CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_VoidArray.h; path = ../../src/containers/juce_VoidArray.h; sourceTree = SOURCE_ROOT; };
 		149E6ECBA264A264C7BB3FB3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Atomic.h; path = ../../src/core/juce_Atomic.h; sourceTree = SOURCE_ROOT; };
 		45AFA4791D59FBB1B548FB2C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_ByteOrder.h; path = ../../src/core/juce_ByteOrder.h; sourceTree = SOURCE_ROOT; };
 		D66C00E06B06EAD3B5257DD6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_FileLogger.cpp; path = ../../src/core/juce_FileLogger.cpp; sourceTree = SOURCE_ROOT; };
@@ -802,7 +799,6 @@
 		5CD42FFF9F1A509D117BD0CB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AffineTransform.h; path = ../../src/gui/graphics/geometry/juce_AffineTransform.h; sourceTree = SOURCE_ROOT; };
 		4B550E0887AA76BBAF8BA5BF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_BorderSize.cpp; path = ../../src/gui/graphics/geometry/juce_BorderSize.cpp; sourceTree = SOURCE_ROOT; };
 		C18F342C087F69D141B3FAF5 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_BorderSize.h; path = ../../src/gui/graphics/geometry/juce_BorderSize.h; sourceTree = SOURCE_ROOT; };
-		2CEB96F1BD38D0F453FEF750 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Line.cpp; path = ../../src/gui/graphics/geometry/juce_Line.cpp; sourceTree = SOURCE_ROOT; };
 		4011751B9EFCA7B9345D7D7C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Line.h; path = ../../src/gui/graphics/geometry/juce_Line.h; sourceTree = SOURCE_ROOT; };
 		29BC53FEE9BC27F44534C909 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_Path.cpp; path = ../../src/gui/graphics/geometry/juce_Path.cpp; sourceTree = SOURCE_ROOT; };
 		795E2BD2D39A3A6E36C26CBF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_Path.h; path = ../../src/gui/graphics/geometry/juce_Path.h; sourceTree = SOURCE_ROOT; };
@@ -894,6 +890,7 @@
 		0EAE8B0F92F23D0CB6EABF2B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_iphone_UIViewComponentPeer.mm; path = ../../src/native/mac/juce_iphone_UIViewComponentPeer.mm; sourceTree = SOURCE_ROOT; };
 		8280AA34B23B4D366711A9E7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_AppleRemote.mm; path = ../../src/native/mac/juce_mac_AppleRemote.mm; sourceTree = SOURCE_ROOT; };
 		C9561A66310DAD5EEB4A9462 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_AudioCDBurner.mm; path = ../../src/native/mac/juce_mac_AudioCDBurner.mm; sourceTree = SOURCE_ROOT; };
+		B62991F8AEE7327BA8A5070F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_AudioCDReader.mm; path = ../../src/native/mac/juce_mac_AudioCDReader.mm; sourceTree = SOURCE_ROOT; };
 		013F753639A6350C8DC602AD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_mac_CameraDevice.mm; path = ../../src/native/mac/juce_mac_CameraDevice.mm; sourceTree = SOURCE_ROOT; };
 		6B46AB1931E43DAFB278D23D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_mac_CarbonViewWrapperComponent.h; path = ../../src/native/mac/juce_mac_CarbonViewWrapperComponent.h; sourceTree = SOURCE_ROOT; };
 		72524FE185FF48DC1F954341 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_mac_CoreAudio.cpp; path = ../../src/native/mac/juce_mac_CoreAudio.cpp; sourceTree = SOURCE_ROOT; };
@@ -1003,7 +1000,6 @@
 				1AA8BE2D76E153874FB08197,
 				05C5C546E12C6422D865D864,
 				1F5A667524FB005D872340E1,
-				0877D5750D6F21C5231687CA,
 				1BBE03BB0D71FEEEA440682B,
 				7D85530D76756C33795ECCE9,
 				013E8938EE1C6B4F63016B55,
@@ -1131,8 +1127,8 @@
 		1CC2889DB696E12FC34E3F50 = { isa = PBXGroup; children = (
 				839BE8047CF2F8EBE43ED34F,
 				EDF52FDF87ACD33FE933142C,
-				CED52F0CC8C92E6F614294A9,
-				57248C0972C9FCA8BE506131,
+				895D742F49DA9F100990879C,
+				96DDC0A32624DA76036824D3,
 				F77C9170829579FABA5679AD,
 				34C402EF9ADCAD34FB657D43,
 				7DA9AC75A4D9227C8FC4B2F7,
@@ -1155,8 +1151,7 @@
 				5D27EE211D9BFF6A58C4DC42,
 				7CABDD863B47D8ADC900A4D8,
 				4DF9D333038A442870668D31,
-				A81B4FC81A75E21E5B96E506,
-				3EA2B10D5A197C9BDA80C5CF ); name = containers; sourceTree = "<group>"; };
+				A81B4FC81A75E21E5B96E506 ); name = containers; sourceTree = "<group>"; };
 		1AF37A533ABDD889670F9349 = { isa = PBXGroup; children = (
 				149E6ECBA264A264C7BB3FB3,
 				45AFA4791D59FBB1B548FB2C,
@@ -1514,7 +1509,6 @@
 				5CD42FFF9F1A509D117BD0CB,
 				4B550E0887AA76BBAF8BA5BF,
 				C18F342C087F69D141B3FAF5,
-				2CEB96F1BD38D0F453FEF750,
 				4011751B9EFCA7B9345D7D7C,
 				29BC53FEE9BC27F44534C909,
 				795E2BD2D39A3A6E36C26CBF,
@@ -1627,6 +1621,7 @@
 				0EAE8B0F92F23D0CB6EABF2B,
 				8280AA34B23B4D366711A9E7,
 				C9561A66310DAD5EEB4A9462,
+				B62991F8AEE7327BA8A5070F,
 				013F753639A6350C8DC602AD,
 				6B46AB1931E43DAFB278D23D,
 				72524FE185FF48DC1F954341,
@@ -1829,7 +1824,6 @@
 				CD59C8E60146B04575CD61E6,
 				76890501626BFFF310A94F15,
 				46151070FA7D3426EC35280F,
-				983FCD60625A60993546F850,
 				416D6F00E88DC74879B4DF2B,
 				9C709BC2F4F0EE60BF52FACA,
 				FB21B7E6A7CE55D3C0E3C37E,
@@ -1878,7 +1872,7 @@
 				D1407BB28C169F5E1CAC3CC7,
 				07E6E11A658930554FF0C56A,
 				E8DFABC1603D55B97429A8E4,
-				F263F3DE818BB387676615F7,
+				BE25871C34D79FEFFD1B94B6,
 				4AB5E55BDF79028F82F83D8E,
 				21BA256CBCC9C15265928A23,
 				9D2D1BA65C27BDA1F7C44769,
@@ -2032,7 +2026,6 @@
 				F0556B3AD9D388177E26B90D,
 				0558FFF11AED944C6B3E5FB5,
 				11109DE27B3E3E3863360113,
-				71E2910A22BF9C53041A1C04,
 				CF73FAC91E319C464F07C966,
 				B6D3EDA0F2E3516F3922F23F,
 				E7C9FAA5F8A4AEDAD8A8CC1D,
@@ -2088,6 +2081,7 @@
 				90D5A45E67E1E8A03167346E,
 				7A86E411B55E15DA7AF1FE67,
 				BD86381924AE45021246ABA3,
+				306AB64E97A05B800349E7E2,
 				E7A5418175B23C794421441C,
 				51F5844EAE455D51BDB17228,
 				C99F35ABEC13F58C27C1D303,

Juce.jucer

@@ -65,8 +65,6 @@
                 file="src/audio/audio_file_formats/juce_AiffAudioFormat.h"/>
           <FILE id="iaSLTdAgX" name="juce_AudioCDBurner.h" compile="0" resource="0"
                 file="src/audio/audio_file_formats/juce_AudioCDBurner.h"/>
-          <FILE id="lgwbgj4vF" name="juce_AudioCDReader.cpp" compile="1" resource="0"
-                file="src/audio/audio_file_formats/juce_AudioCDReader.cpp"/>
           <FILE id="RV1XmJohc" name="juce_AudioCDReader.h" compile="0" resource="0"
                 file="src/audio/audio_file_formats/juce_AudioCDReader.h"/>
           <FILE id="7bdvMw9hr" name="juce_AudioFormat.cpp" compile="1" resource="0"
@@ -301,10 +299,10 @@
         <FILE id="MMVvnl2oo" name="juce_Array.h" compile="0" resource="0" file="src/containers/juce_Array.h"/>
         <FILE id="I2LILZNlU" name="juce_ArrayAllocationBase.h" compile="0"
               resource="0" file="src/containers/juce_ArrayAllocationBase.h"/>
-        <FILE id="T2Ys7NAuy" name="juce_BitArray.cpp" compile="1" resource="0"
-              file="src/containers/juce_BitArray.cpp"/>
-        <FILE id="yo9C7IDcf" name="juce_BitArray.h" compile="0" resource="0"
-              file="src/containers/juce_BitArray.h"/>
+        <FILE id="T2Ys7NAuy" name="juce_BigInteger.cpp" compile="1" resource="0"
+              file="src/containers/juce_BigInteger.cpp"/>
+        <FILE id="yo9C7IDcf" name="juce_BigInteger.h" compile="0" resource="0"
+              file="src/containers/juce_BigInteger.h"/>
         <FILE id="1cwWOJ3Mv" name="juce_DynamicObject.cpp" compile="1" resource="0"
               file="src/containers/juce_DynamicObject.cpp"/>
         <FILE id="e3gh56Kq6" name="juce_DynamicObject.h" compile="0" resource="0"
@@ -349,8 +347,6 @@
               file="src/containers/juce_Variant.cpp"/>
         <FILE id="8q9BHXyE6" name="juce_Variant.h" compile="0" resource="0"
               file="src/containers/juce_Variant.h"/>
-        <FILE id="zxopOwMZz" name="juce_VoidArray.h" compile="0" resource="0"
-              file="src/containers/juce_VoidArray.h"/>
       </GROUP>
       <GROUP id="LTuqRhF2Y" name="core">
         <FILE id="9zAJsfSFe" name="juce_Atomic.h" compile="0" resource="0"
@@ -1035,8 +1031,6 @@
                   file="src/gui/graphics/geometry/juce_BorderSize.cpp"/>
             <FILE id="Yrgxtk9Y" name="juce_BorderSize.h" compile="0" resource="0"
                   file="src/gui/graphics/geometry/juce_BorderSize.h"/>
-            <FILE id="QviRuOhCo" name="juce_Line.cpp" compile="1" resource="0"
-                  file="src/gui/graphics/geometry/juce_Line.cpp"/>
             <FILE id="kctD1TPMS" name="juce_Line.h" compile="0" resource="0" file="src/gui/graphics/geometry/juce_Line.h"/>
             <FILE id="BumvtZ3k6" name="juce_Path.cpp" compile="1" resource="0"
                   file="src/gui/graphics/geometry/juce_Path.cpp"/>
@@ -1233,6 +1227,8 @@
                 file="src/native/mac/juce_mac_AppleRemote.mm"/>
           <FILE id="8rKYGEkhh" name="juce_mac_AudioCDBurner.mm" compile="1" resource="0"
                 file="src/native/mac/juce_mac_AudioCDBurner.mm"/>
+          <FILE id="av8QbC0JI" name="juce_mac_AudioCDReader.mm" compile="1" resource="0"
+                file="src/native/mac/juce_mac_AudioCDReader.mm"/>
           <FILE id="8QiF5ZqPk" name="juce_mac_CameraDevice.mm" compile="1" resource="0"
                 file="src/native/mac/juce_mac_CameraDevice.mm"/>
           <FILE id="JCvDhO9Ty" name="juce_mac_CarbonViewWrapperComponent.h" compile="0"

amalgamation/juce_amalgamated_template.cpp

@@ -102,7 +102,7 @@
  #include "../src/core/juce_RelativeTime.cpp"
  #include "../src/core/juce_SystemStats.cpp"
  #include "../src/core/juce_Time.cpp"
- #include "../src/containers/juce_BitArray.cpp"
+ #include "../src/containers/juce_BigInteger.cpp"
  #include "../src/containers/juce_MemoryBlock.cpp"
  #include "../src/containers/juce_PropertySet.cpp"
  #include "../src/containers/juce_Variant.cpp"
@@ -158,7 +158,6 @@
  #include "../src/utilities/juce_RecentlyOpenedFilesList.cpp"
  #include "../src/utilities/juce_UndoManager.cpp"
  #include "../src/audio/audio_file_formats/juce_AiffAudioFormat.cpp"
- #include "../src/audio/audio_file_formats/juce_AudioCDReader.cpp"
  #include "../src/audio/audio_file_formats/juce_AudioFormat.cpp"
  #include "../src/audio/audio_file_formats/juce_AudioFormatManager.cpp"
  #include "../src/audio/audio_file_formats/juce_AudioSubsectionReader.cpp"
@@ -344,7 +343,6 @@
  #include "../src/gui/graphics/fonts/juce_Typeface.cpp"
  #include "../src/gui/graphics/geometry/juce_AffineTransform.cpp"
  #include "../src/gui/graphics/geometry/juce_BorderSize.cpp"
- #include "../src/gui/graphics/geometry/juce_Line.cpp"
  #include "../src/gui/graphics/geometry/juce_Path.cpp"
  #include "../src/gui/graphics/geometry/juce_PathIterator.cpp"
  #include "../src/gui/graphics/geometry/juce_PathStrokeType.cpp"

extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_MSVC.h

@@ -498,7 +498,7 @@ private:
             if (isDebug)
             {
                 compiler->setAttribute ("BufferSecurityCheck", "");
-                compiler->setAttribute ("DebugInformationFormat", "4");
+                compiler->setAttribute ("DebugInformationFormat", project.isLibrary() ? "3" : "4");
             }
             else
             {
@@ -516,7 +516,7 @@ private:
             compiler->setAttribute ("AssemblerListingLocation", FileUtils::windowsStylePath (intermediatesPath + "/"));
             compiler->setAttribute ("ObjectFile", FileUtils::windowsStylePath (intermediatesPath + "/"));
             compiler->setAttribute ("ProgramDataBaseFileName", FileUtils::windowsStylePath (intermediatesPath + "/"));
-            compiler->setAttribute ("WarningLevel", "3");
+            compiler->setAttribute ("WarningLevel", project.isLibrary() ? "4" : "3");
             compiler->setAttribute ("SuppressStartupBanner", "true");
 
             if (getExtraCompilerFlags().toString().isNotEmpty())

extras/audio plugins/wrapper/AU/juce_AU_Wrapper.mm

@@ -52,7 +52,7 @@
 
 //==============================================================================
 #define juceFilterObjectPropertyID 0x1a45ffe9
-static VoidArray activePlugins, activeUIs;
+static Array<void*> activePlugins, activeUIs;
 
 static const short channelConfigs[][2] = { JucePlugin_PreferredChannelConfigurations };
 static const int numChannelConfigs = sizeof (channelConfigs) / sizeof (*channelConfigs);

extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp

@@ -351,7 +351,7 @@ public:
     juce_UseDebuggingNewOperator
 };
 
-static VoidArray activePlugins;
+static Array<void*> activePlugins;
 
 
 //==============================================================================
@@ -672,7 +672,7 @@ public:
                 int i;
                 for (i = 0; i < numOut; ++i)
                 {
-                    float* chan = (float*) tempChannels.getUnchecked(i);
+                    float* chan = tempChannels.getUnchecked(i);
 
                     if (chan == 0)
                     {
@@ -1417,7 +1417,7 @@ private:
     VstSpeakerArrangementType speakerIn, speakerOut;
     int numInChans, numOutChans;
     HeapBlock <float*> channels;
-    VoidArray tempChannels; // see note in processReplacing()
+    Array<float*> tempChannels; // see note in processReplacing()
     bool hasCreatedTempChannels;
     bool shouldDeleteEditor;
 

juce_amalgamated.h

@@ -3374,7 +3374,7 @@ public:
 
 private:
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
   #if JUCE_64BIT
 	// To avoid including windows.h in the public Juce includes, we'll just allocate a
 	// block of memory here that's big enough to be used internally as a windows critical
@@ -4372,11 +4372,11 @@ private:
 #ifndef __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
 
 #endif
-#ifndef __JUCE_BITARRAY_JUCEHEADER__
+#ifndef __JUCE_BIGINTEGER_JUCEHEADER__
 
-/*** Start of inlined file: juce_BitArray.h ***/
-#ifndef __JUCE_BITARRAY_JUCEHEADER__
-#define __JUCE_BITARRAY_JUCEHEADER__
+/*** Start of inlined file: juce_BigInteger.h ***/
+#ifndef __JUCE_BIGINTEGER_JUCEHEADER__
+#define __JUCE_BIGINTEGER_JUCEHEADER__
 
 class MemoryBlock;
 
@@ -4662,8 +4662,8 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const BigInteger&
 */
 typedef BigInteger BitArray;
 
-#endif   // __JUCE_BITARRAY_JUCEHEADER__
-/*** End of inlined file: juce_BitArray.h ***/
+#endif   // __JUCE_BIGINTEGER_JUCEHEADER__
+/*** End of inlined file: juce_BigInteger.h ***/
 
 
 #endif
@@ -12624,7 +12624,7 @@ public:
 
 		If it's not possible to merge the two actions, the method should return zero.
 	*/
-	virtual UndoableAction* createCoalescedAction (UndoableAction* nextAction)  { return 0; }
+	virtual UndoableAction* createCoalescedAction (UndoableAction* nextAction)  { (void) nextAction; return 0; }
 };
 
 #endif   // __JUCE_UNDOABLEACTION_JUCEHEADER__
@@ -13275,9 +13275,10 @@ private:
 	SharedObjectPtr object;
 	ListenerList <Listener> listeners;
 
-public:
-	/** @internal */
-	explicit ValueTree (SharedObject*);  // (can be made private when VC6 support is finally dropped)
+#if JUCE_MSVC && ! DOXYGEN
+ public:  // (workaround for VC6)
+#endif
+	explicit ValueTree (SharedObject*);
 };
 
 #endif   // __JUCE_VALUETREE_JUCEHEADER__
@@ -13287,25 +13288,6 @@ public:
 #endif
 #ifndef __JUCE_VARIANT_JUCEHEADER__
 
-#endif
-#ifndef __JUCE_VOIDARRAY_JUCEHEADER__
-
-/*** Start of inlined file: juce_VoidArray.h ***/
-#ifndef __JUCE_VOIDARRAY_JUCEHEADER__
-#define __JUCE_VOIDARRAY_JUCEHEADER__
-
-/**
-	A typedef for an Array of void*'s.
-
-	VoidArrays are used in various places throughout the library instead of
-	more strongly-typed arrays, to keep code-size low.
-*/
-typedef Array <void*> VoidArray;
-
-#endif   // __JUCE_VOIDARRAY_JUCEHEADER__
-/*** End of inlined file: juce_VoidArray.h ***/
-
-
 #endif
 #ifndef __JUCE_ATOMIC_JUCEHEADER__
 
@@ -24266,7 +24248,7 @@ class ComponentPeer;
 
 */
 class JUCE_API  Component  : public MouseListener,
-							 protected MessageListener
+							 public MessageListener
 {
 public:
 
@@ -26172,7 +26154,7 @@ private:
 	ImageEffectFilter* effect_;
 	Image* bufferedImage_;
 	Array <MouseListener*>* mouseListeners_;
-	VoidArray* keyListeners_;
+	Array <KeyListener*>* keyListeners_;
 	ListenerList <ComponentListener> componentListeners;
 	NamedValueSet properties;
 
@@ -31324,7 +31306,7 @@ public:
 
 private:
 
-	VoidArray inputs;
+	Array <AudioSource*> inputs;
 	BigInteger inputsToDelete;
 	CriticalSection lock;
 	AudioSampleBuffer tempBuffer;
@@ -37770,7 +37752,7 @@ protected:
 	void sendParamChangeMessageToListeners (const int parameterIndex, const float newValue);
 
 private:
-	VoidArray listeners;
+	Array <AudioProcessorListener*> listeners;
 	AudioProcessorEditor* activeEditor;
 	double sampleRate;
 	int blockSize, numInputChannels, numOutputChannels, latencySamples;
@@ -38056,7 +38038,7 @@ private:
 #ifndef __JUCE_DIRECTXPLUGINFORMAT_JUCEHEADER__
 #define __JUCE_DIRECTXPLUGINFORMAT_JUCEHEADER__
 
-#if JUCE_PLUGINHOST_DX && JUCE_WIN32
+#if JUCE_PLUGINHOST_DX && JUCE_WINDOWS
 
 //   Sorry, this file is just a placeholder at the moment!...
 
@@ -39734,7 +39716,7 @@ private:
 	OwnedArray <MidiBuffer> midiBuffers;
 
 	CriticalSection renderLock;
-	VoidArray renderingOps;
+	Array<void*> renderingOps;
 
 	friend class AudioGraphIOProcessor;
 	AudioSampleBuffer* currentAudioInputBuffer;
@@ -41279,7 +41261,6 @@ private:
 	bool quitMessagePosted, quitMessageReceived;
 	Thread::ThreadID messageThreadId;
 
-	VoidArray modalComponents;
 	static void* exitModalLoopCallback (void*);
 
 	void postMessageToQueue (Message* message);
@@ -50003,7 +49984,7 @@ private:
 
 	Component::SafePointer<Component> component;
 	ComponentPeer* lastPeer;
-	VoidArray registeredParentComps;
+	Array <Component*> registeredParentComps;
 	bool reentrant;
 	Rectangle<int> lastBounds;
 
@@ -52163,8 +52144,8 @@ private:
 	ComponentBoundsConstrainer constrainer;
 	ComponentDragger dragger;
 	Rectangle<int> textArea;
-	VoidArray buttons, textBoxes, comboBoxes;
-	VoidArray progressBars, customComps, textBlocks, allComps;
+	Array<void*> buttons, textBoxes, comboBoxes;
+	Array<void*> progressBars, customComps, textBlocks, allComps;
 	StringArray textboxNames, comboBoxNames;
 	Font font;
 	Component* associatedComponent;

src/audio/audio_sources/juce_BufferingAudioSource.cpp

@@ -30,7 +30,7 @@ BEGIN_JUCE_NAMESPACE
 #include "juce_BufferingAudioSource.h"
 #include "../../threads/juce_ScopedLock.h"
 #include "../../core/juce_Singleton.h"
-#include "../../containers/juce_VoidArray.h"
+#include "../../containers/juce_Array.h"
 #include "../../utilities/juce_DeletedAtShutdown.h"
 #include "../../events/juce_Timer.h"
 

src/audio/audio_sources/juce_MixerAudioSource.cpp

@@ -29,6 +29,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_MixerAudioSource.h"
 #include "../../threads/juce_ScopedLock.h"
+#include "../../containers/juce_OwnedArray.h"
 
 
 //==============================================================================
@@ -98,18 +99,15 @@ void MixerAudioSource::removeInputSource (AudioSource* input, const bool deleteI
 
 void MixerAudioSource::removeAllInputs()
 {
-    VoidArray inputsCopy;
-    BigInteger inputsToDeleteCopy;
+    OwnedArray<AudioSource> toDelete;
 
     {
         const ScopedLock sl (lock);
-        inputsCopy = inputs;
-        inputsToDeleteCopy = inputsToDelete;
-    }
 
-    for (int i = inputsCopy.size(); --i >= 0;)
-        if (inputsToDeleteCopy[i])
-            delete (AudioSource*) inputsCopy[i];
+        for (int i = inputs.size(); --i >= 0;)
+            if (inputsToDelete[i])
+                toDelete.add (inputs.getUnchecked(i));
+    }
 }
 
 void MixerAudioSource::prepareToPlay (int samplesPerBlockExpected, double sampleRate)
@@ -122,8 +120,7 @@ void MixerAudioSource::prepareToPlay (int samplesPerBlockExpected, double sample
     bufferSizeExpected = samplesPerBlockExpected;
 
     for (int i = inputs.size(); --i >= 0;)
-        ((AudioSource*) inputs.getUnchecked(i))->prepareToPlay (samplesPerBlockExpected,
-                                                                sampleRate);
+        inputs.getUnchecked(i)->prepareToPlay (samplesPerBlockExpected, sampleRate);
 }
 
 void MixerAudioSource::releaseResources()
@@ -131,7 +128,7 @@ void MixerAudioSource::releaseResources()
     const ScopedLock sl (lock);
 
     for (int i = inputs.size(); --i >= 0;)
-        ((AudioSource*) inputs.getUnchecked(i))->releaseResources();
+        inputs.getUnchecked(i)->releaseResources();
 
     tempBuffer.setSize (2, 0);
 
@@ -145,7 +142,7 @@ void MixerAudioSource::getNextAudioBlock (const AudioSourceChannelInfo& info)
 
     if (inputs.size() > 0)
     {
-        ((AudioSource*) inputs.getUnchecked(0))->getNextAudioBlock (info);
+        inputs.getUnchecked(0)->getNextAudioBlock (info);
 
         if (inputs.size() > 1)
         {
@@ -159,7 +156,7 @@ void MixerAudioSource::getNextAudioBlock (const AudioSourceChannelInfo& info)
 
             for (int i = 1; i < inputs.size(); ++i)
             {
-                ((AudioSource*) inputs.getUnchecked(i))->getNextAudioBlock (info2);
+                inputs.getUnchecked(i)->getNextAudioBlock (info2);
 
                 for (int chan = 0; chan < info.buffer->getNumChannels(); ++chan)
                     info.buffer->addFrom (chan, info.startSample, tempBuffer, chan, 0, info.numSamples);

src/audio/audio_sources/juce_MixerAudioSource.h

@@ -28,8 +28,8 @@
 
 #include "juce_AudioSource.h"
 #include "../../threads/juce_CriticalSection.h"
-#include "../../containers/juce_VoidArray.h"
-#include "../../containers/juce_BitArray.h"
+#include "../../containers/juce_Array.h"
+#include "../../containers/juce_BigInteger.h"
 
 
 //==============================================================================
@@ -111,7 +111,7 @@ public:
 
 private:
     //==============================================================================
-    VoidArray inputs;
+    Array <AudioSource*> inputs;
     BigInteger inputsToDelete;
     CriticalSection lock;
     AudioSampleBuffer tempBuffer;

src/audio/devices/juce_AudioIODevice.h

@@ -27,7 +27,7 @@
 #define __JUCE_AUDIOIODEVICE_JUCEHEADER__
 
 #include "../../text/juce_StringArray.h"
-#include "../../containers/juce_BitArray.h"
+#include "../../containers/juce_BigInteger.h"
 #include "../../containers/juce_OwnedArray.h"
 class AudioIODevice;
 

src/audio/midi/juce_MidiKeyboardState.h

@@ -28,7 +28,7 @@
 
 #include "juce_MidiBuffer.h"
 #include "../../threads/juce_ScopedLock.h"
-#include "../../containers/juce_VoidArray.h"
+#include "../../containers/juce_Array.h"
 class MidiKeyboardState;
 
 

src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm

@@ -846,8 +846,6 @@ OSStatus AudioUnitPluginInstance::getTransportState (Boolean* outIsPlaying,
 
 
 //==============================================================================
-static VoidArray activeWindows;
-
 class AudioUnitPluginWindowCocoa    : public AudioProcessorEditor
 {
 public:
@@ -858,8 +856,6 @@ public:
     {
         addAndMakeVisible (wrapper = new NSViewComponent());
 
-        activeWindows.add (this);
-
         setOpaque (true);
         setVisible (true);
         setSize (100, 100);
@@ -872,7 +868,6 @@ public:
         const bool wasValid = isValid();
 
         wrapper->setView (0);
-        activeWindows.removeValue (this);
 
         if (wasValid)
             plugin.editorBeingDeleted (this);
@@ -964,8 +959,6 @@ public:
     {
         addAndMakeVisible (innerWrapper = new InnerWrapperComponent (this));
 
-        activeWindows.add (this);
-
         setOpaque (true);
         setVisible (true);
         setSize (400, 300);
@@ -981,7 +974,6 @@ public:
     ~AudioUnitPluginWindowCarbon()
     {
         innerWrapper = 0;
-        activeWindows.removeValue (this);
 
         if (isValid())
             plugin.editorBeingDeleted (this);
@@ -1011,13 +1003,6 @@ public:
         return false;
     }
 
-    //==============================================================================
-    void broughtToFront()
-    {
-        activeWindows.removeValue (this);
-        activeWindows.add (this);
-    }
-
     //==============================================================================
     AudioUnit getAudioUnit() const      { return plugin.audioUnit; }
 

src/audio/plugins/formats/juce_DirectXPluginFormat.h

@@ -28,7 +28,7 @@
 
 #include "../juce_AudioPluginFormat.h"
 
-#if JUCE_PLUGINHOST_DX && JUCE_WIN32
+#if JUCE_PLUGINHOST_DX && JUCE_WINDOWS
 
 
 //   Sorry, this file is just a placeholder at the moment!...

src/audio/plugins/formats/juce_VSTPluginFormat.cpp

@@ -26,7 +26,7 @@
 #include "../../../core/juce_TargetPlatform.h"
 #include "../../../../juce_Config.h"
 
-#if JUCE_PLUGINHOST_VST
+#if JUCE_PLUGINHOST_VST && (JUCE_MAC_VST_INCLUDED || ! JUCE_MAC)
 
 #if JUCE_WINDOWS
  #undef _WIN32_WINNT
@@ -47,11 +47,6 @@
  #undef Drawable
  #undef Time
 #else
- #ifndef JUCE_MAC_VST_INCLUDED
-  // On the mac, this file needs to be compiled indirectly, by using
-  // juce_VSTPluginFormat.mm instead - that wraps it as an objective-C file for cocoa
-  #error
- #endif
  #include <Cocoa/Cocoa.h>
  #include <Carbon/Carbon.h>
 #endif
@@ -112,7 +107,7 @@ BEGIN_JUCE_NAMESPACE
 #include "../juce_PluginDescription.h"
 #include "juce_VSTMidiEventList.h"
 
-#if ! JUCE_WIN32
+#if ! JUCE_WINDOWS
  static void _fpreset() {}
  static void _clearfp() {}
 #endif
@@ -343,9 +338,6 @@ static void translateJuceToXMouseWheelModifiers (const MouseEvent& e, const floa
 
 #endif
 
-//==============================================================================
-static VoidArray activeModules;
-
 //==============================================================================
 class ModuleHandle    : public ReferenceCountedObject
 {
@@ -355,12 +347,18 @@ public:
     MainCall moduleMain;
     String pluginName;
 
+    static Array <ModuleHandle*>& getActiveModules()
+    {
+        static Array <ModuleHandle*> activeModules;
+        return activeModules;
+    }
+
     //==============================================================================
     static ModuleHandle* findOrCreateModule (const File& file)
     {
-        for (int i = activeModules.size(); --i >= 0;)
+        for (int i = getActiveModules().size(); --i >= 0;)
         {
-            ModuleHandle* const module = (ModuleHandle*) activeModules.getUnchecked(i);
+            ModuleHandle* const module = getActiveModules().getUnchecked(i);
 
             if (module->file == file)
                 return module;
@@ -387,7 +385,7 @@ public:
     ModuleHandle (const File& file_)
         : file (file_),
           moduleMain (0),
-#if JUCE_WIN32 || JUCE_LINUX
+#if JUCE_WINDOWS || JUCE_LINUX
           hModule (0)
 #elif JUCE_MAC
           fragId (0),
@@ -396,9 +394,9 @@ public:
           resFileId (0)
 #endif
     {
-        activeModules.add (this);
+        getActiveModules().add (this);
 
-#if JUCE_WIN32 || JUCE_LINUX
+#if JUCE_WINDOWS || JUCE_LINUX
         fullParentDirectoryPathName = file_.getParentDirectory().getFullPathName();
 #elif JUCE_MAC
         FSRef ref;
@@ -409,7 +407,7 @@ public:
 
     ~ModuleHandle()
     {
-        activeModules.removeValue (this);
+        getActiveModules().removeValue (this);
 
         close();
     }
@@ -418,13 +416,13 @@ public:
     juce_UseDebuggingNewOperator
 
     //==============================================================================
-#if JUCE_WIN32 || JUCE_LINUX
+#if JUCE_WINDOWS || JUCE_LINUX
     void* hModule;
     String fullParentDirectoryPathName;
 
     bool open()
     {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
         static bool timePeriodSet = false;
 
         if (! timePeriodSet)
@@ -614,7 +612,7 @@ public:
 #if JUCE_PPC
         if (fragId != 0)
         {
-            VoidArray thingsToDelete;
+            Array<void*> thingsToDelete;
             thingsToDelete.add ((void*) eff->dispatcher);
             thingsToDelete.add ((void*) eff->process);
             thingsToDelete.add ((void*) eff->setParameter);
@@ -673,7 +671,6 @@ public:
 #endif
 };
 
-
 //==============================================================================
 /**
     An instance of a plugin, created by a VSTPluginFormat.
@@ -1052,7 +1049,7 @@ void VSTPluginInstance::processBlock (AudioSampleBuffer& buffer,
                 vstHostTime.flags &= ~kVstTransportPlaying;
         }
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
         vstHostTime.nanoSeconds = timeGetTime() * 1000000.0;
 #elif JUCE_LINUX
         timeval micro;
@@ -1180,7 +1177,7 @@ public:
           alreadyInside (false),
           recursiveResize (false)
     {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
         sizeCheckCount = 0;
         pluginHWND = 0;
 #elif JUCE_LINUX
@@ -1223,7 +1220,7 @@ public:
 
             recursiveResize = true;
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
             if (pluginHWND != 0)
                 MoveWindow (pluginHWND, pos.getX(), pos.getY(), getWidth(), getHeight(), TRUE);
 #elif JUCE_LINUX
@@ -1322,7 +1319,7 @@ public:
     //==============================================================================
     void timerCallback()
     {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
         if (--sizeCheckCount <= 0)
         {
             sizeCheckCount = 10;
@@ -1371,7 +1368,7 @@ public:
 
         sendEventToChild (&ev);
 
-#elif JUCE_WIN32
+#elif JUCE_WINDOWS
         (void) e;
 
         toFront (true);
@@ -1396,7 +1393,7 @@ private:
     bool isOpen, wasShowing, recursiveResize;
     bool pluginWantsKeys, pluginRefusesToResize, alreadyInside;
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     HWND pluginHWND;
     void* originalWndProc;
     int sizeCheckCount;
@@ -1469,7 +1466,7 @@ private:
         // Install keyboard hooks
         pluginWantsKeys = (dispatch (effKeysRequired, 0, 0, 0, 0) == 0);
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
         originalWndProc = 0;
         pluginHWND = GetWindow ((HWND) getWindowHandle(), GW_CHILD);
 
@@ -1555,7 +1552,7 @@ private:
 
         setSize (w, h);
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
         checkPluginWindowSize();
 #endif
 
@@ -1575,7 +1572,7 @@ private:
 
             dispatch (effEditClose, 0, 0, 0, 0);
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
             #pragma warning (push)
             #pragma warning (disable: 4244)
 
@@ -1606,7 +1603,7 @@ private:
     }
 
     //==============================================================================
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     void checkPluginWindowSize() throw()
     {
         RECT r;
@@ -2959,7 +2956,7 @@ bool VSTPluginFormat::fileMightContainThisPluginType (const String& fileOrIdenti
 #endif
 
     return false;
-#elif JUCE_WIN32
+#elif JUCE_WINDOWS
     return f.existsAsFile()
             && f.hasFileExtension (".dll");
 #elif JUCE_LINUX
@@ -3014,7 +3011,7 @@ const FileSearchPath VSTPluginFormat::getDefaultLocationsToSearch()
 {
 #if JUCE_MAC
     return FileSearchPath ("~/Library/Audio/Plug-Ins/VST;/Library/Audio/Plug-Ins/VST");
-#elif JUCE_WIN32
+#elif JUCE_WINDOWS
     const String programFiles (File::getSpecialLocation (File::globalApplicationsDirectory).getFullPathName());
 
     return FileSearchPath (programFiles + "\\Steinberg\\VstPlugins");

src/audio/plugins/juce_AudioPluginFormatManager.cpp

@@ -64,7 +64,7 @@ void AudioPluginFormatManager::addDefaultFormats()
         jassert (dynamic_cast <AudioUnitPluginFormat*> (formats[i]) == 0);
   #endif
 
-  #if JUCE_PLUGINHOST_DX && JUCE_WIN32
+  #if JUCE_PLUGINHOST_DX && JUCE_WINDOWS
         jassert (dynamic_cast <DirectXPluginFormat*> (formats[i]) == 0);
   #endif
 
@@ -82,7 +82,7 @@ void AudioPluginFormatManager::addDefaultFormats()
     formats.add (new VSTPluginFormat());
 #endif
 
-#if JUCE_PLUGINHOST_DX && JUCE_WIN32
+#if JUCE_PLUGINHOST_DX && JUCE_WINDOWS
     formats.add (new DirectXPluginFormat());
 #endif
 

src/audio/processors/juce_AudioProcessor.cpp

@@ -118,7 +118,7 @@ void AudioProcessor::sendParamChangeMessageToListeners (const int parameterIndex
 
         {
             const ScopedLock sl (listenerLock);
-            l = (AudioProcessorListener*) listeners [i];
+            l = listeners [i];
         }
 
         if (l != 0)
@@ -143,7 +143,7 @@ void AudioProcessor::beginParameterChangeGesture (int parameterIndex)
 
         {
             const ScopedLock sl (listenerLock);
-            l = (AudioProcessorListener*) listeners [i];
+            l = listeners [i];
         }
 
         if (l != 0)
@@ -169,7 +169,7 @@ void AudioProcessor::endParameterChangeGesture (int parameterIndex)
 
         {
             const ScopedLock sl (listenerLock);
-            l = (AudioProcessorListener*) listeners [i];
+            l = listeners [i];
         }
 
         if (l != 0)
@@ -185,7 +185,7 @@ void AudioProcessor::updateHostDisplay()
 
         {
             const ScopedLock sl (listenerLock);
-            l = (AudioProcessorListener*) listeners [i];
+            l = listeners [i];
         }
 
         if (l != 0)

src/audio/processors/juce_AudioProcessor.h

@@ -30,7 +30,7 @@
 #include "../dsp/juce_AudioSampleBuffer.h"
 #include "../midi/juce_MidiBuffer.h"
 #include "../../text/juce_XmlElement.h"
-#include "../../containers/juce_BitArray.h"
+#include "../../containers/juce_BigInteger.h"
 #include "juce_AudioProcessorListener.h"
 #include "juce_AudioPlayHead.h"
 
@@ -571,7 +571,7 @@ protected:
     void sendParamChangeMessageToListeners (const int parameterIndex, const float newValue);
 
 private:
-    VoidArray listeners;
+    Array <AudioProcessorListener*> listeners;
     AudioProcessorEditor* activeEditor;
     double sampleRate;
     int blockSize, numInputChannels, numOutputChannels, latencySamples;

src/audio/processors/juce_AudioProcessorGraph.cpp

@@ -549,8 +549,8 @@ class RenderingOpSequenceCalculator
 public:
     //==============================================================================
     RenderingOpSequenceCalculator (AudioProcessorGraph& graph_,
-                                   const VoidArray& orderedNodes_,
-                                   VoidArray& renderingOps)
+                                   const Array<void*>& orderedNodes_,
+                                   Array<void*>& renderingOps)
         : graph (graph_),
           orderedNodes (orderedNodes_)
     {
@@ -578,12 +578,12 @@ public:
 
 private:
     AudioProcessorGraph& graph;
-    const VoidArray& orderedNodes;
+    const Array<void*>& orderedNodes;
     Array <int> nodeIds, channels, midiNodeIds;
 
     //==============================================================================
     void createRenderingOpsForNode (AudioProcessorGraph::Node* const node,
-                                    VoidArray& renderingOps,
+                                    Array<void*>& renderingOps,
                                     const int ourRenderingIndex)
     {
         const int numIns = node->processor->getNumInputChannels();
@@ -999,14 +999,14 @@ bool AudioProcessorGraph::isAnInputTo (const uint32 possibleInputId,
 
 void AudioProcessorGraph::buildRenderingSequence()
 {
-    VoidArray newRenderingOps;
+    Array<void*> newRenderingOps;
     int numRenderingBuffersNeeded = 2;
     int numMidiBuffersNeeded = 1;
 
     {
         MessageManagerLock mml;
 
-        VoidArray orderedNodes;
+        Array<void*> orderedNodes;
 
         int i;
         for (i = 0; i < nodes.size(); ++i)
@@ -1031,7 +1031,7 @@ void AudioProcessorGraph::buildRenderingSequence()
         numMidiBuffersNeeded = calculator.getNumMidiBuffersNeeded();
     }
 
-    VoidArray oldRenderingOps (renderingOps);
+    Array<void*> oldRenderingOps (renderingOps);
 
     {
         // swap over to the new rendering sequence..

src/audio/processors/juce_AudioProcessorGraph.h

@@ -413,7 +413,7 @@ private:
     OwnedArray <MidiBuffer> midiBuffers;
 
     CriticalSection renderLock;
-    VoidArray renderingOps;
+    Array<void*> renderingOps;
 
     friend class AudioGraphIOProcessor;
     AudioSampleBuffer* currentAudioInputBuffer;

src/audio/synthesisers/juce_Sampler.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_SAMPLER_JUCEHEADER__
 #define __JUCE_SAMPLER_JUCEHEADER__
 
-#include "../../containers/juce_BitArray.h"
+#include "../../containers/juce_BigInteger.h"
 #include "juce_Synthesiser.h"
 
 

src/containers/juce_BitArray.cpp → src/containers/juce_BigInteger.cpp

@@ -27,7 +27,7 @@
 
 BEGIN_JUCE_NAMESPACE
 
-#include "juce_BitArray.h"
+#include "juce_BigInteger.h"
 #include "juce_MemoryBlock.h"
 #include "../core/juce_Random.h"
 

src/containers/juce_BitArray.h → src/containers/juce_BigInteger.h

@@ -23,8 +23,8 @@
   ==============================================================================
 */
 
-#ifndef __JUCE_BITARRAY_JUCEHEADER__
-#define __JUCE_BITARRAY_JUCEHEADER__
+#ifndef __JUCE_BIGINTEGER_JUCEHEADER__
+#define __JUCE_BIGINTEGER_JUCEHEADER__
 
 #include "../text/juce_String.h"
 #include "juce_HeapBlock.h"
@@ -325,4 +325,4 @@ OutputStream& JUCE_CALLTYPE operator<< (OutputStream& stream, const BigInteger&
 typedef BigInteger BitArray;
 
 
-#endif   // __JUCE_BITARRAY_JUCEHEADER__
+#endif   // __JUCE_BIGINTEGER_JUCEHEADER__

src/containers/juce_ValueTree.h

@@ -496,9 +496,10 @@ private:
     SharedObjectPtr object;
     ListenerList <Listener> listeners;
 
-public:
-    /** @internal */
-    explicit ValueTree (SharedObject*);  // (can be made private when VC6 support is finally dropped)
+#if JUCE_MSVC && ! DOXYGEN
+ public:  // (workaround for VC6)
+#endif
+    explicit ValueTree (SharedObject*);
 };
 
 

src/containers/juce_VoidArray.h

@@ -1,43 +0,0 @@
-/*
-  ==============================================================================
-
-   This file is part of the JUCE library - "Jules' Utility Class Extensions"
-   Copyright 2004-10 by Raw Material Software Ltd.
-
-  ------------------------------------------------------------------------------
-
-   JUCE can be redistributed and/or modified under the terms of the GNU General
-   Public License (Version 2), as published by the Free Software Foundation.
-   A copy of the license is included in the JUCE distribution, or can be found
-   online at www.gnu.org/licenses.
-
-   JUCE is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-  ------------------------------------------------------------------------------
-
-   To release a closed-source product which uses JUCE, commercial licenses are
-   available: visit www.rawmaterialsoftware.com/juce for more information.
-
-  ==============================================================================
-*/
-
-#ifndef __JUCE_VOIDARRAY_JUCEHEADER__
-#define __JUCE_VOIDARRAY_JUCEHEADER__
-
-#include "juce_Array.h"
-
-
-//==============================================================================
-/**
-    A typedef for an Array of void*'s.
-
-    VoidArrays are used in various places throughout the library instead of
-    more strongly-typed arrays, to keep code-size low.
-*/
-typedef Array <void*> VoidArray;
-
-
-
-#endif   // __JUCE_VOIDARRAY_JUCEHEADER__

src/core/juce_Random.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_RANDOM_JUCEHEADER__
 #define __JUCE_RANDOM_JUCEHEADER__
 
-#include "../containers/juce_BitArray.h"
+#include "../containers/juce_BigInteger.h"
 
 
 //==============================================================================

src/cryptography/juce_Primes.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_PRIMES_JUCEHEADER__
 #define __JUCE_PRIMES_JUCEHEADER__
 
-#include "../containers/juce_BitArray.h"
+#include "../containers/juce_BigInteger.h"
 
 
 //==============================================================================

src/cryptography/juce_RSAKey.h

@@ -26,7 +26,7 @@
 #ifndef __JUCE_RSAKEY_JUCEHEADER__
 #define __JUCE_RSAKEY_JUCEHEADER__
 
-#include "../containers/juce_BitArray.h"
+#include "../containers/juce_BigInteger.h"
 
 
 //==============================================================================

src/events/juce_MessageManager.h

@@ -28,7 +28,6 @@
 
 #include "../utilities/juce_DeletedAtShutdown.h"
 #include "../containers/juce_SortedSet.h"
-#include "../containers/juce_VoidArray.h"
 #include "../containers/juce_ScopedPointer.h"
 #include "../threads/juce_Thread.h"
 #include "../threads/juce_ThreadPool.h"
@@ -182,7 +181,6 @@ private:
     bool quitMessagePosted, quitMessageReceived;
     Thread::ThreadID messageThreadId;
 
-    VoidArray modalComponents;
     static void* exitModalLoopCallback (void*);
 
     void postMessageToQueue (Message* message);

src/events/juce_Timer.cpp

@@ -35,7 +35,6 @@ BEGIN_JUCE_NAMESPACE
 #include "../core/juce_Time.h"
 #include "../threads/juce_Thread.h"
 #include "../threads/juce_ScopedLock.h"
-#include "../containers/juce_VoidArray.h"
 
 
 //==============================================================================

src/gui/components/controls/juce_TableListBox.cpp

@@ -28,7 +28,7 @@
 BEGIN_JUCE_NAMESPACE
 
 #include "juce_TableListBox.h"
-#include "../../../containers/juce_BitArray.h"
+#include "../../../containers/juce_BigInteger.h"
 #include "../../../core/juce_Random.h"
 #include "../mouse/juce_DragAndDropContainer.h"
 #include "../../graphics/imaging/juce_Image.h"

src/gui/components/controls/juce_TextEditor.cpp

@@ -2040,7 +2040,7 @@ bool TextEditor::keyStateChanged (const bool isKeyDown)
     if (! isKeyDown)
         return false;
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     if (KeyPress (KeyPress::F4Key, ModifierKeys::altModifier, 0).isCurrentlyDown())
         return false;  // We need to explicitly allow alt-F4 to pass through on Windows
 #endif

src/gui/components/controls/juce_TreeView.cpp

@@ -29,7 +29,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_TreeView.h"
 #include "../lookandfeel/juce_LookAndFeel.h"
-#include "../../../containers/juce_BitArray.h"
+#include "../../../containers/juce_BigInteger.h"
 #include "../mouse/juce_DragAndDropContainer.h"
 #include "../mouse/juce_MouseInputSource.h"
 #include "../../graphics/imaging/juce_Image.h"

src/gui/components/filebrowser/juce_FileBrowserComponent.h

@@ -29,7 +29,7 @@
 #include "juce_DirectoryContentsDisplayComponent.h"
 #include "juce_FilePreviewComponent.h"
 #include "../../../io/files/juce_File.h"
-#include "../../../containers/juce_BitArray.h"
+#include "../../../containers/juce_BigInteger.h"
 #include "../controls/juce_TextEditor.h"
 #include "../controls/juce_ComboBox.h"
 #include "../buttons/juce_DrawableButton.h"

src/gui/components/juce_Component.cpp

@@ -3151,7 +3151,7 @@ const Rectangle<int> Component::getParentMonitorArea() const
 void Component::addKeyListener (KeyListener* const newListener)
 {
     if (keyListeners_ == 0)
-        keyListeners_ = new VoidArray();
+        keyListeners_ = new Array <KeyListener*>();
 
     keyListeners_->addIfNotAlreadyThere (newListener);
 }

src/gui/components/juce_Component.h

@@ -38,20 +38,21 @@
 #include "../../events/juce_MessageListener.h"
 #include "../../events/juce_ListenerList.h"
 #include "../../text/juce_StringArray.h"
-#include "../../containers/juce_VoidArray.h"
+#include "../../containers/juce_Array.h"
 #include "../../containers/juce_NamedValueSet.h"
 class LookAndFeel;
 class MouseInputSource;
 class MouseInputSourceInternal;
 class ComponentPeer;
 
+
 //==============================================================================
 /**
     The base class for all JUCE user-interface objects.
 
 */
 class JUCE_API  Component  : public MouseListener,
-                             protected MessageListener
+                             public MessageListener
 {
 public:
     //==============================================================================
@@ -2002,7 +2003,7 @@ private:
     ImageEffectFilter* effect_;
     Image* bufferedImage_;
     Array <MouseListener*>* mouseListeners_;
-    VoidArray* keyListeners_;
+    Array <KeyListener*>* keyListeners_;
     ListenerList <ComponentListener> componentListeners;
     NamedValueSet properties;
 

src/gui/components/keyboard/juce_KeyMappingEditorComponent.cpp

@@ -29,7 +29,7 @@ BEGIN_JUCE_NAMESPACE
 
 // N.B. these two includes are put here deliberately to avoid problems with
 // old GCCs failing on long include paths
-#include "../../../containers/juce_VoidArray.h"
+#include "../../../containers/juce_Array.h"
 #include "../../../containers/juce_OwnedArray.h"
 
 #include "juce_KeyMappingEditorComponent.h"

src/gui/components/layout/juce_ComponentMovementWatcher.cpp

@@ -116,7 +116,7 @@ void ComponentMovementWatcher::registerWithParentComps() throw()
 void ComponentMovementWatcher::unregister() throw()
 {
     for (int i = registeredParentComps.size(); --i >= 0;)
-        static_cast <Component*> (registeredParentComps.getUnchecked(i))->removeComponentListener (this);
+        registeredParentComps.getUnchecked(i)->removeComponentListener (this);
 
     registeredParentComps.clear();
 }

src/gui/components/layout/juce_ComponentMovementWatcher.h

@@ -78,7 +78,7 @@ private:
     //==============================================================================
     Component::SafePointer<Component> component;
     ComponentPeer* lastPeer;
-    VoidArray registeredParentComps;
+    Array <Component*> registeredParentComps;
     bool reentrant;
     Rectangle<int> lastBounds;
 

src/gui/components/special/juce_MidiKeyboardComponent.h

@@ -30,7 +30,7 @@
 #include "../../../events/juce_AsyncUpdater.h"
 #include "../../../events/juce_ChangeBroadcaster.h"
 #include "../../../audio/midi/juce_MidiKeyboardState.h"
-#include "../../../containers/juce_BitArray.h"
+#include "../../../containers/juce_BigInteger.h"
 
 
 //==============================================================================

src/gui/components/special/juce_OpenGLComponent.cpp

@@ -105,7 +105,7 @@ bool OpenGLPixelFormat::operator== (const OpenGLPixelFormat& other) const
 }
 
 //==============================================================================
-static VoidArray knownContexts;
+static Array<OpenGLContext*> knownContexts;
 
 OpenGLContext::OpenGLContext() throw()
 {
@@ -121,7 +121,7 @@ OpenGLContext* OpenGLContext::getCurrentContext()
 {
     for (int i = knownContexts.size(); --i >= 0;)
     {
-        OpenGLContext* const oglc = (OpenGLContext*) knownContexts.getUnchecked(i);
+        OpenGLContext* const oglc = knownContexts.getUnchecked(i);
 
         if (oglc->isActive())
             return oglc;

src/gui/components/windows/juce_AlertWindow.h

@@ -362,8 +362,8 @@ private:
     ComponentBoundsConstrainer constrainer;
     ComponentDragger dragger;
     Rectangle<int> textArea;
-    VoidArray buttons, textBoxes, comboBoxes;
-    VoidArray progressBars, customComps, textBlocks, allComps;
+    Array<void*> buttons, textBoxes, comboBoxes;
+    Array<void*> progressBars, customComps, textBlocks, allComps;
     StringArray textboxNames, comboBoxNames;
     Font font;
     Component* associatedComponent;

src/gui/components/windows/juce_ComponentPeer.cpp

@@ -41,7 +41,7 @@ BEGIN_JUCE_NAMESPACE
 
 
 //==============================================================================
-static VoidArray heavyweightPeers;
+static Array <ComponentPeer*> heavyweightPeers;
 
 
 //==============================================================================
@@ -72,14 +72,14 @@ int ComponentPeer::getNumPeers() throw()
 
 ComponentPeer* ComponentPeer::getPeer (const int index) throw()
 {
-    return (ComponentPeer*) heavyweightPeers [index];
+    return heavyweightPeers [index];
 }
 
 ComponentPeer* ComponentPeer::getPeerFor (const Component* const component) throw()
 {
     for (int i = heavyweightPeers.size(); --i >= 0;)
     {
-        ComponentPeer* const peer = (ComponentPeer*) heavyweightPeers.getUnchecked(i);
+        ComponentPeer* const peer = heavyweightPeers.getUnchecked(i);
 
         if (peer->getComponent() == component)
             return peer;
@@ -176,7 +176,7 @@ bool ComponentPeer::handleKeyPress (const int keyCode,
         {
             for (int i = target->keyListeners_->size(); --i >= 0;)
             {
-                keyWasUsed = ((KeyListener*) target->keyListeners_->getUnchecked(i))->keyPressed (keyInfo, target);
+                keyWasUsed = target->keyListeners_->getUnchecked(i)->keyPressed (keyInfo, target);
 
                 if (keyWasUsed || deletionChecker == 0)
                     return keyWasUsed;
@@ -235,7 +235,7 @@ bool ComponentPeer::handleKeyUpOrDown (const bool isKeyDown)
         {
             for (int i = target->keyListeners_->size(); --i >= 0;)
             {
-                keyWasUsed = ((KeyListener*) target->keyListeners_->getUnchecked(i))->keyStateChanged (isKeyDown, target);
+                keyWasUsed = target->keyListeners_->getUnchecked(i)->keyStateChanged (isKeyDown, target);
 
                 if (keyWasUsed || deletionChecker == 0)
                     return keyWasUsed;

src/gui/components/windows/juce_TopLevelWindow.cpp

@@ -85,7 +85,7 @@ public:
 
             for (int i = windows.size(); --i >= 0;)
             {
-                TopLevelWindow* const tlw = (TopLevelWindow*) windows.getUnchecked (i);
+                TopLevelWindow* const tlw = windows.getUnchecked (i);
                 tlw->setWindowActive (isWindowActive (tlw));
 
                 i = jmin (i, windows.size() - 1);
@@ -116,7 +116,7 @@ public:
             deleteInstance();
     }
 
-    VoidArray windows;
+    Array <TopLevelWindow*> windows;
 
 private:
     TopLevelWindow* currentActive;

src/gui/graphics/contexts/juce_Justification.cpp

@@ -59,30 +59,18 @@ void Justification::applyToRectangle (int& x, int& y,
                                       const int spaceW, const int spaceH) const throw()
 {
     if ((flags & horizontallyCentred) != 0)
-    {
         x = spaceX + ((spaceW - w) >> 1);
-    }
     else if ((flags & right) != 0)
-    {
         x = spaceX + spaceW - w;
-    }
     else
-    {
         x = spaceX;
-    }
 
     if ((flags & verticallyCentred) != 0)
-    {
         y = spaceY + ((spaceH - h) >> 1);
-    }
     else if ((flags & bottom) != 0)
-    {
         y = spaceY + spaceH - h;
-    }
     else
-    {
         y = spaceY;
-    }
 }
 
 END_JUCE_NAMESPACE

src/gui/graphics/fonts/juce_TextLayout.h

@@ -28,7 +28,7 @@
 
 #include "juce_Font.h"
 #include "../contexts/juce_Justification.h"
-#include "../../../containers/juce_VoidArray.h"
+#include "../../../containers/juce_OwnedArray.h"
 class Graphics;
 
 

src/gui/graphics/geometry/juce_Line.cpp

@@ -1,33 +0,0 @@
-/*
-  ==============================================================================
-
-   This file is part of the JUCE library - "Jules' Utility Class Extensions"
-   Copyright 2004-10 by Raw Material Software Ltd.
-
-  ------------------------------------------------------------------------------
-
-   JUCE can be redistributed and/or modified under the terms of the GNU General
-   Public License (Version 2), as published by the Free Software Foundation.
-   A copy of the license is included in the JUCE distribution, or can be found
-   online at www.gnu.org/licenses.
-
-   JUCE is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-   A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
-  ------------------------------------------------------------------------------
-
-   To release a closed-source product which uses JUCE, commercial licenses are
-   available: visit www.rawmaterialsoftware.com/juce for more information.
-
-  ==============================================================================
-*/
-
-#include "../../../core/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "juce_Line.h"
-
-
-END_JUCE_NAMESPACE

src/gui/graphics/imaging/juce_ImageCache.h

@@ -30,7 +30,7 @@
 #include "../../../io/files/juce_File.h"
 #include "../../../events/juce_Timer.h"
 #include "../../../utilities/juce_DeletedAtShutdown.h"
-#include "../../../containers/juce_VoidArray.h"
+#include "../../../containers/juce_OwnedArray.h"
 
 
 //==============================================================================

src/io/files/juce_DirectoryIterator.cpp

@@ -27,7 +27,6 @@
 
 BEGIN_JUCE_NAMESPACE
 
-
 #include "juce_DirectoryIterator.h"
 
 

src/io/files/juce_NamedPipe.cpp

@@ -27,7 +27,6 @@
 
 BEGIN_JUCE_NAMESPACE
 
-
 #include "juce_NamedPipe.h"
 
 
@@ -66,6 +65,4 @@ const String NamedPipe::getName() const
 
 // other methods for this class are implemented in the platform-specific files
 
-
-
 END_JUCE_NAMESPACE

src/io/streams/juce_OutputStream.cpp

@@ -30,7 +30,7 @@ BEGIN_JUCE_NAMESPACE
 
 #include "juce_OutputStream.h"
 #include "../../threads/juce_ScopedLock.h"
-#include "../../containers/juce_VoidArray.h"
+#include "../../containers/juce_Array.h"
 #include "../../containers/juce_ScopedPointer.h"
 #include "../files/juce_FileInputStream.h"
 
@@ -38,7 +38,7 @@ BEGIN_JUCE_NAMESPACE
 //==============================================================================
 #if JUCE_DEBUG
 static CriticalSection activeStreamLock;
-static VoidArray activeStreams;
+static Array<void*> activeStreams;
 
 void juce_CheckForDanglingStreams()
 {

src/juce_core_includes.h

@@ -32,8 +32,8 @@
 #ifndef __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
  #include "containers/juce_ArrayAllocationBase.h"
 #endif
-#ifndef __JUCE_BITARRAY_JUCEHEADER__
- #include "containers/juce_BitArray.h"
+#ifndef __JUCE_BIGINTEGER_JUCEHEADER__
+ #include "containers/juce_BigInteger.h"
 #endif
 #ifndef __JUCE_DYNAMICOBJECT_JUCEHEADER__
  #include "containers/juce_DynamicObject.h"
@@ -83,9 +83,6 @@
 #ifndef __JUCE_VARIANT_JUCEHEADER__
  #include "containers/juce_Variant.h"
 #endif
-#ifndef __JUCE_VOIDARRAY_JUCEHEADER__
- #include "containers/juce_VoidArray.h"
-#endif
 #ifndef __JUCE_ATOMIC_JUCEHEADER__
  #include "core/juce_Atomic.h"
 #endif

src/native/juce_mac_NativeCode.mm

@@ -130,6 +130,7 @@ BEGIN_JUCE_NAMESPACE
   #include "mac/juce_mac_FileChooser.mm"
   #include "mac/juce_mac_QuickTimeMovieComponent.mm"
   #include "mac/juce_mac_AudioCDBurner.mm"
+  #include "mac/juce_mac_AudioCDReader.mm"
   #include "mac/juce_mac_MessageManager.mm"
   #include "mac/juce_mac_WebBrowserComponent.mm"
   #include "mac/juce_mac_CoreAudio.cpp"

src/native/linux/juce_linux_JackAudio.cpp

@@ -445,7 +445,7 @@ private:
     HeapBlock <float*> inChans, outChans;
     int totalNumberOfInputChannels;
     int totalNumberOfOutputChannels;
-    VoidArray inputPorts, outputPorts;
+    Array<void*> inputPorts, outputPorts;
 };
 
 

src/audio/audio_file_formats/juce_AudioCDReader.cpp → src/native/mac/juce_mac_AudioCDReader.mm

@@ -23,23 +23,12 @@
   ==============================================================================
 */
 
-#include "../../core/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#if JUCE_MAC && JUCE_USE_CDREADER
+// (This file gets included by juce_mac_NativeCode.mm, rather than being
+// compiled on its own).
+#if JUCE_INCLUDED_FILE && JUCE_USE_CDREADER
 
 //==============================================================================
-// Mac version doesn't need any native code because it's all done with files..
-// Windows + Linux versions are in the platform-dependent code sections.
-
-#include "juce_AudioCDReader.h"
-#include "juce_AiffAudioFormat.h"
-#include "../../io/files/juce_FileInputStream.h"
-#include "../../io/streams/juce_BufferedInputStream.h"
-
-
-static void findCDs (Array<File>& cds)
+static void juce_findCDs (Array<File>& cds)
 {
     File volumes ("/Volumes");
     volumes.findChildFiles (cds, File::findDirectories, false);
@@ -52,7 +41,7 @@ static void findCDs (Array<File>& cds)
 const StringArray AudioCDReader::getAvailableCDNames()
 {
     Array<File> cds;
-    findCDs (cds);
+    juce_findCDs (cds);
 
     StringArray names;
 
@@ -65,12 +54,12 @@ const StringArray AudioCDReader::getAvailableCDNames()
 AudioCDReader* AudioCDReader::createReaderForCD (const int index)
 {
     Array<File> cds;
-    findCDs (cds);
+    juce_findCDs (cds);
 
-    if (cds[index] != File::nonexistent)
+    if (cds[index].exists())
         return new AudioCDReader (cds[index]);
-    else
-        return 0;
+
+    return 0;
 }
 
 AudioCDReader::AudioCDReader (const File& volume)
@@ -91,7 +80,7 @@ AudioCDReader::~AudioCDReader()
 {
 }
 
-static int getTrackNumber (const File& file)
+static int juce_getCDTrackNumber (const File& file)
 {
     return file.getFileName()
                .initialSectionContainingOnly ("0123456789")
@@ -100,8 +89,8 @@ static int getTrackNumber (const File& file)
 
 int AudioCDReader::compareElements (const File& first, const File& second)
 {
-    const int firstTrack  = getTrackNumber (first);
-    const int secondTrack = getTrackNumber (second);
+    const int firstTrack  = juce_getCDTrackNumber (first);
+    const int secondTrack = juce_getCDTrackNumber (second);
 
     jassert (firstTrack > 0 && secondTrack > 0);
 
@@ -233,5 +222,3 @@ int AudioCDReader::getCDDBId()
 }
 
 #endif
-
-END_JUCE_NAMESPACE

src/native/mac/juce_mac_CameraDevice.mm

@@ -190,7 +190,7 @@ public:
 
         for (int i = listeners.size(); --i >= 0;)
         {
-            CameraImageListener* l = (CameraImageListener*) listeners[i];
+            CameraImageListener* const l = listeners[i];
 
             if (l != 0)
                 l->imageReceived (image);
@@ -207,7 +207,7 @@ public:
     QTCaptureCallbackDelegate* callbackDelegate;
     String openingError;
 
-    VoidArray listeners;
+    Array<CameraImageListener*> listeners;
     CriticalSection listenerLock;
 };
 

src/native/mac/juce_mac_CoreMidi.cpp

@@ -471,7 +471,7 @@ struct MidiPortAndCallback
 namespace CoreMidiCallbacks
 {
     static CriticalSection callbackLock;
-    static VoidArray activeCallbacks;
+    static Array<void*> activeCallbacks;
 }
 
 static void midiInputProc (const MIDIPacketList* pktlist,

src/native/windows/juce_win32_ActiveXComponent.cpp

@@ -162,7 +162,7 @@ namespace ActiveXHelpers
     };
 
     //==============================================================================
-    static VoidArray activeXComps;
+    static Array<ActiveXControlComponent*> activeXComps;
 
     static HWND getHWND (const ActiveXControlComponent* const component)
     {
@@ -282,8 +282,7 @@ public:
     {
         for (int i = ActiveXHelpers::activeXComps.size(); --i >= 0;)
         {
-            const ActiveXControlComponent* const ax
-                    = static_cast <const ActiveXControlComponent*> (ActiveXHelpers::activeXComps.getUnchecked(i));
+            const ActiveXControlComponent* const ax = ActiveXHelpers::activeXComps.getUnchecked(i);
 
             if (ax->control != 0 && ax->control->controlHWND == hwnd)
             {

src/native/windows/juce_win32_CameraDevice.cpp

@@ -152,7 +152,7 @@ public:
         removeGraphFromRot();
 
         for (int i = viewerComps.size(); --i >= 0;)
-            ((DShowCaptureViewerComp*) viewerComps.getUnchecked(i))->ownerDeleted();
+            viewerComps.getUnchecked(i)->ownerDeleted();
 
         callback = 0;
         graphBuilder = 0;
@@ -368,7 +368,7 @@ public:
 
         for (int i = listeners.size(); --i >= 0;)
         {
-            CameraImageListener* l = (CameraImageListener*) listeners[i];
+            CameraImageListener* const l = listeners[i];
 
             if (l != 0)
                 l->imageReceived (image);
@@ -431,7 +431,7 @@ public:
     int width, height;
     Time firstRecordedTime;
 
-    VoidArray viewerComps;
+    Array <DShowCaptureViewerComp*> viewerComps;
 
 private:
     CameraDevice* const owner;
@@ -652,7 +652,7 @@ private:
     };
 
     ComSmartPtr <GrabberCallback> callback;
-    VoidArray listeners;
+    Array <CameraImageListener*> listeners;
     CriticalSection listenerLock;
 
     //==============================================================================

src/native/windows/juce_win32_Messaging.cpp

@@ -213,14 +213,14 @@ void* MessageManager::callFunctionOnMessageThread (MessageCallbackFunction* call
 static BOOL CALLBACK BroadcastEnumWindowProc (HWND hwnd, LPARAM lParam)
 {
     if (hwnd != juce_messageWindowHandle)
-        reinterpret_cast <VoidArray*> (lParam)->add ((void*) hwnd);
+        reinterpret_cast <Array<void*>*> (lParam)->add ((void*) hwnd);
 
     return TRUE;
 }
 
 void MessageManager::broadcastMessage (const String& value) throw()
 {
-    VoidArray windows;
+    Array<void*> windows;
     EnumWindows (&BroadcastEnumWindowProc, (LPARAM) &windows);
 
     const String localCopy (value);

src/text/juce_CharacterFunctions.cpp

@@ -137,7 +137,7 @@ int CharacterFunctions::compareIgnoreCase (const char* const s1, const char* con
 {
     jassert (s1 != 0 && s2 != 0);
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     return stricmp (s1, s2);
 #else
     return strcasecmp (s1, s2);
@@ -148,7 +148,7 @@ int CharacterFunctions::compareIgnoreCase (const juce_wchar* s1, const juce_wcha
 {
     jassert (s1 != 0 && s2 != 0);
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     return _wcsicmp (s1, s2);
 #else
     for (;;)
@@ -198,7 +198,7 @@ int CharacterFunctions::compareIgnoreCase (const char* const s1, const char* con
 {
     jassert (s1 != 0 && s2 != 0);
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     return strnicmp (s1, s2, maxChars);
 #else
     return strncasecmp (s1, s2, maxChars);
@@ -209,7 +209,7 @@ int CharacterFunctions::compareIgnoreCase (const juce_wchar* s1, const juce_wcha
 {
     jassert (s1 != 0 && s2 != 0);
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     return _wcsnicmp (s1, s2, maxChars);
 #else
     while (--maxChars >= 0)
@@ -392,7 +392,7 @@ int CharacterFunctions::getIntValue (const char* const s) throw()
 
 int CharacterFunctions::getIntValue (const juce_wchar* s) throw()
 {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     return _wtoi (s);
 #else
     int v = 0;
@@ -422,7 +422,7 @@ int64 CharacterFunctions::getInt64Value (const char* s) throw()
 {
 #if JUCE_LINUX
     return atoll (s);
-#elif defined (JUCE_WIN32)
+#elif JUCE_WINDOWS
     return _atoi64 (s);
 #else
     int64 v = 0;
@@ -450,7 +450,7 @@ int64 CharacterFunctions::getInt64Value (const char* s) throw()
 
 int64 CharacterFunctions::getInt64Value (const juce_wchar* s) throw()
 {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     return _wtoi64 (s);
 #else
     int64 v = 0;
@@ -646,7 +646,7 @@ juce_wchar CharacterFunctions::toUpperCase (const juce_wchar character) throw()
 
 void CharacterFunctions::toUpperCase (char* s) throw()
 {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     strupr (s);
 #else
     while (*s != 0)
@@ -659,7 +659,7 @@ void CharacterFunctions::toUpperCase (char* s) throw()
 
 void CharacterFunctions::toUpperCase (juce_wchar* s) throw()
 {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     _wcsupr (s);
 #else
     while (*s != 0)
@@ -677,7 +677,7 @@ bool CharacterFunctions::isUpperCase (const char character) throw()
 
 bool CharacterFunctions::isUpperCase (const juce_wchar character) throw()
 {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     return iswupper (character) != 0;
 #else
     return toLowerCase (character) != character;
@@ -697,7 +697,7 @@ juce_wchar CharacterFunctions::toLowerCase (const juce_wchar character) throw()
 
 void CharacterFunctions::toLowerCase (char* s) throw()
 {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     strlwr (s);
 #else
     while (*s != 0)
@@ -710,7 +710,7 @@ void CharacterFunctions::toLowerCase (char* s) throw()
 
 void CharacterFunctions::toLowerCase (juce_wchar* s) throw()
 {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     _wcslwr (s);
 #else
     while (*s != 0)
@@ -728,7 +728,7 @@ bool CharacterFunctions::isLowerCase (const char character) throw()
 
 bool CharacterFunctions::isLowerCase (const juce_wchar character) throw()
 {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     return iswlower (character) != 0;
 #else
     return toUpperCase (character) != character;

src/text/juce_String.cpp

@@ -386,7 +386,7 @@ namespace NumberToStringConverters
         }
         else
         {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
   #if _MSC_VER <= 1400
             len = _snwprintf (buffer, numChars, L"%.9g", n);
   #else

src/threads/juce_CriticalSection.h

@@ -99,7 +99,7 @@ public:
 
 private:
     //==============================================================================
-#if JUCE_WIN32
+#if JUCE_WINDOWS
   #if JUCE_64BIT
     // To avoid including windows.h in the public Juce includes, we'll just allocate a
     // block of memory here that's big enough to be used internally as a windows critical

src/threads/juce_Thread.cpp

@@ -37,7 +37,7 @@ void* juce_createThread (void* userData);
 void juce_killThread (void* handle);
 bool juce_setThreadPriority (void* handle, int priority);
 void juce_setCurrentThreadName (const String& name);
-#if JUCE_WIN32
+#if JUCE_WINDOWS
 void juce_CloseThreadHandle (void* handle);
 #endif
 
@@ -74,7 +74,7 @@ void Thread::threadEntryPoint (Thread* const thread)
         runningThreads.removeValue (thread);
     }
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     juce_CloseThreadHandle (thread->threadHandle_);
 #endif
 

src/utilities/juce_DeletedAtShutdown.cpp

@@ -28,13 +28,13 @@
 BEGIN_JUCE_NAMESPACE
 
 #include "juce_DeletedAtShutdown.h"
-#include "../containers/juce_VoidArray.h"
+#include "../containers/juce_Array.h"
 #include "../threads/juce_ScopedLock.h"
 #include "../application/juce_Application.h"
 
 
 //==============================================================================
-static VoidArray objectsToDelete;
+static Array <DeletedAtShutdown*> objectsToDelete;
 static CriticalSection lock;
 
 //==============================================================================
@@ -54,7 +54,7 @@ void DeletedAtShutdown::deleteAll()
 {
     // make a local copy of the array, so it can't get into a loop if something
     // creates another DeletedAtShutdown object during its destructor.
-    VoidArray localCopy;
+    Array <DeletedAtShutdown*> localCopy;
 
     {
         const ScopedLock sl (lock);
@@ -65,7 +65,7 @@ void DeletedAtShutdown::deleteAll()
     {
         JUCE_TRY
         {
-            DeletedAtShutdown* deletee = static_cast <DeletedAtShutdown*> (localCopy.getUnchecked(i));
+            DeletedAtShutdown* deletee = localCopy.getUnchecked(i);
 
             // double-check that it's not already been deleted during another object's destructor.
             {

src/utilities/juce_PropertiesFile.cpp

@@ -309,7 +309,7 @@ const File PropertiesFile::getDefaultAppSettingsFile (const String& applicationN
                                                    : ("." + applicationName)));
 #endif
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
     File dir (File::getSpecialLocation (commonToAllUsers ? File::commonApplicationDataDirectory
                                                          : File::userApplicationDataDirectory));
 

src/utilities/juce_UndoableAction.h

@@ -93,7 +93,7 @@ public:
 
         If it's not possible to merge the two actions, the method should return zero.
     */
-    virtual UndoableAction* createCoalescedAction (UndoableAction* nextAction)  { return 0; }
+    virtual UndoableAction* createCoalescedAction (UndoableAction* nextAction)  { (void) nextAction; return 0; }
 };