From 749c29563fd32cfcf66c813a2421a7966fb5005a Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Sat, 9 Apr 2011 17:19:21 +0100 Subject: [PATCH] Renamed the audio/plugins folder. --- Builds/Linux/Makefile | 32 +-- Builds/MacOSX/Juce.xcodeproj/project.pbxproj | 136 +++++----- Builds/VisualStudio2005/Juce.vcproj | 242 +++++++++--------- Builds/VisualStudio2008/Juce.vcproj | 242 +++++++++--------- Builds/VisualStudio2008_DLL/Juce.vcproj | 242 +++++++++--------- Builds/VisualStudio2010/Juce.vcxproj | 40 +-- Builds/VisualStudio2010/Juce.vcxproj.filters | 150 +++++------ Builds/iOS/Juce.xcodeproj/project.pbxproj | 136 +++++----- Juce.jucer | 178 ++++++------- amalgamation/juce_amalgamated_template.cpp | 18 +- juce_amalgamated.cpp | 31 ++- juce_amalgamated.h | 8 +- .../juce_WavAudioFormat.cpp | 114 ++++----- .../formats/juce_AudioUnitPluginFormat.h | 0 .../formats/juce_AudioUnitPluginFormat.mm | 0 .../formats/juce_DirectXPluginFormat.h | 0 .../formats/juce_LADSPAPluginFormat.h | 0 .../formats/juce_VSTMidiEventList.h | 0 .../formats/juce_VSTPluginFormat.cpp | 0 .../formats/juce_VSTPluginFormat.h | 0 .../formats/juce_VSTPluginFormat.mm | 0 .../juce_AudioPluginFormat.cpp | 0 .../juce_AudioPluginFormat.h | 0 .../juce_AudioPluginFormatManager.cpp | 0 .../juce_AudioPluginFormatManager.h | 0 .../juce_AudioPluginInstance.cpp | 0 .../juce_AudioPluginInstance.h | 0 .../juce_KnownPluginList.cpp | 0 .../juce_KnownPluginList.h | 0 .../juce_PluginDescription.cpp | 0 .../juce_PluginDescription.h | 0 .../juce_PluginDirectoryScanner.cpp | 0 .../juce_PluginDirectoryScanner.h | 0 .../juce_PluginListComponent.cpp | 0 .../juce_PluginListComponent.h | 0 .../processors/juce_AudioProcessorGraph.h | 4 +- src/core/juce_StandardHeader.h | 2 +- src/juce_app_includes.h | 24 +- 38 files changed, 803 insertions(+), 796 deletions(-) rename src/audio/{plugins => plugin_host}/formats/juce_AudioUnitPluginFormat.h (100%) rename src/audio/{plugins => plugin_host}/formats/juce_AudioUnitPluginFormat.mm (100%) rename src/audio/{plugins => plugin_host}/formats/juce_DirectXPluginFormat.h (100%) rename src/audio/{plugins => plugin_host}/formats/juce_LADSPAPluginFormat.h (100%) rename src/audio/{plugins => plugin_host}/formats/juce_VSTMidiEventList.h (100%) rename src/audio/{plugins => plugin_host}/formats/juce_VSTPluginFormat.cpp (100%) rename src/audio/{plugins => plugin_host}/formats/juce_VSTPluginFormat.h (100%) rename src/audio/{plugins => plugin_host}/formats/juce_VSTPluginFormat.mm (100%) rename src/audio/{plugins => plugin_host}/juce_AudioPluginFormat.cpp (100%) rename src/audio/{plugins => plugin_host}/juce_AudioPluginFormat.h (100%) rename src/audio/{plugins => plugin_host}/juce_AudioPluginFormatManager.cpp (100%) rename src/audio/{plugins => plugin_host}/juce_AudioPluginFormatManager.h (100%) rename src/audio/{plugins => plugin_host}/juce_AudioPluginInstance.cpp (100%) rename src/audio/{plugins => plugin_host}/juce_AudioPluginInstance.h (100%) rename src/audio/{plugins => plugin_host}/juce_KnownPluginList.cpp (100%) rename src/audio/{plugins => plugin_host}/juce_KnownPluginList.h (100%) rename src/audio/{plugins => plugin_host}/juce_PluginDescription.cpp (100%) rename src/audio/{plugins => plugin_host}/juce_PluginDescription.h (100%) rename src/audio/{plugins => plugin_host}/juce_PluginDirectoryScanner.cpp (100%) rename src/audio/{plugins => plugin_host}/juce_PluginDirectoryScanner.h (100%) rename src/audio/{plugins => plugin_host}/juce_PluginListComponent.cpp (100%) rename src/audio/{plugins => plugin_host}/juce_PluginListComponent.h (100%) diff --git a/Builds/Linux/Makefile b/Builds/Linux/Makefile index 68580ab60e..ee676c8539 100644 --- a/Builds/Linux/Makefile +++ b/Builds/Linux/Makefile @@ -79,14 +79,14 @@ OBJECTS := \ $(OBJDIR)/juce_MidiMessageCollector_108abdc4.o \ $(OBJDIR)/juce_MidiMessageSequence_a577dcb4.o \ $(OBJDIR)/juce_MidiOutput_3cc0f43f.o \ - $(OBJDIR)/juce_VSTPluginFormat_e4d590ea.o \ - $(OBJDIR)/juce_AudioPluginFormat_a7021cd6.o \ - $(OBJDIR)/juce_AudioPluginFormatManager_259e5a81.o \ - $(OBJDIR)/juce_AudioPluginInstance_905077f4.o \ - $(OBJDIR)/juce_KnownPluginList_18bb712a.o \ - $(OBJDIR)/juce_PluginDescription_23011f1f.o \ - $(OBJDIR)/juce_PluginDirectoryScanner_e732ab58.o \ - $(OBJDIR)/juce_PluginListComponent_ea775c22.o \ + $(OBJDIR)/juce_VSTPluginFormat_af341d6.o \ + $(OBJDIR)/juce_AudioPluginFormat_5dc1eec2.o \ + $(OBJDIR)/juce_AudioPluginFormatManager_c336c715.o \ + $(OBJDIR)/juce_AudioPluginInstance_96637ee0.o \ + $(OBJDIR)/juce_KnownPluginList_cadece16.o \ + $(OBJDIR)/juce_PluginDescription_d9c0f10b.o \ + $(OBJDIR)/juce_PluginDirectoryScanner_c7652cec.o \ + $(OBJDIR)/juce_PluginListComponent_f08a630e.o \ $(OBJDIR)/juce_AudioProcessor_babd0919.o \ $(OBJDIR)/juce_AudioProcessorEditor_82a32d26.o \ $(OBJDIR)/juce_AudioProcessorGraph_76dcb4ff.o \ @@ -584,42 +584,42 @@ $(OBJDIR)/juce_MidiOutput_3cc0f43f.o: ../../src/audio/midi/juce_MidiOutput.cpp @echo "Compiling juce_MidiOutput.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_VSTPluginFormat_e4d590ea.o: ../../src/audio/plugins/formats/juce_VSTPluginFormat.cpp +$(OBJDIR)/juce_VSTPluginFormat_af341d6.o: ../../src/audio/plugin_host/formats/juce_VSTPluginFormat.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_VSTPluginFormat.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioPluginFormat_a7021cd6.o: ../../src/audio/plugins/juce_AudioPluginFormat.cpp +$(OBJDIR)/juce_AudioPluginFormat_5dc1eec2.o: ../../src/audio/plugin_host/juce_AudioPluginFormat.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_AudioPluginFormat.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioPluginFormatManager_259e5a81.o: ../../src/audio/plugins/juce_AudioPluginFormatManager.cpp +$(OBJDIR)/juce_AudioPluginFormatManager_c336c715.o: ../../src/audio/plugin_host/juce_AudioPluginFormatManager.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_AudioPluginFormatManager.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_AudioPluginInstance_905077f4.o: ../../src/audio/plugins/juce_AudioPluginInstance.cpp +$(OBJDIR)/juce_AudioPluginInstance_96637ee0.o: ../../src/audio/plugin_host/juce_AudioPluginInstance.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_AudioPluginInstance.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_KnownPluginList_18bb712a.o: ../../src/audio/plugins/juce_KnownPluginList.cpp +$(OBJDIR)/juce_KnownPluginList_cadece16.o: ../../src/audio/plugin_host/juce_KnownPluginList.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_KnownPluginList.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PluginDescription_23011f1f.o: ../../src/audio/plugins/juce_PluginDescription.cpp +$(OBJDIR)/juce_PluginDescription_d9c0f10b.o: ../../src/audio/plugin_host/juce_PluginDescription.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_PluginDescription.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PluginDirectoryScanner_e732ab58.o: ../../src/audio/plugins/juce_PluginDirectoryScanner.cpp +$(OBJDIR)/juce_PluginDirectoryScanner_c7652cec.o: ../../src/audio/plugin_host/juce_PluginDirectoryScanner.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_PluginDirectoryScanner.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/juce_PluginListComponent_ea775c22.o: ../../src/audio/plugins/juce_PluginListComponent.cpp +$(OBJDIR)/juce_PluginListComponent_f08a630e.o: ../../src/audio/plugin_host/juce_PluginListComponent.cpp -@mkdir -p $(OBJDIR) @echo "Compiling juce_PluginListComponent.cpp" @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" diff --git a/Builds/MacOSX/Juce.xcodeproj/project.pbxproj b/Builds/MacOSX/Juce.xcodeproj/project.pbxproj index 2fa1fb1641..90d52c8520 100644 --- a/Builds/MacOSX/Juce.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/Juce.xcodeproj/project.pbxproj @@ -46,16 +46,16 @@ 573BF08B2CACCC317F3D7603 = { isa = PBXBuildFile; fileRef = 0D3A77572C7256CE4C115FD7; }; 8376B6E3DB141DDF5EFF6327 = { isa = PBXBuildFile; fileRef = 78D29BB5C76CCF7C21EC0DAF; }; B579C891B16F4B219CD751B5 = { isa = PBXBuildFile; fileRef = 01712FF0A160032FA1DAA8C2; }; - A3C433D146C7E1FFCADFB202 = { isa = PBXBuildFile; fileRef = 68D759C0812F1B2D8B1F0288; }; - 0086CA75A5115F4D3E5D7DF4 = { isa = PBXBuildFile; fileRef = B990275870E5E30554AE4C0B; }; - C1857884F37C08F550812E99 = { isa = PBXBuildFile; fileRef = F13BFC8AE68ECB6E063BD8D4; }; - 1BADB47FA8A6F40E31820AD1 = { isa = PBXBuildFile; fileRef = 2CC1A8309CB8301FF9A22371; }; - 5B10F8D4A3986953CD2F0780 = { isa = PBXBuildFile; fileRef = 9A344077AA294E747662C41F; }; - 72A7726E9F52F4DB162D15DC = { isa = PBXBuildFile; fileRef = 3E8765432F8E2966952D7A8D; }; - 5505CAC239FEF5AAA75B01C5 = { isa = PBXBuildFile; fileRef = 137BEF668FB2670FA2DEF03B; }; - 03FFC1B5DAD06521157F07F3 = { isa = PBXBuildFile; fileRef = 7B90C1479968D609C0F9E901; }; - A43ADEFD22A23B9DE2ACBF55 = { isa = PBXBuildFile; fileRef = 428BAE26DC25F9DA51B8E427; }; - 1E67D91CB6529FC367B88F6B = { isa = PBXBuildFile; fileRef = ECCEE0E429B3D81B7893FAFD; }; + 43FA6F0FD4DDEBA6427E730D = { isa = PBXBuildFile; fileRef = 50FAF92038EBD0127900AAA1; }; + BAB3164372A6C31A1A7DA58F = { isa = PBXBuildFile; fileRef = FCBB1DC14311D099809B21F7; }; + D71FEEEA440682B04E024BB7 = { isa = PBXBuildFile; fileRef = 2EBF36FAAF019B6F811D1C84; }; + B331EE2C23176373F2D52C1E = { isa = PBXBuildFile; fileRef = 1C8211DFB558D740EF4B173A; }; + 79D8E372BA77018BDA956D92 = { isa = PBXBuildFile; fileRef = DA4820727D6DDC75561A262C; }; + 21005408DDA892A5B8B4F78D = { isa = PBXBuildFile; fileRef = C96D4FE222A8704A8F3BEDD8; }; + 3688819F98EFF0AABDD79029 = { isa = PBXBuildFile; fileRef = 3110B983ACE956D6A24F8C8C; }; + 84F9FCAE9DF003DC6FC3C941 = { isa = PBXBuildFile; fileRef = B6E20AE45813C0CA9B1014DD; }; + E1046147432EB115A68D6C43 = { isa = PBXBuildFile; fileRef = AF47BC3796A74CC15A192E8B; }; + 5CEE2D7E55DA99C1D310CDC2 = { isa = PBXBuildFile; fileRef = 9C5C0BCB2A298160025B15FC; }; B154245927BCB4F87ABEAF17 = { isa = PBXBuildFile; fileRef = AB554593165FE8C8B40F4447; }; 52ADF1419B058963EE32B7C3 = { isa = PBXBuildFile; fileRef = BC2A50B0B01128E394E9DE9C; }; 31D36C32211754E793B9FF81 = { isa = PBXBuildFile; fileRef = D141C024A3F5A6748B0E9ED7; }; @@ -467,28 +467,28 @@ 6B3896A2CB1BB379BCDD9575 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_IncludeCharacteristics.h; path = "../../extras/audio plugins/wrapper/juce_IncludeCharacteristics.h"; sourceTree = SOURCE_ROOT; }; 6F4941C73B96CE8028AD7999 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHeaders.h; path = "../../extras/audio plugins/wrapper/juce_PluginHeaders.h"; sourceTree = SOURCE_ROOT; }; 21EAF73E1E8D839ABDF6B1CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHostType.h; path = "../../extras/audio plugins/wrapper/juce_PluginHostType.h"; sourceTree = SOURCE_ROOT; }; - AA6DF2B7514484F0A2B06DAA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioUnitPluginFormat.h; path = ../../src/audio/plugins/formats/juce_AudioUnitPluginFormat.h; sourceTree = SOURCE_ROOT; }; - 68D759C0812F1B2D8B1F0288 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AudioUnitPluginFormat.mm; path = ../../src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm; sourceTree = SOURCE_ROOT; }; - 6125D4A328E474BE7A48EF59 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_DirectXPluginFormat.h; path = ../../src/audio/plugins/formats/juce_DirectXPluginFormat.h; sourceTree = SOURCE_ROOT; }; - 9E97260B1E7DCC2EE796B117 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_LADSPAPluginFormat.h; path = ../../src/audio/plugins/formats/juce_LADSPAPluginFormat.h; sourceTree = SOURCE_ROOT; }; - 9B2DF7C49612A962F7130CDB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_VSTMidiEventList.h; path = ../../src/audio/plugins/formats/juce_VSTMidiEventList.h; sourceTree = SOURCE_ROOT; }; - B990275870E5E30554AE4C0B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VSTPluginFormat.cpp; path = ../../src/audio/plugins/formats/juce_VSTPluginFormat.cpp; sourceTree = SOURCE_ROOT; }; - BE58578E96493E70D76E080F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_VSTPluginFormat.h; path = ../../src/audio/plugins/formats/juce_VSTPluginFormat.h; sourceTree = SOURCE_ROOT; }; - F13BFC8AE68ECB6E063BD8D4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VSTPluginFormat.mm; path = ../../src/audio/plugins/formats/juce_VSTPluginFormat.mm; sourceTree = SOURCE_ROOT; }; - 2CC1A8309CB8301FF9A22371 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginFormat.cpp; path = ../../src/audio/plugins/juce_AudioPluginFormat.cpp; sourceTree = SOURCE_ROOT; }; - C4C9911456CA7EADB36E53E3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginFormat.h; path = ../../src/audio/plugins/juce_AudioPluginFormat.h; sourceTree = SOURCE_ROOT; }; - 9A344077AA294E747662C41F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginFormatManager.cpp; path = ../../src/audio/plugins/juce_AudioPluginFormatManager.cpp; sourceTree = SOURCE_ROOT; }; - C7B6686D2316F3333529EA60 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginFormatManager.h; path = ../../src/audio/plugins/juce_AudioPluginFormatManager.h; sourceTree = SOURCE_ROOT; }; - 3E8765432F8E2966952D7A8D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginInstance.cpp; path = ../../src/audio/plugins/juce_AudioPluginInstance.cpp; sourceTree = SOURCE_ROOT; }; - F08D4F9235F82147C634156E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginInstance.h; path = ../../src/audio/plugins/juce_AudioPluginInstance.h; sourceTree = SOURCE_ROOT; }; - 137BEF668FB2670FA2DEF03B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_KnownPluginList.cpp; path = ../../src/audio/plugins/juce_KnownPluginList.cpp; sourceTree = SOURCE_ROOT; }; - B64559DBDA185D34F3998374 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_KnownPluginList.h; path = ../../src/audio/plugins/juce_KnownPluginList.h; sourceTree = SOURCE_ROOT; }; - 7B90C1479968D609C0F9E901 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginDescription.cpp; path = ../../src/audio/plugins/juce_PluginDescription.cpp; sourceTree = SOURCE_ROOT; }; - DC3AB07D4519B8487B5D92DB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginDescription.h; path = ../../src/audio/plugins/juce_PluginDescription.h; sourceTree = SOURCE_ROOT; }; - 428BAE26DC25F9DA51B8E427 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginDirectoryScanner.cpp; path = ../../src/audio/plugins/juce_PluginDirectoryScanner.cpp; sourceTree = SOURCE_ROOT; }; - 8F47FF9F6F07D763E5073975 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginDirectoryScanner.h; path = ../../src/audio/plugins/juce_PluginDirectoryScanner.h; sourceTree = SOURCE_ROOT; }; - ECCEE0E429B3D81B7893FAFD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginListComponent.cpp; path = ../../src/audio/plugins/juce_PluginListComponent.cpp; sourceTree = SOURCE_ROOT; }; - 71A51B564A30F6A5571CC2AB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginListComponent.h; path = ../../src/audio/plugins/juce_PluginListComponent.h; sourceTree = SOURCE_ROOT; }; + D76BDCCF9E1A1F26A8F578F0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioUnitPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.h; sourceTree = SOURCE_ROOT; }; + 50FAF92038EBD0127900AAA1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AudioUnitPluginFormat.mm; path = ../../src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.mm; sourceTree = SOURCE_ROOT; }; + 2073E1A497363200233CD34E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_DirectXPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_DirectXPluginFormat.h; sourceTree = SOURCE_ROOT; }; + F800E47459B2FE9DEF56F312 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_LADSPAPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_LADSPAPluginFormat.h; sourceTree = SOURCE_ROOT; }; + B4291F2CEEC78CFEDEFC360E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_VSTMidiEventList.h; path = ../../src/audio/plugin_host/formats/juce_VSTMidiEventList.h; sourceTree = SOURCE_ROOT; }; + FCBB1DC14311D099809B21F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VSTPluginFormat.cpp; path = ../../src/audio/plugin_host/formats/juce_VSTPluginFormat.cpp; sourceTree = SOURCE_ROOT; }; + 723EBD80931754F4DD77DD53 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_VSTPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_VSTPluginFormat.h; sourceTree = SOURCE_ROOT; }; + 2EBF36FAAF019B6F811D1C84 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VSTPluginFormat.mm; path = ../../src/audio/plugin_host/formats/juce_VSTPluginFormat.mm; sourceTree = SOURCE_ROOT; }; + 1C8211DFB558D740EF4B173A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginFormat.cpp; path = ../../src/audio/plugin_host/juce_AudioPluginFormat.cpp; sourceTree = SOURCE_ROOT; }; + 28534632DF76A1EA837BD0D7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginFormat.h; path = ../../src/audio/plugin_host/juce_AudioPluginFormat.h; sourceTree = SOURCE_ROOT; }; + DA4820727D6DDC75561A262C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginFormatManager.cpp; path = ../../src/audio/plugin_host/juce_AudioPluginFormatManager.cpp; sourceTree = SOURCE_ROOT; }; + A6415104D1E3E5CE7031C0C1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginFormatManager.h; path = ../../src/audio/plugin_host/juce_AudioPluginFormatManager.h; sourceTree = SOURCE_ROOT; }; + C96D4FE222A8704A8F3BEDD8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginInstance.cpp; path = ../../src/audio/plugin_host/juce_AudioPluginInstance.cpp; sourceTree = SOURCE_ROOT; }; + E5BA7B8913271E935A1DA487 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginInstance.h; path = ../../src/audio/plugin_host/juce_AudioPluginInstance.h; sourceTree = SOURCE_ROOT; }; + 3110B983ACE956D6A24F8C8C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_KnownPluginList.cpp; path = ../../src/audio/plugin_host/juce_KnownPluginList.cpp; sourceTree = SOURCE_ROOT; }; + A3FE51C7DD706F536273AB0E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_KnownPluginList.h; path = ../../src/audio/plugin_host/juce_KnownPluginList.h; sourceTree = SOURCE_ROOT; }; + B6E20AE45813C0CA9B1014DD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginDescription.cpp; path = ../../src/audio/plugin_host/juce_PluginDescription.cpp; sourceTree = SOURCE_ROOT; }; + 4AE3A448D79602BE793BB5AA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginDescription.h; path = ../../src/audio/plugin_host/juce_PluginDescription.h; sourceTree = SOURCE_ROOT; }; + AF47BC3796A74CC15A192E8B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginDirectoryScanner.cpp; path = ../../src/audio/plugin_host/juce_PluginDirectoryScanner.cpp; sourceTree = SOURCE_ROOT; }; + 3D170AC8FD8E403C54E08F9D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginDirectoryScanner.h; path = ../../src/audio/plugin_host/juce_PluginDirectoryScanner.h; sourceTree = SOURCE_ROOT; }; + 9C5C0BCB2A298160025B15FC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginListComponent.cpp; path = ../../src/audio/plugin_host/juce_PluginListComponent.cpp; sourceTree = SOURCE_ROOT; }; + 08C65C3EB60FE8BFA252E3EF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginListComponent.h; path = ../../src/audio/plugin_host/juce_PluginListComponent.h; sourceTree = SOURCE_ROOT; }; 4CF107951746567DB63880A3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPlayHead.h; path = ../../src/audio/processors/juce_AudioPlayHead.h; sourceTree = SOURCE_ROOT; }; AB554593165FE8C8B40F4447 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioProcessor.cpp; path = ../../src/audio/processors/juce_AudioProcessor.cpp; sourceTree = SOURCE_ROOT; }; 3F260C24341E58745AC5BE79 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioProcessor.h; path = ../../src/audio/processors/juce_AudioProcessor.h; sourceTree = SOURCE_ROOT; }; @@ -1215,33 +1215,32 @@ 0F0D49D13522C94A0F37D4AB, 6B3896A2CB1BB379BCDD9575, 6F4941C73B96CE8028AD7999, - 21EAF73E1E8D839ABDF6B1CF ); name = "wrapper code"; sourceTree = ""; }; - 6FDCF1A0063FC0ABA27273A0 = { isa = PBXGroup; children = ( - AA6DF2B7514484F0A2B06DAA, - 68D759C0812F1B2D8B1F0288, - 6125D4A328E474BE7A48EF59, - 9E97260B1E7DCC2EE796B117, - 9B2DF7C49612A962F7130CDB, - B990275870E5E30554AE4C0B, - BE58578E96493E70D76E080F, - F13BFC8AE68ECB6E063BD8D4 ); name = formats; sourceTree = ""; }; + 21EAF73E1E8D839ABDF6B1CF ); name = plugin_client; sourceTree = ""; }; + B1F82C796B56FCD97D211D8E = { isa = PBXGroup; children = ( + D76BDCCF9E1A1F26A8F578F0, + 50FAF92038EBD0127900AAA1, + 2073E1A497363200233CD34E, + F800E47459B2FE9DEF56F312, + B4291F2CEEC78CFEDEFC360E, + FCBB1DC14311D099809B21F7, + 723EBD80931754F4DD77DD53, + 2EBF36FAAF019B6F811D1C84 ); name = formats; sourceTree = ""; }; 7AA82894558E047D7D5111E1 = { isa = PBXGroup; children = ( - 2805C9C796CD7D77C2D662BF, - 6FDCF1A0063FC0ABA27273A0, - 2CC1A8309CB8301FF9A22371, - C4C9911456CA7EADB36E53E3, - 9A344077AA294E747662C41F, - C7B6686D2316F3333529EA60, - 3E8765432F8E2966952D7A8D, - F08D4F9235F82147C634156E, - 137BEF668FB2670FA2DEF03B, - B64559DBDA185D34F3998374, - 7B90C1479968D609C0F9E901, - DC3AB07D4519B8487B5D92DB, - 428BAE26DC25F9DA51B8E427, - 8F47FF9F6F07D763E5073975, - ECCEE0E429B3D81B7893FAFD, - 71A51B564A30F6A5571CC2AB ); name = plugins; sourceTree = ""; }; + B1F82C796B56FCD97D211D8E, + 1C8211DFB558D740EF4B173A, + 28534632DF76A1EA837BD0D7, + DA4820727D6DDC75561A262C, + A6415104D1E3E5CE7031C0C1, + C96D4FE222A8704A8F3BEDD8, + E5BA7B8913271E935A1DA487, + 3110B983ACE956D6A24F8C8C, + A3FE51C7DD706F536273AB0E, + B6E20AE45813C0CA9B1014DD, + 4AE3A448D79602BE793BB5AA, + AF47BC3796A74CC15A192E8B, + 3D170AC8FD8E403C54E08F9D, + 9C5C0BCB2A298160025B15FC, + 08C65C3EB60FE8BFA252E3EF ); name = plugin_host; sourceTree = ""; }; 231431F8B23F01DC6ECD4214 = { isa = PBXGroup; children = ( 4CF107951746567DB63880A3, AB554593165FE8C8B40F4447, @@ -1266,6 +1265,7 @@ BF8F3D00CE4E97468E8BBC55, 53C441C8EEF2860715CC6599, 99B60B012D5CCF0BD861011D, + 2805C9C796CD7D77C2D662BF, 7AA82894558E047D7D5111E1, 231431F8B23F01DC6ECD4214, DC641C77950A335A20FD4532 ); name = audio; sourceTree = ""; }; @@ -2075,16 +2075,16 @@ 573BF08B2CACCC317F3D7603, 8376B6E3DB141DDF5EFF6327, B579C891B16F4B219CD751B5, - A3C433D146C7E1FFCADFB202, - 0086CA75A5115F4D3E5D7DF4, - C1857884F37C08F550812E99, - 1BADB47FA8A6F40E31820AD1, - 5B10F8D4A3986953CD2F0780, - 72A7726E9F52F4DB162D15DC, - 5505CAC239FEF5AAA75B01C5, - 03FFC1B5DAD06521157F07F3, - A43ADEFD22A23B9DE2ACBF55, - 1E67D91CB6529FC367B88F6B, + 43FA6F0FD4DDEBA6427E730D, + BAB3164372A6C31A1A7DA58F, + D71FEEEA440682B04E024BB7, + B331EE2C23176373F2D52C1E, + 79D8E372BA77018BDA956D92, + 21005408DDA892A5B8B4F78D, + 3688819F98EFF0AABDD79029, + 84F9FCAE9DF003DC6FC3C941, + E1046147432EB115A68D6C43, + 5CEE2D7E55DA99C1D310CDC2, B154245927BCB4F87ABEAF17, 52ADF1419B058963EE32B7C3, 31D36C32211754E793B9FF81, diff --git a/Builds/VisualStudio2005/Juce.vcproj b/Builds/VisualStudio2005/Juce.vcproj index 05c19b3de5..0e90d6a045 100644 --- a/Builds/VisualStudio2005/Juce.vcproj +++ b/Builds/VisualStudio2005/Juce.vcproj @@ -199,130 +199,130 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/Builds/VisualStudio2008/Juce.vcproj b/Builds/VisualStudio2008/Juce.vcproj index b95c38446d..76bed7f53a 100644 --- a/Builds/VisualStudio2008/Juce.vcproj +++ b/Builds/VisualStudio2008/Juce.vcproj @@ -199,130 +199,130 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/Builds/VisualStudio2008_DLL/Juce.vcproj b/Builds/VisualStudio2008_DLL/Juce.vcproj index 3ed2ab7a2a..171ecd2875 100644 --- a/Builds/VisualStudio2008_DLL/Juce.vcproj +++ b/Builds/VisualStudio2008_DLL/Juce.vcproj @@ -201,130 +201,130 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/Builds/VisualStudio2010/Juce.vcxproj b/Builds/VisualStudio2010/Juce.vcxproj index a02c9d3645..b4ce4827df 100644 --- a/Builds/VisualStudio2010/Juce.vcxproj +++ b/Builds/VisualStudio2010/Juce.vcxproj @@ -162,14 +162,14 @@ - - - - - - - - + + + + + + + + @@ -505,18 +505,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/Builds/VisualStudio2010/Juce.vcxproj.filters b/Builds/VisualStudio2010/Juce.vcxproj.filters index f66bd21c58..57f29cbf93 100644 --- a/Builds/VisualStudio2010/Juce.vcxproj.filters +++ b/Builds/VisualStudio2010/Juce.vcxproj.filters @@ -29,26 +29,26 @@ {5B74C3D9-7807-74F3-0944-5242688166CE} - - {726F1543-3280-C554-0844-B5AF99C2392D} + + {DA71553F-FCAE-CECC-0D46-9A010F7AF17A} - - {9C8B462A-0783-D028-ACCC-B099F374113E} + + {CA2E8133-D32B-A881-6D70-4BF648FABCEF} - - {7576D1E4-5D21-3FA6-7AB5-DCA6983C448C} + + {2DB52D03-DD6A-56FA-C937-A40902E3C777} - - {2CF49E64-7F33-4B2A-255E-A9CD74998334} + + {CC363BEC-07A5-1CB8-E516-B38ECD43E7EB} - - {9958BD40-C957-0509-6285-D04460D9AA99} + + {181ADBA8-0144-1095-D7D7-8AB24D1A5FE8} - - {6936CA53-77BA-C4D2-1DB8-7BE972C31D08} + + {980BA9E8-021A-42BA-80B7-C32853610065} - - {46220919-DA8A-82C3-B033-1939CFCB5579} + + {854CE4D8-6F1C-BF91-CF6D-F0055CE3FD79} {A0FD2518-2705-57EF-1770-7C9BB5396CC7} @@ -308,67 +308,67 @@ Juce\Source\audio\midi - Juce\Source\audio\plugins\wrapper code\AU + Juce\Source\audio\plugin_client\AU - Juce\Source\audio\plugins\wrapper code\RTAS + Juce\Source\audio\plugin_client\RTAS - Juce\Source\audio\plugins\wrapper code\RTAS + Juce\Source\audio\plugin_client\RTAS - Juce\Source\audio\plugins\wrapper code\RTAS + Juce\Source\audio\plugin_client\RTAS - Juce\Source\audio\plugins\wrapper code\RTAS + Juce\Source\audio\plugin_client\RTAS - Juce\Source\audio\plugins\wrapper code\RTAS + Juce\Source\audio\plugin_client\RTAS - Juce\Source\audio\plugins\wrapper code\RTAS + Juce\Source\audio\plugin_client\RTAS - Juce\Source\audio\plugins\wrapper code\VST + Juce\Source\audio\plugin_client\VST - Juce\Source\audio\plugins\wrapper code\VST + Juce\Source\audio\plugin_client\VST - Juce\Source\audio\plugins\wrapper code\Standalone + Juce\Source\audio\plugin_client\Standalone - Juce\Source\audio\plugins\wrapper code\Standalone + Juce\Source\audio\plugin_client\Standalone - - Juce\Source\audio\plugins\formats + + Juce\Source\audio\plugin_host\formats - - Juce\Source\audio\plugins\formats + + Juce\Source\audio\plugin_host\formats - - Juce\Source\audio\plugins\formats + + Juce\Source\audio\plugin_host\formats - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host Juce\Source\audio\processors @@ -1432,58 +1432,58 @@ Juce\Source\audio\midi - Juce\Source\audio\plugins\wrapper code\RTAS + Juce\Source\audio\plugin_client\RTAS - Juce\Source\audio\plugins\wrapper code\Standalone + Juce\Source\audio\plugin_client\Standalone - Juce\Source\audio\plugins\wrapper code\Standalone + Juce\Source\audio\plugin_client\Standalone - Juce\Source\audio\plugins\wrapper code + Juce\Source\audio\plugin_client - Juce\Source\audio\plugins\wrapper code + Juce\Source\audio\plugin_client - Juce\Source\audio\plugins\wrapper code + Juce\Source\audio\plugin_client - - Juce\Source\audio\plugins\formats + + Juce\Source\audio\plugin_host\formats - - Juce\Source\audio\plugins\formats + + Juce\Source\audio\plugin_host\formats - - Juce\Source\audio\plugins\formats + + Juce\Source\audio\plugin_host\formats - - Juce\Source\audio\plugins\formats + + Juce\Source\audio\plugin_host\formats - - Juce\Source\audio\plugins\formats + + Juce\Source\audio\plugin_host\formats - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host - - Juce\Source\audio\plugins + + Juce\Source\audio\plugin_host Juce\Source\audio\processors diff --git a/Builds/iOS/Juce.xcodeproj/project.pbxproj b/Builds/iOS/Juce.xcodeproj/project.pbxproj index 04f6298a47..bbbc5c96b7 100644 --- a/Builds/iOS/Juce.xcodeproj/project.pbxproj +++ b/Builds/iOS/Juce.xcodeproj/project.pbxproj @@ -46,16 +46,16 @@ 573BF08B2CACCC317F3D7603 = { isa = PBXBuildFile; fileRef = 0D3A77572C7256CE4C115FD7; }; 8376B6E3DB141DDF5EFF6327 = { isa = PBXBuildFile; fileRef = 78D29BB5C76CCF7C21EC0DAF; }; B579C891B16F4B219CD751B5 = { isa = PBXBuildFile; fileRef = 01712FF0A160032FA1DAA8C2; }; - A3C433D146C7E1FFCADFB202 = { isa = PBXBuildFile; fileRef = 68D759C0812F1B2D8B1F0288; }; - 0086CA75A5115F4D3E5D7DF4 = { isa = PBXBuildFile; fileRef = B990275870E5E30554AE4C0B; }; - C1857884F37C08F550812E99 = { isa = PBXBuildFile; fileRef = F13BFC8AE68ECB6E063BD8D4; }; - 1BADB47FA8A6F40E31820AD1 = { isa = PBXBuildFile; fileRef = 2CC1A8309CB8301FF9A22371; }; - 5B10F8D4A3986953CD2F0780 = { isa = PBXBuildFile; fileRef = 9A344077AA294E747662C41F; }; - 72A7726E9F52F4DB162D15DC = { isa = PBXBuildFile; fileRef = 3E8765432F8E2966952D7A8D; }; - 5505CAC239FEF5AAA75B01C5 = { isa = PBXBuildFile; fileRef = 137BEF668FB2670FA2DEF03B; }; - 03FFC1B5DAD06521157F07F3 = { isa = PBXBuildFile; fileRef = 7B90C1479968D609C0F9E901; }; - A43ADEFD22A23B9DE2ACBF55 = { isa = PBXBuildFile; fileRef = 428BAE26DC25F9DA51B8E427; }; - 1E67D91CB6529FC367B88F6B = { isa = PBXBuildFile; fileRef = ECCEE0E429B3D81B7893FAFD; }; + 43FA6F0FD4DDEBA6427E730D = { isa = PBXBuildFile; fileRef = 50FAF92038EBD0127900AAA1; }; + BAB3164372A6C31A1A7DA58F = { isa = PBXBuildFile; fileRef = FCBB1DC14311D099809B21F7; }; + D71FEEEA440682B04E024BB7 = { isa = PBXBuildFile; fileRef = 2EBF36FAAF019B6F811D1C84; }; + B331EE2C23176373F2D52C1E = { isa = PBXBuildFile; fileRef = 1C8211DFB558D740EF4B173A; }; + 79D8E372BA77018BDA956D92 = { isa = PBXBuildFile; fileRef = DA4820727D6DDC75561A262C; }; + 21005408DDA892A5B8B4F78D = { isa = PBXBuildFile; fileRef = C96D4FE222A8704A8F3BEDD8; }; + 3688819F98EFF0AABDD79029 = { isa = PBXBuildFile; fileRef = 3110B983ACE956D6A24F8C8C; }; + 84F9FCAE9DF003DC6FC3C941 = { isa = PBXBuildFile; fileRef = B6E20AE45813C0CA9B1014DD; }; + E1046147432EB115A68D6C43 = { isa = PBXBuildFile; fileRef = AF47BC3796A74CC15A192E8B; }; + 5CEE2D7E55DA99C1D310CDC2 = { isa = PBXBuildFile; fileRef = 9C5C0BCB2A298160025B15FC; }; B154245927BCB4F87ABEAF17 = { isa = PBXBuildFile; fileRef = AB554593165FE8C8B40F4447; }; 52ADF1419B058963EE32B7C3 = { isa = PBXBuildFile; fileRef = BC2A50B0B01128E394E9DE9C; }; 31D36C32211754E793B9FF81 = { isa = PBXBuildFile; fileRef = D141C024A3F5A6748B0E9ED7; }; @@ -467,28 +467,28 @@ 6B3896A2CB1BB379BCDD9575 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_IncludeCharacteristics.h; path = "../../extras/audio plugins/wrapper/juce_IncludeCharacteristics.h"; sourceTree = SOURCE_ROOT; }; 6F4941C73B96CE8028AD7999 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHeaders.h; path = "../../extras/audio plugins/wrapper/juce_PluginHeaders.h"; sourceTree = SOURCE_ROOT; }; 21EAF73E1E8D839ABDF6B1CF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginHostType.h; path = "../../extras/audio plugins/wrapper/juce_PluginHostType.h"; sourceTree = SOURCE_ROOT; }; - AA6DF2B7514484F0A2B06DAA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioUnitPluginFormat.h; path = ../../src/audio/plugins/formats/juce_AudioUnitPluginFormat.h; sourceTree = SOURCE_ROOT; }; - 68D759C0812F1B2D8B1F0288 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AudioUnitPluginFormat.mm; path = ../../src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm; sourceTree = SOURCE_ROOT; }; - 6125D4A328E474BE7A48EF59 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_DirectXPluginFormat.h; path = ../../src/audio/plugins/formats/juce_DirectXPluginFormat.h; sourceTree = SOURCE_ROOT; }; - 9E97260B1E7DCC2EE796B117 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_LADSPAPluginFormat.h; path = ../../src/audio/plugins/formats/juce_LADSPAPluginFormat.h; sourceTree = SOURCE_ROOT; }; - 9B2DF7C49612A962F7130CDB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_VSTMidiEventList.h; path = ../../src/audio/plugins/formats/juce_VSTMidiEventList.h; sourceTree = SOURCE_ROOT; }; - B990275870E5E30554AE4C0B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VSTPluginFormat.cpp; path = ../../src/audio/plugins/formats/juce_VSTPluginFormat.cpp; sourceTree = SOURCE_ROOT; }; - BE58578E96493E70D76E080F = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_VSTPluginFormat.h; path = ../../src/audio/plugins/formats/juce_VSTPluginFormat.h; sourceTree = SOURCE_ROOT; }; - F13BFC8AE68ECB6E063BD8D4 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VSTPluginFormat.mm; path = ../../src/audio/plugins/formats/juce_VSTPluginFormat.mm; sourceTree = SOURCE_ROOT; }; - 2CC1A8309CB8301FF9A22371 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginFormat.cpp; path = ../../src/audio/plugins/juce_AudioPluginFormat.cpp; sourceTree = SOURCE_ROOT; }; - C4C9911456CA7EADB36E53E3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginFormat.h; path = ../../src/audio/plugins/juce_AudioPluginFormat.h; sourceTree = SOURCE_ROOT; }; - 9A344077AA294E747662C41F = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginFormatManager.cpp; path = ../../src/audio/plugins/juce_AudioPluginFormatManager.cpp; sourceTree = SOURCE_ROOT; }; - C7B6686D2316F3333529EA60 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginFormatManager.h; path = ../../src/audio/plugins/juce_AudioPluginFormatManager.h; sourceTree = SOURCE_ROOT; }; - 3E8765432F8E2966952D7A8D = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginInstance.cpp; path = ../../src/audio/plugins/juce_AudioPluginInstance.cpp; sourceTree = SOURCE_ROOT; }; - F08D4F9235F82147C634156E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginInstance.h; path = ../../src/audio/plugins/juce_AudioPluginInstance.h; sourceTree = SOURCE_ROOT; }; - 137BEF668FB2670FA2DEF03B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_KnownPluginList.cpp; path = ../../src/audio/plugins/juce_KnownPluginList.cpp; sourceTree = SOURCE_ROOT; }; - B64559DBDA185D34F3998374 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_KnownPluginList.h; path = ../../src/audio/plugins/juce_KnownPluginList.h; sourceTree = SOURCE_ROOT; }; - 7B90C1479968D609C0F9E901 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginDescription.cpp; path = ../../src/audio/plugins/juce_PluginDescription.cpp; sourceTree = SOURCE_ROOT; }; - DC3AB07D4519B8487B5D92DB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginDescription.h; path = ../../src/audio/plugins/juce_PluginDescription.h; sourceTree = SOURCE_ROOT; }; - 428BAE26DC25F9DA51B8E427 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginDirectoryScanner.cpp; path = ../../src/audio/plugins/juce_PluginDirectoryScanner.cpp; sourceTree = SOURCE_ROOT; }; - 8F47FF9F6F07D763E5073975 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginDirectoryScanner.h; path = ../../src/audio/plugins/juce_PluginDirectoryScanner.h; sourceTree = SOURCE_ROOT; }; - ECCEE0E429B3D81B7893FAFD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginListComponent.cpp; path = ../../src/audio/plugins/juce_PluginListComponent.cpp; sourceTree = SOURCE_ROOT; }; - 71A51B564A30F6A5571CC2AB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginListComponent.h; path = ../../src/audio/plugins/juce_PluginListComponent.h; sourceTree = SOURCE_ROOT; }; + D76BDCCF9E1A1F26A8F578F0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioUnitPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.h; sourceTree = SOURCE_ROOT; }; + 50FAF92038EBD0127900AAA1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_AudioUnitPluginFormat.mm; path = ../../src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.mm; sourceTree = SOURCE_ROOT; }; + 2073E1A497363200233CD34E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_DirectXPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_DirectXPluginFormat.h; sourceTree = SOURCE_ROOT; }; + F800E47459B2FE9DEF56F312 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_LADSPAPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_LADSPAPluginFormat.h; sourceTree = SOURCE_ROOT; }; + B4291F2CEEC78CFEDEFC360E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_VSTMidiEventList.h; path = ../../src/audio/plugin_host/formats/juce_VSTMidiEventList.h; sourceTree = SOURCE_ROOT; }; + FCBB1DC14311D099809B21F7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_VSTPluginFormat.cpp; path = ../../src/audio/plugin_host/formats/juce_VSTPluginFormat.cpp; sourceTree = SOURCE_ROOT; }; + 723EBD80931754F4DD77DD53 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_VSTPluginFormat.h; path = ../../src/audio/plugin_host/formats/juce_VSTPluginFormat.h; sourceTree = SOURCE_ROOT; }; + 2EBF36FAAF019B6F811D1C84 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_VSTPluginFormat.mm; path = ../../src/audio/plugin_host/formats/juce_VSTPluginFormat.mm; sourceTree = SOURCE_ROOT; }; + 1C8211DFB558D740EF4B173A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginFormat.cpp; path = ../../src/audio/plugin_host/juce_AudioPluginFormat.cpp; sourceTree = SOURCE_ROOT; }; + 28534632DF76A1EA837BD0D7 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginFormat.h; path = ../../src/audio/plugin_host/juce_AudioPluginFormat.h; sourceTree = SOURCE_ROOT; }; + DA4820727D6DDC75561A262C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginFormatManager.cpp; path = ../../src/audio/plugin_host/juce_AudioPluginFormatManager.cpp; sourceTree = SOURCE_ROOT; }; + A6415104D1E3E5CE7031C0C1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginFormatManager.h; path = ../../src/audio/plugin_host/juce_AudioPluginFormatManager.h; sourceTree = SOURCE_ROOT; }; + C96D4FE222A8704A8F3BEDD8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioPluginInstance.cpp; path = ../../src/audio/plugin_host/juce_AudioPluginInstance.cpp; sourceTree = SOURCE_ROOT; }; + E5BA7B8913271E935A1DA487 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPluginInstance.h; path = ../../src/audio/plugin_host/juce_AudioPluginInstance.h; sourceTree = SOURCE_ROOT; }; + 3110B983ACE956D6A24F8C8C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_KnownPluginList.cpp; path = ../../src/audio/plugin_host/juce_KnownPluginList.cpp; sourceTree = SOURCE_ROOT; }; + A3FE51C7DD706F536273AB0E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_KnownPluginList.h; path = ../../src/audio/plugin_host/juce_KnownPluginList.h; sourceTree = SOURCE_ROOT; }; + B6E20AE45813C0CA9B1014DD = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginDescription.cpp; path = ../../src/audio/plugin_host/juce_PluginDescription.cpp; sourceTree = SOURCE_ROOT; }; + 4AE3A448D79602BE793BB5AA = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginDescription.h; path = ../../src/audio/plugin_host/juce_PluginDescription.h; sourceTree = SOURCE_ROOT; }; + AF47BC3796A74CC15A192E8B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginDirectoryScanner.cpp; path = ../../src/audio/plugin_host/juce_PluginDirectoryScanner.cpp; sourceTree = SOURCE_ROOT; }; + 3D170AC8FD8E403C54E08F9D = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginDirectoryScanner.h; path = ../../src/audio/plugin_host/juce_PluginDirectoryScanner.h; sourceTree = SOURCE_ROOT; }; + 9C5C0BCB2A298160025B15FC = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_PluginListComponent.cpp; path = ../../src/audio/plugin_host/juce_PluginListComponent.cpp; sourceTree = SOURCE_ROOT; }; + 08C65C3EB60FE8BFA252E3EF = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_PluginListComponent.h; path = ../../src/audio/plugin_host/juce_PluginListComponent.h; sourceTree = SOURCE_ROOT; }; 4CF107951746567DB63880A3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioPlayHead.h; path = ../../src/audio/processors/juce_AudioPlayHead.h; sourceTree = SOURCE_ROOT; }; AB554593165FE8C8B40F4447 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = juce_AudioProcessor.cpp; path = ../../src/audio/processors/juce_AudioProcessor.cpp; sourceTree = SOURCE_ROOT; }; 3F260C24341E58745AC5BE79 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = juce_AudioProcessor.h; path = ../../src/audio/processors/juce_AudioProcessor.h; sourceTree = SOURCE_ROOT; }; @@ -1215,33 +1215,32 @@ 0F0D49D13522C94A0F37D4AB, 6B3896A2CB1BB379BCDD9575, 6F4941C73B96CE8028AD7999, - 21EAF73E1E8D839ABDF6B1CF ); name = "wrapper code"; sourceTree = ""; }; - 6FDCF1A0063FC0ABA27273A0 = { isa = PBXGroup; children = ( - AA6DF2B7514484F0A2B06DAA, - 68D759C0812F1B2D8B1F0288, - 6125D4A328E474BE7A48EF59, - 9E97260B1E7DCC2EE796B117, - 9B2DF7C49612A962F7130CDB, - B990275870E5E30554AE4C0B, - BE58578E96493E70D76E080F, - F13BFC8AE68ECB6E063BD8D4 ); name = formats; sourceTree = ""; }; + 21EAF73E1E8D839ABDF6B1CF ); name = plugin_client; sourceTree = ""; }; + B1F82C796B56FCD97D211D8E = { isa = PBXGroup; children = ( + D76BDCCF9E1A1F26A8F578F0, + 50FAF92038EBD0127900AAA1, + 2073E1A497363200233CD34E, + F800E47459B2FE9DEF56F312, + B4291F2CEEC78CFEDEFC360E, + FCBB1DC14311D099809B21F7, + 723EBD80931754F4DD77DD53, + 2EBF36FAAF019B6F811D1C84 ); name = formats; sourceTree = ""; }; 7AA82894558E047D7D5111E1 = { isa = PBXGroup; children = ( - 2805C9C796CD7D77C2D662BF, - 6FDCF1A0063FC0ABA27273A0, - 2CC1A8309CB8301FF9A22371, - C4C9911456CA7EADB36E53E3, - 9A344077AA294E747662C41F, - C7B6686D2316F3333529EA60, - 3E8765432F8E2966952D7A8D, - F08D4F9235F82147C634156E, - 137BEF668FB2670FA2DEF03B, - B64559DBDA185D34F3998374, - 7B90C1479968D609C0F9E901, - DC3AB07D4519B8487B5D92DB, - 428BAE26DC25F9DA51B8E427, - 8F47FF9F6F07D763E5073975, - ECCEE0E429B3D81B7893FAFD, - 71A51B564A30F6A5571CC2AB ); name = plugins; sourceTree = ""; }; + B1F82C796B56FCD97D211D8E, + 1C8211DFB558D740EF4B173A, + 28534632DF76A1EA837BD0D7, + DA4820727D6DDC75561A262C, + A6415104D1E3E5CE7031C0C1, + C96D4FE222A8704A8F3BEDD8, + E5BA7B8913271E935A1DA487, + 3110B983ACE956D6A24F8C8C, + A3FE51C7DD706F536273AB0E, + B6E20AE45813C0CA9B1014DD, + 4AE3A448D79602BE793BB5AA, + AF47BC3796A74CC15A192E8B, + 3D170AC8FD8E403C54E08F9D, + 9C5C0BCB2A298160025B15FC, + 08C65C3EB60FE8BFA252E3EF ); name = plugin_host; sourceTree = ""; }; 231431F8B23F01DC6ECD4214 = { isa = PBXGroup; children = ( 4CF107951746567DB63880A3, AB554593165FE8C8B40F4447, @@ -1266,6 +1265,7 @@ BF8F3D00CE4E97468E8BBC55, 53C441C8EEF2860715CC6599, 99B60B012D5CCF0BD861011D, + 2805C9C796CD7D77C2D662BF, 7AA82894558E047D7D5111E1, 231431F8B23F01DC6ECD4214, DC641C77950A335A20FD4532 ); name = audio; sourceTree = ""; }; @@ -2079,16 +2079,16 @@ 573BF08B2CACCC317F3D7603, 8376B6E3DB141DDF5EFF6327, B579C891B16F4B219CD751B5, - A3C433D146C7E1FFCADFB202, - 0086CA75A5115F4D3E5D7DF4, - C1857884F37C08F550812E99, - 1BADB47FA8A6F40E31820AD1, - 5B10F8D4A3986953CD2F0780, - 72A7726E9F52F4DB162D15DC, - 5505CAC239FEF5AAA75B01C5, - 03FFC1B5DAD06521157F07F3, - A43ADEFD22A23B9DE2ACBF55, - 1E67D91CB6529FC367B88F6B, + 43FA6F0FD4DDEBA6427E730D, + BAB3164372A6C31A1A7DA58F, + D71FEEEA440682B04E024BB7, + B331EE2C23176373F2D52C1E, + 79D8E372BA77018BDA956D92, + 21005408DDA892A5B8B4F78D, + 3688819F98EFF0AABDD79029, + 84F9FCAE9DF003DC6FC3C941, + E1046147432EB115A68D6C43, + 5CEE2D7E55DA99C1D310CDC2, B154245927BCB4F87ABEAF17, 52ADF1419B058963EE32B7C3, 31D36C32211754E793B9FF81, diff --git a/Juce.jucer b/Juce.jucer index 8640fc226f..3bb29a41f3 100644 --- a/Juce.jucer +++ b/Juce.jucer @@ -222,97 +222,97 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + cues[i].identifier = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Identifier", "0").getIntValue()); - c->cues[i].order = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Order", "0").getIntValue()); - c->cues[i].chunkID = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "ChunkID", dataChunkID).getIntValue()); - c->cues[i].chunkStart = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "ChunkStart", "0").getIntValue()); - c->cues[i].blockStart = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "BlockStart", "0").getIntValue()); - c->cues[i].offset = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Offset", "0").getIntValue()); + c->cues[i].identifier = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Identifier", "0").getIntValue()); + c->cues[i].order = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Order", "0").getIntValue()); + c->cues[i].chunkID = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "ChunkID", dataChunkID).getIntValue()); + c->cues[i].chunkStart = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "ChunkStart", "0").getIntValue()); + c->cues[i].blockStart = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "BlockStart", "0").getIntValue()); + c->cues[i].offset = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Offset", "0").getIntValue()); } return data; @@ -267742,8 +267742,11 @@ const String SystemStats::getFullUserName() const String SystemStats::getComputerName() { - return nsStringToJuce ([[NSProcessInfo processInfo] hostName]) - .upToLastOccurrenceOf (".local", false, true); + char name [256] = { 0 }; + if (gethostname (name, sizeof (name) - 1) == 0) + return String (name).upToLastOccurrenceOf (".local", false, true); + + return String::empty; } uint32 juce_millisecondsSinceStartup() noexcept diff --git a/juce_amalgamated.h b/juce_amalgamated.h index e07731fc98..6d5d7616fb 100644 --- a/juce_amalgamated.h +++ b/juce_amalgamated.h @@ -73,7 +73,7 @@ namespace JuceDummyNamespace {} */ #define JUCE_MAJOR_VERSION 1 #define JUCE_MINOR_VERSION 53 -#define JUCE_BUILDNUMBER 71 +#define JUCE_BUILDNUMBER 72 /** Current Juce version number. @@ -760,6 +760,10 @@ namespace JuceDummyNamespace {} #endif #endif +#if defined (_MSC_VER) && _MSC_VER >= 1600 + //#define JUCE_COMPILER_SUPPORTS_CXX2011 1 +#endif + #if ! (DOXYGEN || JUCE_COMPILER_SUPPORTS_CXX2011) #define noexcept throw() // for c++98 compilers, we can fake these newer language features. #define nullptr (0) @@ -21444,7 +21448,7 @@ public: WeakReference& operator= (const WeakReference& other) { holder = other.holder; return *this; } /** Copies another pointer to this one. */ - WeakReference& operator= (ObjectType* const newObject) { holder = newObject != nullptr ? newObject->getWeakReference() : nullptr; return *this; } + WeakReference& operator= (ObjectType* const newObject) { holder = (newObject != nullptr) ? newObject->getWeakReference() : nullptr; return *this; } /** Returns the object that this pointer refers to, or null if the object no longer exists. */ ObjectType* get() const noexcept { return holder != nullptr ? holder->get() : nullptr; } diff --git a/src/audio/audio_file_formats/juce_WavAudioFormat.cpp b/src/audio/audio_file_formats/juce_WavAudioFormat.cpp index 6f97959b3f..c06154ab6c 100644 --- a/src/audio/audio_file_formats/juce_WavAudioFormat.cpp +++ b/src/audio/audio_file_formats/juce_WavAudioFormat.cpp @@ -71,7 +71,7 @@ const StringPairArray WavAudioFormat::createBWAVMetadata (const String& descript //============================================================================== namespace WavFileHelpers { - inline int chunkName (const char* const name) noexcept { return (int) ByteOrder::littleEndianInt (name); } + inline int chunkName (const char* const name) noexcept { return (int) ByteOrder::littleEndianInt (name); } #if JUCE_MSVC #pragma pack (push, 1) @@ -244,68 +244,68 @@ struct SMPLChunk //============================================================================== struct CueChunk { - struct Cue - { - uint32 identifier; - uint32 order; - uint32 chunkID; - uint32 chunkStart; - uint32 blockStart; - uint32 offset; - } PACKED; - - uint32 numCues; - Cue cues[1]; - - void copyTo (StringPairArray& values, const int totalSize) const + struct Cue { - values.set ("NumCuePoints", String (ByteOrder::swapIfBigEndian (numCues))); + uint32 identifier; + uint32 order; + uint32 chunkID; + uint32 chunkStart; + uint32 blockStart; + uint32 offset; + } PACKED; + + uint32 numCues; + Cue cues[1]; + + void copyTo (StringPairArray& values, const int totalSize) const + { + values.set ("NumCuePoints", String (ByteOrder::swapIfBigEndian (numCues))); - for (uint32 i = 0; i < numCues; ++i) - { - if ((uint8*) (cues + (i + 1)) > ((uint8*) this) + totalSize) + for (uint32 i = 0; i < numCues; ++i) + { + if ((uint8*) (cues + (i + 1)) > ((uint8*) this) + totalSize) break; - const String prefix ("Cue" + String(i)); - values.set (prefix + "Identifier", String (ByteOrder::swapIfBigEndian (cues[i].identifier))); - values.set (prefix + "Order", String (ByteOrder::swapIfBigEndian (cues[i].order))); - values.set (prefix + "ChunkID", String (ByteOrder::swapIfBigEndian (cues[i].chunkID))); - values.set (prefix + "ChunkStart", String (ByteOrder::swapIfBigEndian (cues[i].chunkStart))); - values.set (prefix + "BlockStart", String (ByteOrder::swapIfBigEndian (cues[i].blockStart))); - values.set (prefix + "Offset", String (ByteOrder::swapIfBigEndian (cues[i].offset))); - } - } - - static MemoryBlock createFrom (const StringPairArray& values) + const String prefix ("Cue" + String(i)); + values.set (prefix + "Identifier", String (ByteOrder::swapIfBigEndian (cues[i].identifier))); + values.set (prefix + "Order", String (ByteOrder::swapIfBigEndian (cues[i].order))); + values.set (prefix + "ChunkID", String (ByteOrder::swapIfBigEndian (cues[i].chunkID))); + values.set (prefix + "ChunkStart", String (ByteOrder::swapIfBigEndian (cues[i].chunkStart))); + values.set (prefix + "BlockStart", String (ByteOrder::swapIfBigEndian (cues[i].blockStart))); + values.set (prefix + "Offset", String (ByteOrder::swapIfBigEndian (cues[i].offset))); + } + } + + static MemoryBlock createFrom (const StringPairArray& values) { - const int numCues = values.getValue ("NumCuePoints", "0").getIntValue(); + const int numCues = values.getValue ("NumCuePoints", "0").getIntValue(); - if (numCues <= 0) + if (numCues <= 0) return MemoryBlock(); - const size_t sizeNeeded = sizeof (CueChunk) + (numCues - 1) * sizeof (Cue); - MemoryBlock data ((sizeNeeded + 3) & ~3); - data.fillWith (0); + const size_t sizeNeeded = sizeof (CueChunk) + (numCues - 1) * sizeof (Cue); + MemoryBlock data ((sizeNeeded + 3) & ~3); + data.fillWith (0); - CueChunk* const c = static_cast (data.getData()); + CueChunk* const c = static_cast (data.getData()); - c->numCues = ByteOrder::swapIfBigEndian ((uint32) numCues); + c->numCues = ByteOrder::swapIfBigEndian ((uint32) numCues); - const String dataChunkID (chunkName ("data")); + const String dataChunkID (chunkName ("data")); - for (int i = 0; i < numCues; ++i) - { - const String prefix ("Cue" + String(i)); - c->cues[i].identifier = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Identifier", "0").getIntValue()); - c->cues[i].order = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Order", "0").getIntValue()); - c->cues[i].chunkID = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "ChunkID", dataChunkID).getIntValue()); - c->cues[i].chunkStart = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "ChunkStart", "0").getIntValue()); - c->cues[i].blockStart = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "BlockStart", "0").getIntValue()); - c->cues[i].offset = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Offset", "0").getIntValue()); - } + for (int i = 0; i < numCues; ++i) + { + const String prefix ("Cue" + String(i)); + c->cues[i].identifier = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Identifier", "0").getIntValue()); + c->cues[i].order = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Order", "0").getIntValue()); + c->cues[i].chunkID = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "ChunkID", dataChunkID).getIntValue()); + c->cues[i].chunkStart = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "ChunkStart", "0").getIntValue()); + c->cues[i].blockStart = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "BlockStart", "0").getIntValue()); + c->cues[i].offset = ByteOrder::swapIfBigEndian ((uint32) values.getValue (prefix + "Offset", "0").getIntValue()); + } - return data; - } + return data; + } } PACKED; @@ -479,13 +479,13 @@ public: input->read (smpl, length); smpl->copyTo (metadataValues, length); } - else if (chunkType == chunkName ("cue ")) - { - HeapBlock cue; + else if (chunkType == chunkName ("cue ")) + { + HeapBlock cue; cue.calloc (jmax ((size_t) length + 1, sizeof (CueChunk)), 1); input->read (cue, length); cue->copyTo (metadataValues, length); - } + } else if (chunkEnd <= input->getPosition()) { break; @@ -578,7 +578,7 @@ public: { bwavChunk = BWAVChunk::createFrom (metadataValues); smplChunk = SMPLChunk::createFrom (metadataValues); - cueChunk = CueChunk ::createFrom (metadataValues); + cueChunk = CueChunk ::createFrom (metadataValues); } headerPosition = out->getPosition(); @@ -675,7 +675,7 @@ private: + 8 + audioDataSize + (audioDataSize & 1) + (bwavChunk.getSize() > 0 ? (8 + bwavChunk.getSize()) : 0) + (smplChunk.getSize() > 0 ? (8 + smplChunk.getSize()) : 0) - + (cueChunk .getSize() > 0 ? (8 + cueChunk .getSize()) : 0) + + (cueChunk .getSize() > 0 ? (8 + cueChunk .getSize()) : 0) + (8 + 28); // (ds64 chunk) riffChunkSize += (riffChunkSize & 0x1); @@ -754,7 +754,7 @@ private: output->write (smplChunk.getData(), (int) smplChunk.getSize()); } - if (cueChunk.getSize() > 0) + if (cueChunk.getSize() > 0) { output->writeInt (chunkName ("cue ")); output->writeInt ((int) cueChunk.getSize()); diff --git a/src/audio/plugins/formats/juce_AudioUnitPluginFormat.h b/src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.h similarity index 100% rename from src/audio/plugins/formats/juce_AudioUnitPluginFormat.h rename to src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.h diff --git a/src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm b/src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.mm similarity index 100% rename from src/audio/plugins/formats/juce_AudioUnitPluginFormat.mm rename to src/audio/plugin_host/formats/juce_AudioUnitPluginFormat.mm diff --git a/src/audio/plugins/formats/juce_DirectXPluginFormat.h b/src/audio/plugin_host/formats/juce_DirectXPluginFormat.h similarity index 100% rename from src/audio/plugins/formats/juce_DirectXPluginFormat.h rename to src/audio/plugin_host/formats/juce_DirectXPluginFormat.h diff --git a/src/audio/plugins/formats/juce_LADSPAPluginFormat.h b/src/audio/plugin_host/formats/juce_LADSPAPluginFormat.h similarity index 100% rename from src/audio/plugins/formats/juce_LADSPAPluginFormat.h rename to src/audio/plugin_host/formats/juce_LADSPAPluginFormat.h diff --git a/src/audio/plugins/formats/juce_VSTMidiEventList.h b/src/audio/plugin_host/formats/juce_VSTMidiEventList.h similarity index 100% rename from src/audio/plugins/formats/juce_VSTMidiEventList.h rename to src/audio/plugin_host/formats/juce_VSTMidiEventList.h diff --git a/src/audio/plugins/formats/juce_VSTPluginFormat.cpp b/src/audio/plugin_host/formats/juce_VSTPluginFormat.cpp similarity index 100% rename from src/audio/plugins/formats/juce_VSTPluginFormat.cpp rename to src/audio/plugin_host/formats/juce_VSTPluginFormat.cpp diff --git a/src/audio/plugins/formats/juce_VSTPluginFormat.h b/src/audio/plugin_host/formats/juce_VSTPluginFormat.h similarity index 100% rename from src/audio/plugins/formats/juce_VSTPluginFormat.h rename to src/audio/plugin_host/formats/juce_VSTPluginFormat.h diff --git a/src/audio/plugins/formats/juce_VSTPluginFormat.mm b/src/audio/plugin_host/formats/juce_VSTPluginFormat.mm similarity index 100% rename from src/audio/plugins/formats/juce_VSTPluginFormat.mm rename to src/audio/plugin_host/formats/juce_VSTPluginFormat.mm diff --git a/src/audio/plugins/juce_AudioPluginFormat.cpp b/src/audio/plugin_host/juce_AudioPluginFormat.cpp similarity index 100% rename from src/audio/plugins/juce_AudioPluginFormat.cpp rename to src/audio/plugin_host/juce_AudioPluginFormat.cpp diff --git a/src/audio/plugins/juce_AudioPluginFormat.h b/src/audio/plugin_host/juce_AudioPluginFormat.h similarity index 100% rename from src/audio/plugins/juce_AudioPluginFormat.h rename to src/audio/plugin_host/juce_AudioPluginFormat.h diff --git a/src/audio/plugins/juce_AudioPluginFormatManager.cpp b/src/audio/plugin_host/juce_AudioPluginFormatManager.cpp similarity index 100% rename from src/audio/plugins/juce_AudioPluginFormatManager.cpp rename to src/audio/plugin_host/juce_AudioPluginFormatManager.cpp diff --git a/src/audio/plugins/juce_AudioPluginFormatManager.h b/src/audio/plugin_host/juce_AudioPluginFormatManager.h similarity index 100% rename from src/audio/plugins/juce_AudioPluginFormatManager.h rename to src/audio/plugin_host/juce_AudioPluginFormatManager.h diff --git a/src/audio/plugins/juce_AudioPluginInstance.cpp b/src/audio/plugin_host/juce_AudioPluginInstance.cpp similarity index 100% rename from src/audio/plugins/juce_AudioPluginInstance.cpp rename to src/audio/plugin_host/juce_AudioPluginInstance.cpp diff --git a/src/audio/plugins/juce_AudioPluginInstance.h b/src/audio/plugin_host/juce_AudioPluginInstance.h similarity index 100% rename from src/audio/plugins/juce_AudioPluginInstance.h rename to src/audio/plugin_host/juce_AudioPluginInstance.h diff --git a/src/audio/plugins/juce_KnownPluginList.cpp b/src/audio/plugin_host/juce_KnownPluginList.cpp similarity index 100% rename from src/audio/plugins/juce_KnownPluginList.cpp rename to src/audio/plugin_host/juce_KnownPluginList.cpp diff --git a/src/audio/plugins/juce_KnownPluginList.h b/src/audio/plugin_host/juce_KnownPluginList.h similarity index 100% rename from src/audio/plugins/juce_KnownPluginList.h rename to src/audio/plugin_host/juce_KnownPluginList.h diff --git a/src/audio/plugins/juce_PluginDescription.cpp b/src/audio/plugin_host/juce_PluginDescription.cpp similarity index 100% rename from src/audio/plugins/juce_PluginDescription.cpp rename to src/audio/plugin_host/juce_PluginDescription.cpp diff --git a/src/audio/plugins/juce_PluginDescription.h b/src/audio/plugin_host/juce_PluginDescription.h similarity index 100% rename from src/audio/plugins/juce_PluginDescription.h rename to src/audio/plugin_host/juce_PluginDescription.h diff --git a/src/audio/plugins/juce_PluginDirectoryScanner.cpp b/src/audio/plugin_host/juce_PluginDirectoryScanner.cpp similarity index 100% rename from src/audio/plugins/juce_PluginDirectoryScanner.cpp rename to src/audio/plugin_host/juce_PluginDirectoryScanner.cpp diff --git a/src/audio/plugins/juce_PluginDirectoryScanner.h b/src/audio/plugin_host/juce_PluginDirectoryScanner.h similarity index 100% rename from src/audio/plugins/juce_PluginDirectoryScanner.h rename to src/audio/plugin_host/juce_PluginDirectoryScanner.h diff --git a/src/audio/plugins/juce_PluginListComponent.cpp b/src/audio/plugin_host/juce_PluginListComponent.cpp similarity index 100% rename from src/audio/plugins/juce_PluginListComponent.cpp rename to src/audio/plugin_host/juce_PluginListComponent.cpp diff --git a/src/audio/plugins/juce_PluginListComponent.h b/src/audio/plugin_host/juce_PluginListComponent.h similarity index 100% rename from src/audio/plugins/juce_PluginListComponent.h rename to src/audio/plugin_host/juce_PluginListComponent.h diff --git a/src/audio/processors/juce_AudioProcessorGraph.h b/src/audio/processors/juce_AudioProcessorGraph.h index 9c6c849228..94ff980b30 100644 --- a/src/audio/processors/juce_AudioProcessorGraph.h +++ b/src/audio/processors/juce_AudioProcessorGraph.h @@ -27,8 +27,8 @@ #define __JUCE_AUDIOPROCESSORGRAPH_JUCEHEADER__ #include "juce_AudioProcessor.h" -#include "../plugins/juce_AudioPluginFormatManager.h" -#include "../plugins/juce_KnownPluginList.h" +#include "../plugin_host/juce_AudioPluginFormatManager.h" +#include "../plugin_host/juce_KnownPluginList.h" #include "../../containers/juce_NamedValueSet.h" #include "../../containers/juce_ReferenceCountedArray.h" diff --git a/src/core/juce_StandardHeader.h b/src/core/juce_StandardHeader.h index 6cf75a93cd..de332ea03c 100644 --- a/src/core/juce_StandardHeader.h +++ b/src/core/juce_StandardHeader.h @@ -33,7 +33,7 @@ */ #define JUCE_MAJOR_VERSION 1 #define JUCE_MINOR_VERSION 53 -#define JUCE_BUILDNUMBER 71 +#define JUCE_BUILDNUMBER 72 /** Current Juce version number. diff --git a/src/juce_app_includes.h b/src/juce_app_includes.h index 8c2466995c..b4f1e2c297 100644 --- a/src/juce_app_includes.h +++ b/src/juce_app_includes.h @@ -165,40 +165,40 @@ #include "audio/midi/juce_MidiOutput.h" #endif #ifndef __JUCE_AUDIOUNITPLUGINFORMAT_JUCEHEADER__ - #include "audio/plugins/formats/juce_AudioUnitPluginFormat.h" + #include "audio/plugin_host/formats/juce_AudioUnitPluginFormat.h" #endif #ifndef __JUCE_DIRECTXPLUGINFORMAT_JUCEHEADER__ - #include "audio/plugins/formats/juce_DirectXPluginFormat.h" + #include "audio/plugin_host/formats/juce_DirectXPluginFormat.h" #endif #ifndef __JUCE_LADSPAPLUGINFORMAT_JUCEHEADER__ - #include "audio/plugins/formats/juce_LADSPAPluginFormat.h" + #include "audio/plugin_host/formats/juce_LADSPAPluginFormat.h" #endif #ifndef __JUCE_VSTMIDIEVENTLIST_JUCEHEADER__ - #include "audio/plugins/formats/juce_VSTMidiEventList.h" + #include "audio/plugin_host/formats/juce_VSTMidiEventList.h" #endif #ifndef __JUCE_VSTPLUGINFORMAT_JUCEHEADER__ - #include "audio/plugins/formats/juce_VSTPluginFormat.h" + #include "audio/plugin_host/formats/juce_VSTPluginFormat.h" #endif #ifndef __JUCE_AUDIOPLUGINFORMAT_JUCEHEADER__ - #include "audio/plugins/juce_AudioPluginFormat.h" + #include "audio/plugin_host/juce_AudioPluginFormat.h" #endif #ifndef __JUCE_AUDIOPLUGINFORMATMANAGER_JUCEHEADER__ - #include "audio/plugins/juce_AudioPluginFormatManager.h" + #include "audio/plugin_host/juce_AudioPluginFormatManager.h" #endif #ifndef __JUCE_AUDIOPLUGININSTANCE_JUCEHEADER__ - #include "audio/plugins/juce_AudioPluginInstance.h" + #include "audio/plugin_host/juce_AudioPluginInstance.h" #endif #ifndef __JUCE_KNOWNPLUGINLIST_JUCEHEADER__ - #include "audio/plugins/juce_KnownPluginList.h" + #include "audio/plugin_host/juce_KnownPluginList.h" #endif #ifndef __JUCE_PLUGINDESCRIPTION_JUCEHEADER__ - #include "audio/plugins/juce_PluginDescription.h" + #include "audio/plugin_host/juce_PluginDescription.h" #endif #ifndef __JUCE_PLUGINDIRECTORYSCANNER_JUCEHEADER__ - #include "audio/plugins/juce_PluginDirectoryScanner.h" + #include "audio/plugin_host/juce_PluginDirectoryScanner.h" #endif #ifndef __JUCE_PLUGINLISTCOMPONENT_JUCEHEADER__ - #include "audio/plugins/juce_PluginListComponent.h" + #include "audio/plugin_host/juce_PluginListComponent.h" #endif #ifndef __JUCE_AUDIOPLAYHEAD_JUCEHEADER__ #include "audio/processors/juce_AudioPlayHead.h"