diff --git a/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj b/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj index 74a74b0382..50baab7f47 100644 --- a/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj +++ b/examples/AUv3Synth/Builds/MacOSX/AUv3Synth.xcodeproj/project.pbxproj @@ -33,7 +33,6 @@ A144AF8ABB75CF4ED390B381 = {isa = PBXBuildFile; fileRef = BC56941C72580E2EE4E1C7E3; }; EC1B7357C105DC8BC06A0CD4 = {isa = PBXBuildFile; fileRef = 01976E27EC467D051DDCAF01; }; 39ADA8F0E3A434DA57C40A01 = {isa = PBXBuildFile; fileRef = 7E3C4311AC5A5DE17C1AF7AF; }; - 54FE96DC05D1A20972091FF6 = {isa = PBXBuildFile; fileRef = 30556D83A70C2481E6925DCD; }; C51939993311FD8DF1F9B2C9 = {isa = PBXBuildFile; fileRef = 4D4FE075A4D46CB60E0E8F01; }; 7B26C59954340F0002331B08 = {isa = PBXBuildFile; fileRef = F6E8DF2B9B7A4352460F615C; }; AB9A7E653E0DE855B304AA62 = {isa = PBXBuildFile; fileRef = 920ECCCD996910404E154C95; }; @@ -58,7 +57,6 @@ 296CD54575ED27C23A2F13F3 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; 29982493607128FD6DB6A284 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 2B30A6F71FFB6D6A50683093 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-Standalone_Plugin.plist"; path = "Info-Standalone_Plugin.plist"; sourceTree = "SOURCE_ROOT"; }; - 30556D83A70C2481E6925DCD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; 35E9D2B103D5B9BD0D46A7AA = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_graphics"; path = "../../../../modules/juce_graphics"; sourceTree = "SOURCE_ROOT"; }; 3AA0ED454F371BDAC067D012 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_plugin_client"; path = "../../../../modules/juce_audio_plugin_client"; sourceTree = "SOURCE_ROOT"; }; 3D3118026BF0BE81FDFD445D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_processors.mm"; path = "../../JuceLibraryCode/include_juce_audio_processors.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -80,7 +78,6 @@ 7E53C9E87A3F9EBE4D454BA8 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-VST3.plist"; path = "Info-VST3.plist"; sourceTree = "SOURCE_ROOT"; }; 886BABEBD6FBA8D2184B909B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_core.mm"; path = "../../JuceLibraryCode/include_juce_core.mm"; sourceTree = "SOURCE_ROOT"; }; 8F18C9EA4DEB8B87C5EB0E3B = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_data_structures"; path = "../../../../modules/juce_data_structures"; sourceTree = "SOURCE_ROOT"; }; - 920ECCCD996910404E154C95 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_VST3.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_VST3.cpp"; sourceTree = "SOURCE_ROOT"; }; 9C7C3A15A9D747596DDE40AA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AUv3SynthProcessor.cpp; path = ../../Source/AUv3SynthProcessor.cpp; sourceTree = "SOURCE_ROOT"; }; CBCE663C4AF9852BA8D9652E = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_utils"; path = "../../../../modules/juce_audio_utils"; sourceTree = "SOURCE_ROOT"; }; D79BD2605CF93D30EB8EFA46 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_formats"; path = "../../../../modules/juce_audio_formats"; sourceTree = "SOURCE_ROOT"; }; @@ -91,6 +88,7 @@ 872D05BD56490FD7B375C11B = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; }; 8C9C38D32DB4D8BD543CA892 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; 91F2B214D542DE4D2EC899FE = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AUv3Synth.app; sourceTree = "BUILT_PRODUCTS_DIR"; }; + 920ECCCD996910404E154C95 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_VST3.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_VST3.cpp"; sourceTree = "SOURCE_ROOT"; }; 9536B5A780A03F6BACB24144 = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAUv3Synth.a; sourceTree = "BUILT_PRODUCTS_DIR"; }; AC3356631ED2AC043BC67B79 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; AE1D883D951C933760199759 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_extra"; path = "../../../../modules/juce_gui_extra"; sourceTree = "SOURCE_ROOT"; }; @@ -141,7 +139,6 @@ BC56941C72580E2EE4E1C7E3, 01976E27EC467D051DDCAF01, 7E3C4311AC5A5DE17C1AF7AF, - 30556D83A70C2481E6925DCD, 4D4FE075A4D46CB60E0E8F01, F6E8DF2B9B7A4352460F615C, 920ECCCD996910404E154C95, @@ -693,7 +690,6 @@ E54A56600C8600B51EA7AED1, 2D63D809A2897D805216AFF6, A144AF8ABB75CF4ED390B381, - 54FE96DC05D1A20972091FF6, C51939993311FD8DF1F9B2C9, 2FAA6C0C1EB0883691B6DD56, DE6E3762B6B3D67B9BEC4CDF, diff --git a/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj b/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj index dbfbfd602c..469fc94296 100644 --- a/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj +++ b/examples/AUv3Synth/Builds/iOS/AUv3Synth.xcodeproj/project.pbxproj @@ -30,7 +30,6 @@ A144AF8ABB75CF4ED390B381 = {isa = PBXBuildFile; fileRef = BC56941C72580E2EE4E1C7E3; }; EC1B7357C105DC8BC06A0CD4 = {isa = PBXBuildFile; fileRef = 01976E27EC467D051DDCAF01; }; 39ADA8F0E3A434DA57C40A01 = {isa = PBXBuildFile; fileRef = 7E3C4311AC5A5DE17C1AF7AF; }; - 54FE96DC05D1A20972091FF6 = {isa = PBXBuildFile; fileRef = 30556D83A70C2481E6925DCD; }; C51939993311FD8DF1F9B2C9 = {isa = PBXBuildFile; fileRef = 4D4FE075A4D46CB60E0E8F01; }; 2FAA6C0C1EB0883691B6DD56 = {isa = PBXBuildFile; fileRef = 3D3118026BF0BE81FDFD445D; }; DE6E3762B6B3D67B9BEC4CDF = {isa = PBXBuildFile; fileRef = DB76D602FC34311487420B9A; }; @@ -53,7 +52,6 @@ 296CD54575ED27C23A2F13F3 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; 29982493607128FD6DB6A284 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 2B30A6F71FFB6D6A50683093 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-Standalone_Plugin.plist"; path = "Info-Standalone_Plugin.plist"; sourceTree = "SOURCE_ROOT"; }; - 30556D83A70C2481E6925DCD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; 35E9D2B103D5B9BD0D46A7AA = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_graphics"; path = "../../../../modules/juce_graphics"; sourceTree = "SOURCE_ROOT"; }; 3AA0ED454F371BDAC067D012 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_plugin_client"; path = "../../../../modules/juce_audio_plugin_client"; sourceTree = "SOURCE_ROOT"; }; 3D3118026BF0BE81FDFD445D = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_processors.mm"; path = "../../JuceLibraryCode/include_juce_audio_processors.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -128,7 +126,6 @@ BC56941C72580E2EE4E1C7E3, 01976E27EC467D051DDCAF01, 7E3C4311AC5A5DE17C1AF7AF, - 30556D83A70C2481E6925DCD, 4D4FE075A4D46CB60E0E8F01, 3D3118026BF0BE81FDFD445D, DB76D602FC34311487420B9A, @@ -475,7 +472,6 @@ E54A56600C8600B51EA7AED1, 2D63D809A2897D805216AFF6, A144AF8ABB75CF4ED390B381, - 54FE96DC05D1A20972091FF6, C51939993311FD8DF1F9B2C9, 2FAA6C0C1EB0883691B6DD56, DE6E3762B6B3D67B9BEC4CDF, diff --git a/examples/AUv3Synth/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp b/examples/AUv3Synth/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp deleted file mode 100644 index 183f61b238..0000000000 --- a/examples/AUv3Synth/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include diff --git a/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj b/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj index 93fa788168..822e07a941 100644 --- a/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj +++ b/examples/AnimationAppExample/Builds/MacOSX/AnimationAppExample.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ E3498B080326636A372B74AE = {isa = PBXBuildFile; fileRef = 859E13C66F2193112084D1B9; }; 828D4B32ECB7ECE234A5A1A9 = {isa = PBXBuildFile; fileRef = 66DE43B56D8670C78DD3998D; }; ACC6D859315761144D4178A0 = {isa = PBXBuildFile; fileRef = 717FA33AC0AA2629302F0314; }; + D56389F7C2F211D97510A51F = {isa = PBXBuildFile; fileRef = F41993809470A0FF0DC7076E; }; 97CBB80DA6775AEF4872168B = {isa = PBXBuildFile; fileRef = 8F7B1F20EA4F07C9D37D5260; }; 2CDBA22DB877B521681B03C3 = {isa = PBXBuildFile; fileRef = 7DF561FC0400DD7E678CD690; }; 3B937846DB65393DE597ABDE = {isa = PBXBuildFile; fileRef = C9F7ABDA09635BC3FAB0B008; }; @@ -78,6 +79,7 @@ D7AE43E118954402DE85705F = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_graphics"; path = "../../../../modules/juce_graphics"; sourceTree = "SOURCE_ROOT"; }; E86F8ACE887901A756775C0C = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_data_structures"; path = "../../../../modules/juce_data_structures"; sourceTree = "SOURCE_ROOT"; }; EE948FB708041B74B8597E68 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_processors"; path = "../../../../modules/juce_audio_processors"; sourceTree = "SOURCE_ROOT"; }; + F41993809470A0FF0DC7076E = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; F7B6DBDC7439C90B4E01752E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Main.cpp; path = ../../Source/Main.cpp; sourceTree = "SOURCE_ROOT"; }; FE7F391D915BD5CE849883A8 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 9F41B5C4D3F9CE9C17373AB3 = {isa = PBXGroup; children = ( @@ -122,6 +124,7 @@ 859E13C66F2193112084D1B9, 66DE43B56D8670C78DD3998D, 717FA33AC0AA2629302F0314, + F41993809470A0FF0DC7076E, 8F7B1F20EA4F07C9D37D5260, 7DF561FC0400DD7E678CD690, C9F7ABDA09635BC3FAB0B008, @@ -264,6 +267,7 @@ E3498B080326636A372B74AE, 828D4B32ECB7ECE234A5A1A9, ACC6D859315761144D4178A0, + D56389F7C2F211D97510A51F, 97CBB80DA6775AEF4872168B, 2CDBA22DB877B521681B03C3, 3B937846DB65393DE597ABDE, diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj index 06eaaa7466..ad09e9ebdf 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -526,6 +523,9 @@ true + + true + true @@ -1678,13 +1678,7 @@ true - - true - - - true - - + true @@ -1841,7 +1835,6 @@ - @@ -2292,8 +2285,14 @@ - + + + + + + + diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters index 33c30020db..3fdd53ab16 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj.filters @@ -658,9 +658,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -757,6 +754,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -1993,20 +1993,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2463,9 +2454,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3816,12 +3804,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h index 9c3110579c..cbc91df3ac 100644 --- a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h @@ -223,18 +223,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - //#define JUCE_QUICKTIME 1 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj b/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj index 35c478a6ed..9aea2d5977 100644 --- a/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj +++ b/examples/AudioAppExample/Builds/MacOSX/AudioAppExample.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 3286435E3CC944A630866B89 = {isa = PBXBuildFile; fileRef = 92CABA9C9B5148FCA22A0503; }; 7AC823C6BFA28E49D004E0E0 = {isa = PBXBuildFile; fileRef = BD70FA4626657FF1DEBB10DA; }; 558C49788C323F72C879C219 = {isa = PBXBuildFile; fileRef = 440774261ADCDDE62F8611DE; }; + 6295E63A310FB635AC0C1BE1 = {isa = PBXBuildFile; fileRef = FE0301E74455B9D70088792D; }; 32D0B845ED45381A3B0D3286 = {isa = PBXBuildFile; fileRef = C751B4E213343FF77A0681B6; }; 7D74E1C0A7CA9488CCB8FD5D = {isa = PBXBuildFile; fileRef = EA07D9E1051E8FBBB8C21064; }; 2414893F5F6D7096A1350F6B = {isa = PBXBuildFile; fileRef = 0C37646FCADAFC29F28333C0; }; @@ -85,6 +86,7 @@ ED96DF5BB1BAA94746049FE4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_gui_basics.mm"; path = "../../JuceLibraryCode/include_juce_gui_basics.mm"; sourceTree = "SOURCE_ROOT"; }; FA016D0A7169A84A182C404B = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; FB092AF48A13F4F473734F66 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_video.mm"; path = "../../JuceLibraryCode/include_juce_video.mm"; sourceTree = "SOURCE_ROOT"; }; + FE0301E74455B9D70088792D = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; C366FD2226833583ECDE68D2 = {isa = PBXGroup; children = ( 2545022A0EE088A0C46EBD13, D78365C74082A1253E12AF17, ); name = Source; sourceTree = ""; }; @@ -129,6 +131,7 @@ 92CABA9C9B5148FCA22A0503, BD70FA4626657FF1DEBB10DA, 440774261ADCDDE62F8611DE, + FE0301E74455B9D70088792D, C751B4E213343FF77A0681B6, EA07D9E1051E8FBBB8C21064, 0C37646FCADAFC29F28333C0, @@ -273,6 +276,7 @@ 3286435E3CC944A630866B89, 7AC823C6BFA28E49D004E0E0, 558C49788C323F72C879C219, + 6295E63A310FB635AC0C1BE1, 32D0B845ED45381A3B0D3286, 7D74E1C0A7CA9488CCB8FD5D, 2414893F5F6D7096A1350F6B, diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj index b5ce09fd8e..a1470cd59d 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj +++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -574,6 +571,9 @@ true + + true + true @@ -1726,13 +1726,7 @@ true - - true - - - true - - + true @@ -1890,7 +1884,6 @@ - @@ -2354,8 +2347,14 @@ - + + + + + + + diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters index a2d4fe4103..a7f1e709f1 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters +++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj.filters @@ -673,9 +673,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -835,6 +832,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2071,20 +2071,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2544,9 +2535,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3936,12 +3924,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h index 88d18d77c1..835b6ff6b2 100644 --- a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h @@ -235,18 +235,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - //#define JUCE_QUICKTIME 1 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj index 04d1b4d775..ce08a06d41 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj @@ -437,9 +437,6 @@ true - - true - true @@ -593,6 +590,9 @@ true + + true + true @@ -1874,7 +1874,6 @@ - diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj.filters b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj.filters index 603edb2969..ab9b6d9df9 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj.filters @@ -670,9 +670,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -850,6 +847,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2514,9 +2514,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj index c2b4b36506..dfe616a7b2 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -592,6 +589,9 @@ true + + true + true @@ -1873,7 +1873,6 @@ - diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj.filters b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj.filters index 13c58307be..530ed247a7 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj.filters @@ -670,9 +670,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -850,6 +847,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2514,9 +2514,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj index 603d66cfca..fae90e43ed 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -592,6 +589,9 @@ true + + true + true @@ -1873,7 +1873,6 @@ - diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj.filters b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj.filters index ea67ff8219..ed01e81a2d 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj.filters @@ -667,9 +667,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -847,6 +844,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2511,9 +2511,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj index 28ec1343f5..56fa4e653c 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -591,6 +588,9 @@ true + + true + true @@ -1872,7 +1872,6 @@ - diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj.filters b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj.filters index ae9b2cf502..fc85c00e85 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj.filters @@ -667,9 +667,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -847,6 +844,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2511,9 +2511,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj index 5a91be306e..f3cb8f066b 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -592,6 +589,9 @@ true + + true + true @@ -1875,7 +1875,6 @@ - diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj.filters b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj.filters index d221c2983d..6fb2c6c41a 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj.filters @@ -670,9 +670,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -850,6 +847,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2520,9 +2520,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj index f690c1445f..7e3db03715 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -591,6 +588,9 @@ true + + true + true @@ -1874,7 +1874,6 @@ - diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj.filters b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj.filters index f4b586c1fa..788f5bb54c 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj.filters +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj.filters @@ -670,9 +670,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -850,6 +847,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2520,9 +2520,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj b/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj index 4c8f30db34..dbe3509105 100644 --- a/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj +++ b/examples/BouncingBallWavetableDemo/Builds/MacOSX/BouncingBallWavetableDemo.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ 2D79087465BE4742CCA6A9B6 = {isa = PBXBuildFile; fileRef = 30C1898CB24713677FE38922; }; BA1F0D76D823878766369C94 = {isa = PBXBuildFile; fileRef = A3E3503CDB7F6FF5C16ACC90; }; 5641B7544BB1E2460B53A471 = {isa = PBXBuildFile; fileRef = 81D8C6E40C1E1781AE7059D9; }; + 9C814731D34A682990AE17CA = {isa = PBXBuildFile; fileRef = 76D3818D1F0E86B333AA1F99; }; 46CA5521603725FBBFE65242 = {isa = PBXBuildFile; fileRef = 5CB6432630E43D9F5DE84F27; }; A38DDE1419820904238C218A = {isa = PBXBuildFile; fileRef = 35B0E3511789B97455F23A2A; }; E216A7A51124469BAAA36C2F = {isa = PBXBuildFile; fileRef = FAB47C0E7947D33D360FDC31; }; @@ -62,6 +63,7 @@ 698ADE3639E5C47795657FCE = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 6A9EFC3AB24BA57FFB496DED = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_data_structures"; path = "../../../../modules/juce_data_structures"; sourceTree = "SOURCE_ROOT"; }; 742111BC1D219E531E8E32F3 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_basics"; path = "../../../../modules/juce_gui_basics"; sourceTree = "SOURCE_ROOT"; }; + 76D3818D1F0E86B333AA1F99 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; 81D8C6E40C1E1781AE7059D9 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 825A7DCA8A93CD2E51463992 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 8CB18E1E2503AE0EC4B73675 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_cryptography"; path = "../../../../modules/juce_cryptography"; sourceTree = "SOURCE_ROOT"; }; @@ -122,6 +124,7 @@ 30C1898CB24713677FE38922, A3E3503CDB7F6FF5C16ACC90, 81D8C6E40C1E1781AE7059D9, + 76D3818D1F0E86B333AA1F99, 5CB6432630E43D9F5DE84F27, 35B0E3511789B97455F23A2A, FAB47C0E7947D33D360FDC31, @@ -264,6 +267,7 @@ 2D79087465BE4742CCA6A9B6, BA1F0D76D823878766369C94, 5641B7544BB1E2460B53A471, + 9C814731D34A682990AE17CA, 46CA5521603725FBBFE65242, A38DDE1419820904238C218A, E216A7A51124469BAAA36C2F, diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj index 277b0cd703..3028b8dddf 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj @@ -437,9 +437,6 @@ true - - true - true @@ -575,6 +572,9 @@ true + + true + true @@ -1697,13 +1697,7 @@ true - - true - - - true - - + true @@ -1860,7 +1854,6 @@ - @@ -2302,8 +2295,14 @@ - + + + + + + + diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters index 70986b5351..a48ec163d4 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj.filters @@ -658,9 +658,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -820,6 +817,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2023,20 +2023,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2493,9 +2484,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3819,12 +3807,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj index e5c1c27551..27e7c7b237 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -574,6 +571,9 @@ true + + true + true @@ -1696,13 +1696,7 @@ true - - true - - - true - - + true @@ -1859,7 +1853,6 @@ - @@ -2301,8 +2294,14 @@ - + + + + + + + diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters index c2102d3466..319017af92 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj.filters @@ -658,9 +658,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -820,6 +817,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2023,20 +2023,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2493,9 +2484,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3819,12 +3807,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h index a51b0b2278..a90a2dc3e9 100644 --- a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h +++ b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h @@ -234,18 +234,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - //#define JUCE_QUICKTIME 1 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj index ce51787936..22a1cc332f 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj @@ -151,6 +151,9 @@ true + + true + true diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj.filters b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj.filters index 004345d984..469f1e839f 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj.filters +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj.filters @@ -223,6 +223,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj index 368bad9980..bb32a641ba 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj @@ -151,6 +151,9 @@ true + + true + true diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj.filters b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj.filters index a1b61506f7..e3e66d5e9d 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj.filters +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj.filters @@ -223,6 +223,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/examples/Demo/Builds/Android/app/CMakeLists.txt b/examples/Demo/Builds/Android/app/CMakeLists.txt index aad9dcaaec..4814224f4a 100644 --- a/examples/Demo/Builds/Android/app/CMakeLists.txt +++ b/examples/Demo/Builds/Android/app/CMakeLists.txt @@ -319,8 +319,6 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp" "../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h" - "../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp" - "../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp" "../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp" @@ -531,6 +529,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/containers/juce_DynamicObject.h" "../../../../../modules/juce_core/containers/juce_ElementComparator.h" "../../../../../modules/juce_core/containers/juce_HashMap.h" + "../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" "../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" "../../../../../modules/juce_core/containers/juce_ListenerList.cpp" "../../../../../modules/juce_core/containers/juce_ListenerList.h" @@ -1348,13 +1347,16 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_opengl/juce_opengl.h" "../../../../../modules/juce_video/capture/juce_CameraDevice.cpp" "../../../../../modules/juce_video/capture/juce_CameraDevice.h" - "../../../../../modules/juce_video/native/juce_android_CameraDevice.cpp" - "../../../../../modules/juce_video/native/juce_mac_CameraDevice.mm" + "../../../../../modules/juce_video/native/juce_android_CameraDevice.h" + "../../../../../modules/juce_video/native/juce_android_Video.h" + "../../../../../modules/juce_video/native/juce_mac_CameraDevice.h" "../../../../../modules/juce_video/native/juce_mac_MovieComponent.mm" - "../../../../../modules/juce_video/native/juce_win32_CameraDevice.cpp" - "../../../../../modules/juce_video/native/juce_win32_DirectShowComponent.cpp" - "../../../../../modules/juce_video/playback/juce_DirectShowComponent.h" + "../../../../../modules/juce_video/native/juce_mac_Video.h" + "../../../../../modules/juce_video/native/juce_win32_CameraDevice.h" + "../../../../../modules/juce_video/native/juce_win32_Video.h" "../../../../../modules/juce_video/playback/juce_MovieComponent.h" + "../../../../../modules/juce_video/playback/juce_VideoComponent.cpp" + "../../../../../modules/juce_video/playback/juce_VideoComponent.h" "../../../../../modules/juce_video/juce_video.cpp" "../../../../../modules/juce_video/juce_video.mm" "../../../../../modules/juce_video/juce_video.h" @@ -1630,8 +1632,6 @@ set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/ju set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1842,6 +1842,7 @@ set_source_files_properties("../../../../../modules/juce_core/containers/juce_Dy set_source_files_properties("../../../../../modules/juce_core/containers/juce_DynamicObject.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ElementComparator.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.h" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -2659,13 +2660,16 @@ set_source_files_properties("../../../../../modules/juce_opengl/juce_opengl.mm" set_source_files_properties("../../../../../modules/juce_opengl/juce_opengl.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/capture/juce_CameraDevice.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/capture/juce_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_video/native/juce_android_CameraDevice.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_video/native/juce_mac_CameraDevice.mm" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_video/native/juce_android_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_video/native/juce_android_Video.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_video/native/juce_mac_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/native/juce_mac_MovieComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_video/native/juce_win32_CameraDevice.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_video/native/juce_win32_DirectShowComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_video/playback/juce_DirectShowComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_video/native/juce_mac_Video.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_video/native/juce_win32_CameraDevice.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_video/native/juce_win32_Video.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/playback/juce_MovieComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_video/playback/juce_VideoComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_video/playback/juce_VideoComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/juce_video.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/juce_video.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_video/juce_video.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/Demo/Builds/Android/app/build.gradle b/examples/Demo/Builds/Android/app/build.gradle index 4802883aba..9986099647 100644 --- a/examples/Demo/Builds/Android/app/build.gradle +++ b/examples/Demo/Builds/Android/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 10 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" externalNativeBuild { cmake { path "CMakeLists.txt" diff --git a/examples/Demo/Builds/Android/build.gradle b/examples/Demo/Builds/Android/build.gradle index e1c0c91bb7..0109eaa02a 100644 --- a/examples/Demo/Builds/Android/build.gradle +++ b/examples/Demo/Builds/Android/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj b/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj index 18148fd4ba..d59321d7f2 100644 --- a/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj +++ b/examples/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ E16EA7E816B50766F3AE4F88 = {isa = PBXBuildFile; fileRef = 8D7BDA5CDDCCD2F7BE67037A; }; BB7001D6FD448E6C0AAE4F30 = {isa = PBXBuildFile; fileRef = 8452076B5EAE822DD445458F; }; 5CA55A61B4ECF6BE53DB459A = {isa = PBXBuildFile; fileRef = ED6ADC3F084F9F3B6177B0C8; }; + 3A0436B207425DCD0CB3E3AD = {isa = PBXBuildFile; fileRef = BC6DF66E6767EBF159E86906; }; 11F44DE2908CA14F827EB448 = {isa = PBXBuildFile; fileRef = 4621682C1A4E85A088F7CEE0; }; EB6CEE01521D160E50EABCAA = {isa = PBXBuildFile; fileRef = 7EC42C604603E1ED621E635B; }; 3A285384585A5F664BB4C652 = {isa = PBXBuildFile; fileRef = A078E4C69AFA4FAE8DCC66BD; }; @@ -158,6 +159,7 @@ B731664FB9EEEBC618BAB5A0 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TimersAndEventsDemo.cpp; path = ../../Source/Demos/TimersAndEventsDemo.cpp; sourceTree = "SOURCE_ROOT"; }; B84A6E341207FA1F60EB5AF1 = {isa = PBXFileReference; lastKnownFileType = image.png; name = "juce_icon.png"; path = "../../Resources/juce_icon.png"; sourceTree = "SOURCE_ROOT"; }; BA0689752E29259BBD3AECAA = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_basics"; path = "../../../../modules/juce_gui_basics"; sourceTree = "SOURCE_ROOT"; }; + BC6DF66E6767EBF159E86906 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; C0C8D6D7D14DFAFB169FFDCF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ValueTreesDemo.cpp; path = ../../Source/Demos/ValueTreesDemo.cpp; sourceTree = "SOURCE_ROOT"; }; C542454A6B0F43AFAEA63092 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_graphics"; path = "../../../../modules/juce_graphics"; sourceTree = "SOURCE_ROOT"; }; C812CDED0B089FD1B76FC9EF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioLiveScrollingDisplay.h; path = ../../Source/Demos/AudioLiveScrollingDisplay.h; sourceTree = "SOURCE_ROOT"; }; @@ -291,6 +293,7 @@ 8D7BDA5CDDCCD2F7BE67037A, 8452076B5EAE822DD445458F, ED6ADC3F084F9F3B6177B0C8, + BC6DF66E6767EBF159E86906, 4621682C1A4E85A088F7CEE0, 7EC42C604603E1ED621E635B, A078E4C69AFA4FAE8DCC66BD, @@ -481,6 +484,7 @@ E16EA7E816B50766F3AE4F88, BB7001D6FD448E6C0AAE4F30, 5CA55A61B4ECF6BE53DB459A, + 3A0436B207425DCD0CB3E3AD, 11F44DE2908CA14F827EB448, EB6CEE01521D160E50EABCAA, 3A285384585A5F664BB4C652, diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj index df27b0b436..950f224f72 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj @@ -478,9 +478,6 @@ true - - true - true @@ -757,6 +754,9 @@ true + + true + true @@ -1909,13 +1909,7 @@ true - - true - - - true - - + true @@ -2080,7 +2074,6 @@ - @@ -2592,8 +2585,14 @@ - + + + + + + + diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters index d12172d9e1..8620c50e0d 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj.filters @@ -826,9 +826,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -1129,6 +1126,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2365,20 +2365,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2859,9 +2850,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4395,12 +4383,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj index 0be6936bef..79aadccc27 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj @@ -477,9 +477,6 @@ true - - true - true @@ -756,6 +753,9 @@ true + + true + true @@ -1908,13 +1908,7 @@ true - - true - - - true - - + true @@ -2079,7 +2073,6 @@ - @@ -2591,8 +2584,14 @@ - + + + + + + + diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters index c2d7d92ba4..484fe3d7e9 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj.filters @@ -826,9 +826,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -1129,6 +1126,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2365,20 +2365,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2859,9 +2850,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4395,12 +4383,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj index 53f9782d06..b96beff458 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj @@ -477,9 +477,6 @@ true - - true - true @@ -756,6 +753,9 @@ true + + true + true @@ -1908,13 +1908,7 @@ true - - true - - - true - - + true @@ -2079,7 +2073,6 @@ - @@ -2591,8 +2584,14 @@ - + + + + + + + diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters index 4df38daba8..063098bf12 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj.filters @@ -826,9 +826,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -1129,6 +1126,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2365,20 +2365,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2859,9 +2850,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4395,12 +4383,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/Demo/JuceLibraryCode/AppConfig.h b/examples/Demo/JuceLibraryCode/AppConfig.h index 537183f025..fa15111208 100644 --- a/examples/Demo/JuceLibraryCode/AppConfig.h +++ b/examples/Demo/JuceLibraryCode/AppConfig.h @@ -236,18 +236,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - //#define JUCE_QUICKTIME 1 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj index a57b46ece8..35c7cbc75a 100644 --- a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj +++ b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj @@ -151,6 +151,9 @@ true + + true + true diff --git a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj.filters b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj.filters index abae40484f..59293d85c3 100644 --- a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj.filters +++ b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj.filters @@ -223,6 +223,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj index 6af8410987..cc833fed3e 100644 --- a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj +++ b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj @@ -151,6 +151,9 @@ true + + true + true diff --git a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj.filters b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj.filters index b71f7e7865..44ad9a9851 100644 --- a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj.filters +++ b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj.filters @@ -223,6 +223,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj b/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj index 38b43edc10..69eb58a93d 100644 --- a/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj +++ b/examples/MPETest/Builds/MacOSX/MPETest.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ CE2807371257B52B1D2B06E0 = {isa = PBXBuildFile; fileRef = D8FF2E14B072C8B9544C95BF; }; 189A987224B9646B9AA0D399 = {isa = PBXBuildFile; fileRef = C64527E74752ECF0B056A9F5; }; D273118FCE8FE8583D9D4AB2 = {isa = PBXBuildFile; fileRef = CCC23D1BCFBE5FFC700F8608; }; + FBD0FB1E585C84BF818F4CDF = {isa = PBXBuildFile; fileRef = A72937CA4518472989B5644D; }; 354BBD7645C4F76503133A20 = {isa = PBXBuildFile; fileRef = 90E350DA6DF0535788EDA0C7; }; C568BD20102D15116F05E6D4 = {isa = PBXBuildFile; fileRef = AE90B98838251D28244F281D; }; A3BEED6474CF4D29FB8CA568 = {isa = PBXBuildFile; fileRef = 87D653D986B3CB91809A6AA1; }; @@ -64,6 +65,7 @@ 9C6E0B1545D55AF010DBFBC0 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_extra"; path = "../../../../modules/juce_gui_extra"; sourceTree = "SOURCE_ROOT"; }; A373D65BDAB25C19EC6A05AE = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; A39B168B4CC0CDA76F752623 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_events"; path = "../../../../modules/juce_events"; sourceTree = "SOURCE_ROOT"; }; + A72937CA4518472989B5644D = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; A7A229511154A5A91A29958D = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-App.plist"; path = "Info-App.plist"; sourceTree = "SOURCE_ROOT"; }; AB1DE39BFBA22179B919703B = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ZoneLayoutComponent.h; path = ../../Source/ZoneLayoutComponent.h; sourceTree = "SOURCE_ROOT"; }; ACC491D8A1B67C3214E49DE7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MPEDemoSynthVoice.h; path = ../../Source/MPEDemoSynthVoice.h; sourceTree = "SOURCE_ROOT"; }; @@ -138,6 +140,7 @@ D8FF2E14B072C8B9544C95BF, C64527E74752ECF0B056A9F5, CCC23D1BCFBE5FFC700F8608, + A72937CA4518472989B5644D, 90E350DA6DF0535788EDA0C7, AE90B98838251D28244F281D, 87D653D986B3CB91809A6AA1, @@ -281,6 +284,7 @@ CE2807371257B52B1D2B06E0, 189A987224B9646B9AA0D399, D273118FCE8FE8583D9D4AB2, + FBD0FB1E585C84BF818F4CDF, 354BBD7645C4F76503133A20, C568BD20102D15116F05E6D4, A3BEED6474CF4D29FB8CA568, diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj index bab41a6c17..056bcf686d 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -574,6 +571,9 @@ true + + true + true @@ -1726,13 +1726,7 @@ true - - true - - - true - - + true @@ -1896,7 +1890,6 @@ - @@ -2360,8 +2353,14 @@ - + + + + + + + diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters index 877fb03cfe..5576028812 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj.filters @@ -670,9 +670,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -832,6 +829,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2068,20 +2068,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2559,9 +2550,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3951,12 +3939,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj index 2d1087e706..c13dbf87a6 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -573,6 +570,9 @@ true + + true + true @@ -1725,13 +1725,7 @@ true - - true - - - true - - + true @@ -1895,7 +1889,6 @@ - @@ -2359,8 +2352,14 @@ - + + + + + + + diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters index 1af40815c4..d6602a82fe 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj.filters @@ -670,9 +670,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -832,6 +829,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2068,20 +2068,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2559,9 +2550,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3951,12 +3939,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/MPETest/JuceLibraryCode/AppConfig.h b/examples/MPETest/JuceLibraryCode/AppConfig.h index 88d18d77c1..835b6ff6b2 100644 --- a/examples/MPETest/JuceLibraryCode/AppConfig.h +++ b/examples/MPETest/JuceLibraryCode/AppConfig.h @@ -235,18 +235,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - //#define JUCE_QUICKTIME 1 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/MidiTest/Builds/Android/app/CMakeLists.txt b/examples/MidiTest/Builds/Android/app/CMakeLists.txt index 3ee4157e5a..ffee08cf46 100644 --- a/examples/MidiTest/Builds/Android/app/CMakeLists.txt +++ b/examples/MidiTest/Builds/Android/app/CMakeLists.txt @@ -267,8 +267,6 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp" "../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h" - "../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp" - "../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp" "../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp" @@ -383,6 +381,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/containers/juce_DynamicObject.h" "../../../../../modules/juce_core/containers/juce_ElementComparator.h" "../../../../../modules/juce_core/containers/juce_HashMap.h" + "../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" "../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" "../../../../../modules/juce_core/containers/juce_ListenerList.cpp" "../../../../../modules/juce_core/containers/juce_ListenerList.h" @@ -1403,8 +1402,6 @@ set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/ju set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1519,6 +1516,7 @@ set_source_files_properties("../../../../../modules/juce_core/containers/juce_Dy set_source_files_properties("../../../../../modules/juce_core/containers/juce_DynamicObject.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ElementComparator.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/MidiTest/Builds/Android/app/build.gradle b/examples/MidiTest/Builds/Android/app/build.gradle index b0f8fac3a5..4b9f724d16 100644 --- a/examples/MidiTest/Builds/Android/app/build.gradle +++ b/examples/MidiTest/Builds/Android/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" externalNativeBuild { cmake { path "CMakeLists.txt" diff --git a/examples/MidiTest/Builds/Android/build.gradle b/examples/MidiTest/Builds/Android/build.gradle index e1c0c91bb7..0109eaa02a 100644 --- a/examples/MidiTest/Builds/Android/build.gradle +++ b/examples/MidiTest/Builds/Android/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj index 429d4c6d97..a7cc7ac7f5 100644 --- a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj +++ b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj @@ -437,9 +437,6 @@ true - - true - true @@ -575,6 +572,9 @@ true + + true + true @@ -1823,7 +1823,6 @@ - diff --git a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj.filters b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj.filters index ecbddcb14f..34f8eff17e 100644 --- a/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj.filters +++ b/examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj.filters @@ -637,9 +637,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -799,6 +796,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2421,9 +2421,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj index 98487a2ebd..dacd24d1b5 100644 --- a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj +++ b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -574,6 +571,9 @@ true + + true + true @@ -1822,7 +1822,6 @@ - diff --git a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj.filters b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj.filters index ebcae212d8..1a4cb132d2 100644 --- a/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj.filters +++ b/examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj.filters @@ -637,9 +637,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -799,6 +796,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2421,9 +2421,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index dc30690ec6..ac0bab6fbe 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -270,8 +270,6 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp" "../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h" - "../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp" - "../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp" "../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp" @@ -386,6 +384,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/containers/juce_DynamicObject.h" "../../../../../modules/juce_core/containers/juce_ElementComparator.h" "../../../../../modules/juce_core/containers/juce_HashMap.h" + "../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" "../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" "../../../../../modules/juce_core/containers/juce_ListenerList.cpp" "../../../../../modules/juce_core/containers/juce_ListenerList.h" @@ -1481,8 +1480,6 @@ set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/ju set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1597,6 +1594,7 @@ set_source_files_properties("../../../../../modules/juce_core/containers/juce_Dy set_source_files_properties("../../../../../modules/juce_core/containers/juce_DynamicObject.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ElementComparator.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle b/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle index 9d52b4dc26..25716734df 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 10 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" externalNativeBuild { cmake { path "CMakeLists.txt" diff --git a/examples/NetworkGraphicsDemo/Builds/Android/build.gradle b/examples/NetworkGraphicsDemo/Builds/Android/build.gradle index e1c0c91bb7..0109eaa02a 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/build.gradle +++ b/examples/NetworkGraphicsDemo/Builds/Android/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj index 4c8f7104aa..6310fe782f 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -574,6 +571,9 @@ true + + true + true @@ -1907,7 +1907,6 @@ - diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj.filters b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj.filters index b9ec759fcc..6e6bb8fa75 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj.filters +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj.filters @@ -664,9 +664,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -826,6 +823,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2553,9 +2553,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj index f6f7c2977d..f23d7db9b1 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -573,6 +570,9 @@ true + + true + true @@ -1906,7 +1906,6 @@ - diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj.filters b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj.filters index eb3ea81359..5531b925b0 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj.filters +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj.filters @@ -664,9 +664,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -826,6 +823,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2553,9 +2553,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj b/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj index 526e35b2a3..bae2a11c6e 100644 --- a/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj +++ b/examples/OSCMonitor/Builds/MacOSX/OSCMonitor.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ EEF1C1AC7B804FD1DD290FF3 = {isa = PBXBuildFile; fileRef = 9919E2B6BB47D980D2621E05; }; 8F90CDDE444EA79E66718A5B = {isa = PBXBuildFile; fileRef = FBA6EB8BE426F4B718F80127; }; 73E26130783B152A4761D427 = {isa = PBXBuildFile; fileRef = 8DEBC3B6CF15D41618B1BE2E; }; + 902ACAB486D4041D598627F6 = {isa = PBXBuildFile; fileRef = 5C0E3D89065E4444921C8A2A; }; 0D4B330237E806FD83EAE57F = {isa = PBXBuildFile; fileRef = A00D6A45BDF5A73D8280A716; }; AFAF70AFAE4EB2218010021D = {isa = PBXBuildFile; fileRef = 88DE251DF6AE9B26738AE499; }; 3E7F8C668A6B9D59129DB060 = {isa = PBXBuildFile; fileRef = 92BF599DA326087F0C148FCD; }; @@ -47,6 +48,7 @@ 358B56F4E9EADBE499A6E4AC = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-App.plist"; path = "Info-App.plist"; sourceTree = "SOURCE_ROOT"; }; 38581D69B32C47722153A7F5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_events.mm"; path = "../../JuceLibraryCode/include_juce_events.mm"; sourceTree = "SOURCE_ROOT"; }; 5BB56FCAD65ECB76C33B8BE6 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_basics"; path = "../../../../modules/juce_audio_basics"; sourceTree = "SOURCE_ROOT"; }; + 5C0E3D89065E4444921C8A2A = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; 6325F284F0D69948E272BBEC = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_cryptography"; path = "../../../../modules/juce_cryptography"; sourceTree = "SOURCE_ROOT"; }; 69CCCF783C45EAEC120130F5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_osc.cpp"; path = "../../JuceLibraryCode/include_juce_osc.cpp"; sourceTree = "SOURCE_ROOT"; }; 6C4247B39550441A1914323B = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; @@ -128,6 +130,7 @@ 9919E2B6BB47D980D2621E05, FBA6EB8BE426F4B718F80127, 8DEBC3B6CF15D41618B1BE2E, + 5C0E3D89065E4444921C8A2A, A00D6A45BDF5A73D8280A716, 88DE251DF6AE9B26738AE499, 92BF599DA326087F0C148FCD, @@ -270,6 +273,7 @@ EEF1C1AC7B804FD1DD290FF3, 8F90CDDE444EA79E66718A5B, 73E26130783B152A4761D427, + 902ACAB486D4041D598627F6, 0D4B330237E806FD83EAE57F, AFAF70AFAE4EB2218010021D, 3E7F8C668A6B9D59129DB060, diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj index 0b29ae8aa4..8442254521 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -526,6 +523,9 @@ true + + true + true @@ -1705,13 +1705,7 @@ true - - true - - - true - - + true @@ -1871,7 +1865,6 @@ - @@ -2331,8 +2324,14 @@ - + + + + + + + diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters index 390c930fca..9c701fae35 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj.filters @@ -661,9 +661,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -760,6 +757,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2023,20 +2023,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2502,9 +2493,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3882,12 +3870,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj index ec4d16161d..195ca09198 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -525,6 +522,9 @@ true + + true + true @@ -1704,13 +1704,7 @@ true - - true - - - true - - + true @@ -1870,7 +1864,6 @@ - @@ -2330,8 +2323,14 @@ - + + + + + + + diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters index 54c4316149..f61215cf41 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj.filters @@ -661,9 +661,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -760,6 +757,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2023,20 +2023,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2502,9 +2493,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3882,12 +3870,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h index 0ccddd7849..d43fda9dc7 100644 --- a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h @@ -224,18 +224,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - //#define JUCE_QUICKTIME 1 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt index d9667593e5..443175833c 100644 --- a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt @@ -37,6 +37,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/containers/juce_DynamicObject.h" "../../../../../modules/juce_core/containers/juce_ElementComparator.h" "../../../../../modules/juce_core/containers/juce_HashMap.h" + "../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" "../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" "../../../../../modules/juce_core/containers/juce_ListenerList.cpp" "../../../../../modules/juce_core/containers/juce_ListenerList.h" @@ -858,6 +859,7 @@ set_source_files_properties("../../../../../modules/juce_core/containers/juce_Dy set_source_files_properties("../../../../../modules/juce_core/containers/juce_DynamicObject.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ElementComparator.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/OSCReceiver/Builds/Android/app/build.gradle b/examples/OSCReceiver/Builds/Android/app/build.gradle index af7b9b800f..bfb7ffb9ff 100644 --- a/examples/OSCReceiver/Builds/Android/app/build.gradle +++ b/examples/OSCReceiver/Builds/Android/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 10 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" externalNativeBuild { cmake { path "CMakeLists.txt" diff --git a/examples/OSCReceiver/Builds/Android/build.gradle b/examples/OSCReceiver/Builds/Android/build.gradle index e1c0c91bb7..0109eaa02a 100644 --- a/examples/OSCReceiver/Builds/Android/build.gradle +++ b/examples/OSCReceiver/Builds/Android/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj index 5ffb7dcad8..9ca94a19c5 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj +++ b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj @@ -151,6 +151,9 @@ true + + true + true diff --git a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj.filters b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj.filters index f9719f66e2..30bf034405 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj.filters +++ b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj.filters @@ -235,6 +235,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj index ee330734fa..3fb347275b 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj +++ b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj @@ -150,6 +150,9 @@ true + + true + true diff --git a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj.filters b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj.filters index 257c114151..e775880bb9 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj.filters +++ b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver_App.vcxproj.filters @@ -235,6 +235,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/examples/OSCSender/Builds/Android/app/CMakeLists.txt b/examples/OSCSender/Builds/Android/app/CMakeLists.txt index 7c8f5919e0..b426b87d15 100644 --- a/examples/OSCSender/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCSender/Builds/Android/app/CMakeLists.txt @@ -37,6 +37,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/containers/juce_DynamicObject.h" "../../../../../modules/juce_core/containers/juce_ElementComparator.h" "../../../../../modules/juce_core/containers/juce_HashMap.h" + "../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" "../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" "../../../../../modules/juce_core/containers/juce_ListenerList.cpp" "../../../../../modules/juce_core/containers/juce_ListenerList.h" @@ -787,6 +788,7 @@ set_source_files_properties("../../../../../modules/juce_core/containers/juce_Dy set_source_files_properties("../../../../../modules/juce_core/containers/juce_DynamicObject.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ElementComparator.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/OSCSender/Builds/Android/app/build.gradle b/examples/OSCSender/Builds/Android/app/build.gradle index bbb9502cdf..976970f342 100644 --- a/examples/OSCSender/Builds/Android/app/build.gradle +++ b/examples/OSCSender/Builds/Android/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 10 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" externalNativeBuild { cmake { path "CMakeLists.txt" diff --git a/examples/OSCSender/Builds/Android/build.gradle b/examples/OSCSender/Builds/Android/build.gradle index e1c0c91bb7..0109eaa02a 100644 --- a/examples/OSCSender/Builds/Android/build.gradle +++ b/examples/OSCSender/Builds/Android/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj index 6a97cd81fe..9fec2c6b12 100644 --- a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj +++ b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj @@ -151,6 +151,9 @@ true + + true + true diff --git a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj.filters b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj.filters index c20cc3988a..f5ebf540d0 100644 --- a/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj.filters +++ b/examples/OSCSender/Builds/VisualStudio2015/OSCSender_App.vcxproj.filters @@ -208,6 +208,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj index e1415bdcbe..57f6ac6a1c 100644 --- a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj +++ b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj @@ -150,6 +150,9 @@ true + + true + true diff --git a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj.filters b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj.filters index 86d6be1474..0525d9fb58 100644 --- a/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj.filters +++ b/examples/OSCSender/Builds/VisualStudio2017/OSCSender_App.vcxproj.filters @@ -208,6 +208,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj b/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj index 90c4a9b26d..68ea3c3bf4 100644 --- a/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj +++ b/examples/OpenGLAppExample/Builds/MacOSX/OpenGLAppExample.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ F2E327A47E10F43D6991A306 = {isa = PBXBuildFile; fileRef = 50151F5E1EA38C0768AD9AC8; }; 7FF434A451FC85BF1B79BC7F = {isa = PBXBuildFile; fileRef = 3948321FE783006946DC8F1F; }; F9B99B7794442B691803718A = {isa = PBXBuildFile; fileRef = CC144EDF680633EC54BB6C7C; }; + 1D983C056C6ECFB00C81D961 = {isa = PBXBuildFile; fileRef = F791D9DE9743A0D2CA3E81AD; }; 96CB0F03F9B80A334DEA2147 = {isa = PBXBuildFile; fileRef = DB3D37600C745E6F62C5A04B; }; 8A6D37A2A20E92532DE4CDE6 = {isa = PBXBuildFile; fileRef = A2A8888BB2A9B1BF61955BEA; }; 2A954B85CEC7CB6CDDE645AF = {isa = PBXBuildFile; fileRef = 8E5DB762FF5447085518EB85; }; @@ -84,6 +85,7 @@ DCA070129A9B3031E7342AF7 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_opengl"; path = "../../../../modules/juce_opengl"; sourceTree = "SOURCE_ROOT"; }; E388431BD28744CBA815E6D7 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_basics"; path = "../../../../modules/juce_audio_basics"; sourceTree = "SOURCE_ROOT"; }; EE9163FBAA413EB537932E47 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_video.mm"; path = "../../JuceLibraryCode/include_juce_video.mm"; sourceTree = "SOURCE_ROOT"; }; + F791D9DE9743A0D2CA3E81AD = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; FD8B62AE07B555A19D70A4A3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_graphics.mm"; path = "../../JuceLibraryCode/include_juce_graphics.mm"; sourceTree = "SOURCE_ROOT"; }; A4D3B14A21B5F8202D2A49AE = {isa = PBXGroup; children = ( 7D21460B496E5E03FA58654B, ); name = Resources; sourceTree = ""; }; @@ -133,6 +135,7 @@ 50151F5E1EA38C0768AD9AC8, 3948321FE783006946DC8F1F, CC144EDF680633EC54BB6C7C, + F791D9DE9743A0D2CA3E81AD, DB3D37600C745E6F62C5A04B, A2A8888BB2A9B1BF61955BEA, 8E5DB762FF5447085518EB85, @@ -276,6 +279,7 @@ F2E327A47E10F43D6991A306, 7FF434A451FC85BF1B79BC7F, F9B99B7794442B691803718A, + 1D983C056C6ECFB00C81D961, 96CB0F03F9B80A334DEA2147, 8A6D37A2A20E92532DE4CDE6, 2A954B85CEC7CB6CDDE645AF, diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj index f3e8f94861..f465820e39 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -526,6 +523,9 @@ true + + true + true @@ -1678,13 +1678,7 @@ true - - true - - - true - - + true @@ -1843,7 +1837,6 @@ - @@ -2294,8 +2287,14 @@ - + + + + + + + diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters index 9f36dc0ee4..7cfac1a34b 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample_App.vcxproj.filters @@ -661,9 +661,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -760,6 +757,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -1996,20 +1996,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2472,9 +2463,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3825,12 +3813,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h index 9c3110579c..cbc91df3ac 100644 --- a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h @@ -223,18 +223,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - //#define JUCE_QUICKTIME 1 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj index 72b1963e5b..abc620d25f 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -574,6 +571,9 @@ true + + true + true @@ -1824,7 +1824,6 @@ - diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj.filters b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj.filters index e6b5202613..7b7c2f0d16 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj.filters +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo_App.vcxproj.filters @@ -634,9 +634,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -796,6 +793,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2424,9 +2424,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj index 1ddbefe57b..d6157dda61 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -573,6 +570,9 @@ true + + true + true @@ -1823,7 +1823,6 @@ - diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj.filters b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj.filters index 161fae0454..c877f36a6e 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj.filters +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo_App.vcxproj.filters @@ -634,9 +634,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -796,6 +793,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2424,9 +2424,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj b/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj index c4a20b327d..6baf01a260 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/MacOSX/Arpeggiator.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ D0DA0BDE4746B7B12FD847CF = {isa = PBXBuildFile; fileRef = AC840D910B076A8D6E11D0E3; }; 762272ABD27938B84C8E9CB1 = {isa = PBXBuildFile; fileRef = 6965419522A8F4EE3C0E2F45; }; BF943B39DF6CAEF466FDEE9F = {isa = PBXBuildFile; fileRef = 72397638CA72E3953957CF97; }; + 95BEE60865061CC70522E3F0 = {isa = PBXBuildFile; fileRef = 30BD38248938ADACB208BCE6; }; 6AAE082359758785B89D3620 = {isa = PBXBuildFile; fileRef = 79BAABFF142E737F1B69E92D; }; 35F81D0026609F1B1F03C592 = {isa = PBXBuildFile; fileRef = 9C24A5EC057F1DF3D288143C; }; 8A0C4A63928476A51A5ABA85 = {isa = PBXBuildFile; fileRef = 56D6FCED08A719CBB031E441; }; @@ -31,7 +32,6 @@ D42548E813E707CD0A82E82B = {isa = PBXBuildFile; fileRef = 5D388CC3880062CA7D34DAC7; }; 816D2235A8E8DCD2F2223F6E = {isa = PBXBuildFile; fileRef = 6D6B8C8C2F02E290AAFF57D1; }; C0B574019E715C73CEDDE0C9 = {isa = PBXBuildFile; fileRef = 6ECD836FD092E8A2D3398C53; }; - 7362A0D6144BF4FFDE9C3F5A = {isa = PBXBuildFile; fileRef = F0CFFA787B89ADA2DEAB3044; }; 0BED0E26C94260A9831351B0 = {isa = PBXBuildFile; fileRef = 4CD86AD12C974AF8686B6F9E; }; 276A615FDB5F13C678CA1462 = {isa = PBXBuildFile; fileRef = 6FBF6878792BE8B7A8EB8C56; }; 3350A4D9C50AE7E10C742E8F = {isa = PBXBuildFile; fileRef = 992A0CD210174F34CDA91A7B; }; @@ -54,17 +54,18 @@ 2B44B90F3CEDD45A731586AD = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; }; 2F12CFEB1E95BC54E1CD3C7D = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; 300E6ADCFB36DD743EED4531 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + 30BD38248938ADACB208BCE6 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; 3E5564A1657A5094900B05E9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_basics.mm"; path = "../../JuceLibraryCode/include_juce_audio_basics.mm"; sourceTree = "SOURCE_ROOT"; }; + 427916B14A13C9592134DE85 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 4CD86AD12C974AF8686B6F9E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_VST_utils.mm"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_VST_utils.mm"; sourceTree = "SOURCE_ROOT"; }; 506896452A740D03C9E5E254 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_opengl.mm"; path = "../../JuceLibraryCode/include_juce_opengl.mm"; sourceTree = "SOURCE_ROOT"; }; - 5D388CC3880062CA7D34DAC7 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_AU.r"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AU.r"; sourceTree = "SOURCE_ROOT"; }; - 625312519BED207C9047A862 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_formats.mm"; path = "../../JuceLibraryCode/include_juce_audio_formats.mm"; sourceTree = "SOURCE_ROOT"; }; B7A2991D3F6CDC78EE921F1D = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Arpeggiator.vst; sourceTree = "BUILT_PRODUCTS_DIR"; }; 40D80A7071E7DF99EF20511D = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Arpeggiator.component; sourceTree = "BUILT_PRODUCTS_DIR"; }; - 427916B14A13C9592134DE85 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 509EAB8A04273892F0DFB9AD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; }; 56D6FCED08A719CBB031E441 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; + 5D388CC3880062CA7D34DAC7 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_AU.r"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AU.r"; sourceTree = "SOURCE_ROOT"; }; 610811262821957123FBBAA5 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_core"; path = "../../../../../modules/juce_core"; sourceTree = "SOURCE_ROOT"; }; + 625312519BED207C9047A862 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_formats.mm"; path = "../../JuceLibraryCode/include_juce_audio_formats.mm"; sourceTree = "SOURCE_ROOT"; }; 6965419522A8F4EE3C0E2F45 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 6C612817F52B969A5F16CE94 = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libArpeggiator.a; sourceTree = "BUILT_PRODUCTS_DIR"; }; 6D6B8C8C2F02E290AAFF57D1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AU_1.mm"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AU_1.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -95,7 +96,6 @@ DE6DA39AFE9EBCB7C2EBADA8 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_basics"; path = "../../../../../modules/juce_gui_basics"; sourceTree = "SOURCE_ROOT"; }; E04FB656F412B7AABBCE8391 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_extra"; path = "../../../../../modules/juce_gui_extra"; sourceTree = "SOURCE_ROOT"; }; E39E8398B8A26F3F99A37341 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AU.plist"; path = "Info-AU.plist"; sourceTree = "SOURCE_ROOT"; }; - F0CFFA787B89ADA2DEAB3044 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; F0EA8B0A23C9C5AD2DA5C3FD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_gui_extra.mm"; path = "../../JuceLibraryCode/include_juce_gui_extra.mm"; sourceTree = "SOURCE_ROOT"; }; F175178B06C128804FE8B2DD = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; F4AFD4E9AEACE1644C6E9A38 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; }; @@ -128,7 +128,6 @@ 5D388CC3880062CA7D34DAC7, 6D6B8C8C2F02E290AAFF57D1, 6ECD836FD092E8A2D3398C53, - F0CFFA787B89ADA2DEAB3044, 4CD86AD12C974AF8686B6F9E, 6FBF6878792BE8B7A8EB8C56, 992A0CD210174F34CDA91A7B, @@ -151,6 +150,7 @@ AC840D910B076A8D6E11D0E3, 6965419522A8F4EE3C0E2F45, 72397638CA72E3953957CF97, + 30BD38248938ADACB208BCE6, 79BAABFF142E737F1B69E92D, 9C24A5EC057F1DF3D288143C, 56D6FCED08A719CBB031E441, @@ -450,6 +450,7 @@ E1EAF7A85355978D529D0FAA, D0DA0BDE4746B7B12FD847CF, BF943B39DF6CAEF466FDEE9F, + 95BEE60865061CC70522E3F0, 6AAE082359758785B89D3620, 35F81D0026609F1B1F03C592, 8A0C4A63928476A51A5ABA85, @@ -479,6 +480,7 @@ D0DA0BDE4746B7B12FD847CF, 762272ABD27938B84C8E9CB1, BF943B39DF6CAEF466FDEE9F, + 95BEE60865061CC70522E3F0, 6AAE082359758785B89D3620, 35F81D0026609F1B1F03C592, 8A0C4A63928476A51A5ABA85, @@ -503,7 +505,6 @@ 479348D0BFE26AB4A7222B31, BC057D99A97434445E795118, 6A5902A0FE5470669F2F15FE, - 7362A0D6144BF4FFDE9C3F5A, 0BED0E26C94260A9831351B0, 3350A4D9C50AE7E10C742E8F, 6E6A09F94CB884C580BBA4B7, diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj index b8cc1a9935..b01c14aae1 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj @@ -442,9 +442,6 @@ true - - true - true @@ -547,9 +544,6 @@ true - - true - true @@ -604,6 +598,9 @@ true + + true + true @@ -1756,13 +1753,7 @@ true - - true - - - true - - + true @@ -1771,7 +1762,6 @@ - @@ -1920,7 +1910,6 @@ - @@ -2417,8 +2406,14 @@ - + + + + + + + diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters index 808629a673..dd944baf9d 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator_SharedCode.vcxproj.filters @@ -673,9 +673,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -784,9 +781,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -850,6 +844,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2086,20 +2083,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2116,9 +2104,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2559,9 +2544,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4050,12 +4032,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj index 6fb6f9c69b..5ec25c9675 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -540,9 +537,6 @@ true - - true - true @@ -597,6 +591,9 @@ true + + true + true @@ -1749,13 +1746,7 @@ true - - true - - - true - - + true @@ -1764,7 +1755,6 @@ - @@ -1913,7 +1903,6 @@ - @@ -2410,8 +2399,14 @@ - + + + + + + + diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters index f05d69108a..05ac0be882 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator_SharedCode.vcxproj.filters @@ -673,9 +673,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -784,9 +781,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -850,6 +844,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2086,20 +2083,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2116,9 +2104,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2559,9 +2544,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4050,12 +4032,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h index 7dbf69c208..08038a2297 100644 --- a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h @@ -235,18 +235,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - #define JUCE_QUICKTIME 0 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp deleted file mode 100644 index 183f61b238..0000000000 --- a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include diff --git a/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj b/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj index 31eb50991d..3aa23ef358 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/MacOSX/GainPlugIn.xcodeproj/project.pbxproj @@ -14,6 +14,7 @@ 46AB8BC7FA7E34563E5F005C = {isa = PBXBuildFile; fileRef = 9D6BD8DE6FC16E28FE2169F0; }; 9F2D7A648AEF91BE4D602EAF = {isa = PBXBuildFile; fileRef = F8F9E0D474403C57C8F0D211; }; 289C698FD9DC4E79275CF86D = {isa = PBXBuildFile; fileRef = F00ECA1608A6FE20D2590505; }; + 4EBB095214CB5A349E224ABA = {isa = PBXBuildFile; fileRef = 3FF83E79A175F46A651127DC; }; CE59F17AE351D2C1CE9576C3 = {isa = PBXBuildFile; fileRef = CC9362142B6BAC4A72B9C872; }; 353BAEC02C6386CEE3594B18 = {isa = PBXBuildFile; fileRef = C6B52DA1DA289B8A57DEF4F9; }; C4CDB09203A906EA7EAA2026 = {isa = PBXBuildFile; fileRef = A970D3F194D02E962DFBA282; }; @@ -32,7 +33,6 @@ 50D015AFB4853731AB8D45A3 = {isa = PBXBuildFile; fileRef = 3F96318499BA2580780842AB; }; 0AA050E349D02DAE82BECF71 = {isa = PBXBuildFile; fileRef = 11D9CFC87E75163357606DA8; }; 54C7A6FD684A1DF585D5C5CC = {isa = PBXBuildFile; fileRef = DE03327637A503DEB70DFF75; }; - 0A090C0CE0B0590DEB6B3C58 = {isa = PBXBuildFile; fileRef = 2E1227BEF17A267ED6C2419A; }; 40CB2DAFFD0EA567F118C59F = {isa = PBXBuildFile; fileRef = 6CC4D6C98E0CEFD30ABDB838; }; F718B5590B023470F3CB7EF9 = {isa = PBXBuildFile; fileRef = 4B9F0ABDCBB3C33CCC72608C; }; 1378088F158B5ACD762CEB86 = {isa = PBXBuildFile; fileRef = 00E36F5E0D67695B5C4A0FBD; }; @@ -58,10 +58,10 @@ 28754784774E7974CF215965 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 2B186C698E4525FF67DC068E = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; 2C29E6A7967E9244FC3CDE85 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; }; - 2E1227BEF17A267ED6C2419A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; 3011D9B18FF9AE4F53DBE7D6 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_basics"; path = "../../../../../modules/juce_gui_basics"; sourceTree = "SOURCE_ROOT"; }; 380D7D8ABD419DB53E620E2B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_devices.mm"; path = "../../JuceLibraryCode/include_juce_audio_devices.mm"; sourceTree = "SOURCE_ROOT"; }; 3F96318499BA2580780842AB = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_AU.r"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AU.r"; sourceTree = "SOURCE_ROOT"; }; + 3FF83E79A175F46A651127DC = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; 4B9F0ABDCBB3C33CCC72608C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_VST2.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_VST2.cpp"; sourceTree = "SOURCE_ROOT"; }; 5025F0054324107E418D3F5F = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_data_structures"; path = "../../../../../modules/juce_data_structures"; sourceTree = "SOURCE_ROOT"; }; 5E02EFCB21F6DB2235E1BF0F = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_video"; path = "../../../../../modules/juce_video"; sourceTree = "SOURCE_ROOT"; }; @@ -133,7 +133,6 @@ 3F96318499BA2580780842AB, 11D9CFC87E75163357606DA8, DE03327637A503DEB70DFF75, - 2E1227BEF17A267ED6C2419A, 6CC4D6C98E0CEFD30ABDB838, 4B9F0ABDCBB3C33CCC72608C, 00E36F5E0D67695B5C4A0FBD, @@ -158,6 +157,7 @@ 9D6BD8DE6FC16E28FE2169F0, F8F9E0D474403C57C8F0D211, F00ECA1608A6FE20D2590505, + 3FF83E79A175F46A651127DC, CC9362142B6BAC4A72B9C872, C6B52DA1DA289B8A57DEF4F9, A970D3F194D02E962DFBA282, @@ -537,6 +537,7 @@ FA171B2FEC24575B5157EB15, 46AB8BC7FA7E34563E5F005C, 289C698FD9DC4E79275CF86D, + 4EBB095214CB5A349E224ABA, CE59F17AE351D2C1CE9576C3, 353BAEC02C6386CEE3594B18, C4CDB09203A906EA7EAA2026, @@ -562,6 +563,7 @@ FA171B2FEC24575B5157EB15, 46AB8BC7FA7E34563E5F005C, 289C698FD9DC4E79275CF86D, + 4EBB095214CB5A349E224ABA, CE59F17AE351D2C1CE9576C3, 353BAEC02C6386CEE3594B18, C4CDB09203A906EA7EAA2026, @@ -591,6 +593,7 @@ 46AB8BC7FA7E34563E5F005C, 9F2D7A648AEF91BE4D602EAF, 289C698FD9DC4E79275CF86D, + 4EBB095214CB5A349E224ABA, CE59F17AE351D2C1CE9576C3, 353BAEC02C6386CEE3594B18, C4CDB09203A906EA7EAA2026, @@ -615,7 +618,6 @@ EC209736C29D8C6461375889, 8CBD735EEDDEA0B21BE313D1, 2336EC665223825FA5FB2F9D, - 0A090C0CE0B0590DEB6B3C58, 40CB2DAFFD0EA567F118C59F, 707AB353716F42ED6BC03D2A, F2BD260A57133C938B1A2ED1, diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj index 9c6177bc98..e59e36c44d 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj @@ -442,9 +442,6 @@ true - - true - true @@ -547,9 +544,6 @@ true - - true - true @@ -604,6 +598,9 @@ true + + true + true @@ -1756,13 +1753,7 @@ true - - true - - - true - - + true @@ -1771,7 +1762,6 @@ - @@ -1920,7 +1910,6 @@ - @@ -2417,8 +2406,14 @@ - + + + + + + + diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters index 01b4862866..9eef9b6755 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn_SharedCode.vcxproj.filters @@ -673,9 +673,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -784,9 +781,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -850,6 +844,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2086,20 +2083,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2116,9 +2104,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2559,9 +2544,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4050,12 +4032,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj index 38c3604f44..46334a51ef 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -540,9 +537,6 @@ true - - true - true @@ -597,6 +591,9 @@ true + + true + true @@ -1749,13 +1746,7 @@ true - - true - - - true - - + true @@ -1764,7 +1755,6 @@ - @@ -1913,7 +1903,6 @@ - @@ -2410,8 +2399,14 @@ - + + + + + + + diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters index 5e60fc7b2c..85de1fad05 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn_SharedCode.vcxproj.filters @@ -673,9 +673,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -784,9 +781,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -850,6 +844,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2086,20 +2083,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2116,9 +2104,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2559,9 +2544,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4050,12 +4032,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h index f90b551436..1d746960fb 100644 --- a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h @@ -235,18 +235,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - #define JUCE_QUICKTIME 0 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp deleted file mode 100644 index 183f61b238..0000000000 --- a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include diff --git a/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj b/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj index 835fe3efe3..f57c28d5cf 100644 --- a/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/InterAppAudioEffect/Builds/iOS/InterAppAudioEffect.xcodeproj/project.pbxproj @@ -26,7 +26,6 @@ 0E026EE54B36795F4F77515A = {isa = PBXBuildFile; fileRef = 0F3042AB2BAEE0EC5457645F; }; 84598523747D55CB777888F2 = {isa = PBXBuildFile; fileRef = 77951CA64AAA0680E6D1E12D; }; 4F7A927DB4DA2E1E97DA74A4 = {isa = PBXBuildFile; fileRef = BF84B6C400483E92E912D64D; }; - CDB1A4C456EB24F3ED5B0652 = {isa = PBXBuildFile; fileRef = A8C00FF5E11897C4FC77F7B8; }; 5E4611B5666DE0EA4AEB3085 = {isa = PBXBuildFile; fileRef = 1867AF96FAD8E984651D1CEF; }; A4703B30F19268B6B572B97D = {isa = PBXBuildFile; fileRef = 9A4973AD24CF4666139E1AEC; }; 4CBDEF6C6472EE15D7D2C3FA = {isa = PBXBuildFile; fileRef = 560FFA3E4AA82A8E33CB2874; }; @@ -64,7 +63,6 @@ 82F310E23852E0C002F5A2D1 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 9A4973AD24CF4666139E1AEC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_processors.mm"; path = "../../JuceLibraryCode/include_juce_audio_processors.mm"; sourceTree = "SOURCE_ROOT"; }; 9C809DD426D6B660393427D4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SimpleMeter.h; path = ../../Source/SimpleMeter.h; sourceTree = "SOURCE_ROOT"; }; - A8C00FF5E11897C4FC77F7B8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; AD9B42ED650058295A747510 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; }; B3D01A391D4DF11709AE5688 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; }; B69C94CF64688C5270D8122C = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; @@ -111,7 +109,6 @@ 0F3042AB2BAEE0EC5457645F, 77951CA64AAA0680E6D1E12D, BF84B6C400483E92E912D64D, - A8C00FF5E11897C4FC77F7B8, 1867AF96FAD8E984651D1CEF, 9A4973AD24CF4666139E1AEC, 560FFA3E4AA82A8E33CB2874, @@ -361,7 +358,6 @@ 67B1C010E9354F24FE07FD47, 0E026EE54B36795F4F77515A, 84598523747D55CB777888F2, - CDB1A4C456EB24F3ED5B0652, 5E4611B5666DE0EA4AEB3085, A4703B30F19268B6B572B97D, 4CBDEF6C6472EE15D7D2C3FA, diff --git a/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp b/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp deleted file mode 100644 index 183f61b238..0000000000 --- a/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj b/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj index 48aa93177b..d9d9800768 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/MacOSX/MultiOutSynth.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ DB4D2ED38B12372CBA084588 = {isa = PBXBuildFile; fileRef = 759F7DE2DC579FE827D3048E; }; 1F6FFD1131767D8AB101550A = {isa = PBXBuildFile; fileRef = 2E0C4FC468B849B9262CE17F; }; 0F147A6316F706269C538017 = {isa = PBXBuildFile; fileRef = 2CC4531721B860EC2CFFC5CA; }; + 99DD65022E824419E32C779D = {isa = PBXBuildFile; fileRef = 875372AC50458E04393C3ED2; }; 3353DDE09726F4D299D82B62 = {isa = PBXBuildFile; fileRef = 1803EE52393C5255A1C51132; }; 578C165E2B9B13D3889275F3 = {isa = PBXBuildFile; fileRef = 36B5C6B3069E8603220A9E7E; }; 62B6FB220AF68EBA704B9D4E = {isa = PBXBuildFile; fileRef = 4287FC6B2DA51D6C65604731; }; @@ -35,7 +36,6 @@ F7A7AF4D7457BF44C59DB1B4 = {isa = PBXBuildFile; fileRef = D9C657BAED4B772E275451FC; }; EA268FCD2AD9B096A5D0DEDC = {isa = PBXBuildFile; fileRef = F25BF846A74376674487733A; }; 1D682E3A6918200227FF11F6 = {isa = PBXBuildFile; fileRef = 86DFC0B5916DA1A810F1BF88; }; - 3876C3E2CE4035FAC46C9766 = {isa = PBXBuildFile; fileRef = 9291F7C37BBA40A0D79F21F8; }; 71F277487BA0E866AEDEA723 = {isa = PBXBuildFile; fileRef = E5DAC0FAA2FE03D325EC240E; }; 2B16343B8C3EAC17CD3128B3 = {isa = PBXBuildFile; fileRef = 28B890782C541438C80A7A4E; }; 50D72B5486E40902D2129644 = {isa = PBXBuildFile; fileRef = 27B3DF9F5D0BFC76CFCDFF75; }; @@ -79,7 +79,6 @@ 5FA3746FDF65FC12689CC472 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_core"; path = "../../../../../modules/juce_core"; sourceTree = "SOURCE_ROOT"; }; 614BDB6E04A50D791DF8A237 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MultiOutSynth.cpp; path = ../../Source/MultiOutSynth.cpp; sourceTree = "SOURCE_ROOT"; }; 623B11E55A0D25A3511AB902 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MultiOutSynth.vst; sourceTree = "BUILT_PRODUCTS_DIR"; }; - 641C08407D49F28BD9FDB843 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-VST3.plist"; path = "Info-VST3.plist"; sourceTree = "SOURCE_ROOT"; }; 6616DECBDFF085579A6E63F9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_devices.mm"; path = "../../JuceLibraryCode/include_juce_audio_devices.mm"; sourceTree = "SOURCE_ROOT"; }; 68DBE6FCEAC0673B6DDE8F0A = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 69E32FCFD434780251A56543 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_processors"; path = "../../../../../modules/juce_audio_processors"; sourceTree = "SOURCE_ROOT"; }; @@ -88,13 +87,14 @@ 788C7CD1E0B328730237A319 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_formats.mm"; path = "../../JuceLibraryCode/include_juce_audio_formats.mm"; sourceTree = "SOURCE_ROOT"; }; 823176BBEBAB0ABC7DBA2817 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; }; 86DFC0B5916DA1A810F1BF88 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AU_2.mm"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AU_2.mm"; sourceTree = "SOURCE_ROOT"; }; + 875372AC50458E04393C3ED2 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; 8CA216104C881963A428F228 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_gui_extra.mm"; path = "../../JuceLibraryCode/include_juce_gui_extra.mm"; sourceTree = "SOURCE_ROOT"; }; 8F6829961A0F50B8265BD9CB = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; DA5881053EBA06F96F1D1CF3 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MultiOutSynth.vst3; sourceTree = "BUILT_PRODUCTS_DIR"; }; 4E98D6E65CE3E073DB1F9113 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MultiOutSynth.aaxplugin; sourceTree = "BUILT_PRODUCTS_DIR"; }; + 641C08407D49F28BD9FDB843 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-VST3.plist"; path = "Info-VST3.plist"; sourceTree = "SOURCE_ROOT"; }; 7F0C0DB27B5F3B0E118AECEE = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_events"; path = "../../../../../modules/juce_events"; sourceTree = "SOURCE_ROOT"; }; 918ECC9726F9792AEA2BF389 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; - 9291F7C37BBA40A0D79F21F8 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; 93EF1E5E3685F5C2237CF5A4 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_processors.mm"; path = "../../JuceLibraryCode/include_juce_audio_processors.mm"; sourceTree = "SOURCE_ROOT"; }; 9A34D18E2F6CFC64544D5256 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; AB9D444F1580EABA77ADE4AF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_cryptography.mm"; path = "../../JuceLibraryCode/include_juce_cryptography.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -148,7 +148,6 @@ D9C657BAED4B772E275451FC, F25BF846A74376674487733A, 86DFC0B5916DA1A810F1BF88, - 9291F7C37BBA40A0D79F21F8, E5DAC0FAA2FE03D325EC240E, 28B890782C541438C80A7A4E, 27B3DF9F5D0BFC76CFCDFF75, @@ -174,6 +173,7 @@ 759F7DE2DC579FE827D3048E, 2E0C4FC468B849B9262CE17F, 2CC4531721B860EC2CFFC5CA, + 875372AC50458E04393C3ED2, 1803EE52393C5255A1C51132, 36B5C6B3069E8603220A9E7E, 4287FC6B2DA51D6C65604731, @@ -635,6 +635,7 @@ 4C5BD07CD6009F527FA6A300, DB4D2ED38B12372CBA084588, 0F147A6316F706269C538017, + 99DD65022E824419E32C779D, 3353DDE09726F4D299D82B62, 578C165E2B9B13D3889275F3, 62B6FB220AF68EBA704B9D4E, @@ -660,6 +661,7 @@ 4C5BD07CD6009F527FA6A300, DB4D2ED38B12372CBA084588, 0F147A6316F706269C538017, + 99DD65022E824419E32C779D, 3353DDE09726F4D299D82B62, 578C165E2B9B13D3889275F3, 62B6FB220AF68EBA704B9D4E, @@ -685,6 +687,7 @@ 4C5BD07CD6009F527FA6A300, DB4D2ED38B12372CBA084588, 0F147A6316F706269C538017, + 99DD65022E824419E32C779D, 3353DDE09726F4D299D82B62, 578C165E2B9B13D3889275F3, 62B6FB220AF68EBA704B9D4E, @@ -714,6 +717,7 @@ DB4D2ED38B12372CBA084588, 1F6FFD1131767D8AB101550A, 0F147A6316F706269C538017, + 99DD65022E824419E32C779D, 3353DDE09726F4D299D82B62, 578C165E2B9B13D3889275F3, 62B6FB220AF68EBA704B9D4E, @@ -739,7 +743,6 @@ 65A5C6623671A0666C26B8AC, A4D8DECEE8DF41A1726F4E71, 9288531855108E558244BBC8, - 3876C3E2CE4035FAC46C9766, 71F277487BA0E866AEDEA723, 87C64FC0E741E5A2D86FE380, 3E7393CF2C030D14CBE01623, diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj index 6f885cefb5..20fa469172 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj @@ -442,9 +442,6 @@ true - - true - true @@ -547,9 +544,6 @@ true - - true - true @@ -604,6 +598,9 @@ true + + true + true @@ -1756,13 +1753,7 @@ true - - true - - - true - - + true @@ -1772,7 +1763,6 @@ - @@ -1921,7 +1911,6 @@ - @@ -2418,8 +2407,14 @@ - + + + + + + + diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters index 197c88a502..e125fdf0a6 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_SharedCode.vcxproj.filters @@ -676,9 +676,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -787,9 +784,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -853,6 +847,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2089,20 +2086,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2122,9 +2110,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2565,9 +2550,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4056,12 +4038,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj index 61b5e7dad5..63dd069c40 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -540,9 +537,6 @@ true - - true - true @@ -597,6 +591,9 @@ true + + true + true @@ -1749,13 +1746,7 @@ true - - true - - - true - - + true @@ -1765,7 +1756,6 @@ - @@ -1914,7 +1904,6 @@ - @@ -2411,8 +2400,14 @@ - + + + + + + + diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters index cc7f97f1f7..99f815a5d4 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_SharedCode.vcxproj.filters @@ -676,9 +676,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -787,9 +784,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -853,6 +847,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2089,20 +2086,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2122,9 +2110,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2565,9 +2550,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4056,12 +4038,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h index 5857391781..629e3b3eeb 100644 --- a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h @@ -235,18 +235,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - #define JUCE_QUICKTIME 0 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp deleted file mode 100644 index 183f61b238..0000000000 --- a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include diff --git a/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj b/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj index fc89482e46..21cb3644ea 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/MacOSX/NoiseGate.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ C8E62BFBF82AAA3D808055D9 = {isa = PBXBuildFile; fileRef = 943B88ECAC8C127556319A56; }; D8B83A6B9A0149E776E8DCDB = {isa = PBXBuildFile; fileRef = E3DD9EFD8E27134F5118B406; }; 235C5CD9733098A68F4E9AEA = {isa = PBXBuildFile; fileRef = 552283D8644A04B734537064; }; + 5D4F2D1090F1C61E41B0BEA9 = {isa = PBXBuildFile; fileRef = 68F5FE8B180FBB3B19DCE1FD; }; 2515D42B55FD9E455C772B71 = {isa = PBXBuildFile; fileRef = E90DDDD9070BC5C48FFFD5A3; }; 44A5A26F142FFD23304A8A19 = {isa = PBXBuildFile; fileRef = 0CBCCBEC3C5EFD346E5894F3; }; 22E029B69DCF0227A2F1C4C0 = {isa = PBXBuildFile; fileRef = 682D8F418F4F2A594B675B04; }; @@ -34,7 +35,6 @@ 79BC10F4ED35FB8D3825875B = {isa = PBXBuildFile; fileRef = A7B226F7042869A27979FAC5; }; CCF9B996371B1EF84E0AE70D = {isa = PBXBuildFile; fileRef = E72328B0E774674FE8D148BB; }; 9DB6D293D7A87DD9F076A91E = {isa = PBXBuildFile; fileRef = 02E27C34FC6B2BB2E632A2FB; }; - 42F0BBAA6A93335ACFA2D9E1 = {isa = PBXBuildFile; fileRef = DFF24406756A99ECC98673E5; }; 3A09C2C8913DA7AC50833562 = {isa = PBXBuildFile; fileRef = 3693D664DAEB199CA6DD0EA0; }; 48AE348A6632D354F84A01EA = {isa = PBXBuildFile; fileRef = A0BE76EB59F9125B30C683EB; }; 0CCB1B4282F141EAD8A7A4BD = {isa = PBXBuildFile; fileRef = 7645E5A165FB46FBB8A142A7; }; @@ -71,36 +71,36 @@ 625CDFFCC5CC00D8967C48B1 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; 6742C94F2A81B0490E896452 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_data_structures"; path = "../../../../../modules/juce_data_structures"; sourceTree = "SOURCE_ROOT"; }; 682D8F418F4F2A594B675B04 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; + 68F5FE8B180FBB3B19DCE1FD = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; 6A25D165EFEF09D036B36B91 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-VST.plist"; path = "Info-VST.plist"; sourceTree = "SOURCE_ROOT"; }; 7645E5A165FB46FBB8A142A7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_VST3.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_VST3.cpp"; sourceTree = "SOURCE_ROOT"; }; 7A6A889A32581FBE73645356 = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; 923C77ACDDA4CB97B0D77EBC = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_data_structures.mm"; path = "../../JuceLibraryCode/include_juce_data_structures.mm"; sourceTree = "SOURCE_ROOT"; }; + 950421F9EBDF9FA98F88C23B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_devices.mm"; path = "../../JuceLibraryCode/include_juce_audio_devices.mm"; sourceTree = "SOURCE_ROOT"; }; + 9F27CCF7CF691C619EF02FC9 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_formats"; path = "../../../../../modules/juce_audio_formats"; sourceTree = "SOURCE_ROOT"; }; + A0BE76EB59F9125B30C683EB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_VST2.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_VST2.cpp"; sourceTree = "SOURCE_ROOT"; }; + A7B226F7042869A27979FAC5 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_AU.r"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AU.r"; sourceTree = "SOURCE_ROOT"; }; + C634B641AD1E428A4A956B8E = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_graphics"; path = "../../../../../modules/juce_graphics"; sourceTree = "SOURCE_ROOT"; }; + D45FD3CBDD0706C7290324F7 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_basics"; path = "../../../../../modules/juce_audio_basics"; sourceTree = "SOURCE_ROOT"; }; E39A67D3DE5B2F2092769CE7 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NoiseGate.vst3; sourceTree = "BUILT_PRODUCTS_DIR"; }; 9C62742BCA5D3C9524DE3029 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NoiseGate.aaxplugin; sourceTree = "BUILT_PRODUCTS_DIR"; }; 8D84B63F343660AEE31FD166 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NoiseGate.component; sourceTree = "BUILT_PRODUCTS_DIR"; }; 943B88ECAC8C127556319A56 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; - 950421F9EBDF9FA98F88C23B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_devices.mm"; path = "../../JuceLibraryCode/include_juce_audio_devices.mm"; sourceTree = "SOURCE_ROOT"; }; - 9F27CCF7CF691C619EF02FC9 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_formats"; path = "../../../../../modules/juce_audio_formats"; sourceTree = "SOURCE_ROOT"; }; - A0BE76EB59F9125B30C683EB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_VST2.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_VST2.cpp"; sourceTree = "SOURCE_ROOT"; }; A2563ADBA0761C752C302077 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; A2932FACF83001AFD0656467 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_events"; path = "../../../../../modules/juce_events"; sourceTree = "SOURCE_ROOT"; }; A35FA240D1B9B62278997E63 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = System/Library/Frameworks/CoreMIDI.framework; sourceTree = SDKROOT; }; - A7B226F7042869A27979FAC5 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_AU.r"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AU.r"; sourceTree = "SOURCE_ROOT"; }; AC6AA120B434B2AAE1A10CCD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_cryptography.mm"; path = "../../JuceLibraryCode/include_juce_cryptography.mm"; sourceTree = "SOURCE_ROOT"; }; AD0976A5426F78E6C7B67D2A = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_graphics.mm"; path = "../../JuceLibraryCode/include_juce_graphics.mm"; sourceTree = "SOURCE_ROOT"; }; B15F50973CE5D365D77D282B = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libNoiseGate.a; sourceTree = "BUILT_PRODUCTS_DIR"; }; B6567C791BE962F993B78C02 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; BCC02F39B2F24479D8F6DB50 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-VST3.plist"; path = "Info-VST3.plist"; sourceTree = "SOURCE_ROOT"; }; BFD1E323CFA0C31373F17005 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; - C634B641AD1E428A4A956B8E = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_graphics"; path = "../../../../../modules/juce_graphics"; sourceTree = "SOURCE_ROOT"; }; D30F58A3C82A7C61E6768EBE = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AU.plist"; path = "Info-AU.plist"; sourceTree = "SOURCE_ROOT"; }; - D45FD3CBDD0706C7290324F7 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_basics"; path = "../../../../../modules/juce_audio_basics"; sourceTree = "SOURCE_ROOT"; }; D59FAAF31C1C533C7536C9FF = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_extra"; path = "../../../../../modules/juce_gui_extra"; sourceTree = "SOURCE_ROOT"; }; D8A92F0AAC8A9BB34F3259EA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_video.mm"; path = "../../JuceLibraryCode/include_juce_video.mm"; sourceTree = "SOURCE_ROOT"; }; DB1F5A7A4070A941E1F533C7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_events.mm"; path = "../../JuceLibraryCode/include_juce_events.mm"; sourceTree = "SOURCE_ROOT"; }; DFB4100560378C66ACD8BFAA = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_basics"; path = "../../../../../modules/juce_gui_basics"; sourceTree = "SOURCE_ROOT"; }; DFC0A7EDD875F762B5B595AF = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_opengl.mm"; path = "../../JuceLibraryCode/include_juce_opengl.mm"; sourceTree = "SOURCE_ROOT"; }; - DFF24406756A99ECC98673E5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; E3DD9EFD8E27134F5118B406 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; E6F2E6774BE6E475B513B610 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AAX.mm"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AAX.mm"; sourceTree = "SOURCE_ROOT"; }; E72328B0E774674FE8D148BB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AU_1.mm"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AU_1.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -139,7 +139,6 @@ A7B226F7042869A27979FAC5, E72328B0E774674FE8D148BB, 02E27C34FC6B2BB2E632A2FB, - DFF24406756A99ECC98673E5, 3693D664DAEB199CA6DD0EA0, A0BE76EB59F9125B30C683EB, 7645E5A165FB46FBB8A142A7, @@ -165,6 +164,7 @@ 943B88ECAC8C127556319A56, E3DD9EFD8E27134F5118B406, 552283D8644A04B734537064, + 68F5FE8B180FBB3B19DCE1FD, E90DDDD9070BC5C48FFFD5A3, 0CBCCBEC3C5EFD346E5894F3, 682D8F418F4F2A594B675B04, @@ -626,6 +626,7 @@ 059D9D5EBC6026109D86F9EA, C8E62BFBF82AAA3D808055D9, 235C5CD9733098A68F4E9AEA, + 5D4F2D1090F1C61E41B0BEA9, 2515D42B55FD9E455C772B71, 44A5A26F142FFD23304A8A19, 22E029B69DCF0227A2F1C4C0, @@ -651,6 +652,7 @@ 059D9D5EBC6026109D86F9EA, C8E62BFBF82AAA3D808055D9, 235C5CD9733098A68F4E9AEA, + 5D4F2D1090F1C61E41B0BEA9, 2515D42B55FD9E455C772B71, 44A5A26F142FFD23304A8A19, 22E029B69DCF0227A2F1C4C0, @@ -676,6 +678,7 @@ 059D9D5EBC6026109D86F9EA, C8E62BFBF82AAA3D808055D9, 235C5CD9733098A68F4E9AEA, + 5D4F2D1090F1C61E41B0BEA9, 2515D42B55FD9E455C772B71, 44A5A26F142FFD23304A8A19, 22E029B69DCF0227A2F1C4C0, @@ -705,6 +708,7 @@ C8E62BFBF82AAA3D808055D9, D8B83A6B9A0149E776E8DCDB, 235C5CD9733098A68F4E9AEA, + 5D4F2D1090F1C61E41B0BEA9, 2515D42B55FD9E455C772B71, 44A5A26F142FFD23304A8A19, 22E029B69DCF0227A2F1C4C0, @@ -729,7 +733,6 @@ CDBA6E75F1D2EF3B7CADC1B6, 24B080F646E530681EBB4EC6, 670DE365F798A49F8671939B, - 42F0BBAA6A93335ACFA2D9E1, 3A09C2C8913DA7AC50833562, B3A87347F345BB3E6A03B992, 6A04758A092EA7DAD812DE0C, diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj index 1656a0b2e1..8c81f91956 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj @@ -442,9 +442,6 @@ true - - true - true @@ -547,9 +544,6 @@ true - - true - true @@ -604,6 +598,9 @@ true + + true + true @@ -1756,13 +1753,7 @@ true - - true - - - true - - + true @@ -1771,7 +1762,6 @@ - @@ -1920,7 +1910,6 @@ - @@ -2417,8 +2406,14 @@ - + + + + + + + diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters index fc938a672c..9233a6ff33 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_SharedCode.vcxproj.filters @@ -673,9 +673,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -784,9 +781,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -850,6 +844,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2086,20 +2083,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2116,9 +2104,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2559,9 +2544,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4050,12 +4032,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj index a5f1ec7328..e3488d0c1b 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -540,9 +537,6 @@ true - - true - true @@ -597,6 +591,9 @@ true + + true + true @@ -1749,13 +1746,7 @@ true - - true - - - true - - + true @@ -1764,7 +1755,6 @@ - @@ -1913,7 +1903,6 @@ - @@ -2410,8 +2399,14 @@ - + + + + + + + diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters index abd9fb8ac8..46c8d49477 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_SharedCode.vcxproj.filters @@ -673,9 +673,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -784,9 +781,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -850,6 +844,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2086,20 +2083,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2116,9 +2104,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2559,9 +2544,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4050,12 +4032,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h index 693a3526a0..78542a2d27 100644 --- a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h @@ -235,18 +235,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - #define JUCE_QUICKTIME 0 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp deleted file mode 100644 index 183f61b238..0000000000 --- a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include diff --git a/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile b/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile index 53a6892ae3..0ab79bae06 100644 --- a/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile +++ b/examples/PlugInSamples/Surround/Builds/LinuxMakefile/Makefile @@ -87,7 +87,6 @@ OBJECTS_SHARED_CODE := \ $(JUCE_OBJDIR)/include_juce_audio_basics_8a4e984a.o \ $(JUCE_OBJDIR)/include_juce_audio_devices_63111d02.o \ $(JUCE_OBJDIR)/include_juce_audio_formats_15f82001.o \ - $(JUCE_OBJDIR)/include_juce_audio_plugin_client_utils_e32edaee.o \ $(JUCE_OBJDIR)/include_juce_audio_processors_10c03666.o \ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o \ $(JUCE_OBJDIR)/include_juce_cryptography_8cb807a8.o \ @@ -145,11 +144,6 @@ $(JUCE_OBJDIR)/include_juce_audio_formats_15f82001.o: ../../JuceLibraryCode/incl @echo "Compiling include_juce_audio_formats.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<" -$(JUCE_OBJDIR)/include_juce_audio_plugin_client_utils_e32edaee.o: ../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp - -$(V_AT)mkdir -p $(JUCE_OBJDIR) - @echo "Compiling include_juce_audio_plugin_client_utils.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<" - $(JUCE_OBJDIR)/include_juce_audio_processors_10c03666.o: ../../JuceLibraryCode/include_juce_audio_processors.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) @echo "Compiling include_juce_audio_processors.cpp" diff --git a/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj b/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj index 4b89e6e49f..96b0315bf0 100644 --- a/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj +++ b/examples/PlugInSamples/Surround/Builds/MacOSX/Surround.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 3A9DA4E9002E62503BE11891 = {isa = PBXBuildFile; fileRef = D8FC94038AF7B050BBADC027; }; 029B18BC4295AE3360F6EC0A = {isa = PBXBuildFile; fileRef = A70EECB9198195AFDADBC672; }; 96D124AA5C4960B5F465583F = {isa = PBXBuildFile; fileRef = 7501D91CCCDA5C9EF2FD11FE; }; + 67209FE1F27314836E825395 = {isa = PBXBuildFile; fileRef = A8B6DCF7085838203FE781EA; }; 471B0DAB418CA9BF51D3567F = {isa = PBXBuildFile; fileRef = 253FCE81AE9E1892C73442D6; }; 985B36DFE9EF062E1E004089 = {isa = PBXBuildFile; fileRef = 0693085A1667BC47ED3617D6; }; A17BCBEF822B10243D4FC7CF = {isa = PBXBuildFile; fileRef = B27D6516C9B3775F094E3FB8; }; @@ -34,7 +35,6 @@ 23725124430EA1F38813F7E7 = {isa = PBXBuildFile; fileRef = B7AEFBCEF0B40E7A0B82BF09; }; FD44D2CA47FCDF0FD2CB616A = {isa = PBXBuildFile; fileRef = 2424E7A9AD711B1C265B4C65; }; E91D828343243E9D44F7061C = {isa = PBXBuildFile; fileRef = 20F20F0F4198C1C360F27DCC; }; - 343A4660CB674F1FD442CBAB = {isa = PBXBuildFile; fileRef = 3F3CE19DD83C2D516EEECB06; }; 7C1CD234D93B496AD3B03772 = {isa = PBXBuildFile; fileRef = 391B816C0D4D54B7964B4059; }; 1A101C20D0AC821CF74E2024 = {isa = PBXBuildFile; fileRef = 3029DE6EE1F42700F4B6592C; }; 2898D4AE7B6ABC66B813AADA = {isa = PBXBuildFile; fileRef = 852EC4107648F2C474985AC3; }; @@ -63,7 +63,6 @@ 3029DE6EE1F42700F4B6592C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_VST2.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_VST2.cpp"; sourceTree = "SOURCE_ROOT"; }; 391B816C0D4D54B7964B4059 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_VST_utils.mm"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_VST_utils.mm"; sourceTree = "SOURCE_ROOT"; }; 3E67AEA9A0FD3291E8C1B486 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-VST3.plist"; path = "Info-VST3.plist"; sourceTree = "SOURCE_ROOT"; }; - 3F3CE19DD83C2D516EEECB06 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; 407B6CB925E1B5FAA7E3914E = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; }; 499621E04BA626F64944B0D4 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Surround.vst; sourceTree = "BUILT_PRODUCTS_DIR"; }; 4F1AF1D850DBBFB581EAE294 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SurroundProcessor.cpp; path = ../../Source/SurroundProcessor.cpp; sourceTree = "SOURCE_ROOT"; }; @@ -77,6 +76,7 @@ 6EAE7594B2D797B40FF78913 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_devices"; path = "../../../../../modules/juce_audio_devices"; sourceTree = "SOURCE_ROOT"; }; 7501D91CCCDA5C9EF2FD11FE = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 779B2DEAEE0E57CE5E08FC15 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppConfig.h; path = ../../JuceLibraryCode/AppConfig.h; sourceTree = "SOURCE_ROOT"; }; + 7B09ECEA92A79A22173B9A1A = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; 7D4D0AC458E2024CE17C25BD = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_opengl.mm"; path = "../../JuceLibraryCode/include_juce_opengl.mm"; sourceTree = "SOURCE_ROOT"; }; 7DD2ABC793C377F7943052D1 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_cryptography.mm"; path = "../../JuceLibraryCode/include_juce_cryptography.mm"; sourceTree = "SOURCE_ROOT"; }; 84CA5C42C631465D83A10889 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_data_structures.mm"; path = "../../JuceLibraryCode/include_juce_data_structures.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -84,18 +84,18 @@ 8F68B92E44C5DF8D2DEEB347 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 918568B9D08B50BBF607304A = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_cryptography"; path = "../../../../../modules/juce_cryptography"; sourceTree = "SOURCE_ROOT"; }; 924EB465BCBA5BE8D3ABD3D3 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_opengl"; path = "../../../../../modules/juce_opengl"; sourceTree = "SOURCE_ROOT"; }; - 9F7EDA3A32A7919E8CF32487 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_basics.mm"; path = "../../JuceLibraryCode/include_juce_audio_basics.mm"; sourceTree = "SOURCE_ROOT"; }; A70EECB9198195AFDADBC672 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; - C0A5E837710E3B35036FAB37 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; + A8B6DCF7085838203FE781EA = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; D035D1C2F16559D0BB4F80D0 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Surround.vst3; sourceTree = "BUILT_PRODUCTS_DIR"; }; C3AF8BFE5557DE30A253564C = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Surround.aaxplugin; sourceTree = "BUILT_PRODUCTS_DIR"; }; 79FE5C3ECC20E6354609E715 = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Surround.component; sourceTree = "BUILT_PRODUCTS_DIR"; }; - 7B09ECEA92A79A22173B9A1A = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; + 9F7EDA3A32A7919E8CF32487 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_basics.mm"; path = "../../JuceLibraryCode/include_juce_audio_basics.mm"; sourceTree = "SOURCE_ROOT"; }; A0BFEED17AF0E43A7401189C = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Surround.entitlements; path = Surround.entitlements; sourceTree = "SOURCE_ROOT"; }; B1598EA4A72641A6F4B97446 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_formats.mm"; path = "../../JuceLibraryCode/include_juce_audio_formats.mm"; sourceTree = "SOURCE_ROOT"; }; B27D6516C9B3775F094E3FB8 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; B308A76D9F181930FD48B861 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; B7AEFBCEF0B40E7A0B82BF09 = {isa = PBXFileReference; lastKnownFileType = file.r; name = "include_juce_audio_plugin_client_AU.r"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AU.r"; sourceTree = "SOURCE_ROOT"; }; + C0A5E837710E3B35036FAB37 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; C26ABA1B100809876F503588 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SurroundEditor.h; path = ../../Source/SurroundEditor.h; sourceTree = "SOURCE_ROOT"; }; C274C15D68390C86200C523E = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_formats"; path = "../../../../../modules/juce_audio_formats"; sourceTree = "SOURCE_ROOT"; }; C4FF5C510C969A5FD3F29A3D = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_core"; path = "../../../../../modules/juce_core"; sourceTree = "SOURCE_ROOT"; }; @@ -141,7 +141,6 @@ B7AEFBCEF0B40E7A0B82BF09, 2424E7A9AD711B1C265B4C65, 20F20F0F4198C1C360F27DCC, - 3F3CE19DD83C2D516EEECB06, 391B816C0D4D54B7964B4059, 3029DE6EE1F42700F4B6592C, 852EC4107648F2C474985AC3, @@ -167,6 +166,7 @@ D8FC94038AF7B050BBADC027, A70EECB9198195AFDADBC672, 7501D91CCCDA5C9EF2FD11FE, + A8B6DCF7085838203FE781EA, 253FCE81AE9E1892C73442D6, 0693085A1667BC47ED3617D6, B27D6516C9B3775F094E3FB8, @@ -638,6 +638,7 @@ 1F5789B6D2334580C0F3D9AE, 3A9DA4E9002E62503BE11891, 96D124AA5C4960B5F465583F, + 67209FE1F27314836E825395, 471B0DAB418CA9BF51D3567F, 985B36DFE9EF062E1E004089, A17BCBEF822B10243D4FC7CF, @@ -663,6 +664,7 @@ 1F5789B6D2334580C0F3D9AE, 3A9DA4E9002E62503BE11891, 96D124AA5C4960B5F465583F, + 67209FE1F27314836E825395, 471B0DAB418CA9BF51D3567F, 985B36DFE9EF062E1E004089, A17BCBEF822B10243D4FC7CF, @@ -688,6 +690,7 @@ 1F5789B6D2334580C0F3D9AE, 3A9DA4E9002E62503BE11891, 96D124AA5C4960B5F465583F, + 67209FE1F27314836E825395, 471B0DAB418CA9BF51D3567F, 985B36DFE9EF062E1E004089, A17BCBEF822B10243D4FC7CF, @@ -717,6 +720,7 @@ 3A9DA4E9002E62503BE11891, 029B18BC4295AE3360F6EC0A, 96D124AA5C4960B5F465583F, + 67209FE1F27314836E825395, 471B0DAB418CA9BF51D3567F, 985B36DFE9EF062E1E004089, A17BCBEF822B10243D4FC7CF, @@ -741,7 +745,6 @@ DF36C21AE8098DDBBA721398, 7E12C0915AEC650E0F0DE75A, 3FA71C26E0ADDB94DA622288, - 343A4660CB674F1FD442CBAB, 7C1CD234D93B496AD3B03772, 1857E8A1B9272919D6452192, CD5DDE43DC460ED00610018C, diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj index ae42ef6401..0fb6a31024 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -540,9 +537,6 @@ true - - true - true @@ -597,6 +591,9 @@ true + + true + true @@ -1749,13 +1746,7 @@ true - - true - - - true - - + true @@ -1764,7 +1755,6 @@ - @@ -1914,7 +1904,6 @@ - @@ -2411,8 +2400,14 @@ - + + + + + + + diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters index c9b76f1c83..af846d9fa0 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_SharedCode.vcxproj.filters @@ -673,9 +673,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -784,9 +781,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -850,6 +844,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2086,20 +2083,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2116,9 +2104,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2562,9 +2547,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4053,12 +4035,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj index 78325100a0..7b2574df05 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -540,9 +537,6 @@ true - - true - true @@ -597,6 +591,9 @@ true + + true + true @@ -1749,13 +1746,7 @@ true - - true - - - true - - + true @@ -1764,7 +1755,6 @@ - @@ -1914,7 +1904,6 @@ - @@ -2411,8 +2400,14 @@ - + + + + + + + diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters index b998603797..835e424b85 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_SharedCode.vcxproj.filters @@ -673,9 +673,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -784,9 +781,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -850,6 +844,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2086,20 +2083,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2116,9 +2104,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2562,9 +2547,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -4053,12 +4035,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h index efac35f7a0..5f6397a551 100644 --- a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h @@ -235,18 +235,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - #define JUCE_QUICKTIME 0 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/examples/PlugInSamples/Surround/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp b/examples/PlugInSamples/Surround/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp deleted file mode 100644 index 183f61b238..0000000000 --- a/examples/PlugInSamples/Surround/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj index 31a5374b74..e69788847e 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -574,6 +571,9 @@ true + + true + true @@ -1822,7 +1822,6 @@ - diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters index 861c25d16c..2034f9a1eb 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample_App.vcxproj.filters @@ -634,9 +634,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -796,6 +793,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2418,9 +2418,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj index ca5fba37bd..50842ac9f2 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -573,6 +570,9 @@ true + + true + true @@ -1821,7 +1821,6 @@ - diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters index df4a2644af..4defd1e684 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample_App.vcxproj.filters @@ -634,9 +634,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -796,6 +793,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2418,9 +2418,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt index 4eade5dbb3..56411b5eb3 100644 --- a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt +++ b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt @@ -269,8 +269,6 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp" "../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h" - "../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp" - "../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp" "../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp" @@ -353,6 +351,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/ComponentBase.h" "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/MusicDeviceBase.cpp" "../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/MusicDeviceBase.h" + "../../../../../modules/juce_audio_plugin_client/AU/juce_AU_Shared.h" "../../../../../modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm" "../../../../../modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm" "../../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h" @@ -388,7 +387,6 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_RTAS_utils.cpp" "../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_RTAS_utils.mm" "../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_Standalone.cpp" - "../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_utils.cpp" "../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_VST_utils.mm" "../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_VST2.cpp" "../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_VST3.cpp" @@ -483,6 +481,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/containers/juce_DynamicObject.h" "../../../../../modules/juce_core/containers/juce_ElementComparator.h" "../../../../../modules/juce_core/containers/juce_HashMap.h" + "../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" "../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" "../../../../../modules/juce_core/containers/juce_ListenerList.cpp" "../../../../../modules/juce_core/containers/juce_ListenerList.h" @@ -1255,7 +1254,6 @@ add_library( ${BINARY_NAME} "../../../JuceLibraryCode/include_juce_audio_devices.cpp" "../../../JuceLibraryCode/include_juce_audio_formats.cpp" "../../../JuceLibraryCode/include_juce_audio_plugin_client_Standalone.cpp" - "../../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp" "../../../JuceLibraryCode/include_juce_audio_processors.cpp" "../../../JuceLibraryCode/include_juce_audio_utils.cpp" "../../../JuceLibraryCode/include_juce_core.cpp" @@ -1507,8 +1505,6 @@ set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/ju set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1591,6 +1587,7 @@ set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/ set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/ComponentBase.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/MusicDeviceBase.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/CoreAudioUtilityClasses/MusicDeviceBase.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/juce_AU_Shared.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_plugin_client/AU/juce_AUv3_Wrapper.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode_Header.h" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1626,7 +1623,6 @@ set_source_files_properties("../../../../../modules/juce_audio_plugin_client/juc set_source_files_properties("../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_RTAS_utils.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_RTAS_utils.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_Standalone.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_utils.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_VST_utils.mm" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_VST2.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_plugin_client/juce_audio_plugin_client_VST3.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1721,6 +1717,7 @@ set_source_files_properties("../../../../../modules/juce_core/containers/juce_Dy set_source_files_properties("../../../../../modules/juce_core/containers/juce_DynamicObject.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ElementComparator.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/audio plugin demo/Builds/Android/app/build.gradle b/examples/audio plugin demo/Builds/Android/app/build.gradle index e8fddb0e47..46d36426c3 100644 --- a/examples/audio plugin demo/Builds/Android/app/build.gradle +++ b/examples/audio plugin demo/Builds/Android/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" externalNativeBuild { cmake { path "CMakeLists.txt" diff --git a/examples/audio plugin demo/Builds/Android/build.gradle b/examples/audio plugin demo/Builds/Android/build.gradle index e1c0c91bb7..0109eaa02a 100644 --- a/examples/audio plugin demo/Builds/Android/build.gradle +++ b/examples/audio plugin demo/Builds/Android/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/examples/audio plugin demo/Builds/LinuxMakefile/Makefile b/examples/audio plugin demo/Builds/LinuxMakefile/Makefile index e1d27502d3..da00c50ebe 100644 --- a/examples/audio plugin demo/Builds/LinuxMakefile/Makefile +++ b/examples/audio plugin demo/Builds/LinuxMakefile/Makefile @@ -97,7 +97,6 @@ OBJECTS_SHARED_CODE := \ $(JUCE_OBJDIR)/include_juce_audio_basics_8a4e984a.o \ $(JUCE_OBJDIR)/include_juce_audio_devices_63111d02.o \ $(JUCE_OBJDIR)/include_juce_audio_formats_15f82001.o \ - $(JUCE_OBJDIR)/include_juce_audio_plugin_client_utils_e32edaee.o \ $(JUCE_OBJDIR)/include_juce_audio_processors_10c03666.o \ $(JUCE_OBJDIR)/include_juce_audio_utils_9f9fb2d6.o \ $(JUCE_OBJDIR)/include_juce_core_f26d17db.o \ @@ -171,11 +170,6 @@ $(JUCE_OBJDIR)/include_juce_audio_formats_15f82001.o: ../../JuceLibraryCode/incl @echo "Compiling include_juce_audio_formats.cpp" $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<" -$(JUCE_OBJDIR)/include_juce_audio_plugin_client_utils_e32edaee.o: ../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp - -$(V_AT)mkdir -p $(JUCE_OBJDIR) - @echo "Compiling include_juce_audio_plugin_client_utils.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<" - $(JUCE_OBJDIR)/include_juce_audio_processors_10c03666.o: ../../JuceLibraryCode/include_juce_audio_processors.cpp -$(V_AT)mkdir -p $(JUCE_OBJDIR) @echo "Compiling include_juce_audio_processors.cpp" diff --git a/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj index 9565d192eb..61383cdec0 100644 --- a/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/examples/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ 691446A3E50A7F4BA0F389CD = {isa = PBXBuildFile; fileRef = 073124646F1E32620AF99DF6; }; 98D108769B3D5FA294AAB584 = {isa = PBXBuildFile; fileRef = 5132C865BDCE0B0326B019FD; }; D8EBA95A2599F03F8B2B32FD = {isa = PBXBuildFile; fileRef = 4A0343731333180C271AE65B; }; - A3F5A02A4BEF81AFC0C6A0F1 = {isa = PBXBuildFile; fileRef = 05CA7B6D7ABC9523E7D5719C; }; DB2E1EA8C939BA976044FDE4 = {isa = PBXBuildFile; fileRef = A223BB226C3409428AD73ABA; }; BB0A1989A6079F13E1FCF895 = {isa = PBXBuildFile; fileRef = CD24509D3F984BF91474A03D; }; DEE3691A017247A2FCA63D38 = {isa = PBXBuildFile; fileRef = C8482ADAA1C6FFA154ED3CAB; }; @@ -47,7 +46,6 @@ 1CB0E809D1804F8D21FF3E41 = {isa = PBXBuildFile; fileRef = 26D0AE41100F00F2F7FC1F4F; }; 80AB3252A67CCE24226B54A2 = {isa = PBXBuildFile; fileRef = DD262804AD7479D96C0EF6DD; }; 010DAA22AD28546E50396014 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_devices.mm"; path = "../../JuceLibraryCode/include_juce_audio_devices.mm"; sourceTree = "SOURCE_ROOT"; }; - 05CA7B6D7ABC9523E7D5719C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; 073124646F1E32620AF99DF6 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_AU_2.mm"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_AU_2.mm"; sourceTree = "SOURCE_ROOT"; }; 0926E36205F4D676343AB6E7 = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = "SOURCE_ROOT"; }; 09B817FE8945ED9710651B2E = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_basics"; path = "../../../../modules/juce_audio_basics"; sourceTree = "SOURCE_ROOT"; }; @@ -81,13 +79,13 @@ 85953323F917885511BC7FD1 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; }; 869C1CEB4424636C094947C6 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_utils"; path = "../../../../modules/juce_audio_utils"; sourceTree = "SOURCE_ROOT"; }; 8925EA4584599C0FF441CB48 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_formats"; path = "../../../../modules/juce_audio_formats"; sourceTree = "SOURCE_ROOT"; }; - 8FB68CA43E49DD39E013DB82 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; }; 93FBD648EA104B18DC9502FD = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SinewaveSynth.h; path = ../../Source/SinewaveSynth.h; sourceTree = "SOURCE_ROOT"; }; A206765795252391D3F60EA4 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; E4EE10B38F49E1F661E81D7F = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = JuceDemoPlugin.appex; sourceTree = "BUILT_PRODUCTS_DIR"; }; 193085CDCD099EC3E375DE7E = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JuceDemoPlugin.app; sourceTree = "BUILT_PRODUCTS_DIR"; }; 4D6248E85C22578615FA809C = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libJuceDemoPlugin.a; sourceTree = "BUILT_PRODUCTS_DIR"; }; 8B67A16CB449160267AA05BB = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AU.plist"; path = "Info-AU.plist"; sourceTree = "SOURCE_ROOT"; }; + 8FB68CA43E49DD39E013DB82 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; }; 92E3996FAE3B5EDB69483530 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_data_structures"; path = "../../../../modules/juce_data_structures"; sourceTree = "SOURCE_ROOT"; }; 9EC0C4C02099C656EEF39DA9 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PluginEditor.cpp; path = ../../Source/PluginEditor.cpp; sourceTree = "SOURCE_ROOT"; }; A223BB226C3409428AD73ABA = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_plugin_client_VST_utils.mm"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_VST_utils.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -137,7 +135,6 @@ 073124646F1E32620AF99DF6, 5132C865BDCE0B0326B019FD, 4A0343731333180C271AE65B, - 05CA7B6D7ABC9523E7D5719C, A223BB226C3409428AD73ABA, CD24509D3F984BF91474A03D, C8482ADAA1C6FFA154ED3CAB, @@ -698,7 +695,6 @@ 7D4E8A0438CA332B2392F728, A1D67EC48E3C93D236B16F69, FDFFAB3E2509D6072F3B7313, - A3F5A02A4BEF81AFC0C6A0F1, DB2E1EA8C939BA976044FDE4, DEE3691A017247A2FCA63D38, D6B952B1FD4B1B91452722F0, diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj index fcb9121923..a99046cd44 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -541,9 +538,6 @@ true - - true - true @@ -646,6 +640,9 @@ true + + true + true @@ -1747,7 +1744,6 @@ - @@ -1897,7 +1893,6 @@ - diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj.filters b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj.filters index f5e82e4a93..b16c809579 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj.filters +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin_SharedCode.vcxproj.filters @@ -652,9 +652,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -763,9 +760,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -892,6 +886,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2077,9 +2074,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2523,9 +2517,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj index b3663ad5e0..27db604e65 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -541,9 +538,6 @@ true - - true - true @@ -646,6 +640,9 @@ true + + true + true @@ -1747,7 +1744,6 @@ - @@ -1897,7 +1893,6 @@ - diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj.filters b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj.filters index 1a86ca4aa2..f8a912ce29 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj.filters +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin_SharedCode.vcxproj.filters @@ -652,9 +652,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -763,9 +760,6 @@ Juce Modules\juce_audio_plugin_client\VST - - Juce Modules\juce_audio_plugin_client - Juce Modules\juce_audio_plugin_client @@ -892,6 +886,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2077,9 +2074,6 @@ Juce Library Code - - Juce Library Code - Juce Library Code @@ -2523,9 +2517,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj b/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj index 9894806cc4..1abbd086ee 100644 --- a/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/examples/audio plugin demo/Builds/iOS/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -29,7 +29,6 @@ FDFFAB3E2509D6072F3B7313 = {isa = PBXBuildFile; fileRef = C8D826AFFFE0764B26256C2B; }; 98D108769B3D5FA294AAB584 = {isa = PBXBuildFile; fileRef = 5132C865BDCE0B0326B019FD; }; D8EBA95A2599F03F8B2B32FD = {isa = PBXBuildFile; fileRef = 4A0343731333180C271AE65B; }; - A3F5A02A4BEF81AFC0C6A0F1 = {isa = PBXBuildFile; fileRef = 05CA7B6D7ABC9523E7D5719C; }; DB2E1EA8C939BA976044FDE4 = {isa = PBXBuildFile; fileRef = A223BB226C3409428AD73ABA; }; DEE3691A017247A2FCA63D38 = {isa = PBXBuildFile; fileRef = C8482ADAA1C6FFA154ED3CAB; }; D6B952B1FD4B1B91452722F0 = {isa = PBXBuildFile; fileRef = D93E873FBC53C08E462DD4F1; }; @@ -41,18 +40,17 @@ 80AB3252A67CCE24226B54A2 = {isa = PBXBuildFile; fileRef = DD262804AD7479D96C0EF6DD; }; 010DAA22AD28546E50396014 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_devices.mm"; path = "../../JuceLibraryCode/include_juce_audio_devices.mm"; sourceTree = "SOURCE_ROOT"; }; 017903C25C83552C04C69C25 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - 05CA7B6D7ABC9523E7D5719C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_utils.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp"; sourceTree = "SOURCE_ROOT"; }; 09B817FE8945ED9710651B2E = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_basics"; path = "../../../../modules/juce_audio_basics"; sourceTree = "SOURCE_ROOT"; }; 103D9154469D5ED207CDDD5A = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_devices"; path = "../../../../modules/juce_audio_devices"; sourceTree = "SOURCE_ROOT"; }; 1B99F665552C3C2BFE719E55 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_plugin_client"; path = "../../../../modules/juce_audio_plugin_client"; sourceTree = "SOURCE_ROOT"; }; 26D0AE41100F00F2F7FC1F4F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_gui_basics.mm"; path = "../../JuceLibraryCode/include_juce_gui_basics.mm"; sourceTree = "SOURCE_ROOT"; }; + 499B5F4CF1AA0ED9298A9E0E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_core.mm"; path = "../../JuceLibraryCode/include_juce_core.mm"; sourceTree = "SOURCE_ROOT"; }; E4EE10B38F49E1F661E81D7F = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = JuceDemoPlugin.appex; sourceTree = "BUILT_PRODUCTS_DIR"; }; 193085CDCD099EC3E375DE7E = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JuceDemoPlugin.app; sourceTree = "BUILT_PRODUCTS_DIR"; }; 1BC36F43D1D9E0AD2ECC56D1 = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = JuceDemoPlugin/Images.xcassets; sourceTree = "SOURCE_ROOT"; }; 2A31FED02189E6DD1E1BBED8 = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-Standalone_Plugin.plist"; path = "Info-Standalone_Plugin.plist"; sourceTree = "SOURCE_ROOT"; }; 2AEC947D2E8080881E668E7A = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_core"; path = "../../../../modules/juce_core"; sourceTree = "SOURCE_ROOT"; }; 3EED20FD854357B29EE2C0A3 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_gui_basics"; path = "../../../../modules/juce_gui_basics"; sourceTree = "SOURCE_ROOT"; }; - 499B5F4CF1AA0ED9298A9E0E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_core.mm"; path = "../../JuceLibraryCode/include_juce_core.mm"; sourceTree = "SOURCE_ROOT"; }; 4A0343731333180C271AE65B = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_audio_plugin_client_Standalone.cpp"; path = "../../JuceLibraryCode/include_juce_audio_plugin_client_Standalone.cpp"; sourceTree = "SOURCE_ROOT"; }; 4D6248E85C22578615FA809C = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libJuceDemoPlugin.a; sourceTree = "BUILT_PRODUCTS_DIR"; }; 51309CECB6D206FE4793981F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_basics.mm"; path = "../../JuceLibraryCode/include_juce_audio_basics.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -117,7 +115,6 @@ C8D826AFFFE0764B26256C2B, 5132C865BDCE0B0326B019FD, 4A0343731333180C271AE65B, - 05CA7B6D7ABC9523E7D5719C, A223BB226C3409428AD73ABA, C8482ADAA1C6FFA154ED3CAB, D93E873FBC53C08E462DD4F1, @@ -455,7 +452,6 @@ 7D4E8A0438CA332B2392F728, A1D67EC48E3C93D236B16F69, FDFFAB3E2509D6072F3B7313, - A3F5A02A4BEF81AFC0C6A0F1, DB2E1EA8C939BA976044FDE4, DEE3691A017247A2FCA63D38, D6B952B1FD4B1B91452722F0, diff --git a/examples/audio plugin demo/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp b/examples/audio plugin demo/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp deleted file mode 100644 index 183f61b238..0000000000 --- a/examples/audio plugin demo/JuceLibraryCode/include_juce_audio_plugin_client_utils.cpp +++ /dev/null @@ -1,9 +0,0 @@ -/* - - IMPORTANT! This file is auto-generated each time you save your - project - if you alter its contents, your changes may be overwritten! - -*/ - -#include "AppConfig.h" -#include diff --git a/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj b/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj index 560401c5b0..08f713d805 100644 --- a/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj +++ b/examples/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj @@ -11,6 +11,7 @@ 21D330A5B13178B12BEAFC3C = {isa = PBXBuildFile; fileRef = D4EBC17BDB7F88CCBC76730B; }; B288A89F96704F142ED8E939 = {isa = PBXBuildFile; fileRef = 5ACC21AA45BBF48C3C64D56D; }; 851C1165C9E4ACDD19C56A96 = {isa = PBXBuildFile; fileRef = 942A0F04EFB8D0B2FF9780BA; }; + AF42316D915057E930A5624E = {isa = PBXBuildFile; fileRef = A4B568E26157FC282214976F; }; 2B4B9CF71F94BDD1E3AC89AE = {isa = PBXBuildFile; fileRef = B0935EBBA4F6E2B05F3D1C0A; }; AC3BED74AC7C6D9F5739F38B = {isa = PBXBuildFile; fileRef = 9794142D24966F93FFDE51A1; }; E3CB85BA817BC9E3942A8AB0 = {isa = PBXBuildFile; fileRef = 9F9B445E6755CAA19E4344ED; }; @@ -83,6 +84,7 @@ 9794142D24966F93FFDE51A1 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 9BA1DD697B98005D24F7EC3C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = FilterGraph.cpp; path = ../../Source/FilterGraph.cpp; sourceTree = "SOURCE_ROOT"; }; 9F9B445E6755CAA19E4344ED = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; + A4B568E26157FC282214976F = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; A5E7CA8A71D049BE2BD33861 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JuceHeader.h; path = ../../JuceLibraryCode/JuceHeader.h; sourceTree = "SOURCE_ROOT"; }; A66EFAC64B1B67B536C73415 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = HostStartup.cpp; path = ../../Source/HostStartup.cpp; sourceTree = "SOURCE_ROOT"; }; B0935EBBA4F6E2B05F3D1C0A = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; @@ -154,6 +156,7 @@ D4EBC17BDB7F88CCBC76730B, 5ACC21AA45BBF48C3C64D56D, 942A0F04EFB8D0B2FF9780BA, + A4B568E26157FC282214976F, B0935EBBA4F6E2B05F3D1C0A, 9794142D24966F93FFDE51A1, 9F9B445E6755CAA19E4344ED, @@ -306,6 +309,7 @@ 21D330A5B13178B12BEAFC3C, B288A89F96704F142ED8E939, 851C1165C9E4ACDD19C56A96, + AF42316D915057E930A5624E, 2B4B9CF71F94BDD1E3AC89AE, AC3BED74AC7C6D9F5739F38B, E3CB85BA817BC9E3942A8AB0, diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj index 304a45c904..8d258a6c5a 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj @@ -441,9 +441,6 @@ true - - true - true @@ -579,6 +576,9 @@ true + + true + true @@ -1731,13 +1731,7 @@ true - - true - - - true - - + true @@ -1900,7 +1894,6 @@ - @@ -2364,8 +2357,14 @@ - + + + + + + + diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters index 0672510535..444cb240f8 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host_App.vcxproj.filters @@ -682,9 +682,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -844,6 +841,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2080,20 +2080,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2568,9 +2559,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3960,12 +3948,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj index 7cd4a65707..4d25acdd9c 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj @@ -440,9 +440,6 @@ true - - true - true @@ -578,6 +575,9 @@ true + + true + true @@ -1730,13 +1730,7 @@ true - - true - - - true - - + true @@ -1899,7 +1893,6 @@ - @@ -2363,8 +2356,14 @@ - + + + + + + + diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters index 47ea7d4525..3b7b088b8d 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host_App.vcxproj.filters @@ -682,9 +682,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -844,6 +841,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2080,20 +2080,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2568,9 +2559,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3960,12 +3948,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj index 97ff2f0968..a822dde946 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj @@ -440,9 +440,6 @@ true - - true - true @@ -578,6 +575,9 @@ true + + true + true @@ -1730,13 +1730,7 @@ true - - true - - - true - - + true @@ -1899,7 +1893,6 @@ - @@ -2363,8 +2356,14 @@ - + + + + + + + diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters index 5a2a19795d..d52b7aba52 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host_App.vcxproj.filters @@ -682,9 +682,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -844,6 +841,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2080,20 +2080,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2568,9 +2559,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3960,12 +3948,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/examples/audio plugin host/JuceLibraryCode/AppConfig.h b/examples/audio plugin host/JuceLibraryCode/AppConfig.h index d8411afaa6..38617944dc 100644 --- a/examples/audio plugin host/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin host/JuceLibraryCode/AppConfig.h @@ -235,18 +235,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - #define JUCE_QUICKTIME 0 -#endif - #ifndef JUCE_USE_CAMERA #define JUCE_USE_CAMERA 0 #endif diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index c54769b1fa..945a170262 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -266,8 +266,6 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp" "../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h" - "../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp" - "../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp" "../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.h" "../../../../../modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp" @@ -382,6 +380,7 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/containers/juce_DynamicObject.h" "../../../../../modules/juce_core/containers/juce_ElementComparator.h" "../../../../../modules/juce_core/containers/juce_HashMap.h" + "../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" "../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" "../../../../../modules/juce_core/containers/juce_ListenerList.cpp" "../../../../../modules/juce_core/containers/juce_ListenerList.h" @@ -1402,8 +1401,6 @@ set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/ju set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_MP3AudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_QuickTimeAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WavAudioFormat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_formats/codecs/juce_WindowsMediaAudioFormat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1518,6 +1515,7 @@ set_source_files_properties("../../../../../modules/juce_core/containers/juce_Dy set_source_files_properties("../../../../../modules/juce_core/containers/juce_DynamicObject.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ElementComparator.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/containers/juce_HashMap_test.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_LinkedListPointer.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/containers/juce_ListenerList.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle index e37b5ed760..4c93c1ad89 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/build.gradle +++ b/extras/AudioPerformanceTest/Builds/Android/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "25.0.2" + buildToolsVersion "26.0.0" externalNativeBuild { cmake { path "CMakeLists.txt" diff --git a/extras/AudioPerformanceTest/Builds/Android/build.gradle b/extras/AudioPerformanceTest/Builds/Android/build.gradle index e1c0c91bb7..0109eaa02a 100644 --- a/extras/AudioPerformanceTest/Builds/Android/build.gradle +++ b/extras/AudioPerformanceTest/Builds/Android/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj index 938790f471..1609a35481 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -574,6 +571,9 @@ true + + true + true @@ -1822,7 +1822,6 @@ - diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj.filters b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj.filters index 05bc3afca0..a265668ea6 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj.filters +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest_App.vcxproj.filters @@ -634,9 +634,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -796,6 +793,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2418,9 +2418,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj index 4aaca25e5b..6098159210 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj @@ -242,6 +242,9 @@ true + + true + true diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters index 1ed4943777..3c1db26bf7 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj.filters @@ -463,6 +463,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj index ea3d4d943f..dd6d541431 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj @@ -242,6 +242,9 @@ true + + true + true diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters index d3bbd966de..f3b5639510 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj.filters @@ -463,6 +463,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj index fcd56b2e4e..2d0bb1b4e2 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj @@ -242,6 +242,9 @@ true + + true + true diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters index e754746f72..6b3134ee6d 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj.filters @@ -463,6 +463,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj index 741fc6fa64..a7205c65f4 100644 --- a/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj +++ b/extras/UnitTestRunner/Builds/MacOSX/UnitTestRunner.xcodeproj/project.pbxproj @@ -10,6 +10,7 @@ A70F7F4891DB1CF67653BE74 = {isa = PBXBuildFile; fileRef = B38A1AC42B002115350C0268; }; 96EFF7BA261F57DD829324D8 = {isa = PBXBuildFile; fileRef = 7898C73DCA6FA9D9CF669D32; }; 6EB1A3B818863EF1787A9CCE = {isa = PBXBuildFile; fileRef = 4B427AF10E722F9A362CEB73; }; + D82BA4D40F5686DAFF5E11FB = {isa = PBXBuildFile; fileRef = 99527F36B4484133087435CD; }; 59004CE43AE081B4A6CE9E17 = {isa = PBXBuildFile; fileRef = 1932D54A7FAE13BADBA3E9B5; }; AA207299991F85938465BF65 = {isa = PBXBuildFile; fileRef = 2030A589A9355FE6A0F72428; }; 66FC7F44EEC9044E5C4A21C3 = {isa = PBXBuildFile; fileRef = C0531453A002C480280C5F05; }; @@ -64,6 +65,7 @@ 8C449538B266A891147103D6 = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; 8EBA9CF0874619A8FA0B4E74 = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_osc"; path = "../../../../modules/juce_osc"; sourceTree = "SOURCE_ROOT"; }; 8ED5AB2E4E106FB97C033C5B = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + 99527F36B4484133087435CD = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; }; A40A2A0B2841A622C53047CD = {isa = PBXFileReference; lastKnownFileType = file; name = "juce_audio_processors"; path = "../../../../modules/juce_audio_processors"; sourceTree = "SOURCE_ROOT"; }; A59D9064C3A2D7EC3DC45420 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "include_juce_osc.cpp"; path = "../../JuceLibraryCode/include_juce_osc.cpp"; sourceTree = "SOURCE_ROOT"; }; A76DD7182C290A9020C96CA7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "include_juce_audio_formats.mm"; path = "../../JuceLibraryCode/include_juce_audio_formats.mm"; sourceTree = "SOURCE_ROOT"; }; @@ -122,6 +124,7 @@ B38A1AC42B002115350C0268, 7898C73DCA6FA9D9CF669D32, 4B427AF10E722F9A362CEB73, + 99527F36B4484133087435CD, 1932D54A7FAE13BADBA3E9B5, 2030A589A9355FE6A0F72428, C0531453A002C480280C5F05, @@ -264,6 +267,7 @@ A70F7F4891DB1CF67653BE74, 96EFF7BA261F57DD829324D8, 6EB1A3B818863EF1787A9CCE, + D82BA4D40F5686DAFF5E11FB, 59004CE43AE081B4A6CE9E17, AA207299991F85938465BF65, 66FC7F44EEC9044E5C4A21C3, diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj index 198ca47621..854c4460d1 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj @@ -436,9 +436,6 @@ true - - true - true @@ -526,6 +523,9 @@ true + + true + true @@ -1705,13 +1705,7 @@ true - - true - - - true - - + true @@ -1869,7 +1863,6 @@ - @@ -2329,8 +2322,14 @@ - + + + + + + + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters index 3fd1f7c065..2ed63ad4b9 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2015/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -661,9 +661,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -760,6 +757,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2023,20 +2023,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2496,9 +2487,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3876,12 +3864,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj index e6fa835431..f35d3125e5 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj @@ -435,9 +435,6 @@ true - - true - true @@ -525,6 +522,9 @@ true + + true + true @@ -1704,13 +1704,7 @@ true - - true - - - true - - + true @@ -1868,7 +1862,6 @@ - @@ -2328,8 +2321,14 @@ - + + + + + + + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters index 69e3584e1e..269057c0a3 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -661,9 +661,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -760,6 +757,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2023,20 +2023,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2496,9 +2487,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3876,12 +3864,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h index 0ccddd7849..d43fda9dc7 100644 --- a/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h +++ b/extras/UnitTestRunner/JuceLibraryCode/AppConfig.h @@ -224,18 +224,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - //#define JUCE_QUICKTIME 1 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif diff --git a/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj b/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj index 65cc0293f3..b51dc170ee 100644 --- a/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj +++ b/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj @@ -150,6 +150,9 @@ true + + true + true diff --git a/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj.filters b/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj.filters index c1fd252165..69bed1dfd6 100644 --- a/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj.filters +++ b/extras/binarybuilder/Builds/VisualStudio2017/BinaryBuilder_ConsoleApp.vcxproj.filters @@ -82,6 +82,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj index e10d79613a..a4c07e4892 100644 --- a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj +++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj @@ -434,9 +434,6 @@ true - - true - true @@ -572,6 +569,9 @@ true + + true + true @@ -1724,13 +1724,7 @@ true - - true - - - true - - + true @@ -1888,7 +1882,6 @@ - @@ -2352,8 +2345,14 @@ - + + + + + + + diff --git a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters index 024d827b00..f5da5ee5d0 100644 --- a/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters +++ b/extras/windows dll/Builds/VisualStudio2017/juce_dll_StaticLibrary.vcxproj.filters @@ -661,9 +661,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -823,6 +820,9 @@ Juce Modules\juce_core\containers + + Juce Modules\juce_core\containers + Juce Modules\juce_core\containers @@ -2059,20 +2059,11 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native - Juce Modules\juce_video\native - - Juce Modules\juce_video\native - - - Juce Modules\juce_video\native + + Juce Modules\juce_video\playback Juce Modules\juce_video @@ -2532,9 +2523,6 @@ Juce Modules\juce_audio_formats\codecs - - Juce Modules\juce_audio_formats\codecs - Juce Modules\juce_audio_formats\codecs @@ -3924,12 +3912,30 @@ Juce Modules\juce_video\capture - - Juce Modules\juce_video\playback + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native + + + Juce Modules\juce_video\native Juce Modules\juce_video\playback + + Juce Modules\juce_video\playback + Juce Modules\juce_video diff --git a/extras/windows dll/JuceLibraryCode/AppConfig.h b/extras/windows dll/JuceLibraryCode/AppConfig.h index 88d18d77c1..835b6ff6b2 100644 --- a/extras/windows dll/JuceLibraryCode/AppConfig.h +++ b/extras/windows dll/JuceLibraryCode/AppConfig.h @@ -235,18 +235,6 @@ //============================================================================== // juce_video flags: -#ifndef JUCE_DIRECTSHOW - //#define JUCE_DIRECTSHOW 1 -#endif - -#ifndef JUCE_MEDIAFOUNDATION - //#define JUCE_MEDIAFOUNDATION 1 -#endif - -#ifndef JUCE_QUICKTIME - //#define JUCE_QUICKTIME 1 -#endif - #ifndef JUCE_USE_CAMERA //#define JUCE_USE_CAMERA 1 #endif