diff --git a/ChangeList.txt b/ChangeList.txt index 711ca28e66..da31109987 100644 --- a/ChangeList.txt +++ b/ChangeList.txt @@ -4,6 +4,14 @@ This file just lists the more notable headline features. For more detailed info about minor changes and bugfixes, please see the git log! +Version 5.0.1 + - Fixed Windows live build engine on Visual Studio 2017 + - Fixed memory-leak in Projucer live build engine + - Fixed an issue where you could not paste your redeem serial number with Cmd+V on macOS + - Fixed an issue where the Projucer would crash on linux due to missing symbols in WebKit + - Minor Projucer UI improvements + - Various minor improvements and bug fixes + Version 5.0.0 - New licensing model - Projucer UI/UX overhaul diff --git a/examples/AUv3Synth/AUv3Synth.jucer b/examples/AUv3Synth/AUv3Synth.jucer index 251467ccf9..6e90d1746c 100644 --- a/examples/AUv3Synth/AUv3Synth.jucer +++ b/examples/AUv3Synth/AUv3Synth.jucer @@ -8,7 +8,7 @@ pluginCode="AUv3" pluginChannelConfigs="" pluginIsSynth="1" pluginWantsMidiIn="1" pluginProducesMidiOut="0" pluginIsMidiEffectPlugin="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="AUv3SynthAU" pluginRTASCategory="" aaxIdentifier="com.roli.development.AUv3Synth" - pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.0" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.1" buildStandalone="1" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"> diff --git a/examples/AUv3Synth/JuceLibraryCode/AppConfig.h b/examples/AUv3Synth/JuceLibraryCode/AppConfig.h index e2cfb2b0c1..9db11b56f1 100644 --- a/examples/AUv3Synth/JuceLibraryCode/AppConfig.h +++ b/examples/AUv3Synth/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/AnimationAppExample/AnimationAppExample.jucer b/examples/AnimationAppExample/AnimationAppExample.jucer index 99718fcd72..e641a927c8 100644 --- a/examples/AnimationAppExample/AnimationAppExample.jucer +++ b/examples/AnimationAppExample/AnimationAppExample.jucer @@ -2,7 +2,7 @@ diff --git a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln index 8638d5e9b0..d9f941cb30 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln +++ b/examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample.sln @@ -575,6 +575,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h index 8eb8079eb8..89980ac4f4 100644 --- a/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AnimationAppExample/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/AudioAppExample/AudioAppExample.jucer b/examples/AudioAppExample/AudioAppExample.jucer index e6e445dc4d..f85d5794b8 100644 --- a/examples/AudioAppExample/AudioAppExample.jucer +++ b/examples/AudioAppExample/AudioAppExample.jucer @@ -2,7 +2,7 @@ diff --git a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample.sln b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample.sln index 7263dc0a60..09cc16d279 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample.sln +++ b/examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample.sln @@ -630,6 +630,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h index 3cecdb782f..55eef3d08f 100644 --- a/examples/AudioAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/AudioAppExample/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer b/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer index 865cd525ae..26875e2be2 100644 --- a/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer +++ b/examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer @@ -2,7 +2,7 @@ diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln index 55fb52639a..ae01669f8e 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing.sln @@ -688,6 +688,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln index 12b7499b34..ec088d05a5 100644 --- a/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln +++ b/examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing.sln @@ -688,6 +688,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h index 6dd059b7a6..64b41c5282 100644 --- a/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksDrawing/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer b/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer index a7f894cb29..1c9e74c4ff 100644 --- a/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer +++ b/examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer @@ -2,7 +2,7 @@ diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln index 39122f6f61..5a4fad574e 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor.sln @@ -688,6 +688,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln index ec8eca2dc8..23f0410ef8 100644 --- a/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln +++ b/examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor.sln @@ -688,6 +688,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h index 6dd059b7a6..64b41c5282 100644 --- a/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksMonitor/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer b/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer index 9200e08251..21cfb822e2 100644 --- a/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer +++ b/examples/BLOCKS/BlocksSynth/BlocksSynth.jucer @@ -2,7 +2,7 @@ diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln index 1a77de05b7..b7541be510 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth.sln @@ -694,6 +694,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln index 94f2f458cd..3a01b1821b 100644 --- a/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln +++ b/examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth.sln @@ -694,6 +694,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h index 6dd059b7a6..64b41c5282 100644 --- a/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h +++ b/examples/BLOCKS/BlocksSynth/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer b/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer index 4ff7cdb02b..62456367db 100644 --- a/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer +++ b/examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer @@ -2,7 +2,7 @@ diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln index 9e6608dffb..4b04d39e63 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.sln @@ -630,6 +630,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln index f50f0a7c17..61b310c03c 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo.sln @@ -630,6 +630,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h index 6b0b930741..42cdccbcd6 100644 --- a/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h +++ b/examples/BouncingBallWavetableDemo/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln index 36ccac4709..6fc59cba40 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample.sln @@ -125,6 +125,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln index ce392fd8fa..c218bc2657 100644 --- a/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln +++ b/examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample.sln @@ -125,6 +125,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/ComponentTutorialExample/ComponentTutorialExample.jucer b/examples/ComponentTutorialExample/ComponentTutorialExample.jucer index 187e825309..c596072310 100644 --- a/examples/ComponentTutorialExample/ComponentTutorialExample.jucer +++ b/examples/ComponentTutorialExample/ComponentTutorialExample.jucer @@ -2,7 +2,7 @@ diff --git a/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h b/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h index 04e17cc5c0..64d17a02c7 100644 --- a/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h +++ b/examples/ComponentTutorialExample/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/Demo/Builds/Android/app/CMakeLists.txt b/examples/Demo/Builds/Android/app/CMakeLists.txt index ea888f65ce..3bb752fa02 100644 --- a/examples/Demo/Builds/Android/app/CMakeLists.txt +++ b/examples/Demo/Builds/Android/app/CMakeLists.txt @@ -601,6 +601,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/misc/juce_Result.h" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" "../../../../../modules/juce_core/misc/juce_Uuid.cpp" "../../../../../modules/juce_core/misc/juce_Uuid.h" "../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" @@ -1924,6 +1926,8 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.c set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln index aeb655645a..2d73b5fdb6 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo.sln @@ -828,6 +828,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj index 9ea70fa51a..a9e7f5e471 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj @@ -76,6 +76,7 @@ Level4 true true + /FC %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -117,6 +118,7 @@ Level4 true true + /FC %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln index f80fd9ee13..3159b833c2 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo.sln @@ -828,6 +828,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj index 0c2b1846f4..92c73ec4ea 100644 --- a/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj @@ -78,6 +78,7 @@ Level4 true true + /FC %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -117,6 +118,7 @@ Level4 true true + /FC %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln b/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln index 9d852666a2..6d8eaac5eb 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo.sln @@ -828,6 +828,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj index f91e621977..05a080aef3 100644 --- a/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj +++ b/examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj @@ -78,6 +78,7 @@ Level4 true true + /FC %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -117,6 +118,7 @@ Level4 true true + /FC %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) diff --git a/examples/Demo/JuceDemo.jucer b/examples/Demo/JuceDemo.jucer index 37f762cb32..961f3dda0d 100644 --- a/examples/Demo/JuceDemo.jucer +++ b/examples/Demo/JuceDemo.jucer @@ -1,7 +1,7 @@ @@ -64,7 +64,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -114,7 +114,8 @@ - + diff --git a/examples/Demo/JuceLibraryCode/AppConfig.h b/examples/Demo/JuceLibraryCode/AppConfig.h index 5ac66ffab2..c431c45c32 100644 --- a/examples/Demo/JuceLibraryCode/AppConfig.h +++ b/examples/Demo/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/Demo/Source/Demos/AudioLatencyDemo.cpp b/examples/Demo/Source/Demos/AudioLatencyDemo.cpp index b3a4ea0ebd..c2103c76c4 100644 --- a/examples/Demo/Source/Demos/AudioLatencyDemo.cpp +++ b/examples/Demo/Source/Demos/AudioLatencyDemo.cpp @@ -308,9 +308,6 @@ public: resultsBox.setCaretVisible (false); resultsBox.setPopupMenuEnabled (true); - resultsBox.setColour (TextEditor::backgroundColourId, - getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::widgetBackground, - Colour (0x32ffffff))); resultsBox.setColour (TextEditor::outlineColourId, Colour (0x1c000000)); resultsBox.setColour (TextEditor::shadowColourId, Colour (0x16000000)); @@ -368,6 +365,13 @@ private: startTest(); } + void lookAndFeelChanged() override + { + resultsBox.setColour (TextEditor::backgroundColourId, + getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::widgetBackground, + Colour (0x32ffffff))); + } + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AudioLatencyDemo) }; diff --git a/examples/Demo/Source/Demos/AudioSettingsDemo.cpp b/examples/Demo/Source/Demos/AudioSettingsDemo.cpp index 580c9de49f..9d68ed04cd 100644 --- a/examples/Demo/Source/Demos/AudioSettingsDemo.cpp +++ b/examples/Demo/Source/Demos/AudioSettingsDemo.cpp @@ -113,6 +113,11 @@ private: dumpDeviceInfo(); } + void lookAndFeelChanged() override + { + diagnosticsBox.applyFontToAllText (diagnosticsBox.getFont()); + } + static String getListOfActiveBits (const BitArray& b) { StringArray bits; diff --git a/examples/Demo/Source/Demos/Box2DDemo.cpp b/examples/Demo/Source/Demos/Box2DDemo.cpp index 92a7adcb83..47dd1a89c5 100644 --- a/examples/Demo/Source/Demos/Box2DDemo.cpp +++ b/examples/Demo/Source/Demos/Box2DDemo.cpp @@ -299,6 +299,11 @@ private: } } + void lookAndFeelChanged() override + { + instructions.applyFontToAllText (instructions.getFont()); + } + static StringArray getTestsList() { const char* tests[] = diff --git a/examples/Demo/Source/Demos/ChildProcessDemo.cpp b/examples/Demo/Source/Demos/ChildProcessDemo.cpp index 65c75bfae6..18c25341ee 100644 --- a/examples/Demo/Source/Demos/ChildProcessDemo.cpp +++ b/examples/Demo/Source/Demos/ChildProcessDemo.cpp @@ -205,6 +205,11 @@ private: testResultsBox.moveCaretToEnd(); } + void lookAndFeelChanged() override + { + testResultsBox.applyFontToAllText (testResultsBox.getFont()); + } + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ChildProcessDemo) }; diff --git a/examples/Demo/Source/Demos/CryptographyDemo.cpp b/examples/Demo/Source/Demos/CryptographyDemo.cpp index 52eb471f4c..41eaff84ba 100644 --- a/examples/Demo/Source/Demos/CryptographyDemo.cpp +++ b/examples/Demo/Source/Demos/CryptographyDemo.cpp @@ -36,16 +36,6 @@ public: addAndMakeVisible (rsaGroup); rsaGroup.setText ("RSA Encryption"); - rsaGroup.setColour (GroupComponent::outlineColourId, - getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::outline, - Colours::grey)); - rsaGroup.setColour (GroupComponent::textColourId, - getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::defaultText, - Colours::white)); - rsaResultBox.setColour (TextEditor::backgroundColourId, - getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::widgetBackground, - Colours::white.withAlpha (0.5f))); - bitSizeLabel.setText ("Num Bits to Use:", dontSendNotification); bitSizeLabel.attachToComponent (&bitSize, true); @@ -120,6 +110,22 @@ private: createRSAKey(); } + void lookAndFeelChanged() override + { + rsaGroup.setColour (GroupComponent::outlineColourId, + getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::outline, + Colours::grey)); + rsaGroup.setColour (GroupComponent::textColourId, + getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::defaultText, + Colours::white)); + rsaResultBox.setColour (TextEditor::backgroundColourId, + getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::widgetBackground, + Colours::white.withAlpha (0.5f))); + + bitSize.applyFontToAllText (bitSize.getFont()); + rsaResultBox.applyFontToAllText (rsaResultBox.getFont()); + } + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (RSAComponent) }; @@ -133,16 +139,6 @@ public: addAndMakeVisible (hashGroup); hashGroup.setText ("Hashes"); - hashGroup.setColour (GroupComponent::outlineColourId, - getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::outline, - Colours::grey)); - hashGroup.setColour (GroupComponent::textColourId, - getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::defaultText, - Colours::white)); - hashEntryBox.setColour (TextEditor::backgroundColourId, - getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::widgetBackground, - Colours::white.withAlpha (0.5f))); - addAndMakeVisible (hashEntryBox); hashEntryBox.setMultiLine (true); @@ -214,6 +210,21 @@ private: void textEditorEscapeKeyPressed (TextEditor&) override { updateHashes(); } void textEditorFocusLost (TextEditor&) override { updateHashes(); } + void lookAndFeelChanged() override + { + hashGroup.setColour (GroupComponent::outlineColourId, + getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::outline, + Colours::grey)); + hashGroup.setColour (GroupComponent::textColourId, + getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::defaultText, + Colours::white)); + hashEntryBox.setColour (TextEditor::backgroundColourId, + getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::widgetBackground, + Colours::white.withAlpha (0.5f))); + + hashEntryBox.applyFontToAllText (hashEntryBox.getFont()); + } + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (HashesComponent) }; diff --git a/examples/Demo/Source/Demos/FlexBoxDemo.cpp b/examples/Demo/Source/Demos/FlexBoxDemo.cpp index bcf7f20918..0d5064552f 100644 --- a/examples/Demo/Source/Demos/FlexBoxDemo.cpp +++ b/examples/Demo/Source/Demos/FlexBoxDemo.cpp @@ -124,6 +124,14 @@ struct DemoFlexPanel : public juce::Component, r.reduced (4), Justification::bottomRight, 2); } + void lookAndFeelChanged() override + { + flexOrderEditor.applyFontToAllText (flexOrderEditor.getFont()); + flexGrowEditor.applyFontToAllText (flexGrowEditor.getFont()); + flexShrinkEditor.applyFontToAllText (flexShrinkEditor.getFont()); + flexBasisEditor.applyFontToAllText (flexBasisEditor.getFont()); + } + FlexItem& flexItem; TextEditor flexOrderEditor, flexGrowEditor, flexShrinkEditor, flexBasisEditor; diff --git a/examples/Demo/Source/Demos/JavaScript.cpp b/examples/Demo/Source/Demos/JavaScript.cpp index 6a8384edfe..70ba20ee1b 100644 --- a/examples/Demo/Source/Demos/JavaScript.cpp +++ b/examples/Demo/Source/Demos/JavaScript.cpp @@ -152,6 +152,11 @@ private: outputDisplay.setBounds (r.withTrimmedTop (8)); } + void lookAndFeelChanged() override + { + outputDisplay.applyFontToAllText (outputDisplay.getFont()); + } + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (JavaScriptDemo) }; diff --git a/examples/Demo/Source/Demos/KeyMappingsDemo.cpp b/examples/Demo/Source/Demos/KeyMappingsDemo.cpp index 3da3203ff5..01e2133acb 100644 --- a/examples/Demo/Source/Demos/KeyMappingsDemo.cpp +++ b/examples/Demo/Source/Demos/KeyMappingsDemo.cpp @@ -36,10 +36,6 @@ public: { setOpaque (true); addAndMakeVisible (keyMappingEditor); - - LookAndFeel* lf = &LookAndFeel::getDefaultLookAndFeel(); - keyMappingEditor.setColours (lf->findColour (KeyMappingEditorComponent::backgroundColourId), - lf->findColour (KeyMappingEditorComponent::textColourId)); } void paint (Graphics& g) override @@ -56,6 +52,13 @@ public: private: KeyMappingEditorComponent keyMappingEditor; + void lookAndFeelChanged() override + { + auto* lf = &LookAndFeel::getDefaultLookAndFeel(); + keyMappingEditor.setColours (lf->findColour (KeyMappingEditorComponent::backgroundColourId), + lf->findColour (KeyMappingEditorComponent::textColourId)); + } + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (KeyMappingsDemo) }; diff --git a/examples/Demo/Source/Demos/MDIDemo.cpp b/examples/Demo/Source/Demos/MDIDemo.cpp index 20144dd450..68f6144d73 100644 --- a/examples/Demo/Source/Demos/MDIDemo.cpp +++ b/examples/Demo/Source/Demos/MDIDemo.cpp @@ -114,6 +114,11 @@ private: changed(); } + void lookAndFeelChanged() override + { + editor.applyFontToAllText (editor.getFont()); + } + void textEditorReturnKeyPressed (TextEditor&) override {} void textEditorEscapeKeyPressed (TextEditor&) override {} void textEditorFocusLost (TextEditor&) override {} diff --git a/examples/Demo/Source/Demos/NetworkingDemo.cpp b/examples/Demo/Source/Demos/NetworkingDemo.cpp index 8c06f66a3a..0e8cefc215 100644 --- a/examples/Demo/Source/Demos/NetworkingDemo.cpp +++ b/examples/Demo/Source/Demos/NetworkingDemo.cpp @@ -118,6 +118,11 @@ private: fetchButton.triggerClick(); } + void lookAndFeelChanged() override + { + urlBox.applyFontToAllText (urlBox.getFont()); + } + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NetworkingDemo) }; diff --git a/examples/Demo/Source/Demos/OpenGLDemo.cpp b/examples/Demo/Source/Demos/OpenGLDemo.cpp index cc7f5b839d..69e2ecbc29 100644 --- a/examples/Demo/Source/Demos/OpenGLDemo.cpp +++ b/examples/Demo/Source/Demos/OpenGLDemo.cpp @@ -368,18 +368,11 @@ struct OpenGLDemoClasses addAndMakeVisible (showBackgroundToggle); showBackgroundToggle.addListener (this); - Colour editorBackground = dynamic_cast (&LookAndFeel::getDefaultLookAndFeel()) - ? getLookAndFeel().findColour (ResizableWindow::backgroundColourId) - : Colours::white; - addAndMakeVisible (tabbedComp); tabbedComp.setTabBarDepth (25); tabbedComp.setColour (TabbedButtonBar::tabTextColourId, Colours::grey); - tabbedComp.addTab ("Vertex", editorBackground, &vertexEditorComp, false); - tabbedComp.addTab ("Fragment", editorBackground, &fragmentEditorComp, false); - - vertexEditorComp.setColour (CodeEditorComponent::backgroundColourId, editorBackground); - fragmentEditorComp.setColour (CodeEditorComponent::backgroundColourId, editorBackground); + tabbedComp.addTab ("Vertex", Colours::transparentBlack, &vertexEditorComp, false); + tabbedComp.addTab ("Fragment", Colours::transparentBlack, &fragmentEditorComp, false); vertexDocument.addListener (this); fragmentDocument.addListener (this); @@ -409,6 +402,8 @@ struct OpenGLDemoClasses addAndMakeVisible (textureLabel); textureLabel.setText ("Texture:", dontSendNotification); textureLabel.attachToComponent (&textureBox, true); + + lookAndFeelChanged(); } void initialise() @@ -562,6 +557,18 @@ struct OpenGLDemoClasses selectTexture (textureBox.getSelectedId()); } + void lookAndFeelChanged() override + { + auto editorBackground = getUIColourIfAvailable (LookAndFeel_V4::ColourScheme::UIColour::windowBackground, + Colours::white); + + for (int i = tabbedComp.getNumTabs(); i >= 0; --i) + tabbedComp.setTabBackgroundColour (i, editorBackground); + + vertexEditorComp.setColour (CodeEditorComponent::backgroundColourId, editorBackground); + fragmentEditorComp.setColour (CodeEditorComponent::backgroundColourId, editorBackground); + } + OpenGLDemo& demo; Label speedLabel, zoomLabel; diff --git a/examples/Demo/Source/Demos/SystemInfoDemo.cpp b/examples/Demo/Source/Demos/SystemInfoDemo.cpp index 7ef0049a73..4d9731bf22 100644 --- a/examples/Demo/Source/Demos/SystemInfoDemo.cpp +++ b/examples/Demo/Source/Demos/SystemInfoDemo.cpp @@ -202,6 +202,11 @@ public: private: TextEditor resultsBox; + void lookAndFeelChanged() override + { + resultsBox.applyFontToAllText (resultsBox.getFont()); + } + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SystemInfoDemo) }; diff --git a/examples/Demo/Source/Demos/UnitTestsDemo.cpp b/examples/Demo/Source/Demos/UnitTestsDemo.cpp index 3c5e031afa..148662dcdc 100644 --- a/examples/Demo/Source/Demos/UnitTestsDemo.cpp +++ b/examples/Demo/Source/Demos/UnitTestsDemo.cpp @@ -186,6 +186,11 @@ struct UnitTestClasses TextButton startTestButton; TextEditor testResultsBox; + void lookAndFeelChanged() override + { + testResultsBox.applyFontToAllText (testResultsBox.getFont()); + } + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (UnitTestsDemo) }; }; diff --git a/examples/Demo/Source/Demos/WebBrowserDemo.cpp b/examples/Demo/Source/Demos/WebBrowserDemo.cpp index 8ed7061d37..658d330d64 100644 --- a/examples/Demo/Source/Demos/WebBrowserDemo.cpp +++ b/examples/Demo/Source/Demos/WebBrowserDemo.cpp @@ -140,6 +140,11 @@ private: webView->goToURL (addressTextBox.getText()); } + void lookAndFeelChanged() override + { + addressTextBox.applyFontToAllText (addressTextBox.getFont()); + } + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (WebBrowserDemo) }; diff --git a/examples/Demo/Source/Demos/WidgetsDemo.cpp b/examples/Demo/Source/Demos/WidgetsDemo.cpp index bed2ac69b0..fc9d5237c2 100644 --- a/examples/Demo/Source/Demos/WidgetsDemo.cpp +++ b/examples/Demo/Source/Demos/WidgetsDemo.cpp @@ -447,6 +447,12 @@ struct MiscPage : public Component comboBox.setSelectedId (1); } + void lookAndFeelChanged() override + { + textEditor1.applyFontToAllText (textEditor1.getFont()); + textEditor2.applyFontToAllText (textEditor2.getFont()); + } + TextEditor textEditor1, textEditor2; ComboBox comboBox; }; @@ -1572,6 +1578,11 @@ private: setTabBackgroundColour (i, getLookAndFeel().findColour (ResizableWindow::backgroundColourId)); } } + + void lookAndFeelChanged() override + { + updateTabColours(); + } }; //============================================================================== diff --git a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln index 7bbd42b2e1..4bed8c0dd3 100644 --- a/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln +++ b/examples/HelloWorld/Builds/VisualStudio2015/HelloWorld.sln @@ -123,6 +123,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln index a209dc350e..08533d9c99 100644 --- a/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln +++ b/examples/HelloWorld/Builds/VisualStudio2017/HelloWorld.sln @@ -123,6 +123,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/HelloWorld/HelloWorld.jucer b/examples/HelloWorld/HelloWorld.jucer index f52cb0ce11..a3547ef8b4 100644 --- a/examples/HelloWorld/HelloWorld.jucer +++ b/examples/HelloWorld/HelloWorld.jucer @@ -1,7 +1,7 @@ diff --git a/examples/HelloWorld/JuceLibraryCode/AppConfig.h b/examples/HelloWorld/JuceLibraryCode/AppConfig.h index 04e17cc5c0..64d17a02c7 100644 --- a/examples/HelloWorld/JuceLibraryCode/AppConfig.h +++ b/examples/HelloWorld/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/MPETest/Builds/VisualStudio2015/MPETest.sln b/examples/MPETest/Builds/VisualStudio2015/MPETest.sln index b2b08a5e46..664616c2e3 100644 --- a/examples/MPETest/Builds/VisualStudio2015/MPETest.sln +++ b/examples/MPETest/Builds/VisualStudio2015/MPETest.sln @@ -635,6 +635,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/MPETest/Builds/VisualStudio2017/MPETest.sln b/examples/MPETest/Builds/VisualStudio2017/MPETest.sln index ee4f18d8a0..26a384e3a2 100644 --- a/examples/MPETest/Builds/VisualStudio2017/MPETest.sln +++ b/examples/MPETest/Builds/VisualStudio2017/MPETest.sln @@ -635,6 +635,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/MPETest/JuceLibraryCode/AppConfig.h b/examples/MPETest/JuceLibraryCode/AppConfig.h index 3cecdb782f..55eef3d08f 100644 --- a/examples/MPETest/JuceLibraryCode/AppConfig.h +++ b/examples/MPETest/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/MPETest/MPETest.jucer b/examples/MPETest/MPETest.jucer index 55cca5cb4b..26005d8159 100644 --- a/examples/MPETest/MPETest.jucer +++ b/examples/MPETest/MPETest.jucer @@ -2,7 +2,7 @@ diff --git a/examples/MidiTest/Builds/Android/app/CMakeLists.txt b/examples/MidiTest/Builds/Android/app/CMakeLists.txt index 93263f6ce4..4144b5b9e0 100644 --- a/examples/MidiTest/Builds/Android/app/CMakeLists.txt +++ b/examples/MidiTest/Builds/Android/app/CMakeLists.txt @@ -452,6 +452,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/misc/juce_Result.h" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" "../../../../../modules/juce_core/misc/juce_Uuid.cpp" "../../../../../modules/juce_core/misc/juce_Uuid.h" "../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" @@ -1596,6 +1598,8 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.c set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln b/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln index ee308f93e3..1841b95b84 100644 --- a/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln +++ b/examples/MidiTest/Builds/VisualStudio2015/MidiTest.sln @@ -631,6 +631,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln b/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln index 252e3be6d0..9640c97e50 100644 --- a/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln +++ b/examples/MidiTest/Builds/VisualStudio2017/MidiTest.sln @@ -631,6 +631,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/MidiTest/JuceLibraryCode/AppConfig.h b/examples/MidiTest/JuceLibraryCode/AppConfig.h index cdf56cb38a..0c0ae04d52 100644 --- a/examples/MidiTest/JuceLibraryCode/AppConfig.h +++ b/examples/MidiTest/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/MidiTest/MidiTest.jucer b/examples/MidiTest/MidiTest.jucer index 217dbb47ca..02bb85602c 100644 --- a/examples/MidiTest/MidiTest.jucer +++ b/examples/MidiTest/MidiTest.jucer @@ -2,7 +2,7 @@ diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index 01eaf933fd..4f1bc5ee48 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -455,6 +455,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/misc/juce_Result.h" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" "../../../../../modules/juce_core/misc/juce_Uuid.cpp" "../../../../../modules/juce_core/misc/juce_Uuid.h" "../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" @@ -1677,6 +1679,8 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.c set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln index ffd7a12c87..395ccb523c 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo.sln @@ -636,6 +636,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln index 4624a78f6a..8f45326237 100644 --- a/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln +++ b/examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo.sln @@ -636,6 +636,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h b/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h index 11aac134c5..3259bddc2a 100644 --- a/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/NetworkGraphicsDemo/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer index c95f38db7b..c0ae18247b 100644 --- a/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer +++ b/examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer @@ -2,7 +2,7 @@ diff --git a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln index 9504eb6e6a..daf4ccb729 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln +++ b/examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor.sln @@ -576,6 +576,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln index 065b60d7e7..81879c583f 100644 --- a/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln +++ b/examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor.sln @@ -576,6 +576,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h index df70943a8c..c2b9d5645f 100644 --- a/examples/OSCMonitor/JuceLibraryCode/AppConfig.h +++ b/examples/OSCMonitor/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/OSCMonitor/OSCMonitor.jucer b/examples/OSCMonitor/OSCMonitor.jucer index 2bd33138a1..0e4ed3de90 100644 --- a/examples/OSCMonitor/OSCMonitor.jucer +++ b/examples/OSCMonitor/OSCMonitor.jucer @@ -2,7 +2,7 @@ diff --git a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt index 0803853485..527c8bcdfb 100644 --- a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt @@ -101,6 +101,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/misc/juce_Result.h" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" "../../../../../modules/juce_core/misc/juce_Uuid.cpp" "../../../../../modules/juce_core/misc/juce_Uuid.h" "../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" @@ -927,6 +929,8 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.c set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln index a5d46a5f86..548432d7c0 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln +++ b/examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver.sln @@ -122,6 +122,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln index 766ad7d335..c0914891a0 100644 --- a/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln +++ b/examples/OSCReceiver/Builds/VisualStudio2017/OSCReceiver.sln @@ -122,6 +122,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/OSCReceiver/JuceLibraryCode/AppConfig.h b/examples/OSCReceiver/JuceLibraryCode/AppConfig.h index 4f260fd9eb..18d6e34707 100644 --- a/examples/OSCReceiver/JuceLibraryCode/AppConfig.h +++ b/examples/OSCReceiver/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/OSCReceiver/OSCReceiver.jucer b/examples/OSCReceiver/OSCReceiver.jucer index 34186c96e7..431f101f3c 100644 --- a/examples/OSCReceiver/OSCReceiver.jucer +++ b/examples/OSCReceiver/OSCReceiver.jucer @@ -2,7 +2,7 @@ diff --git a/examples/OSCSender/Builds/Android/app/CMakeLists.txt b/examples/OSCSender/Builds/Android/app/CMakeLists.txt index 685d1f408e..d62b3072ce 100644 --- a/examples/OSCSender/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCSender/Builds/Android/app/CMakeLists.txt @@ -101,6 +101,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/misc/juce_Result.h" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" "../../../../../modules/juce_core/misc/juce_Uuid.cpp" "../../../../../modules/juce_core/misc/juce_Uuid.h" "../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" @@ -854,6 +856,8 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.c set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/OSCSender/Builds/VisualStudio2015/OSCSender.sln b/examples/OSCSender/Builds/VisualStudio2015/OSCSender.sln index c0e480f38a..ef8da18d58 100644 --- a/examples/OSCSender/Builds/VisualStudio2015/OSCSender.sln +++ b/examples/OSCSender/Builds/VisualStudio2015/OSCSender.sln @@ -122,6 +122,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/OSCSender/Builds/VisualStudio2017/OSCSender.sln b/examples/OSCSender/Builds/VisualStudio2017/OSCSender.sln index fd1a8c8834..8cc156c427 100644 --- a/examples/OSCSender/Builds/VisualStudio2017/OSCSender.sln +++ b/examples/OSCSender/Builds/VisualStudio2017/OSCSender.sln @@ -122,6 +122,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/OSCSender/JuceLibraryCode/AppConfig.h b/examples/OSCSender/JuceLibraryCode/AppConfig.h index b6df60da65..c811797b8e 100644 --- a/examples/OSCSender/JuceLibraryCode/AppConfig.h +++ b/examples/OSCSender/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/OSCSender/OSCSender.jucer b/examples/OSCSender/OSCSender.jucer index e64ac468f9..238ccef994 100644 --- a/examples/OSCSender/OSCSender.jucer +++ b/examples/OSCSender/OSCSender.jucer @@ -2,7 +2,7 @@ diff --git a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln index f6a4f07db2..fb7e888f8f 100644 --- a/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln +++ b/examples/OpenGLAppExample/Builds/VisualStudio2017/OpenGLAppExample.sln @@ -581,6 +581,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h index 8eb8079eb8..89980ac4f4 100644 --- a/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h +++ b/examples/OpenGLAppExample/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/OpenGLAppExample/OpenGLAppExample.jucer b/examples/OpenGLAppExample/OpenGLAppExample.jucer index 5e0827e9fa..aac8b7040e 100644 --- a/examples/OpenGLAppExample/OpenGLAppExample.jucer +++ b/examples/OpenGLAppExample/OpenGLAppExample.jucer @@ -2,7 +2,7 @@ diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln index 04f6d8c92c..1731cfa36c 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.sln @@ -632,6 +632,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln index 5526517943..aec94bae6e 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2017/PluckedStringsDemo.sln @@ -632,6 +632,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h b/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h index cdf56cb38a..0c0ae04d52 100644 --- a/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h +++ b/examples/PluckedStringsDemo/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/PluckedStringsDemo/PluckedStringsDemo.jucer b/examples/PluckedStringsDemo/PluckedStringsDemo.jucer index 09093ca2db..c2ba60807a 100644 --- a/examples/PluckedStringsDemo/PluckedStringsDemo.jucer +++ b/examples/PluckedStringsDemo/PluckedStringsDemo.jucer @@ -2,7 +2,7 @@ diff --git a/examples/PlugInSamples/Arpeggiator/Arpeggiator.jucer b/examples/PlugInSamples/Arpeggiator/Arpeggiator.jucer index fd053e9ca5..387aaa5028 100644 --- a/examples/PlugInSamples/Arpeggiator/Arpeggiator.jucer +++ b/examples/PlugInSamples/Arpeggiator/Arpeggiator.jucer @@ -9,7 +9,7 @@ pluginIsMidiEffectPlugin="1" pluginSilenceInIsSilenceOut="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="ArpeggiatorAU" pluginRTASCategory="" aaxIdentifier="com.ROLI.Arpeggiator" pluginAAXCategory="AAX_EPlugInCategory_Effect" - jucerVersion="5.0.0" companyName="ROLI Ltd." companyWebsite="www.juce.com" + jucerVersion="5.0.1" companyName="ROLI Ltd." companyWebsite="www.juce.com" companyEmail="info@juce.com" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"> diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln index f7dbdc6cf7..4fae01916b 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2015/Arpeggiator.sln @@ -714,6 +714,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln index a7cebb7880..8a3f09713c 100644 --- a/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln +++ b/examples/PlugInSamples/Arpeggiator/Builds/VisualStudio2017/Arpeggiator.sln @@ -714,6 +714,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h index a2c4f4b42b..e7651daaaa 100644 --- a/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Arpeggiator/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln index 22cf2581a1..a27c90682f 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2015/GainPlugIn.sln @@ -719,6 +719,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln index 27eabf7196..a6c1ccadbf 100644 --- a/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln +++ b/examples/PlugInSamples/GainPlugIn/Builds/VisualStudio2017/GainPlugIn.sln @@ -719,6 +719,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer b/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer index d5fecf1eb3..17eedc7118 100644 --- a/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer +++ b/examples/PlugInSamples/GainPlugIn/GainPlugIn.jucer @@ -8,7 +8,7 @@ pluginIsSynth="0" pluginWantsMidiIn="0" pluginProducesMidiOut="0" pluginSilenceInIsSilenceOut="1" pluginEditorRequiresKeys="0" pluginAUExportPrefix="GainPlugInAU" pluginRTASCategory="" aaxIdentifier="com.ROLI.GainPlugIn" - pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.0" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.1" pluginIsMidiEffectPlugin="0" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"> diff --git a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h index 821d46eb67..cbec5064ce 100644 --- a/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/GainPlugIn/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/PlugInSamples/InterAppAudioEffect/InterAppAudioEffect.jucer b/examples/PlugInSamples/InterAppAudioEffect/InterAppAudioEffect.jucer index 512904830d..bbcce97dcc 100644 --- a/examples/PlugInSamples/InterAppAudioEffect/InterAppAudioEffect.jucer +++ b/examples/PlugInSamples/InterAppAudioEffect/InterAppAudioEffect.jucer @@ -9,7 +9,7 @@ pluginIsSynth="0" pluginWantsMidiIn="0" pluginProducesMidiOut="0" pluginIsMidiEffectPlugin="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="InterAppAudioEffectAU" pluginRTASCategory="" aaxIdentifier="com.yourcompany.InterAppAudioEffect" - pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.0" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.1" companyName="ROLI Ltd." buildStandalone="1" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"> diff --git a/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h index 415f65a02a..111f25e446 100644 --- a/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/InterAppAudioEffect/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln index 65b64d7c48..2764cd4ff0 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth.sln @@ -729,6 +729,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj index d5e8990884..db6dafa2fe 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2015/MultiOutSynth_AAX.vcxproj @@ -106,7 +106,7 @@ if not exist "$(OutDir)\MultiOutSynth.aaxplugin\Contents\Win32" mkdir copy /Y "$(OutDir)\MultiOutSynth.aaxdll" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\Win32\MultiOutSynth.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\Win32" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\Win32" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" @@ -159,7 +159,7 @@ if not exist "$(OutDir)\MultiOutSynth.aaxplugin\Contents\Win32" mkdir copy /Y "$(OutDir)\MultiOutSynth.aaxdll" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\Win32\MultiOutSynth.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\Win32" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\Win32" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln index e8b5ccb9bc..6a1915887e 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth.sln @@ -729,6 +729,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj index 29b853db1e..a0773a8a9b 100644 --- a/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj +++ b/examples/PlugInSamples/MultiOutSynth/Builds/VisualStudio2017/MultiOutSynth_AAX.vcxproj @@ -106,7 +106,7 @@ if not exist "$(OutDir)\MultiOutSynth.aaxplugin\Contents\x64" mkdir &q copy /Y "$(OutDir)\MultiOutSynth.aaxdll" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\x64\MultiOutSynth.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" @@ -158,7 +158,7 @@ if not exist "$(OutDir)\MultiOutSynth.aaxplugin\Contents\x64" mkdir &q copy /Y "$(OutDir)\MultiOutSynth.aaxdll" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\x64\MultiOutSynth.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\MultiOutSynth.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" diff --git a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h index 8c685e2cc1..c70bc24052 100644 --- a/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/MultiOutSynth/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer b/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer index a37095e21c..a82cd4844f 100644 --- a/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer +++ b/examples/PlugInSamples/MultiOutSynth/MultiOutSynth.jucer @@ -9,7 +9,7 @@ pluginSilenceInIsSilenceOut="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="MultiOutSynthAU" pluginRTASCategory="" aaxIdentifier="com.ROLI.MultiOutSynth" pluginAAXCategory="AAX_ePlugInCategory_SWGenerators" - jucerVersion="5.0.0" companyName="ROLI Ltd." companyWebsite="www.roli.com" + jucerVersion="5.0.1" companyName="ROLI Ltd." companyWebsite="www.roli.com" companyEmail="info@juce.com" pluginIsMidiEffectPlugin="0" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"> diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln index 89620c050e..89599c5f08 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate.sln @@ -724,6 +724,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj index b8e002b610..97afc34f6a 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2015/NoiseGate_AAX.vcxproj @@ -106,7 +106,7 @@ if not exist "$(OutDir)\NoiseGate.aaxplugin\Contents\Win32" mkdir &quo copy /Y "$(OutDir)\NoiseGate.aaxdll" "$(OutDir)\NoiseGate.aaxplugin\Contents\Win32\NoiseGate.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\NoiseGate.aaxplugin\Contents\Win32" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\NoiseGate.aaxplugin\Contents\Win32" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" @@ -159,7 +159,7 @@ if not exist "$(OutDir)\NoiseGate.aaxplugin\Contents\Win32" mkdir &quo copy /Y "$(OutDir)\NoiseGate.aaxdll" "$(OutDir)\NoiseGate.aaxplugin\Contents\Win32\NoiseGate.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\NoiseGate.aaxplugin\Contents\Win32" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\NoiseGate.aaxplugin\Contents\Win32" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln index 972d14eb3d..c6fe64bd9e 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate.sln @@ -724,6 +724,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj index 4f73107d59..6db366a171 100644 --- a/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj +++ b/examples/PlugInSamples/NoiseGate/Builds/VisualStudio2017/NoiseGate_AAX.vcxproj @@ -106,7 +106,7 @@ if not exist "$(OutDir)\NoiseGate.aaxplugin\Contents\x64" mkdir " copy /Y "$(OutDir)\NoiseGate.aaxdll" "$(OutDir)\NoiseGate.aaxplugin\Contents\x64\NoiseGate.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\NoiseGate.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\NoiseGate.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" @@ -158,7 +158,7 @@ if not exist "$(OutDir)\NoiseGate.aaxplugin\Contents\x64" mkdir " copy /Y "$(OutDir)\NoiseGate.aaxdll" "$(OutDir)\NoiseGate.aaxplugin\Contents\x64\NoiseGate.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\NoiseGate.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\NoiseGate.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" diff --git a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h index a67c41d29f..f3b739f070 100644 --- a/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/NoiseGate/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/PlugInSamples/NoiseGate/NoiseGate.jucer b/examples/PlugInSamples/NoiseGate/NoiseGate.jucer index 2d2b427d4f..139fd5c9ff 100644 --- a/examples/PlugInSamples/NoiseGate/NoiseGate.jucer +++ b/examples/PlugInSamples/NoiseGate/NoiseGate.jucer @@ -8,7 +8,7 @@ pluginIsSynth="0" pluginWantsMidiIn="0" pluginProducesMidiOut="0" pluginSilenceInIsSilenceOut="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="NoiseGateAU" pluginRTASCategory="" aaxIdentifier="com.roli.NoiseGate" - pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.0" + pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.0.1" pluginIsMidiEffectPlugin="0" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"> diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln index 9116239c3a..437e49540a 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround.sln @@ -725,6 +725,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj index 6f96508b01..de2a1d84cb 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2015/Surround_AAX.vcxproj @@ -106,7 +106,7 @@ if not exist "$(OutDir)\Surround.aaxplugin\Contents\x64" mkdir "$ copy /Y "$(OutDir)\Surround.aaxdll" "$(OutDir)\Surround.aaxplugin\Contents\x64\Surround.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Surround.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Surround.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" @@ -158,7 +158,7 @@ if not exist "$(OutDir)\Surround.aaxplugin\Contents\x64" mkdir "$ copy /Y "$(OutDir)\Surround.aaxdll" "$(OutDir)\Surround.aaxplugin\Contents\x64\Surround.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Surround.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Surround.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln index 28208eb2c8..f5f193cad8 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround.sln @@ -725,6 +725,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj index 8bad750f48..c30406c6d5 100644 --- a/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj +++ b/examples/PlugInSamples/Surround/Builds/VisualStudio2017/Surround_AAX.vcxproj @@ -106,7 +106,7 @@ if not exist "$(OutDir)\Surround.aaxplugin\Contents\x64" mkdir "$ copy /Y "$(OutDir)\Surround.aaxdll" "$(OutDir)\Surround.aaxplugin\Contents\x64\Surround.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Surround.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Surround.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" @@ -158,7 +158,7 @@ if not exist "$(OutDir)\Surround.aaxplugin\Contents\x64" mkdir "$ copy /Y "$(OutDir)\Surround.aaxdll" "$(OutDir)\Surround.aaxplugin\Contents\x64\Surround.aaxplugin" -"c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Surround.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" +call "c:\\SDKs\\AAX\\Utilities\\CreatePackage.bat" "$(OutDir)\Surround.aaxplugin\Contents\x64" "c:\\SDKs\\AAX\\Utilities\\PlugIn.ico" diff --git a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h index f154082533..1179fe9057 100644 --- a/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h +++ b/examples/PlugInSamples/Surround/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/PlugInSamples/Surround/Surround.jucer b/examples/PlugInSamples/Surround/Surround.jucer index 4532fde826..cb4aeddec3 100644 --- a/examples/PlugInSamples/Surround/Surround.jucer +++ b/examples/PlugInSamples/Surround/Surround.jucer @@ -9,7 +9,7 @@ pluginIsMidiEffectPlugin="0" pluginSilenceInIsSilenceOut="0" pluginEditorRequiresKeys="0" pluginAUExportPrefix="SurroundAU" pluginRTASCategory="" aaxIdentifier="com.ROLI.Surround" pluginAAXCategory="AAX_ePlugInCategory_Dynamics" - jucerVersion="5.0.0" buildAUv3="0" buildStandalone="0" enableIAA="0" + jucerVersion="5.0.1" buildAUv3="0" buildStandalone="0" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" splashScreenColour="Dark"> diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln index a2d9f847db..995e078f98 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.sln @@ -630,6 +630,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln index 6f3951bd79..dda2e652e4 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln +++ b/examples/SimpleFFTExample/Builds/VisualStudio2017/SimpleFFTExample.sln @@ -630,6 +630,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h b/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h index cdf56cb38a..0c0ae04d52 100644 --- a/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h +++ b/examples/SimpleFFTExample/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/SimpleFFTExample/SimpleFFTExample.jucer b/examples/SimpleFFTExample/SimpleFFTExample.jucer index 1849a32b46..7b24e4acb3 100644 --- a/examples/SimpleFFTExample/SimpleFFTExample.jucer +++ b/examples/SimpleFFTExample/SimpleFFTExample.jucer @@ -2,7 +2,7 @@ diff --git a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt index 62fc9aed48..fcead2caab 100644 --- a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt +++ b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt @@ -553,6 +553,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/misc/juce_Result.h" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" "../../../../../modules/juce_core/misc/juce_Uuid.cpp" "../../../../../modules/juce_core/misc/juce_Uuid.h" "../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" @@ -1800,6 +1802,8 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.c set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln index 981e8795a3..8973deedf8 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln +++ b/examples/audio plugin demo/Builds/VisualStudio2015/JuceDemoPlugin.sln @@ -776,6 +776,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln index 3311c5c6ac..05980ed8c0 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln +++ b/examples/audio plugin demo/Builds/VisualStudio2017/JuceDemoPlugin.sln @@ -776,6 +776,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/audio plugin demo/JuceDemoPlugin.jucer b/examples/audio plugin demo/JuceDemoPlugin.jucer index 5af0f6f98e..d02b38a775 100644 --- a/examples/audio plugin demo/JuceDemoPlugin.jucer +++ b/examples/audio plugin demo/JuceDemoPlugin.jucer @@ -8,7 +8,7 @@ pluginProducesMidiOut="1" pluginSilenceInIsSilenceOut="0" pluginTailLength="0" pluginEditorRequiresKeys="1" pluginAUExportPrefix="JuceDemoProjectAU" pluginAUViewClass="JuceDemoProjectAU_V1" pluginRTASCategory="" - bundleIdentifier="com.juce.JuceDemoPlugin" jucerVersion="5.0.0" + bundleIdentifier="com.juce.JuceDemoPlugin" jucerVersion="5.0.1" companyName="ROLI Ltd." aaxIdentifier="com.yourcompany.JuceDemoPlugin" buildAAX="0" pluginAAXCategory="AAX_ePlugInCategory_Dynamics" includeBinaryInAppConfig="1" buildVST3="0" pluginManufacturerEmail="support@yourcompany.com" diff --git a/examples/audio plugin demo/JuceLibraryCode/AppConfig.h b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h index 980f0d4995..325f480008 100644 --- a/examples/audio plugin demo/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin demo/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln index e82ea0380d..c318c61d82 100644 --- a/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln +++ b/examples/audio plugin host/Builds/VisualStudio2013/Plugin Host.sln @@ -637,6 +637,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln index 31bb9471f1..64d24f01c2 100644 --- a/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln +++ b/examples/audio plugin host/Builds/VisualStudio2015/Plugin Host.sln @@ -637,6 +637,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln index 8cab3b9fd9..3ca14b32a6 100644 --- a/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln +++ b/examples/audio plugin host/Builds/VisualStudio2017/Plugin Host.sln @@ -637,6 +637,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/examples/audio plugin host/JuceLibraryCode/AppConfig.h b/examples/audio plugin host/JuceLibraryCode/AppConfig.h index 547bdaa9a3..3952f7d597 100644 --- a/examples/audio plugin host/JuceLibraryCode/AppConfig.h +++ b/examples/audio plugin host/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/examples/audio plugin host/Plugin Host.jucer b/examples/audio plugin host/Plugin Host.jucer index 3617b7b41e..4adb8a81f5 100644 --- a/examples/audio plugin host/Plugin Host.jucer +++ b/examples/audio plugin host/Plugin Host.jucer @@ -2,7 +2,7 @@ diff --git a/examples/audio plugin host/Source/FilterGraph.cpp b/examples/audio plugin host/Source/FilterGraph.cpp index 2c9b10118d..c6802ec658 100644 --- a/examples/audio plugin host/Source/FilterGraph.cpp +++ b/examples/audio plugin host/Source/FilterGraph.cpp @@ -69,16 +69,27 @@ int FilterGraph::getNumFilters() const noexcept return graph.getNumNodes(); } -const AudioProcessorGraph::Node::Ptr FilterGraph::getNode (const int index) const noexcept +AudioProcessorGraph::Node::Ptr FilterGraph::getNode (const int index) const noexcept { return graph.getNode (index); } -const AudioProcessorGraph::Node::Ptr FilterGraph::getNodeForId (const uint32 uid) const noexcept +AudioProcessorGraph::Node::Ptr FilterGraph::getNodeForId (const uint32 uid) const { return graph.getNodeForId (uid); } +AudioProcessorGraph::Node::Ptr FilterGraph::getNodeForName (const String& name) const +{ + for (int i = 0; i < graph.getNumNodes(); i++) + if (auto node = graph.getNode (i)) + if (auto p = node->getProcessor()) + if (p->getName().equalsIgnoreCase (name)) + return node; + + return nullptr; +} + void FilterGraph::addFilter (const PluginDescription* desc, double x, double y) { if (desc != nullptr) diff --git a/examples/audio plugin host/Source/FilterGraph.h b/examples/audio plugin host/Source/FilterGraph.h index bfd8c7ffd9..5ce6613633 100644 --- a/examples/audio plugin host/Source/FilterGraph.h +++ b/examples/audio plugin host/Source/FilterGraph.h @@ -47,10 +47,12 @@ public: AudioProcessorGraph& getGraph() noexcept { return graph; } int getNumFilters() const noexcept; - const AudioProcessorGraph::Node::Ptr getNode (const int index) const noexcept; - const AudioProcessorGraph::Node::Ptr getNodeForId (const uint32 uid) const noexcept; + AudioProcessorGraph::Node::Ptr getNode (int index) const noexcept; - void addFilter (const PluginDescription* desc, double x, double y); + AudioProcessorGraph::Node::Ptr getNodeForId (uint32 uid) const; + AudioProcessorGraph::Node::Ptr getNodeForName (const String& name) const; + + void addFilter (const PluginDescription*, double x, double y); void addFilterCallback (AudioPluginInstance* instance, const String& error, double x, double y); diff --git a/examples/audio plugin host/Source/MainHostWindow.cpp b/examples/audio plugin host/Source/MainHostWindow.cpp index ddbff65783..d44f0aaee0 100644 --- a/examples/audio plugin host/Source/MainHostWindow.cpp +++ b/examples/audio plugin host/Source/MainHostWindow.cpp @@ -110,7 +110,7 @@ MainHostWindow::MainHostWindow() knownPluginList.addChangeListener (this); - if (FilterGraph* filterGraph = getGraphEditor()->graph.get()) + if (auto* filterGraph = getGraphEditor()->graph.get()) filterGraph->addChangeListener (this); addKeyListener (getCommandManager().getKeyMappings()); @@ -131,7 +131,7 @@ MainHostWindow::~MainHostWindow() pluginListWindow = nullptr; knownPluginList.removeChangeListener (this); - if (FilterGraph* filterGraph = getGraphEditor()->graph.get()) + if (auto* filterGraph = getGraphEditor()->graph.get()) filterGraph->removeChangeListener (this); getAppProperties().getUserSettings()->setValue ("mainWindowPos", getWindowStateAsString()); @@ -198,9 +198,7 @@ void MainHostWindow::changeListenerCallback (ChangeBroadcaster* changed) StringArray MainHostWindow::getMenuBarNames() { - const char* const names[] = { "File", "Plugins", "Options", "Windows", nullptr }; - - return StringArray (names); + return { "File", "Plugins", "Options", "Windows" }; } PopupMenu MainHostWindow::getMenuForIndex (int topLevelMenuIndex, const String& /*menuName*/) @@ -266,12 +264,10 @@ PopupMenu MainHostWindow::getMenuForIndex (int topLevelMenuIndex, const String& void MainHostWindow::menuItemSelected (int menuItemID, int /*topLevelMenuIndex*/) { - GraphDocumentComponent* const graphEditor = getGraphEditor(); - if (menuItemID == 250) { - if (graphEditor != nullptr) - if (FilterGraph* filterGraph = getGraphEditor()->graph.get()) + if (auto* graphEditor = getGraphEditor()) + if (auto* filterGraph = graphEditor->graph.get()) filterGraph->clear(); } else if (menuItemID >= 100 && menuItemID < 200) @@ -280,10 +276,9 @@ void MainHostWindow::menuItemSelected (int menuItemID, int /*topLevelMenuIndex*/ recentFiles.restoreFromString (getAppProperties().getUserSettings() ->getValue ("recentFilterGraphFiles")); - if (graphEditor != nullptr - && getGraphEditor()->graph != nullptr - && graphEditor->graph->saveIfNeededAndUserAgrees() == FileBasedDocument::savedOk) - graphEditor->graph->loadFrom (recentFiles.getFile (menuItemID - 100), true); + if (auto* graphEditor = getGraphEditor()) + if (graphEditor->graph != nullptr && graphEditor->graph->saveIfNeededAndUserAgrees() == FileBasedDocument::savedOk) + graphEditor->graph->loadFrom (recentFiles.getFile (menuItemID - 100), true); } else if (menuItemID >= 200 && menuItemID < 210) { @@ -307,24 +302,26 @@ void MainHostWindow::menuItemSelected (int menuItemID, int /*topLevelMenuIndex*/ void MainHostWindow::menuBarActivated (bool isActivated) { - GraphDocumentComponent* const graphEditor = getGraphEditor(); - - if (graphEditor != nullptr && isActivated) - graphEditor->unfocusKeyboardComponent(); + if (auto* graphEditor = getGraphEditor()) + if (isActivated) + graphEditor->unfocusKeyboardComponent(); } void MainHostWindow::createPlugin (const PluginDescription* desc, int x, int y) { - GraphDocumentComponent* const graphEditor = getGraphEditor(); - - if (graphEditor != nullptr) + if (auto* graphEditor = getGraphEditor()) graphEditor->createNewPlugin (desc, x, y); } void MainHostWindow::addPluginsToMenu (PopupMenu& m) const { - for (int i = 0; i < internalTypes.size(); ++i) - m.addItem (i + 1, internalTypes.getUnchecked(i)->name); + if (auto* graphEditor = getGraphEditor()) + { + int i = 0; + + for (auto* t : internalTypes) + m.addItem (++i, t->name, graphEditor->graph->getNodeForName (t->name) == nullptr); + } m.addSeparator(); @@ -345,7 +342,7 @@ ApplicationCommandTarget* MainHostWindow::getNextCommandTarget() return findFirstTargetParentComponent(); } -void MainHostWindow::getAllCommands (Array & commands) +void MainHostWindow::getAllCommands (Array& commands) { // this returns the set of all commands that this target can perform.. const CommandID ids[] = { CommandIDs::newFile, @@ -420,7 +417,7 @@ void MainHostWindow::getCommandInfo (const CommandID commandID, ApplicationComma bool MainHostWindow::perform (const InvocationInfo& info) { - GraphDocumentComponent* const graphEditor = getGraphEditor(); + auto* graphEditor = getGraphEditor(); switch (info.commandID) { @@ -456,7 +453,7 @@ bool MainHostWindow::perform (const InvocationInfo& info) break; case CommandIDs::toggleDoublePrecision: - if (PropertiesFile* props = getAppProperties().getUserSettings()) + if (auto* props = getAppProperties().getUserSettings()) { bool newIsDoublePrecision = ! isDoublePrecisionProcessing(); props->setValue ("doublePrecisionProcessing", var (newIsDoublePrecision)); @@ -478,7 +475,7 @@ bool MainHostWindow::perform (const InvocationInfo& info) case CommandIDs::allWindowsForward: { - Desktop& desktop = Desktop::getInstance(); + auto& desktop = Desktop::getInstance(); for (int i = 0; i < desktop.getNumComponents(); ++i) desktop.getComponent (i)->toBehind (this); @@ -518,10 +515,9 @@ void MainHostWindow::showAudioSettings() getAppProperties().getUserSettings()->setValue ("audioDeviceState", audioState); getAppProperties().getUserSettings()->saveIfNeeded(); - GraphDocumentComponent* const graphEditor = getGraphEditor(); - - if (graphEditor != nullptr && graphEditor->graph != nullptr) - graphEditor->graph->removeIllegalConnections(); + if (auto* graphEditor = getGraphEditor()) + if (graphEditor->graph != nullptr) + graphEditor->graph->removeIllegalConnections(); } bool MainHostWindow::isInterestedInFileDrag (const StringArray&) @@ -543,25 +539,23 @@ void MainHostWindow::fileDragExit (const StringArray&) void MainHostWindow::filesDropped (const StringArray& files, int x, int y) { - GraphDocumentComponent* const graphEditor = getGraphEditor(); - - if (graphEditor != nullptr) + if (auto* graphEditor = getGraphEditor()) { if (files.size() == 1 && File (files[0]).hasFileExtension (filenameSuffix)) { - if (FilterGraph* filterGraph = graphEditor->graph.get()) - if (filterGraph->saveIfNeededAndUserAgrees() == FileBasedDocument::savedOk) - filterGraph->loadFrom (File (files[0]), true); + if (auto* filterGraph = graphEditor->graph.get()) + if (filterGraph->saveIfNeededAndUserAgrees() == FileBasedDocument::savedOk) + filterGraph->loadFrom (File (files[0]), true); } else { - OwnedArray typesFound; + OwnedArray typesFound; knownPluginList.scanAndAddDragAndDroppedFiles (formatManager, files, typesFound); - Point pos (graphEditor->getLocalPoint (this, Point (x, y))); + auto pos = graphEditor->getLocalPoint (this, Point (x, y)); for (int i = 0; i < jmin (5, typesFound.size()); ++i) - createPlugin (typesFound.getUnchecked(i), pos.getX(), pos.getY()); + createPlugin (typesFound.getUnchecked(i), pos.x, pos.y); } } } @@ -573,7 +567,7 @@ GraphDocumentComponent* MainHostWindow::getGraphEditor() const bool MainHostWindow::isDoublePrecisionProcessing() { - if (PropertiesFile* props = getAppProperties().getUserSettings()) + if (auto* props = getAppProperties().getUserSettings()) return props->getBoolValue ("doublePrecisionProcessing", false); return false; diff --git a/examples/audio plugin host/Source/MainHostWindow.h b/examples/audio plugin host/Source/MainHostWindow.h index f43b1f0bb6..837a18863e 100644 --- a/examples/audio plugin host/Source/MainHostWindow.h +++ b/examples/audio plugin host/Source/MainHostWindow.h @@ -77,16 +77,16 @@ public: PopupMenu getMenuForIndex (int topLevelMenuIndex, const String& menuName); void menuItemSelected (int menuItemID, int topLevelMenuIndex); ApplicationCommandTarget* getNextCommandTarget(); - void getAllCommands (Array & commands); + void getAllCommands (Array& commands); void getCommandInfo (CommandID commandID, ApplicationCommandInfo& result); bool perform (const InvocationInfo& info); bool tryToQuitApplication(); - void createPlugin (const PluginDescription* desc, int x, int y); + void createPlugin (const PluginDescription*, int x, int y); - void addPluginsToMenu (PopupMenu& m) const; - const PluginDescription* getChosenType (const int menuID) const; + void addPluginsToMenu (PopupMenu&) const; + const PluginDescription* getChosenType (int menuID) const; GraphDocumentComponent* getGraphEditor() const; @@ -98,7 +98,7 @@ private: AudioDeviceManager deviceManager; AudioPluginFormatManager formatManager; - OwnedArray internalTypes; + OwnedArray internalTypes; KnownPluginList knownPluginList; KnownPluginList::SortMethod pluginSortMethod; diff --git a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer index 94aec54503..182395f7d1 100644 --- a/extras/AudioPerformanceTest/AudioPerformanceTest.jucer +++ b/extras/AudioPerformanceTest/AudioPerformanceTest.jucer @@ -2,7 +2,7 @@ diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index 5342c1cc8e..fa6e8ccbe5 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -451,6 +451,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_core/misc/juce_Result.h" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" "../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" + "../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" "../../../../../modules/juce_core/misc/juce_Uuid.cpp" "../../../../../modules/juce_core/misc/juce_Uuid.h" "../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" @@ -1595,6 +1597,8 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.c set_source_files_properties("../../../../../modules/juce_core/misc/juce_Result.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_RuntimePermissions.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunctionCompat.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln index dfa64c64d4..7896086883 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2015/AudioPerformanceTest.sln @@ -630,6 +630,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h index cdf56cb38a..0c0ae04d52 100644 --- a/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h +++ b/extras/AudioPerformanceTest/JuceLibraryCode/AppConfig.h @@ -20,7 +20,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile index 016163a112..4a12c59b81 100644 --- a/extras/Projucer/Builds/LinuxMakefile/Makefile +++ b/extras/Projucer/Builds/LinuxMakefile/Makefile @@ -33,7 +33,7 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.0.0 -DJUCE_APP_VERSION_HEX=0x50000 $(shell pkg-config --cflags freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.0.1 -DJUCE_APP_VERSION_HEX=0x50001 $(shell pkg-config --cflags freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := Projucer @@ -54,7 +54,7 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.0.0 -DJUCE_APP_VERSION_HEX=0x50000 $(shell pkg-config --cflags freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.0.1 -DJUCE_APP_VERSION_HEX=0x50001 $(shell pkg-config --cflags freetype2 gtk+-x11-3.0 libcurl webkit2gtk-4.0 x11 xext xinerama) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 JUCE_TARGET_APP := Projucer diff --git a/extras/Projucer/Builds/MacOSX/Info-App.plist b/extras/Projucer/Builds/MacOSX/Info-App.plist index 6f14f1ea78..d94c28717a 100644 --- a/extras/Projucer/Builds/MacOSX/Info-App.plist +++ b/extras/Projucer/Builds/MacOSX/Info-App.plist @@ -33,9 +33,9 @@ CFBundleSignature ???? CFBundleShortVersionString - 5.0.0 + 5.0.1 CFBundleVersion - 5.0.0 + 5.0.1 NSHumanReadableCopyright NSHighResolutionCapable diff --git a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj index e4d8d7f697..68f51481ed 100644 --- a/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj +++ b/extras/Projucer/Builds/MacOSX/Projucer.xcodeproj/project.pbxproj @@ -737,8 +737,8 @@ "_DEBUG=1", "DEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=5.0.0", - "JUCE_APP_VERSION_HEX=0x50000", + "JUCE_APP_VERSION=5.0.1", + "JUCE_APP_VERSION_HEX=0x50001", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", @@ -768,8 +768,8 @@ "_NDEBUG=1", "NDEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1", - "JUCE_APP_VERSION=5.0.0", - "JUCE_APP_VERSION_HEX=0x50000", + "JUCE_APP_VERSION=5.0.1", + "JUCE_APP_VERSION_HEX=0x50001", "JucePlugin_Build_VST=0", "JucePlugin_Build_VST3=0", "JucePlugin_Build_AU=0", diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer.sln b/extras/Projucer/Builds/VisualStudio2013/Projucer.sln index 1a704aeeab..70122b062c 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer.sln +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer.sln @@ -445,6 +445,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj index 3850ec571e..4c9378e49a 100644 --- a/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2013/Projucer_App.vcxproj @@ -68,7 +68,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=5.0.0;JUCE_APP_VERSION_HEX=0x50000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -107,7 +107,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=5.0.0;JUCE_APP_VERSION_HEX=0x50000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Projucer/Builds/VisualStudio2013/resources.rc b/extras/Projucer/Builds/VisualStudio2013/resources.rc index bbe43f7c6e..74ebe016f0 100644 --- a/extras/Projucer/Builds/VisualStudio2013/resources.rc +++ b/extras/Projucer/Builds/VisualStudio2013/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 5,0,0,0 +FILEVERSION 5,0,1,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "Projucer\0" - VALUE "FileVersion", "5.0.0\0" + VALUE "FileVersion", "5.0.1\0" VALUE "ProductName", "Projucer\0" - VALUE "ProductVersion", "5.0.0\0" + VALUE "ProductVersion", "5.0.1\0" END END diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer.sln b/extras/Projucer/Builds/VisualStudio2015/Projucer.sln index 133c5676a2..3032e41930 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer.sln +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer.sln @@ -445,6 +445,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj index f8b33ea5d6..c6437b4447 100644 --- a/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2015/Projucer_App.vcxproj @@ -68,7 +68,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=5.0.0;JUCE_APP_VERSION_HEX=0x50000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebugDLL true @@ -107,7 +107,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=5.0.0;JUCE_APP_VERSION_HEX=0x50000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Projucer/Builds/VisualStudio2015/resources.rc b/extras/Projucer/Builds/VisualStudio2015/resources.rc index bbe43f7c6e..74ebe016f0 100644 --- a/extras/Projucer/Builds/VisualStudio2015/resources.rc +++ b/extras/Projucer/Builds/VisualStudio2015/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 5,0,0,0 +FILEVERSION 5,0,1,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "Projucer\0" - VALUE "FileVersion", "5.0.0\0" + VALUE "FileVersion", "5.0.1\0" VALUE "ProductName", "Projucer\0" - VALUE "ProductVersion", "5.0.0\0" + VALUE "ProductVersion", "5.0.1\0" END END diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer.sln b/extras/Projucer/Builds/VisualStudio2017/Projucer.sln index 77ba38c9af..0d52e3dece 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer.sln +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer.sln @@ -445,6 +445,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "misc", "misc", "{228DF378-D ..\..\..\..\modules\juce_core\misc\juce_Result.h = ..\..\..\..\modules\juce_core\misc\juce_Result.h ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.cpp ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h = ..\..\..\..\modules\juce_core\misc\juce_RuntimePermissions.h + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.cpp + ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h = ..\..\..\..\modules\juce_core\misc\juce_StdFunctionCompat.h ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp = ..\..\..\..\modules\juce_core\misc\juce_Uuid.cpp ..\..\..\..\modules\juce_core\misc\juce_Uuid.h = ..\..\..\..\modules\juce_core\misc\juce_Uuid.h ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h = ..\..\..\..\modules\juce_core\misc\juce_WindowsRegistry.h diff --git a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj index 9e65156c73..821df092d6 100644 --- a/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj +++ b/extras/Projucer/Builds/VisualStudio2017/Projucer_App.vcxproj @@ -68,7 +68,7 @@ Disabled ProgramDatabase ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=5.0.0;JUCE_APP_VERSION_HEX=0x50000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -107,7 +107,7 @@ Full ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) - _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=5.0.0;JUCE_APP_VERSION_HEX=0x50000;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;JUCER_VS2017_78A5024=1;JUCE_APP_VERSION=5.0.1;JUCE_APP_VERSION_HEX=0x50001;JucePlugin_Build_VST=0;JucePlugin_Build_VST3=0;JucePlugin_Build_AU=0;JucePlugin_Build_AUv3=0;JucePlugin_Build_RTAS=0;JucePlugin_Build_AAX=0;JucePlugin_Build_Standalone=0;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Projucer/Builds/VisualStudio2017/resources.rc b/extras/Projucer/Builds/VisualStudio2017/resources.rc index bbe43f7c6e..74ebe016f0 100644 --- a/extras/Projucer/Builds/VisualStudio2017/resources.rc +++ b/extras/Projucer/Builds/VisualStudio2017/resources.rc @@ -7,16 +7,16 @@ #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 5,0,0,0 +FILEVERSION 5,0,1,0 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "Projucer\0" - VALUE "FileVersion", "5.0.0\0" + VALUE "FileVersion", "5.0.1\0" VALUE "ProductName", "Projucer\0" - VALUE "ProductVersion", "5.0.0\0" + VALUE "ProductVersion", "5.0.1\0" END END diff --git a/extras/Projucer/JuceLibraryCode/AppConfig.h b/extras/Projucer/JuceLibraryCode/AppConfig.h index d85805a50b..6cb927d0f3 100644 --- a/extras/Projucer/JuceLibraryCode/AppConfig.h +++ b/extras/Projucer/JuceLibraryCode/AppConfig.h @@ -38,7 +38,6 @@ // [END_USER_CODE_SECTION] -//============================================================================== /* ============================================================================== @@ -53,8 +52,8 @@ // BEGIN SECTION A -#define JUCE_DISPLAY_SPLASH_SCREEN 1 -#define JUCE_REPORT_APP_USAGE 1 +#define JUCE_DISPLAY_SPLASH_SCREEN 0 +#define JUCE_REPORT_APP_USAGE 0 // END SECTION A diff --git a/extras/Projucer/JuceLibraryCode/JuceHeader.h b/extras/Projucer/JuceLibraryCode/JuceHeader.h index e714c6cf80..9447b34bf1 100644 --- a/extras/Projucer/JuceLibraryCode/JuceHeader.h +++ b/extras/Projucer/JuceLibraryCode/JuceHeader.h @@ -34,7 +34,7 @@ namespace ProjectInfo { const char* const projectName = "Projucer"; - const char* const versionString = "5.0.0"; - const int versionNumber = 0x50000; + const char* const versionString = "5.0.1"; + const int versionNumber = 0x50001; } #endif diff --git a/extras/Projucer/Projucer.jucer b/extras/Projucer/Projucer.jucer index 85a4f844be..2650c775c9 100644 --- a/extras/Projucer/Projucer.jucer +++ b/extras/Projucer/Projucer.jucer @@ -1,9 +1,9 @@ + jucerVersion="5.0.1" version="5.0.1" bundleIdentifier="com.juce.theprojucer" + defines="" includeBinaryInAppConfig="1" splashScreenColour="Dark" + displaySplashScreen="0" reportAppUsage="0"> - + diff --git a/extras/Projucer/Source/Application/jucer_Application.cpp b/extras/Projucer/Source/Application/jucer_Application.cpp index f255c1e3a2..d06d74fcd1 100644 --- a/extras/Projucer/Source/Application/jucer_Application.cpp +++ b/extras/Projucer/Source/Application/jucer_Application.cpp @@ -82,9 +82,13 @@ void ProjucerApplication::initialise (const String& commandLine) initialiseBasics(); - if (commandLine.isNotEmpty()) + isRunningCommandLine = commandLine.isNotEmpty(); + + licenseController = new LicenseController; + licenseController->addLicenseStatusChangedCallback (this); + + if (isRunningCommandLine) { - isRunningCommandLine = true; const int appReturnCode = performCommandLine (commandLine); if (appReturnCode != commandLineNotPerformed) @@ -149,9 +153,8 @@ bool ProjucerApplication::initialiseLogger (const char* filePrefix) void ProjucerApplication::handleAsyncUpdate() { - licenseController = new LicenseController; - licenseController->addLicenseStatusChangedCallback (this); - licenseStateChanged (licenseController->getState()); + if (licenseController != nullptr) + licenseController->startWebviewIfNeeded(); #if JUCE_MAC PopupMenu extraAppleMenuItems; @@ -175,6 +178,9 @@ void ProjucerApplication::initialiseWindows (const String& commandLine) mainWindowList.reopenLastProjects(); mainWindowList.createWindowIfNoneAreOpen(); + + if (licenseController->getState().applicationUsageDataState == LicenseState::ApplicationUsageData::notChosenYet) + showApplicationUsageDataAgreementPopup(); } void ProjucerApplication::shutdown() @@ -255,8 +261,12 @@ void ProjucerApplication::systemRequestedQuit() //============================================================================== void ProjucerApplication::licenseStateChanged (const LicenseState& state) { + #if ! JUCER_ENABLE_GPL_MODE if (state.type != LicenseState::Type::notLoggedIn && state.type != LicenseState::Type::noLicenseChosenYet) + #else + ignoreUnused (state); + #endif { initialiseWindows (getCommandLineParameters()); } @@ -370,6 +380,7 @@ void ProjucerApplication::createFileMenu (PopupMenu& menu) #if ! JUCE_MAC menu.addCommandItem (commandManager, CommandIDs::showAboutWindow); + menu.addCommandItem (commandManager, CommandIDs::showAppUsageWindow); menu.addCommandItem (commandManager, CommandIDs::showGlobalPreferences); menu.addSeparator(); menu.addCommandItem (commandManager, StandardApplicationCommandIDs::quit); @@ -411,9 +422,8 @@ void ProjucerApplication::createViewMenu (PopupMenu& menu) void ProjucerApplication::createBuildMenu (PopupMenu& menu) { menu.addCommandItem (commandManager, CommandIDs::toggleBuildEnabled); - menu.addCommandItem (commandManager, CommandIDs::toggleContinuousBuild); menu.addCommandItem (commandManager, CommandIDs::buildNow); - + menu.addCommandItem (commandManager, CommandIDs::toggleContinuousBuild); menu.addSeparator(); menu.addCommandItem (commandManager, CommandIDs::launchApp); menu.addCommandItem (commandManager, CommandIDs::killApp); @@ -468,6 +478,7 @@ void ProjucerApplication::createToolsMenu (PopupMenu& menu) void ProjucerApplication::createExtraAppleMenuItems (PopupMenu& menu) { menu.addCommandItem (commandManager, CommandIDs::showAboutWindow); + menu.addCommandItem (commandManager, CommandIDs::showAppUsageWindow); menu.addSeparator(); menu.addCommandItem (commandManager, CommandIDs::showGlobalPreferences); } @@ -509,10 +520,11 @@ void ProjucerApplication::handleMainMenuCommand (int menuItemID) lookAndFeel.setupColours(); mainWindowList.sendLookAndFeelChange(); - if (utf8Window != nullptr) utf8Window->sendLookAndFeelChange(); - if (svgPathWindow != nullptr) svgPathWindow->sendLookAndFeelChange(); - if (globalPreferencesWindow != nullptr) globalPreferencesWindow->sendLookAndFeelChange(); - if (aboutWindow != nullptr) aboutWindow->sendLookAndFeelChange(); + if (utf8Window != nullptr) utf8Window->sendLookAndFeelChange(); + if (svgPathWindow != nullptr) svgPathWindow->sendLookAndFeelChange(); + if (globalPreferencesWindow != nullptr) globalPreferencesWindow->sendLookAndFeelChange(); + if (aboutWindow != nullptr) aboutWindow->sendLookAndFeelChange(); + if (applicationUsageDataWindow != nullptr) applicationUsageDataWindow->sendLookAndFeelChange(); } else { @@ -533,6 +545,7 @@ void ProjucerApplication::getAllCommands (Array & commands) CommandIDs::showUTF8Tool, CommandIDs::showSVGPathTool, CommandIDs::showAboutWindow, + CommandIDs::showAppUsageWindow, CommandIDs::loginLogout }; commands.addArray (ids, numElementsInArray (ids)); @@ -579,6 +592,10 @@ void ProjucerApplication::getCommandInfo (CommandID commandID, ApplicationComman result.setInfo ("About Projucer", "Shows the Projucer's 'About' page.", CommandCategories::general, 0); break; + case CommandIDs::showAppUsageWindow: + result.setInfo ("Application Usage Data", "Shows the application usage data agreement window", CommandCategories::general, 0); + break; + case CommandIDs::loginLogout: { bool isLoggedIn = false; @@ -616,6 +633,7 @@ bool ProjucerApplication::perform (const InvocationInfo& info) case CommandIDs::showSVGPathTool: showSVGPathDataToolWindow(); break; case CommandIDs::showGlobalPreferences: AppearanceSettings::showGlobalPreferences (globalPreferencesWindow); break; case CommandIDs::showAboutWindow: showAboutWindow(); break; + case CommandIDs::showAppUsageWindow: showApplicationUsageDataAgreementPopup(); break; case CommandIDs::loginLogout: doLogout(); break; default: return JUCEApplication::perform (info); } @@ -687,12 +705,28 @@ void ProjucerApplication::showAboutWindow() if (aboutWindow != nullptr) aboutWindow->toFront (true); else - new FloatingToolWindow ("", - "aboutWindowPos", - new AboutWindowComponent(), aboutWindow, false, + new FloatingToolWindow ({}, {}, new AboutWindowComponent(), + aboutWindow, false, 500, 300, 500, 300, 500, 300); } +void ProjucerApplication::showApplicationUsageDataAgreementPopup() +{ + if (applicationUsageDataWindow != nullptr) + applicationUsageDataWindow->toFront (true); + else + new FloatingToolWindow ("Application Usage Analytics", + {}, new ApplicationUsageDataWindowComponent (isPaidOrGPL()), + applicationUsageDataWindow, false, + 400, 300, 400, 300, 400, 300); +} + +void ProjucerApplication::dismissApplicationUsageDataAgreementPopup() +{ + if (applicationUsageDataWindow != nullptr) + applicationUsageDataWindow = nullptr; +} + //============================================================================== struct FileWithTime { diff --git a/extras/Projucer/Source/Application/jucer_Application.h b/extras/Projucer/Source/Application/jucer_Application.h index 1aea62e0d1..c019958448 100644 --- a/extras/Projucer/Source/Application/jucer_Application.h +++ b/extras/Projucer/Source/Application/jucer_Application.h @@ -99,8 +99,8 @@ public: void showSVGPathDataToolWindow(); void showAboutWindow(); - - void showLoginWindow(); + void showApplicationUsageDataAgreementPopup(); + void dismissApplicationUsageDataAgreementPopup(); void updateAllBuildTabs(); LatestVersionChecker* createVersionChecker() const; @@ -124,7 +124,9 @@ public: OpenDocumentManager openDocumentManager; ScopedPointer commandManager; - ScopedPointer appearanceEditorWindow, globalPreferencesWindow, utf8Window, svgPathWindow, aboutWindow; + ScopedPointer appearanceEditorWindow, globalPreferencesWindow, utf8Window, + svgPathWindow, aboutWindow, applicationUsageDataWindow; + ScopedPointer logger; bool isRunningCommandLine; diff --git a/extras/Projucer/Source/Application/jucer_CommandIDs.h b/extras/Projucer/Source/Application/jucer_CommandIDs.h index 850bb41412..3046977511 100644 --- a/extras/Projucer/Source/Application/jucer_CommandIDs.h +++ b/extras/Projucer/Source/Application/jucer_CommandIDs.h @@ -49,6 +49,7 @@ namespace CommandIDs showTranslationTool = 0x300022, showSVGPathTool = 0x300023, showAboutWindow = 0x300024, + showAppUsageWindow = 0x300025, showProjectSettings = 0x300030, showProjectTab = 0x300031, diff --git a/extras/Projucer/Source/Application/jucer_Main.cpp b/extras/Projucer/Source/Application/jucer_Main.cpp index 094564b1a0..1f68447cd2 100644 --- a/extras/Projucer/Source/Application/jucer_Main.cpp +++ b/extras/Projucer/Source/Application/jucer_Main.cpp @@ -34,6 +34,7 @@ #include "../Utility/jucer_UTF8Component.h" #include "../Utility/jucer_SVGPathDataComponent.h" #include "../Utility/jucer_AboutWindowComponent.h" +#include "../Utility/jucer_ApplicationUsageDataWindowComponent.h" #include "../Utility/jucer_FloatingToolWindow.h" #include "../LiveBuildEngine/projucer_MessageIDs.h" diff --git a/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h b/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h index a4f52e5e82..9852315be6 100644 --- a/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h +++ b/extras/Projucer/Source/ComponentEditor/properties/jucer_ColourPropertyComponent.h @@ -163,7 +163,7 @@ public: return getAppSettings().swatchColours [index]; } - void setSwatchColour (int index, const Colour& newColour) const override + void setSwatchColour (int index, const Colour& newColour) override { getAppSettings().swatchColours.set (index, newColour); } diff --git a/extras/Projucer/Source/Licenses/jucer_LicenseController.cpp b/extras/Projucer/Source/Licenses/jucer_LicenseController.cpp index c2e6085074..178facf086 100644 --- a/extras/Projucer/Source/Licenses/jucer_LicenseController.cpp +++ b/extras/Projucer/Source/Licenses/jucer_LicenseController.cpp @@ -71,6 +71,23 @@ static LicenseState::Type getLicenseTypeFromValue (const String& d) return LicenseState::Type::noLicenseChosenYet; } +static const char* getApplicationUsageDataStateValue (LicenseState::ApplicationUsageData type) +{ + switch (type) + { + case LicenseState::ApplicationUsageData::enabled: return "enabled"; + case LicenseState::ApplicationUsageData::disabled: return "disabled"; + default: return "notChosen"; + } +} + +static LicenseState::ApplicationUsageData getApplicationUsageDataTypeFromValue (const String& value) +{ + if (value == getApplicationUsageDataStateValue (LicenseState::ApplicationUsageData::enabled)) return LicenseState::ApplicationUsageData::enabled; + if (value == getApplicationUsageDataStateValue (LicenseState::ApplicationUsageData::disabled)) return LicenseState::ApplicationUsageData::disabled; + return LicenseState::ApplicationUsageData::notChosenYet; +} + //============================================================================== struct LicenseController::ModalCompletionCallback : ModalComponentManager::Callback { @@ -83,15 +100,11 @@ struct LicenseController::ModalCompletionCallback : ModalComponentManager::Callb //============================================================================== LicenseController::LicenseController() - #if (! JUCER_ENABLE_GPL_MODE) : state (licenseStateFromSettings (ProjucerApplication::getApp().settings->getGlobalProperties())) - #endif { #if JUCER_ENABLE_GPL_MODE state.type = LicenseState::Type::GPL; state.username = "GPL mode"; - #else - thread = new LicenseThread (*this, false); #endif } @@ -101,6 +114,37 @@ LicenseController::~LicenseController() closeWebview (-1); } +LicenseState LicenseController::getState() const noexcept +{ + LicenseState projucerState = state; + + // if the user has never logged in before and the user is running from command line + // then we have no way to ask the user to log in, so fallback to GPL mode + if (guiNotInitialisedYet + && (state.type == LicenseState::Type::notLoggedIn + || state.type == LicenseState::Type::noLicenseChosenYet)) + { + projucerState.type = LicenseState::Type::GPL; + projucerState.username = "GPL mode"; + } + + return projucerState; +} + +void LicenseController::startWebviewIfNeeded() +{ + if (guiNotInitialisedYet) + { + guiNotInitialisedYet = false; + listeners.call (&StateChangedCallback::licenseStateChanged, getState()); + } + + #if ! JUCER_ENABLE_GPL_MODE + if (thread == nullptr) + thread = new LicenseThread (*this, false); + #endif +} + void LicenseController::logout() { jassert (MessageManager::getInstance()->isThisTheMessageThread()); @@ -127,6 +171,15 @@ void LicenseController::chooseNewLicense() #endif } +void LicenseController::setApplicationUsageDataState (LicenseState::ApplicationUsageData newState) +{ + if (state.applicationUsageDataState != newState) + { + state.applicationUsageDataState = newState; + updateState (state); + } +} + //============================================================================== void LicenseController::closeWebview (int result) { @@ -198,7 +251,7 @@ void LicenseController::updateState (const LicenseState& newState) state = newState; licenseStateToSettings (state, props); - listeners.call (&StateChangedCallback::licenseStateChanged, state); + listeners.call (&StateChangedCallback::licenseStateChanged, getState()); } LicenseState LicenseController::licenseStateFromSettings (PropertiesFile& props) @@ -208,10 +261,11 @@ LicenseState LicenseController::licenseStateFromSettings (PropertiesFile& props) if (licenseXml != nullptr) { LicenseState result; - result.type = getLicenseTypeFromValue (licenseXml->getChildElementAllSubText ("type", {})); - result.username = licenseXml->getChildElementAllSubText ("username", {}); - result.email = licenseXml->getChildElementAllSubText ("email", {}); - result.authToken = licenseXml->getChildElementAllSubText ("authToken", {}); + result.type = getLicenseTypeFromValue (licenseXml->getChildElementAllSubText ("type", {})); + result.applicationUsageDataState = getApplicationUsageDataTypeFromValue (licenseXml->getChildElementAllSubText ("applicationUsageData", {})); + result.username = licenseXml->getChildElementAllSubText ("username", {}); + result.email = licenseXml->getChildElementAllSubText ("email", {}); + result.authToken = licenseXml->getChildElementAllSubText ("authToken", {}); MemoryOutputStream imageData; Base64::convertFromBase64 (imageData, licenseXml->getChildElementAllSubText ("avatar", {})); @@ -227,14 +281,15 @@ void LicenseController::licenseStateToSettings (const LicenseState& state, Prope { props.removeValue ("license"); - if (state.type != LicenseState::Type::notLoggedIn - && state.username.isNotEmpty() && state.authToken.isNotEmpty()) + if (state.type != LicenseState::Type::notLoggedIn && state.username.isNotEmpty()) { XmlElement licenseXml ("license"); if (auto* typeString = getLicenseStateValue (state.type)) licenseXml.createNewChildElement ("type")->addTextElement (typeString); + licenseXml.createNewChildElement ("applicationUsageData")->addTextElement (getApplicationUsageDataStateValue (state.applicationUsageDataState)); + licenseXml.createNewChildElement ("username")->addTextElement (state.username); licenseXml.createNewChildElement ("email") ->addTextElement (state.email); diff --git a/extras/Projucer/Source/Licenses/jucer_LicenseController.h b/extras/Projucer/Source/Licenses/jucer_LicenseController.h index ffa654c4a4..c5a03cd6dc 100644 --- a/extras/Projucer/Source/Licenses/jucer_LicenseController.h +++ b/extras/Projucer/Source/Licenses/jucer_LicenseController.h @@ -44,7 +44,16 @@ struct LicenseState pro }; + enum class ApplicationUsageData + { + notChosenYet, + + enabled, + disabled + }; + Type type = Type::notLoggedIn; + ApplicationUsageData applicationUsageDataState = ApplicationUsageData::notChosenYet; String username; String email; String authToken; @@ -71,10 +80,13 @@ public: LicenseController(); ~LicenseController(); + void startWebviewIfNeeded(); + //============================================================================== - const LicenseState& getState() const noexcept { return state; } + LicenseState getState() const noexcept; void logout(); void chooseNewLicense(); + void setApplicationUsageDataState (LicenseState::ApplicationUsageData newState); //============================================================================== void addLicenseStatusChangedCallback (StateChangedCallback* callback) { listeners.add (callback); } @@ -103,6 +115,7 @@ private: ScopedPointer thread; LicenseWebview* licenseWebview = nullptr; ListenerList listeners; + bool guiNotInitialisedYet = true; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (LicenseController) }; diff --git a/extras/Projucer/Source/Licenses/jucer_LicenseThread.h b/extras/Projucer/Source/Licenses/jucer_LicenseThread.h index 6d9a2b74a0..d65f2ae1e9 100644 --- a/extras/Projucer/Source/Licenses/jucer_LicenseThread.h +++ b/extras/Projucer/Source/Licenses/jucer_LicenseThread.h @@ -263,7 +263,7 @@ struct LicenseThread : NetWorkerThread DynamicObject::Ptr redeamObject = new DynamicObject(); redeamObject->setProperty (serialIdentifier, productKey); - String postData (JSON::toString (var (redeamObject))); + String postData (JSON::toString (var (redeamObject.get()))); ScopedPointer shared = getSharedWebInputStream (URL ("https://api.roli.com/api/v1/user/products").withPOSTData (postData), true); @@ -292,11 +292,11 @@ struct LicenseThread : NetWorkerThread DynamicObject::Ptr jsonLicenseRequest = new DynamicObject(); - jsonLicenseRequest->setProperty (licenseIdentifier, var (jsonLicenseObject)); + jsonLicenseRequest->setProperty (licenseIdentifier, var (jsonLicenseObject.get())); jsonLicenseRequest->setProperty (searchInternalIdentifier, "com.roli.projucer"); jsonLicenseRequest->setProperty (licenseTypeIdentifier, "software"); - String postData (JSON::toString (var (jsonLicenseRequest))); + String postData (JSON::toString (var (jsonLicenseRequest.get()))); ScopedPointer shared = getSharedWebInputStream (URL ("https://api.roli.com/api/v1/user/products/redeem").withPOSTData (postData), true); diff --git a/extras/Projucer/Source/Licenses/jucer_LicenseWebview.h b/extras/Projucer/Source/Licenses/jucer_LicenseWebview.h index 1a285e0f59..21eba575ac 100644 --- a/extras/Projucer/Source/Licenses/jucer_LicenseWebview.h +++ b/extras/Projucer/Source/Licenses/jucer_LicenseWebview.h @@ -138,7 +138,7 @@ private: } } - static constexpr uint32 backgroundColour = 0xff414141; + const uint32 backgroundColour = 0xff414141; ScopedPointer juceLogo = Drawable::createFromImageData (BinaryData::jucelogowithtext_svg, BinaryData::jucelogowithtext_svgSize); diff --git a/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.cpp b/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.cpp index afdf98559e..350138024a 100644 --- a/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.cpp +++ b/extras/Projucer/Source/LiveBuildEngine/projucer_CompileEngineClient.cpp @@ -69,16 +69,18 @@ namespace ProjectProperties static Value getLiveSetting (Project& p, const Identifier& i) { return getLiveSettings (p).getPropertyAsValue (i, p.getUndoManagerFor (getLiveSettings (p))); } static var getLiveSettingVar (Project& p, const Identifier& i) { return getLiveSettingsConst (p) [i]; } - static Value getUserHeaderPathValue (Project& p) { return getLiveSetting (p, Ids::headerPath); } - static String getUserHeaderPathString (Project& p) { return getLiveSettingVar (p, Ids::headerPath); } - static Value getSystemHeaderPathValue (Project& p) { return getLiveSetting (p, Ids::systemHeaderPath); } - static String getSystemHeaderPathString (Project& p) { return getLiveSettingVar (p, Ids::systemHeaderPath); } - static Value getExtraDLLsValue (Project& p) { return getLiveSetting (p, Ids::extraDLLs); } - static String getExtraDLLsString (Project& p) { return getLiveSettingVar (p, Ids::extraDLLs); } - static Value getExtraCompilerFlagsValue (Project& p) { return getLiveSetting (p, Ids::extraCompilerFlags); } - static String getExtraCompilerFlagsString (Project& p) { return getLiveSettingVar (p, Ids::extraCompilerFlags); } - static Value getExtraPreprocessorDefsValue (Project& p) { return getLiveSetting (p, Ids::defines); } - static String getExtraPreprocessorDefsString (Project& p) { return getLiveSettingVar (p, Ids::defines); } + static Value getUserHeaderPathValue (Project& p) { return getLiveSetting (p, Ids::headerPath); } + static String getUserHeaderPathString (Project& p) { return getLiveSettingVar (p, Ids::headerPath); } + static Value getSystemHeaderPathValue (Project& p) { return getLiveSetting (p, Ids::systemHeaderPath); } + static String getSystemHeaderPathString (Project& p) { return getLiveSettingVar (p, Ids::systemHeaderPath); } + static Value getExtraDLLsValue (Project& p) { return getLiveSetting (p, Ids::extraDLLs); } + static String getExtraDLLsString (Project& p) { return getLiveSettingVar (p, Ids::extraDLLs); } + static Value getExtraCompilerFlagsValue (Project& p) { return getLiveSetting (p, Ids::extraCompilerFlags); } + static String getExtraCompilerFlagsString (Project& p) { return getLiveSettingVar (p, Ids::extraCompilerFlags); } + static Value getExtraPreprocessorDefsValue (Project& p) { return getLiveSetting (p, Ids::defines); } + static String getExtraPreprocessorDefsString (Project& p) { return getLiveSettingVar (p, Ids::defines); } + static Value getWindowsTargetPlatformVersionValue (Project& p) { return getLiveSetting (p, Ids::liveWindowsTargetPlatformVersion); } + static String getWindowsTargetPlatformVersionString (Project& p) { return getLiveSettingVar (p, Ids::liveWindowsTargetPlatformVersion); } static File getProjucerTempFolder() { @@ -121,6 +123,13 @@ void LiveBuildProjectSettings::getLiveSettings (Project& project, PropertyListBu props.add (new TextPropertyComponent (getExtraDLLsValue (project), "Extra dynamic libraries", 2048, true), "Extra dynamic libs that the running code may require. Use new-lines or commas to separate the items"); + + static const char* targetPlatformNames[] = { "(default)", "8.1", "10.0.10240.0", "10.0.10586.0", "10.0.14393.0", "10.0.15063.0", nullptr }; + const var targetPlatforms[] = { var(), "8.1", "10.0.10240.0", "10.0.10586.0", "10.0.14393.0", "10.0.15063.0" }; + + props.add (new ChoicePropertyComponent (getWindowsTargetPlatformVersionValue (project), "Windows Target Platform", + StringArray (targetPlatformNames), Array (targetPlatforms, numElementsInArray (targetPlatforms))), + "The Windows target platform to use"); } void LiveBuildProjectSettings::updateNewlyOpenedProject (Project&) { /* placeholder */ } @@ -325,6 +334,8 @@ public: build.setUtilsCppInclude (project.getAppIncludeFile().getFullPathName()); + build.setWindowsTargetPlatformVersion (ProjectProperties::getWindowsTargetPlatformVersionString (project)); + scanForProjectFiles (project, build); owner.updateAllEditors(); @@ -383,6 +394,10 @@ private: if (exporter->canLaunchProject()) defs << " " << exporter->getExporterIdentifierMacro() << "=1"; + // Use the JUCE implementation of std::function until the live build + // engine can compile the one from the standard library + defs << " _LIBCPP_FUNCTIONAL=1"; + return defs; } @@ -844,6 +859,12 @@ void CompileEngineChildProcess::handleClassListChanged (const ValueTree& newList void CompileEngineChildProcess::handleBuildFailed() { + auto* mcm = ModalComponentManager::getInstance(); + auto* pcc = findProjectContentComponent(); + + if (mcm->getNumModalComponents() > 0 || pcc == nullptr || pcc->getCurrentTabIndex() == 1) + return; + if (errorList.getNumErrors() > 0) ProjucerApplication::getCommandManager().invokeDirectly (CommandIDs::showBuildTab, true); diff --git a/extras/Projucer/Source/LiveBuildEngine/projucer_ErrorListComponent.h b/extras/Projucer/Source/LiveBuildEngine/projucer_ErrorListComponent.h index 3e3185386a..aed354daf7 100644 --- a/extras/Projucer/Source/LiveBuildEngine/projucer_ErrorListComponent.h +++ b/extras/Projucer/Source/LiveBuildEngine/projucer_ErrorListComponent.h @@ -253,10 +253,22 @@ private: Colour getContentColour (bool isIcon) const override { - return message.isError() ? Colours::red - : message.isWarning() ? Colours::yellow - : getOwnerView()->findColour (isIcon ? treeIconColourId - : defaultTextColourId); + if (isIcon) + { + if (isSelected()) + return getOwnerView()->findColour (defaultHighlightedTextColourId); + + if (message.isError()) + return Colours::red; + + if (message.isWarning()) + return Colours::yellow; + + return getOwnerView()->findColour (treeIconColourId); + } + + return getOwnerView()->findColour (isSelected() ? defaultHighlightedTextColourId + : defaultTextColourId); } void showPopupMenu() override diff --git a/extras/Projucer/Source/LiveBuildEngine/projucer_ProjectBuildInfo.h b/extras/Projucer/Source/LiveBuildEngine/projucer_ProjectBuildInfo.h index 8ddc36510a..4c6b363ddf 100644 --- a/extras/Projucer/Source/LiveBuildEngine/projucer_ProjectBuildInfo.h +++ b/extras/Projucer/Source/LiveBuildEngine/projucer_ProjectBuildInfo.h @@ -91,5 +91,8 @@ struct ProjectBuildInfo StringArray getExtraDLLs() const { return separateJoinedStrings (tree [Ids::extraDLLs]); } void setExtraDLLs (const StringArray& s) { tree.setProperty (Ids::extraDLLs, concatenateListOfStrings (s), nullptr); } + String getWindowsTargetPlatformVersion() const { return tree [Ids::liveWindowsTargetPlatformVersion]; } + void setWindowsTargetPlatformVersion (const String& s) { tree.setProperty (Ids::liveWindowsTargetPlatformVersion, s, nullptr); } + ValueTree tree; }; diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h index b044c155bd..9710f50005 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h @@ -770,7 +770,7 @@ private: //============================================================================== String createDefaultClassName() const { - String s (project.getBundleIdentifier().toString().toLowerCase()); + auto s = project.getBundleIdentifier().toString().toLowerCase(); if (s.length() > 5 && s.containsChar ('.') @@ -790,11 +790,8 @@ private: void initialiseDependencyPathValues() { - sdkPath.referTo (Value (new DependencyPathValueSource (getSetting (Ids::androidSDKPath), - Ids::androidSDKPath, TargetOS::getThisOS()))); - - ndkPath.referTo (Value (new DependencyPathValueSource (getSetting (Ids::androidNDKPath), - Ids::androidNDKPath, TargetOS::getThisOS()))); + sdkPath.referTo (Value (new DependencyPathValueSource (getSetting (Ids::androidSDKPath), Ids::androidSDKPath, TargetOS::getThisOS()))); + ndkPath.referTo (Value (new DependencyPathValueSource (getSetting (Ids::androidNDKPath), Ids::androidNDKPath, TargetOS::getThisOS()))); } //============================================================================== @@ -807,9 +804,7 @@ private: createDirectoryOrThrow (targetFolder); - LibraryModule* const coreModule = getCoreModule (modules); - - if (coreModule != nullptr) + if (auto* coreModule = getCoreModule (modules)) { File javaDestFile (targetFolder.getChildFile (className + ".java")); @@ -840,16 +835,14 @@ private: .replace ("JuceAppActivity", className); } - File javaSourceFile (javaSourceFolder.getChildFile ("JuceAppActivity.java")); - StringArray javaSourceLines (StringArray::fromLines (javaSourceFile.loadFileAsString())); + auto javaSourceFile = javaSourceFolder.getChildFile ("JuceAppActivity.java"); + auto javaSourceLines = StringArray::fromLines (javaSourceFile.loadFileAsString()); { MemoryOutputStream newFile; - for (int i = 0; i < javaSourceLines.size(); ++i) + for (const auto& line : javaSourceLines) { - const String& line = javaSourceLines[i]; - if (line.contains ("$$JuceAndroidMidiImports$$")) newFile << juceMidiImports; else if (line.contains ("$$JuceAndroidMidiCode$$")) diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h index d42b13ca73..ce28bd944e 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h @@ -344,7 +344,7 @@ public: const String macOSDir = bundleContents + String ("\\") + (is64Bit ? "x64" : "Win32"); const String executable = macOSDir + String ("\\") + config.getOutputFilename (".aaxplugin", true); - return String ("copy /Y \"") + getOutputFilePath (config) + String ("\" \"") + executable + String ("\"\r\n") + + return String ("copy /Y \"") + getOutputFilePath (config) + String ("\" \"") + executable + String ("\"\r\ncall ") + createRebasedPath (bundleScript) + String (" \"") + macOSDir + String ("\" ") + createRebasedPath (iconFilePath); } @@ -1444,6 +1444,7 @@ public: } getOwner().addPlatformToolsetToPropertyGroup (projectXml); + getOwner().addWindowsTargetPlatformVersionToPropertyGroup (projectXml); getOwner().addIPPSettingToPropertyGroup (projectXml); } @@ -1688,7 +1689,8 @@ protected: } }; - virtual void addPlatformToolsetToPropertyGroup (XmlElement&) const {} + virtual void addPlatformToolsetToPropertyGroup (XmlElement&) const {} + virtual void addWindowsTargetPlatformVersionToPropertyGroup (XmlElement&) const {} void addIPPSettingToPropertyGroup (XmlElement& p) const { @@ -1732,6 +1734,8 @@ public: int getVisualStudioVersion() const override { return 11; } String getSolutionComment() const override { return "# Visual Studio 2012"; } String getDefaultToolset() const override { return "v110"; } + Value getWindowsTargetPlatformVersionValue() { return getSetting (Ids::windowsTargetPlatformVersion); } + String getWindowsTargetPlatformVersion() const { return settings [Ids::windowsTargetPlatformVersion]; } static MSVCProjectExporterVC2012* createForSettings (Project& project, const ValueTree& settings) { @@ -1752,6 +1756,16 @@ public: addIPPLibraryProperty (props); } + void addWindowsTargetPlatformProperties (PropertyListBuilder& props) + { + static const char* targetPlatformNames[] = { "(default)", "8.1", "10.0.10240.0", "10.0.10586.0", "10.0.14393.0", "10.0.15063.0", nullptr }; + const var targetPlatforms[] = { var(), "8.1", "10.0.10240.0", "10.0.10586.0", "10.0.14393.0", "10.0.15063.0" }; + + props.add (new ChoicePropertyComponent (getWindowsTargetPlatformVersionValue(), "Windows Target Platform", + StringArray (targetPlatformNames), Array (targetPlatforms, numElementsInArray (targetPlatforms))), + "The Windows target platform version to use"); + } + private: void addPlatformToolsetToPropertyGroup (XmlElement& p) const override { @@ -1759,6 +1773,15 @@ private: e->createNewChildElement ("PlatformToolset")->addTextElement (getPlatformToolset()); } + void addWindowsTargetPlatformVersionToPropertyGroup (XmlElement& p) const override + { + const String& targetVersion = getWindowsTargetPlatformVersion(); + + if (targetVersion.isNotEmpty()) + forEachXmlChildElementWithTagName (p, e, "PropertyGroup") + e->createNewChildElement ("WindowsTargetPlatformVersion")->addTextElement (getWindowsTargetPlatformVersion()); + } + JUCE_DECLARE_NON_COPYABLE (MSVCProjectExporterVC2012) }; @@ -1796,6 +1819,7 @@ public: addToolsetProperty (props, toolsetNames, toolsets, numElementsInArray (toolsets)); addIPPLibraryProperty (props); + addWindowsTargetPlatformProperties (props); } JUCE_DECLARE_NON_COPYABLE (MSVCProjectExporterVC2013) @@ -1835,6 +1859,7 @@ public: addToolsetProperty (props, toolsetNames, toolsets, numElementsInArray (toolsets)); addIPPLibraryProperty (props); + addWindowsTargetPlatformProperties (props); } JUCE_DECLARE_NON_COPYABLE (MSVCProjectExporterVC2015) @@ -1877,8 +1902,9 @@ public: addToolsetProperty (props, toolsetNames, toolsets, numElementsInArray (toolsets)); addIPPLibraryProperty (props); + addWindowsTargetPlatformProperties (props); - static const char* cppStandardNames[] = { "(default)", "C++14", "Latest C++ Standard" }; + static const char* cppStandardNames[] = { "(default)", "C++14", "Latest C++ Standard", nullptr }; Array cppStandardValues; cppStandardValues.add (var()); @@ -1888,7 +1914,6 @@ public: props.add (new ChoicePropertyComponent (getCppStandardValue(), "C++ standard to use", StringArray (cppStandardNames), cppStandardValues), "The C++ language standard to use"); - } JUCE_DECLARE_NON_COPYABLE (MSVCProjectExporterVC2017) diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp index 5ec4b8ef62..99af25731a 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExporter.cpp @@ -86,10 +86,9 @@ ProjectExporter* ProjectExporter::createNewExporter (Project& project, const int StringArray ProjectExporter::getExporterNames() { StringArray s; - Array types (getExporterTypes()); - for (int i = 0; i < types.size(); ++i) - s.add (types.getReference(i).name); + for (auto& e : getExporterTypes()) + s.add (e.name); return s; } @@ -225,20 +224,23 @@ void ProjectExporter::createDependencyPathProperties (PropertyListBuilder& props { if (shouldBuildTargetType (ProjectType::Target::VST3PlugIn) || project.isVST3PluginHost()) { - props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), getVST3PathValue(), "VST3 SDK Folder"), - "If you're building a VST3 plugin or host, this must be the folder containing the VST3 SDK. This can be an absolute path, or a path relative to the Projucer project file."); + if (dynamic_cast (&getVST3PathValue().getValueSource()) != nullptr) + props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), getVST3PathValue(), "VST3 SDK Folder"), + "If you're building a VST3 plugin or host, this must be the folder containing the VST3 SDK. This can be an absolute path, or a path relative to the Projucer project file."); } if (shouldBuildTargetType (ProjectType::Target::AAXPlugIn) && project.shouldBuildAAX()) { - props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), getAAXPathValue(), "AAX SDK Folder"), - "If you're building an AAX plugin, this must be the folder containing the AAX SDK. This can be an absolute path, or a path relative to the Projucer project file."); + if (dynamic_cast (&getAAXPathValue().getValueSource()) != nullptr) + props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), getAAXPathValue(), "AAX SDK Folder"), + "If you're building an AAX plugin, this must be the folder containing the AAX SDK. This can be an absolute path, or a path relative to the Projucer project file."); } if (shouldBuildTargetType (ProjectType::Target::RTASPlugIn) && project.shouldBuildRTAS()) { - props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), getRTASPathValue(), "RTAS SDK Folder"), - "If you're building an RTAS, this must be the folder containing the RTAS SDK. This can be an absolute path, or a path relative to the Projucer project file."); + if (dynamic_cast (&getRTASPathValue().getValueSource()) != nullptr) + props.add (new DependencyPathPropertyComponent (project.getFile().getParentDirectory(), getRTASPathValue(), "RTAS SDK Folder"), + "If you're building an RTAS, this must be the folder containing the RTAS SDK. This can be an absolute path, or a path relative to the Projucer project file."); } } diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h index 06997a5e13..44781d44e7 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectSaver.h @@ -374,7 +374,6 @@ private: << "// [END_USER_CODE_SECTION]" << newLine; out << newLine - << "//==============================================================================" << newLine << "/*" << newLine << " ==============================================================================" << newLine << newLine diff --git a/extras/Projucer/Source/Project/jucer_ConfigTree_Exporter.h b/extras/Projucer/Source/Project/jucer_ConfigTree_Exporter.h index d25e699041..cb575d3ab1 100644 --- a/extras/Projucer/Source/Project/jucer_ConfigTree_Exporter.h +++ b/extras/Projucer/Source/Project/jucer_ConfigTree_Exporter.h @@ -155,9 +155,8 @@ private: int exporterIndex; //============================================================================== - class SettingsComp : public Component + struct SettingsComp : public Component { - public: SettingsComp (ProjectExporter* exp) : group (exp->getName(), ExporterItem::getIconForExporter (exp)) { @@ -169,11 +168,9 @@ private: parentSizeChanged(); } - void parentSizeChanged() override { updateSize (*this, group); } + void parentSizeChanged() override { updateSize (*this, group); } + void resized() override { group.setBounds (getLocalBounds().withTrimmedLeft (12)); } - void resized() override { group.setBounds (getLocalBounds().withTrimmedLeft (12)); } - - private: PropertyGroupComponent group; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SettingsComp) diff --git a/extras/Projucer/Source/Project/jucer_HeaderComponent.h b/extras/Projucer/Source/Project/jucer_HeaderComponent.h index 9160359ee1..833d1ba1f8 100644 --- a/extras/Projucer/Source/Project/jucer_HeaderComponent.h +++ b/extras/Projucer/Source/Project/jucer_HeaderComponent.h @@ -307,11 +307,8 @@ public: project->addChangeListener (this); updateName(); - continuousRebuildButton->setEnabled (true); - updateContinuousRebuildButtonIcon(); - if (auto* pcc = findParentComponentOfClass()) - buildNowButton->setEnabled (! pcc->isContinuousRebuildEnabled() || ! pcc->isBuildEnabled()); + updateBuildButtons (pcc->isBuildEnabled(), pcc->isContinuousRebuildEnabled()); } void updateExporters() @@ -373,6 +370,16 @@ public: userSettingsWindow = &CallOutBox::launchAsynchronously (content, userSettingsButton->getScreenBounds(), nullptr); } + void updateBuildButtons (bool isBuildEnabled, bool isContinuousRebuildEnabled) + { + buildNowButton->setEnabled (isBuildEnabled && ! isContinuousRebuildEnabled); + continuousRebuildButton->setEnabled (isBuildEnabled); + + continuousRebuildButton->icon = Icon (isContinuousRebuildEnabled ? &getIcons().continuousBuildStop : &getIcons().continuousBuildStart, + Colours::transparentBlack); + repaint(); + } + void lookAndFeelChanged() override { if (userSettingsWindow != nullptr) @@ -399,40 +406,12 @@ private: { auto* pcc = findParentComponentOfClass(); - if (b == projectSettingsButton) - { - pcc->showProjectSettings(); - } - else if (b == continuousRebuildButton) - { - if (! pcc->isBuildEnabled()) - pcc->setBuildEnabled (true); - - auto newState = ! pcc->isContinuousRebuildEnabled(); - pcc->setContinuousRebuildEnabled (newState); - - updateContinuousRebuildButtonIcon(); - buildNowButton->setEnabled (! pcc->isContinuousRebuildEnabled() || ! pcc->isBuildEnabled()); - } - else if (b == buildNowButton) - { - if (! pcc->isBuildEnabled()) - pcc->setBuildEnabled (true); - - pcc->rebuildNow(); - } - else if (b == exporterSettingsButton) - { - pcc->showExporterSettings (getSelectedExporterName()); - } - else if (b == saveAndOpenInIDEButton) - { - pcc->openInSelectedIDE (true); - } - else if (b == userSettingsButton) - { - showUserSettings(); - } + if (b == projectSettingsButton) pcc->showProjectSettings(); + else if (b == continuousRebuildButton) pcc->setContinuousRebuildEnabled (! pcc->isContinuousRebuildEnabled()); + else if (b == buildNowButton) pcc->rebuildNow(); + else if (b == exporterSettingsButton) pcc->showExporterSettings (getSelectedExporterName()); + else if (b == saveAndOpenInIDEButton) pcc->openInSelectedIDE (true); + else if (b == userSettingsButton) showUserSettings(); } void comboBoxChanged (ComboBox* c) override @@ -463,11 +442,9 @@ private: addAndMakeVisible (continuousRebuildButton = new IconButton ("Continuous Rebuild", &icons.continuousBuildStart)); continuousRebuildButton->addListener (this); - continuousRebuildButton->setEnabled (false); addAndMakeVisible (buildNowButton = new IconButton ("Build Now", &icons.buildNow)); buildNowButton->addListener (this); - buildNowButton->setEnabled (false); addAndMakeVisible (exporterSettingsButton = new IconButton ("Exporter Settings", &icons.edit)); exporterSettingsButton->addListener (this); @@ -514,22 +491,12 @@ private: { if (LicenseController* controller = ProjucerApplication::getApp().licenseController) { - auto& state = controller->getState(); + auto state = controller->getState(); userSettingsButton->iconImage = state.avatar; userSettingsButton->repaint(); } } - void updateContinuousRebuildButtonIcon() - { - if (auto* pcc = findParentComponentOfClass()) - { - continuousRebuildButton->setEnabled (pcc->isBuildEnabled()); - continuousRebuildButton->icon = Icon (pcc->isContinuousRebuildEnabled() ? &getIcons().continuousBuildStop - : &getIcons().continuousBuildStart, Colours::transparentBlack); - } - } - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (HeaderComponent) }; diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index 995a1029a4..4012db1c8e 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -113,13 +113,19 @@ void Project::setMissingDefaultValues() setTitle ("JUCE Project"); { - auto defaultSplashScreenAndReporting = ! ProjucerApplication::getApp().isPaidOrGPL(); + auto defaultSplashScreen = ! ProjucerApplication::getApp().isPaidOrGPL(); - if (shouldDisplaySplashScreen() == var() || defaultSplashScreenAndReporting) - shouldDisplaySplashScreen() = defaultSplashScreenAndReporting; + if (shouldDisplaySplashScreen() == var() || defaultSplashScreen) + shouldDisplaySplashScreen() = defaultSplashScreen; - if (shouldReportAppUsage() == var() || defaultSplashScreenAndReporting) - shouldReportAppUsage() = defaultSplashScreenAndReporting; + if (ProjucerApplication::getApp().isPaidOrGPL()) + { + if (shouldReportAppUsage() == var()) + shouldReportAppUsage() = ProjucerApplication::getApp().licenseController->getState().applicationUsageDataState + == LicenseState::ApplicationUsageData::enabled; + } + else + shouldReportAppUsage() = true; } if (splashScreenColour() == var()) diff --git a/extras/Projucer/Source/Project/jucer_ProjectContentComponent.cpp b/extras/Projucer/Source/Project/jucer_ProjectContentComponent.cpp index a979655f5f..5d41939aab 100644 --- a/extras/Projucer/Source/Project/jucer_ProjectContentComponent.cpp +++ b/extras/Projucer/Source/Project/jucer_ProjectContentComponent.cpp @@ -1244,6 +1244,9 @@ void ProjectContentComponent::setBuildEnabled (bool b) LiveBuildProjectSettings::setBuildDisabled (*project, ! b); killChildProcess(); refreshTabsIfBuildStatusChanged(); + + if (auto* h = dynamic_cast (header.get())) + h->updateBuildButtons (b, isContinuousRebuildEnabled()); } } @@ -1382,10 +1385,17 @@ bool ProjectContentComponent::isContinuousRebuildEnabled() void ProjectContentComponent::setContinuousRebuildEnabled (bool b) { - getAppSettings().getGlobalProperties().setValue ("continuousRebuild", b); - if (childProcess != nullptr) + { childProcess->setContinuousRebuild (b); + + if (auto* h = dynamic_cast (header.get())) + h->updateBuildButtons (isBuildEnabled(), b); + + getAppSettings().getGlobalProperties().setValue ("continuousRebuild", b); + + ProjucerApplication::getCommandManager().commandStatusChanged(); + } } ReferenceCountedObjectPtr ProjectContentComponent::getChildProcess() diff --git a/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h b/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h index 3680a563c7..f4e0d7d05e 100644 --- a/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h +++ b/extras/Projucer/Source/Project/jucer_ProjectContentComponent.h @@ -80,8 +80,9 @@ public: void openInSelectedIDE (bool saveFirst); void showNewExporterMenu(); - void showProjectTab() { sidebarTabs.setCurrentTabIndex (0); } - void showBuildTab() { sidebarTabs.setCurrentTabIndex (1); } + void showProjectTab() { sidebarTabs.setCurrentTabIndex (0); } + void showBuildTab() { sidebarTabs.setCurrentTabIndex (1); } + int getCurrentTabIndex() { return sidebarTabs.getCurrentTabIndex(); } void showFilesPanel() { showProjectPanel (0); } void showModulesPanel() { showProjectPanel (1); } diff --git a/extras/Projucer/Source/Utility/jucer_ApplicationUsageDataWindowComponent.h b/extras/Projucer/Source/Utility/jucer_ApplicationUsageDataWindowComponent.h new file mode 100644 index 0000000000..05b94bc263 --- /dev/null +++ b/extras/Projucer/Source/Utility/jucer_ApplicationUsageDataWindowComponent.h @@ -0,0 +1,167 @@ +/* + ============================================================================== + + This file is part of the JUCE library. + Copyright (c) 2017 - ROLI Ltd. + + JUCE is an open source library subject to commercial or open-source + licensing. + + By using JUCE, you agree to the terms of both the JUCE 5 End-User License + Agreement and JUCE 5 Privacy Policy (both updated and effective as of the + 27th April 2017). + + End User License Agreement: www.juce.com/juce-5-licence + Privacy Policy: www.juce.com/juce-5-privacy-policy + + Or: You may also use this code under the terms of the GPL v3 (see + www.gnu.org/licenses). + + JUCE IS PROVIDED "AS IS" WITHOUT ANY WARRANTY, AND ALL WARRANTIES, WHETHER + EXPRESSED OR IMPLIED, INCLUDING MERCHANTABILITY AND FITNESS FOR PURPOSE, ARE + DISCLAIMED. + + ============================================================================== +*/ + +#pragma once + +class ApplicationUsageDataWindowComponent : public Component, + private Button::Listener +{ +public: + ApplicationUsageDataWindowComponent (bool showCheckbox) + { + addAndMakeVisible (headerLabel); + headerLabel.setText ("Application Usage Analytics", dontSendNotification); + headerLabel.setFont (Font (20.0f, Font::FontStyleFlags::bold)); + headerLabel.setJustificationType (Justification::centred); + + auto textToShow = String ("We use analytics services to understand how developers use our software in order for JUCE to improve its software and services. "); + + if (! showCheckbox) + textToShow += String (" Analytics can be disabled with an Indie or Pro license. "); + + textToShow += String ("For more information, please read the JUCE EULA and Privacy policy:"); + + addAndMakeVisible (bodyLabel); + bodyLabel.setText (textToShow, dontSendNotification); + bodyLabel.setFont (Font (14.0f)); + bodyLabel.setJustificationType (Justification::centredLeft); + + addAndMakeVisible (juceEULALink); + juceEULALink.setButtonText ("JUCE EULA"); + juceEULALink.setFont (Font (14.0f), false); + juceEULALink.setURL (URL ("https://juce.com/juce-5-license")); + + addAndMakeVisible (privacyPolicyLink); + privacyPolicyLink.setButtonText ("Privacy Policy"); + privacyPolicyLink.setFont (Font (14.0f), false); + privacyPolicyLink.setURL (URL ("https://juce.com/privacy-policy")); + + addAndMakeVisible (okButton); + okButton.setButtonText ("OK"); + okButton.addListener (this); + + if (showCheckbox) + { + addAndMakeVisible (shareApplicationUsageDataToggle = new ToggleButton()); + shareApplicationUsageDataToggle->setToggleState (true, dontSendNotification); + + addAndMakeVisible(shareApplicationUsageDataLabel = new Label ({}, "Help JUCE to improve its software and services by sharing my application usage data")); + shareApplicationUsageDataLabel->setFont (Font (14.0f)); + shareApplicationUsageDataLabel->setMinimumHorizontalScale (1.0f); + } + else + { + addAndMakeVisible (upgradeLicenseButton = new TextButton ("Upgrade License")); + upgradeLicenseButton->addListener (this); + upgradeLicenseButton->setColour (TextButton::buttonColourId, findColour (secondaryButtonBackgroundColourId)); + } + } + + ~ApplicationUsageDataWindowComponent() + { + if (LicenseController* controller = ProjucerApplication::getApp().licenseController) + { + auto newApplicationUsageDataState = LicenseState::ApplicationUsageData::enabled; + + if (shareApplicationUsageDataToggle != nullptr && ! shareApplicationUsageDataToggle->getToggleState()) + newApplicationUsageDataState = LicenseState::ApplicationUsageData::disabled; + + controller->setApplicationUsageDataState (newApplicationUsageDataState); + } + } + + void resized() override + { + auto bounds = getLocalBounds().reduced (20); + headerLabel.setBounds (bounds.removeFromTop (40)); + bodyLabel.setBounds (bounds.removeFromTop (75)); + + bounds.removeFromTop (10); + + auto linkBounds = bounds.removeFromTop (20); + juceEULALink.setBounds (linkBounds.removeFromLeft (linkBounds.getWidth() / 2).reduced (2)); + privacyPolicyLink.setBounds (linkBounds.reduced (2)); + + if (shareApplicationUsageDataToggle != nullptr) + { + bounds.removeFromTop (10); + + auto toggleBounds = bounds.removeFromTop (40); + shareApplicationUsageDataToggle->setBounds (toggleBounds.removeFromLeft (40).reduced (5)); + shareApplicationUsageDataLabel->setBounds (toggleBounds); + } + + bounds.removeFromTop (10); + + auto buttonW = 125; + auto buttonH = 40; + + if (upgradeLicenseButton != nullptr) + { + auto left = bounds.removeFromLeft (bounds.getWidth() / 2); + + upgradeLicenseButton->setSize (buttonW, buttonH); + upgradeLicenseButton->setCentrePosition (left.getCentreX(), left.getCentreY()); + } + + okButton.setSize (buttonW, buttonH); + okButton.setCentrePosition (bounds.getCentreX(), bounds.getCentreY()); + } + + void paint (Graphics& g) override + { + g.fillAll (findColour (backgroundColourId)); + } + +private: + Label headerLabel, bodyLabel; + HyperlinkButton juceEULALink, privacyPolicyLink; + ScopedPointer