Browse Source

Resaved all projects.

tags/2021-05-28
Lukasz Kozakiewicz 8 years ago
parent
commit
f6c74afc77
100 changed files with 618 additions and 65 deletions
  1. +4
    -2
      examples/AUv3Synth/AUv3Synth.jucer
  2. +30
    -0
      examples/AUv3Synth/Builds/iOS/AUv3Synth/Images.xcassets/AppIcon.appiconset/Contents.json
  3. +4
    -2
      examples/AnimationAppExample/AnimationAppExample.jucer
  4. +2
    -0
      examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj
  5. +1
    -0
      examples/AnimationAppExample/Builds/VisualStudio2017/resources.rc
  6. +30
    -0
      examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/AppIcon.appiconset/Contents.json
  7. +4
    -2
      examples/AudioAppExample/AudioAppExample.jucer
  8. +2
    -0
      examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj
  9. +1
    -0
      examples/AudioAppExample/Builds/VisualStudio2017/resources.rc
  10. +30
    -0
      examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/AppIcon.appiconset/Contents.json
  11. +3
    -2
      examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer
  12. +1
    -1
      examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile
  13. +3
    -2
      examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj
  14. +2
    -0
      examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj
  15. +30
    -0
      examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing/Images.xcassets/AppIcon.appiconset/Contents.json
  16. +3
    -2
      examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer
  17. +1
    -1
      examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile
  18. +3
    -2
      examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj
  19. +2
    -0
      examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj
  20. +30
    -0
      examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor/Images.xcassets/AppIcon.appiconset/Contents.json
  21. +3
    -2
      examples/BLOCKS/BlocksSynth/BlocksSynth.jucer
  22. +1
    -1
      examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile
  23. +3
    -2
      examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj
  24. +2
    -0
      examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj
  25. +30
    -0
      examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth/Images.xcassets/AppIcon.appiconset/Contents.json
  26. +1
    -1
      examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer
  27. +1
    -1
      examples/BouncingBallWavetableDemo/Builds/LinuxMakefile/Makefile
  28. +3
    -2
      examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj
  29. +1
    -0
      examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/resources.rc
  30. +2
    -0
      examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj
  31. +1
    -0
      examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/resources.rc
  32. +2
    -0
      examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj
  33. +1
    -0
      examples/ComponentTutorialExample/Builds/VisualStudio2015/resources.rc
  34. +2
    -0
      examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj
  35. +1
    -0
      examples/ComponentTutorialExample/Builds/VisualStudio2017/resources.rc
  36. +1
    -1
      examples/ComponentTutorialExample/ComponentTutorialExample.jucer
  37. +2
    -0
      examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_SharedCode.vcxproj
  38. +6
    -0
      examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_StandalonePlugin.vcxproj
  39. +6
    -0
      examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_VST.vcxproj
  40. +1
    -0
      examples/DSP module plugin demo/Builds/VisualStudio2015/resources.rc
  41. +2
    -0
      examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj
  42. +6
    -0
      examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_StandalonePlugin.vcxproj
  43. +6
    -0
      examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_VST.vcxproj
  44. +1
    -0
      examples/DSP module plugin demo/Builds/VisualStudio2017/resources.rc
  45. +1
    -1
      examples/DSP module plugin demo/DSP module plugin demo.jucer
  46. +1
    -1
      examples/DSPDemo/Builds/LinuxMakefile/Makefile
  47. +2
    -0
      examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj
  48. +1
    -0
      examples/DSPDemo/Builds/VisualStudio2017/resources.rc
  49. +1
    -1
      examples/DSPDemo/DSPDemo.jucer
  50. +23
    -1
      examples/Demo/Builds/Android/app/src/main/java/com/yourcompany/jucedemo/JuceDemo.java
  51. +1
    -1
      examples/Demo/Builds/LinuxMakefile/Makefile
  52. +3
    -2
      examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj
  53. +1
    -0
      examples/Demo/Builds/VisualStudio2013/resources.rc
  54. +2
    -0
      examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj
  55. +1
    -0
      examples/Demo/Builds/VisualStudio2015/resources.rc
  56. +2
    -0
      examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj
  57. +1
    -0
      examples/Demo/Builds/VisualStudio2017/resources.rc
  58. +30
    -0
      examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json
  59. +4
    -2
      examples/Demo/JuceDemo.jucer
  60. +1
    -1
      examples/HelloWorld/Builds/LinuxMakefile/Makefile
  61. +2
    -0
      examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj
  62. +1
    -0
      examples/HelloWorld/Builds/VisualStudio2015/resources.rc
  63. +2
    -0
      examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj
  64. +1
    -0
      examples/HelloWorld/Builds/VisualStudio2017/resources.rc
  65. +30
    -0
      examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json
  66. +4
    -2
      examples/HelloWorld/HelloWorld.jucer
  67. +23
    -1
      examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java
  68. +30
    -0
      examples/InAppPurchase/Builds/iOS/InAppPurchase/Images.xcassets/AppIcon.appiconset/Contents.json
  69. +3
    -2
      examples/InAppPurchase/InAppPurchase.jucer
  70. +1
    -1
      examples/MPETest/Builds/LinuxMakefile/Makefile
  71. +3
    -2
      examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj
  72. +1
    -0
      examples/MPETest/Builds/VisualStudio2015/resources.rc
  73. +2
    -0
      examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj
  74. +1
    -0
      examples/MPETest/Builds/VisualStudio2017/resources.rc
  75. +2
    -1
      examples/MPETest/MPETest.jucer
  76. +23
    -1
      examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java
  77. +1
    -1
      examples/MidiTest/Builds/LinuxMakefile/Makefile
  78. +3
    -2
      examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj
  79. +1
    -0
      examples/MidiTest/Builds/VisualStudio2015/resources.rc
  80. +2
    -0
      examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj
  81. +1
    -0
      examples/MidiTest/Builds/VisualStudio2017/resources.rc
  82. +30
    -0
      examples/MidiTest/Builds/iOS/MidiTest/Images.xcassets/AppIcon.appiconset/Contents.json
  83. +4
    -2
      examples/MidiTest/MidiTest.jucer
  84. +23
    -1
      examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java
  85. +1
    -1
      examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile
  86. +3
    -2
      examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj
  87. +1
    -0
      examples/NetworkGraphicsDemo/Builds/VisualStudio2013/resources.rc
  88. +2
    -0
      examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj
  89. +1
    -0
      examples/NetworkGraphicsDemo/Builds/VisualStudio2017/resources.rc
  90. +30
    -0
      examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo/Images.xcassets/AppIcon.appiconset/Contents.json
  91. +3
    -2
      examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
  92. +1
    -1
      examples/OSCMonitor/Builds/LinuxMakefile/Makefile
  93. +3
    -2
      examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj
  94. +1
    -0
      examples/OSCMonitor/Builds/VisualStudio2015/resources.rc
  95. +2
    -0
      examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj
  96. +1
    -0
      examples/OSCMonitor/Builds/VisualStudio2017/resources.rc
  97. +2
    -1
      examples/OSCMonitor/OSCMonitor.jucer
  98. +23
    -1
      examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java
  99. +1
    -1
      examples/OSCReceiver/Builds/LinuxMakefile/Makefile
  100. +3
    -2
      examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj

+ 4
- 2
examples/AUv3Synth/AUv3Synth.jucer View File

@@ -10,7 +10,8 @@
pluginAUExportPrefix="AUv3SynthAU" pluginRTASCategory="" aaxIdentifier="com.roli.development.AUv3Synth" pluginAUExportPrefix="AUv3SynthAU" pluginRTASCategory="" aaxIdentifier="com.roli.development.AUv3Synth"
pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.1.2" pluginAAXCategory="AAX_ePlugInCategory_Dynamics" jucerVersion="5.1.2"
buildStandalone="1" enableIAA="0" displaySplashScreen="0" reportAppUsage="0" buildStandalone="1" enableIAA="0" displaySplashScreen="0" reportAppUsage="0"
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11">
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11"
companyCopyright="ROLI Ltd.">
<MAINGROUP id="h0gx6L" name="AUv3Synth"> <MAINGROUP id="h0gx6L" name="AUv3Synth">
<GROUP id="{9DC59668-E6DF-876C-EB58-DDA88D152162}" name="Source"> <GROUP id="{9DC59668-E6DF-876C-EB58-DDA88D152162}" name="Source">
<GROUP id="{CDDEC2D7-B8D6-2849-AC85-2363EAD0449C}" name="BinaryData"> <GROUP id="{CDDEC2D7-B8D6-2849-AC85-2363EAD0449C}" name="BinaryData">
@@ -29,7 +30,8 @@
</MAINGROUP> </MAINGROUP>
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_IPHONE targetFolder="Builds/iOS" vstFolder="" vst3Folder="" iosScreenOrientation="portraitlandscape" <XCODE_IPHONE targetFolder="Builds/iOS" vstFolder="" vst3Folder="" iosScreenOrientation="portraitlandscape"
iosDevelopmentTeamID="">
iosDevelopmentTeamID="" iPadScreenOrientation="portraitlandscape"
iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" iosCompatibility="default" isDebug="1" optimisation="1" <CONFIGURATION name="Debug" iosCompatibility="default" isDebug="1" optimisation="1"
targetName="AUv3Synth" codeSigningIdentity=""/> targetName="AUv3Synth" codeSigningIdentity=""/>


+ 30
- 0
examples/AUv3Synth/Builds/iOS/AUv3Synth/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 4
- 2
examples/AnimationAppExample/AnimationAppExample.jucer View File

@@ -3,7 +3,8 @@
<JUCERPROJECT id="LrATE6" name="AnimationAppExample" projectType="guiapp" version="1.0.0" <JUCERPROJECT id="LrATE6" name="AnimationAppExample" projectType="guiapp" version="1.0.0"
bundleIdentifier="com.roli.AnimationAppExample" includeBinaryInAppConfig="1" bundleIdentifier="com.roli.AnimationAppExample" includeBinaryInAppConfig="1"
jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0"
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11">
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11"
companyCopyright="ROLI Ltd.">
<MAINGROUP id="F3keCY" name="AnimationAppExample"> <MAINGROUP id="F3keCY" name="AnimationAppExample">
<GROUP id="{5E4132EA-C4A0-CBDE-BEDA-FD6772DA79D5}" name="Source"> <GROUP id="{5E4132EA-C4A0-CBDE-BEDA-FD6772DA79D5}" name="Source">
<FILE id="n1FmZc" name="MainComponent.cpp" compile="1" resource="0" <FILE id="n1FmZc" name="MainComponent.cpp" compile="1" resource="0"
@@ -35,7 +36,8 @@
<MODULEPATH id="juce_audio_processors" path="../../modules"/> <MODULEPATH id="juce_audio_processors" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</XCODE_MAC> </XCODE_MAC>
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape">
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape"
iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" iosCompatibility="default" isDebug="1" optimisation="1" <CONFIGURATION name="Debug" iosCompatibility="default" isDebug="1" optimisation="1"
targetName="AnimationAppExample"/> targetName="AnimationAppExample"/>


+ 2
- 0
examples/AnimationAppExample/Builds/VisualStudio2017/AnimationAppExample_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\AnimationAppExample.bsc</OutputFile> <OutputFile>$(IntDir)\AnimationAppExample.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\AnimationAppExample.bsc</OutputFile> <OutputFile>$(IntDir)\AnimationAppExample.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\MainComponent.cpp"/> <ClCompile Include="..\..\Source\MainComponent.cpp"/>


+ 1
- 0
examples/AnimationAppExample/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "AnimationAppExample\0" VALUE "FileDescription", "AnimationAppExample\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "AnimationAppExample\0" VALUE "ProductName", "AnimationAppExample\0"


+ 30
- 0
examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 4
- 2
examples/AudioAppExample/AudioAppExample.jucer View File

@@ -3,7 +3,8 @@
<JUCERPROJECT id="PAnJXP" name="AudioAppExample" projectType="guiapp" version="1.0.0" <JUCERPROJECT id="PAnJXP" name="AudioAppExample" projectType="guiapp" version="1.0.0"
bundleIdentifier="com.roli.AudioAppExample" includeBinaryInAppConfig="1" bundleIdentifier="com.roli.AudioAppExample" includeBinaryInAppConfig="1"
jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0"
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11">
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11"
companyCopyright="ROLI Ltd.">
<MAINGROUP id="GaJIge" name="AudioAppExample"> <MAINGROUP id="GaJIge" name="AudioAppExample">
<GROUP id="{168FC5D4-FA65-8320-F83E-C14C416638E1}" name="Source"> <GROUP id="{168FC5D4-FA65-8320-F83E-C14C416638E1}" name="Source">
<FILE id="aHvhJ2" name="MainComponent.cpp" compile="1" resource="0" <FILE id="aHvhJ2" name="MainComponent.cpp" compile="1" resource="0"
@@ -36,7 +37,8 @@
<MODULEPATH id="juce_audio_utils" path="../../modules"/> <MODULEPATH id="juce_audio_utils" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</XCODE_MAC> </XCODE_MAC>
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape">
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape"
iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" iosCompatibility="default" isDebug="1" optimisation="1" <CONFIGURATION name="Debug" iosCompatibility="default" isDebug="1" optimisation="1"
targetName="AudioAppExample"/> targetName="AudioAppExample"/>


+ 2
- 0
examples/AudioAppExample/Builds/VisualStudio2017/AudioAppExample_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\AudioAppExample.bsc</OutputFile> <OutputFile>$(IntDir)\AudioAppExample.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\AudioAppExample.bsc</OutputFile> <OutputFile>$(IntDir)\AudioAppExample.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\MainComponent.cpp"/> <ClCompile Include="..\..\Source\MainComponent.cpp"/>


+ 1
- 0
examples/AudioAppExample/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "AudioAppExample\0" VALUE "FileDescription", "AudioAppExample\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "AudioAppExample\0" VALUE "ProductName", "AudioAppExample\0"


+ 30
- 0
examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 3
- 2
examples/BLOCKS/BlocksDrawing/BlocksDrawing.jucer View File

@@ -3,7 +3,7 @@
<JUCERPROJECT id="aa4reI" name="BlocksDrawing" projectType="guiapp" version="1.0.0" <JUCERPROJECT id="aa4reI" name="BlocksDrawing" projectType="guiapp" version="1.0.0"
bundleIdentifier="com.yourcompany.BlocksDrawing" includeBinaryInAppConfig="1" bundleIdentifier="com.yourcompany.BlocksDrawing" includeBinaryInAppConfig="1"
jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0"
splashScreenColour="Dark" cppLanguageStandard="11">
splashScreenColour="Dark" cppLanguageStandard="11" companyCopyright="">
<MAINGROUP id="yXiPIx" name="BlocksDrawing"> <MAINGROUP id="yXiPIx" name="BlocksDrawing">
<GROUP id="{092A4D5B-31E2-5D03-9B41-81C10EC447E8}" name="Source"> <GROUP id="{092A4D5B-31E2-5D03-9B41-81C10EC447E8}" name="Source">
<FILE id="qnbQP7" name="LightpadComponent.h" compile="0" resource="0" <FILE id="qnbQP7" name="LightpadComponent.h" compile="0" resource="0"
@@ -36,7 +36,8 @@
<MODULEPATH id="juce_audio_processors" path="../../../modules"/> <MODULEPATH id="juce_audio_processors" path="../../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</XCODE_MAC> </XCODE_MAC>
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape">
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape"
iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="BlocksDrawing"/> <CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="BlocksDrawing"/>
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="BlocksDrawing"/> <CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="BlocksDrawing"/>


+ 1
- 1
examples/BLOCKS/BlocksDrawing/Builds/LinuxMakefile/Makefile View File

@@ -170,7 +170,7 @@ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o: ../../JuceLibraryCode/include_juce
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning BlocksDrawing @echo Cleaning BlocksDrawing


+ 3
- 2
examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2015/BlocksDrawing_App.vcxproj View File

@@ -69,7 +69,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -94,13 +94,13 @@
<ProgramDatabaseFile>$(IntDir)\BlocksDrawing.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)\BlocksDrawing.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksDrawing.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksDrawing.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl> <Midl>
@@ -144,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksDrawing.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksDrawing.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 2
- 0
examples/BLOCKS/BlocksDrawing/Builds/VisualStudio2017/BlocksDrawing_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksDrawing.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksDrawing.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksDrawing.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksDrawing.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 30
- 0
examples/BLOCKS/BlocksDrawing/Builds/iOS/BlocksDrawing/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 3
- 2
examples/BLOCKS/BlocksMonitor/BlocksMonitor.jucer View File

@@ -3,7 +3,7 @@
<JUCERPROJECT id="X7eXs7" name="BlocksMonitor" projectType="guiapp" version="1.0.0" <JUCERPROJECT id="X7eXs7" name="BlocksMonitor" projectType="guiapp" version="1.0.0"
bundleIdentifier="com.yourcompany.BlocksInfo" includeBinaryInAppConfig="1" bundleIdentifier="com.yourcompany.BlocksInfo" includeBinaryInAppConfig="1"
jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0"
splashScreenColour="Dark" cppLanguageStandard="11">
splashScreenColour="Dark" cppLanguageStandard="11" companyCopyright="">
<MAINGROUP id="msZ9DB" name="BlocksMonitor"> <MAINGROUP id="msZ9DB" name="BlocksMonitor">
<GROUP id="{2C318C74-6596-8102-3CA6-602595447F25}" name="Source"> <GROUP id="{2C318C74-6596-8102-3CA6-602595447F25}" name="Source">
<FILE id="Tw2mMp" name="Main.cpp" compile="1" resource="0" file="Source/Main.cpp"/> <FILE id="Tw2mMp" name="Main.cpp" compile="1" resource="0" file="Source/Main.cpp"/>
@@ -34,7 +34,8 @@
<MODULEPATH id="juce_audio_processors" path="../../../modules"/> <MODULEPATH id="juce_audio_processors" path="../../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</XCODE_MAC> </XCODE_MAC>
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape">
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape"
iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="BlocksMonitor"/> <CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="BlocksMonitor"/>
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="BlocksMonitor"/> <CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="BlocksMonitor"/>


+ 1
- 1
examples/BLOCKS/BlocksMonitor/Builds/LinuxMakefile/Makefile View File

@@ -164,7 +164,7 @@ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o: ../../JuceLibraryCode/include_juce
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning BlocksMonitor @echo Cleaning BlocksMonitor


+ 3
- 2
examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2015/BlocksMonitor_App.vcxproj View File

@@ -69,7 +69,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -94,13 +94,13 @@
<ProgramDatabaseFile>$(IntDir)\BlocksMonitor.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)\BlocksMonitor.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksMonitor.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksMonitor.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl> <Midl>
@@ -144,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksMonitor.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksMonitor.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 2
- 0
examples/BLOCKS/BlocksMonitor/Builds/VisualStudio2017/BlocksMonitor_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksMonitor.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksMonitor.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksMonitor.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksMonitor.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 30
- 0
examples/BLOCKS/BlocksMonitor/Builds/iOS/BlocksMonitor/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 3
- 2
examples/BLOCKS/BlocksSynth/BlocksSynth.jucer View File

@@ -3,7 +3,7 @@
<JUCERPROJECT id="XsTycT" name="BlocksSynth" projectType="guiapp" version="1.0.0" <JUCERPROJECT id="XsTycT" name="BlocksSynth" projectType="guiapp" version="1.0.0"
bundleIdentifier="com.yourcompany.BlocksSynth" includeBinaryInAppConfig="1" bundleIdentifier="com.yourcompany.BlocksSynth" includeBinaryInAppConfig="1"
jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0"
splashScreenColour="Dark" cppLanguageStandard="11">
splashScreenColour="Dark" cppLanguageStandard="11" companyCopyright="">
<MAINGROUP id="onTNql" name="BlocksSynth"> <MAINGROUP id="onTNql" name="BlocksSynth">
<GROUP id="{0CEBC63B-4C52-E77F-CD6E-A2E65F0C9B2B}" name="Source"> <GROUP id="{0CEBC63B-4C52-E77F-CD6E-A2E65F0C9B2B}" name="Source">
<GROUP id="{06BF67F9-0F56-6AD3-00A9-443125750AAE}" name="Audio"> <GROUP id="{06BF67F9-0F56-6AD3-00A9-443125750AAE}" name="Audio">
@@ -38,7 +38,8 @@
<MODULEPATH id="juce_audio_utils" path="../../../modules"/> <MODULEPATH id="juce_audio_utils" path="../../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</XCODE_MAC> </XCODE_MAC>
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape">
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape"
iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="BlocksSynth"/> <CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="BlocksSynth"/>
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="BlocksSynth"/> <CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="BlocksSynth"/>


+ 1
- 1
examples/BLOCKS/BlocksSynth/Builds/LinuxMakefile/Makefile View File

@@ -164,7 +164,7 @@ $(JUCE_OBJDIR)/include_juce_opengl_a8a032b.o: ../../JuceLibraryCode/include_juce
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning BlocksSynth @echo Cleaning BlocksSynth


+ 3
- 2
examples/BLOCKS/BlocksSynth/Builds/VisualStudio2015/BlocksSynth_App.vcxproj View File

@@ -69,7 +69,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -94,13 +94,13 @@
<ProgramDatabaseFile>$(IntDir)\BlocksSynth.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)\BlocksSynth.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksSynth.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksSynth.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl> <Midl>
@@ -144,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksSynth.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksSynth.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 2
- 0
examples/BLOCKS/BlocksSynth/Builds/VisualStudio2017/BlocksSynth_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksSynth.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksSynth.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BlocksSynth.bsc</OutputFile> <OutputFile>$(IntDir)\BlocksSynth.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 30
- 0
examples/BLOCKS/BlocksSynth/Builds/iOS/BlocksSynth/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 1
- 1
examples/BouncingBallWavetableDemo/BouncingBallWavetableDemo.jucer View File

@@ -4,7 +4,7 @@
version="1.0.0" bundleIdentifier="com.juce.BouncingBallWavetableDemo" version="1.0.0" bundleIdentifier="com.juce.BouncingBallWavetableDemo"
includeBinaryInAppConfig="1" jucerVersion="5.1.2" displaySplashScreen="0" includeBinaryInAppConfig="1" jucerVersion="5.1.2" displaySplashScreen="0"
reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd." reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd."
cppLanguageStandard="11">
cppLanguageStandard="11" companyCopyright="ROLI Ltd.">
<MAINGROUP id="MgjqDB" name="BouncingBallWavetableDemo"> <MAINGROUP id="MgjqDB" name="BouncingBallWavetableDemo">
<GROUP id="{D35F88A0-C242-1CAA-21A9-6D01F78F4128}" name="Source"> <GROUP id="{D35F88A0-C242-1CAA-21A9-6D01F78F4128}" name="Source">
<FILE id="M5GUDX" name="MainComponent.cpp" compile="1" resource="0" <FILE id="M5GUDX" name="MainComponent.cpp" compile="1" resource="0"


+ 1
- 1
examples/BouncingBallWavetableDemo/Builds/LinuxMakefile/Makefile View File

@@ -170,7 +170,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning BouncingBallWavetableDemo @echo Cleaning BouncingBallWavetableDemo


+ 3
- 2
examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo_App.vcxproj View File

@@ -69,7 +69,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -94,13 +94,13 @@
<ProgramDatabaseFile>$(IntDir)\WavetableBouncingEditor.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)\WavetableBouncingEditor.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\WavetableBouncingEditor.bsc</OutputFile> <OutputFile>$(IntDir)\WavetableBouncingEditor.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl> <Midl>
@@ -144,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\WavetableBouncingEditor.bsc</OutputFile> <OutputFile>$(IntDir)\WavetableBouncingEditor.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\MainComponent.cpp"/> <ClCompile Include="..\..\Source\MainComponent.cpp"/>


+ 1
- 0
examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "BouncingBallWavetableDemo\0" VALUE "FileDescription", "BouncingBallWavetableDemo\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "BouncingBallWavetableDemo\0" VALUE "ProductName", "BouncingBallWavetableDemo\0"


+ 2
- 0
examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/BouncingBallWavetableDemo_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BouncingBallWavetableDemo.bsc</OutputFile> <OutputFile>$(IntDir)\BouncingBallWavetableDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\BouncingBallWavetableDemo.bsc</OutputFile> <OutputFile>$(IntDir)\BouncingBallWavetableDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\MainComponent.cpp"/> <ClCompile Include="..\..\Source\MainComponent.cpp"/>


+ 1
- 0
examples/BouncingBallWavetableDemo/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "BouncingBallWavetableDemo\0" VALUE "FileDescription", "BouncingBallWavetableDemo\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "BouncingBallWavetableDemo\0" VALUE "ProductName", "BouncingBallWavetableDemo\0"


+ 2
- 0
examples/ComponentTutorialExample/Builds/VisualStudio2015/ComponentTutorialExample_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\ComponentTutorialExample.bsc</OutputFile> <OutputFile>$(IntDir)\ComponentTutorialExample.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\ComponentTutorialExample.bsc</OutputFile> <OutputFile>$(IntDir)\ComponentTutorialExample.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\MainComponent.cpp"/> <ClCompile Include="..\..\Source\MainComponent.cpp"/>


+ 1
- 0
examples/ComponentTutorialExample/Builds/VisualStudio2015/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "ComponentTutorialExample\0" VALUE "FileDescription", "ComponentTutorialExample\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "ComponentTutorialExample\0" VALUE "ProductName", "ComponentTutorialExample\0"


+ 2
- 0
examples/ComponentTutorialExample/Builds/VisualStudio2017/ComponentTutorialExample_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\ComponentTutorialExample.bsc</OutputFile> <OutputFile>$(IntDir)\ComponentTutorialExample.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\ComponentTutorialExample.bsc</OutputFile> <OutputFile>$(IntDir)\ComponentTutorialExample.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\MainComponent.cpp"/> <ClCompile Include="..\..\Source\MainComponent.cpp"/>


+ 1
- 0
examples/ComponentTutorialExample/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "ComponentTutorialExample\0" VALUE "FileDescription", "ComponentTutorialExample\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "ComponentTutorialExample\0" VALUE "ProductName", "ComponentTutorialExample\0"


+ 1
- 1
examples/ComponentTutorialExample/ComponentTutorialExample.jucer View File

@@ -4,7 +4,7 @@
version="1.0.0" bundleIdentifier="com.roli.ComponentTutorialExample" version="1.0.0" bundleIdentifier="com.roli.ComponentTutorialExample"
includeBinaryInAppConfig="1" jucerVersion="5.1.2" displaySplashScreen="0" includeBinaryInAppConfig="1" jucerVersion="5.1.2" displaySplashScreen="0"
reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd." reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd."
cppLanguageStandard="11">
cppLanguageStandard="11" companyCopyright="ROLI Ltd.">
<MAINGROUP id="WydTVz" name="ComponentTutorialExample"> <MAINGROUP id="WydTVz" name="ComponentTutorialExample">
<GROUP id="{F2C8112A-EE4B-7AF1-A0A9-16152D1EF1A7}" name="Source"> <GROUP id="{F2C8112A-EE4B-7AF1-A0A9-16152D1EF1A7}" name="Source">
<FILE id="t4ngZQ" name="ToggleLightGridComponent.h" compile="0" resource="0" <FILE id="t4ngZQ" name="ToggleLightGridComponent.h" compile="0" resource="0"


+ 2
- 0
examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_SharedCode.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\PluginProcessor.cpp"/> <ClCompile Include="..\..\Source\PluginProcessor.cpp"/>


+ 6
- 0
examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_StandalonePlugin.vcxproj View File

@@ -104,6 +104,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib>
<AdditionalDependencies>DSPModulePluginDemo.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -147,6 +150,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib>
<AdditionalDependencies>DSPModulePluginDemo.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_audio_plugin_client_Standalone.cpp"/> <ClCompile Include="..\..\JuceLibraryCode\include_juce_audio_plugin_client_Standalone.cpp"/>


+ 6
- 0
examples/DSP module plugin demo/Builds/VisualStudio2015/DSPModulePluginDemo_VST.vcxproj View File

@@ -104,6 +104,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib>
<AdditionalDependencies>DSPModulePluginDemo.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -147,6 +150,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib>
<AdditionalDependencies>DSPModulePluginDemo.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_audio_plugin_client_VST2.cpp"/> <ClCompile Include="..\..\JuceLibraryCode\include_juce_audio_plugin_client_VST2.cpp"/>


+ 1
- 0
examples/DSP module plugin demo/Builds/VisualStudio2015/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "DSPModulePluginDemo\0" VALUE "FileDescription", "DSPModulePluginDemo\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "DSPModulePluginDemo\0" VALUE "ProductName", "DSPModulePluginDemo\0"


+ 2
- 0
examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_SharedCode.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -144,6 +145,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\PluginProcessor.cpp"/> <ClCompile Include="..\..\Source\PluginProcessor.cpp"/>


+ 6
- 0
examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_StandalonePlugin.vcxproj View File

@@ -104,6 +104,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib>
<AdditionalDependencies>DSPModulePluginDemo.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -148,6 +151,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib>
<AdditionalDependencies>DSPModulePluginDemo.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_audio_plugin_client_Standalone.cpp"/> <ClCompile Include="..\..\JuceLibraryCode\include_juce_audio_plugin_client_Standalone.cpp"/>


+ 6
- 0
examples/DSP module plugin demo/Builds/VisualStudio2017/DSPModulePluginDemo_VST.vcxproj View File

@@ -104,6 +104,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib>
<AdditionalDependencies>DSPModulePluginDemo.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -148,6 +151,9 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPModulePluginDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib>
<AdditionalDependencies>DSPModulePluginDemo.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_audio_plugin_client_VST2.cpp"/> <ClCompile Include="..\..\JuceLibraryCode\include_juce_audio_plugin_client_VST2.cpp"/>


+ 1
- 0
examples/DSP module plugin demo/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "DSPModulePluginDemo\0" VALUE "FileDescription", "DSPModulePluginDemo\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "DSPModulePluginDemo\0" VALUE "ProductName", "DSPModulePluginDemo\0"


+ 1
- 1
examples/DSP module plugin demo/DSP module plugin demo.jucer View File

@@ -12,7 +12,7 @@
pluginAUExportPrefix="DSPmoduleplugindemoAU" pluginRTASCategory="" pluginAUExportPrefix="DSPmoduleplugindemoAU" pluginRTASCategory=""
aaxIdentifier="com.yourcompany.DSPmoduleplugindemo" pluginAAXCategory="AAX_ePlugInCategory_Dynamics" aaxIdentifier="com.yourcompany.DSPmoduleplugindemo" pluginAAXCategory="AAX_ePlugInCategory_Dynamics"
jucerVersion="5.1.2" companyName="ROLI Ltd." companyWebsite="www.juce.com" jucerVersion="5.1.2" companyName="ROLI Ltd." companyWebsite="www.juce.com"
companyEmail="info@juce.com" cppLanguageStandard="14">
companyEmail="info@juce.com" cppLanguageStandard="14" companyCopyright="ROLI Ltd.">
<MAINGROUP id="EukfoT" name="DSPModulePluginDemo"> <MAINGROUP id="EukfoT" name="DSPModulePluginDemo">
<GROUP id="{03DB4847-1567-1194-A0D2-ECC6C6C5042C}" name="Resources"> <GROUP id="{03DB4847-1567-1194-A0D2-ECC6C6C5042C}" name="Resources">
<FILE id="EWBl4v" name="Impulse1.wav" compile="0" resource="1" file="Resources/Impulse1.wav"/> <FILE id="EWBl4v" name="Impulse1.wav" compile="0" resource="1" file="Resources/Impulse1.wav"/>


+ 1
- 1
examples/DSPDemo/Builds/LinuxMakefile/Makefile View File

@@ -224,7 +224,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning DSPDemo @echo Cleaning DSPDemo


+ 2
- 0
examples/DSPDemo/Builds/VisualStudio2017/DSPDemo_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\DSPDemo.bsc</OutputFile> <OutputFile>$(IntDir)\DSPDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Demos\ConvolutionDemo.cpp"/> <ClCompile Include="..\..\Source\Demos\ConvolutionDemo.cpp"/>


+ 1
- 0
examples/DSPDemo/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "DSPDemo\0" VALUE "FileDescription", "DSPDemo\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "DSPDemo\0" VALUE "ProductName", "DSPDemo\0"


+ 1
- 1
examples/DSPDemo/DSPDemo.jucer View File

@@ -4,7 +4,7 @@
splashScreenColour="Dark" projectType="guiapp" version="1.0.0" splashScreenColour="Dark" projectType="guiapp" version="1.0.0"
bundleIdentifier="com.roli.DSPDemo" includeBinaryInAppConfig="1" bundleIdentifier="com.roli.DSPDemo" includeBinaryInAppConfig="1"
jucerVersion="5.1.2" cppLanguageStandard="14" companyName="ROLI Ltd." jucerVersion="5.1.2" cppLanguageStandard="14" companyName="ROLI Ltd."
companyWebsite="www.juce.com" companyEmail="info@juce.com">
companyWebsite="www.juce.com" companyEmail="info@juce.com" companyCopyright="ROLI Ltd.">
<MAINGROUP id="vJBLPL" name="DSPDemo"> <MAINGROUP id="vJBLPL" name="DSPDemo">
<GROUP id="{EF78091C-1BFD-651B-9BAA-893A127B90F5}" name="Source"> <GROUP id="{EF78091C-1BFD-651B-9BAA-893A127B90F5}" name="Source">
<GROUP id="{5F45257F-D13D-6B55-449A-8502543E2C89}" name="Resources"> <GROUP id="{5F45257F-D13D-6B55-449A-8502543E2C89}" name="Resources">


+ 23
- 1
examples/Demo/Builds/Android/app/src/main/java/com/yourcompany/jucedemo/JuceDemo.java View File

@@ -400,6 +400,8 @@ public class JuceDemo extends Activity
public final void deleteView (ComponentPeerView view) public final void deleteView (ComponentPeerView view)
{ {
view.host = 0;
ViewGroup group = (ViewGroup) (view.getParent()); ViewGroup group = (ViewGroup) (view.getParent());
if (group != null) if (group != null)
@@ -629,7 +631,6 @@ public class JuceDemo extends Activity
setFocusable (true); setFocusable (true);
setFocusableInTouchMode (true); setFocusableInTouchMode (true);
setOnFocusChangeListener (this); setOnFocusChangeListener (this);
requestFocus();
// swap red and blue colours to match internal opengl texture format // swap red and blue colours to match internal opengl texture format
ColorMatrix colorMatrix = new ColorMatrix(); ColorMatrix colorMatrix = new ColorMatrix();
@@ -649,6 +650,9 @@ public class JuceDemo extends Activity
@Override @Override
public void onDraw (Canvas canvas) public void onDraw (Canvas canvas)
{ {
if (host == 0)
return;
handlePaint (host, canvas, paint); handlePaint (host, canvas, paint);
} }
@@ -670,6 +674,9 @@ public class JuceDemo extends Activity
@Override @Override
public boolean onTouchEvent (MotionEvent event) public boolean onTouchEvent (MotionEvent event)
{ {
if (host == 0)
return false;
int action = event.getAction(); int action = event.getAction();
long time = event.getEventTime(); long time = event.getEventTime();
@@ -740,6 +747,9 @@ public class JuceDemo extends Activity
@Override @Override
public boolean onKeyDown (int keyCode, KeyEvent event) public boolean onKeyDown (int keyCode, KeyEvent event)
{ {
if (host == 0)
return false;
switch (keyCode) switch (keyCode)
{ {
case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_UP:
@@ -762,6 +772,9 @@ public class JuceDemo extends Activity
@Override @Override
public boolean onKeyUp (int keyCode, KeyEvent event) public boolean onKeyUp (int keyCode, KeyEvent event)
{ {
if (host == 0)
return false;
handleKeyUp (host, keyCode, event.getUnicodeChar()); handleKeyUp (host, keyCode, event.getUnicodeChar());
return true; return true;
} }
@@ -769,6 +782,9 @@ public class JuceDemo extends Activity
@Override @Override
public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) public boolean onKeyMultiple (int keyCode, int count, KeyEvent event)
{ {
if (host == 0)
return false;
if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE)
return super.onKeyMultiple (keyCode, count, event); return super.onKeyMultiple (keyCode, count, event);
@@ -801,6 +817,9 @@ public class JuceDemo extends Activity
@Override @Override
protected void onSizeChanged (int w, int h, int oldw, int oldh) protected void onSizeChanged (int w, int h, int oldw, int oldh)
{ {
if (host == 0)
return;
super.onSizeChanged (w, h, oldw, oldh); super.onSizeChanged (w, h, oldw, oldh);
viewSizeChanged (host); viewSizeChanged (host);
} }
@@ -817,6 +836,9 @@ public class JuceDemo extends Activity
@Override @Override
public void onFocusChange (View v, boolean hasFocus) public void onFocusChange (View v, boolean hasFocus)
{ {
if (host == 0)
return;
if (v == this) if (v == this)
focusChanged (host, hasFocus); focusChanged (host, hasFocus);
} }


+ 1
- 1
examples/Demo/Builds/LinuxMakefile/Makefile View File

@@ -428,7 +428,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning JuceDemo @echo Cleaning JuceDemo


+ 3
- 2
examples/Demo/Builds/VisualStudio2013/JuceDemo_App.vcxproj View File

@@ -69,7 +69,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.0.0;JUCE_APP_VERSION_HEX=0x30000;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)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=3.0.0;JUCE_APP_VERSION_HEX=0x30000;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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -95,13 +95,13 @@
<ProgramDatabaseFile>$(IntDir)\JuceDemo.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)\JuceDemo.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile> <OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl> <Midl>
@@ -146,6 +146,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile> <OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/Demo/Builds/VisualStudio2013/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "JuceDemo\0" VALUE "FileDescription", "JuceDemo\0"
VALUE "FileVersion", "3.0.0\0" VALUE "FileVersion", "3.0.0\0"
VALUE "ProductName", "JuceDemo\0" VALUE "ProductName", "JuceDemo\0"


+ 2
- 0
examples/Demo/Builds/VisualStudio2015/JuceDemo_App.vcxproj View File

@@ -102,6 +102,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile> <OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -145,6 +146,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile> <OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/Demo/Builds/VisualStudio2015/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "JuceDemo\0" VALUE "FileDescription", "JuceDemo\0"
VALUE "FileVersion", "3.0.0\0" VALUE "FileVersion", "3.0.0\0"
VALUE "ProductName", "JuceDemo\0" VALUE "ProductName", "JuceDemo\0"


+ 2
- 0
examples/Demo/Builds/VisualStudio2017/JuceDemo_App.vcxproj View File

@@ -102,6 +102,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile> <OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -145,6 +146,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile> <OutputFile>$(IntDir)\JuceDemo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/Demo/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "JuceDemo\0" VALUE "FileDescription", "JuceDemo\0"
VALUE "FileVersion", "3.0.0\0" VALUE "FileVersion", "3.0.0\0"
VALUE "ProductName", "JuceDemo\0" VALUE "ProductName", "JuceDemo\0"


+ 30
- 0
examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 4
- 2
examples/Demo/JuceDemo.jucer View File

@@ -3,7 +3,8 @@
<JUCERPROJECT id="sBBIzr" name="JuceDemo" projectType="guiapp" version="3.0.0" <JUCERPROJECT id="sBBIzr" name="JuceDemo" projectType="guiapp" version="3.0.0"
bundleIdentifier="com.roli.JuceDemo" jucerVersion="5.1.2" defines="JUCE_UNIT_TESTS=1" bundleIdentifier="com.roli.JuceDemo" jucerVersion="5.1.2" defines="JUCE_UNIT_TESTS=1"
includeBinaryInAppConfig="1" displaySplashScreen="0" reportAppUsage="0" includeBinaryInAppConfig="1" displaySplashScreen="0" reportAppUsage="0"
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11">
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11"
companyCopyright="ROLI Ltd.">
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
objCExtraSuffix="hZh0GG" bigIcon="BvyE0d" extraCompilerFlags="-Wall -Wshadow -Wstrict-aliasing -Wconversion -Wsign-compare -Woverloaded-virtual -Wextra-semi" objCExtraSuffix="hZh0GG" bigIcon="BvyE0d" extraCompilerFlags="-Wall -Wshadow -Wstrict-aliasing -Wconversion -Wsign-compare -Woverloaded-virtual -Wextra-semi"
@@ -37,7 +38,8 @@
<XCODE_IPHONE targetFolder="Builds/iOS" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_IPHONE targetFolder="Builds/iOS" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
objCExtraSuffix="Lpywnl" bigIcon="BvyE0d" iosScreenOrientation="portraitlandscape" objCExtraSuffix="Lpywnl" bigIcon="BvyE0d" iosScreenOrientation="portraitlandscape"
customPList="&lt;plist&gt;&#10;&lt;dict&gt;&#10;&#9;&lt;key&gt;NSAppTransportSecurity&lt;/key&gt;&#10;&#9;&lt;dict&gt;&#10;&#9;&#9;&lt;key&gt;NSAllowsArbitraryLoads&lt;/key&gt;&#10;&#9;&#9;&lt;true/&gt;&#10;&#9;&lt;/dict&gt;&#10;&lt;/dict&gt;&#10;&lt;/plist&gt;" customPList="&lt;plist&gt;&#10;&lt;dict&gt;&#10;&#9;&lt;key&gt;NSAppTransportSecurity&lt;/key&gt;&#10;&#9;&lt;dict&gt;&#10;&#9;&#9;&lt;key&gt;NSAllowsArbitraryLoads&lt;/key&gt;&#10;&#9;&#9;&lt;true/&gt;&#10;&#9;&lt;/dict&gt;&#10;&lt;/dict&gt;&#10;&lt;/plist&gt;"
microphonePermissionNeeded="1" extraCompilerFlags="-pedantic -Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wextra-semi">
microphonePermissionNeeded="1" extraCompilerFlags="-pedantic -Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wextra-semi"
iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="JuceDemo" <CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="JuceDemo"
osxSDK="default" osxCompatibility="default" osxArchitecture="default" osxSDK="default" osxCompatibility="default" osxArchitecture="default"


+ 1
- 1
examples/HelloWorld/Builds/LinuxMakefile/Makefile View File

@@ -128,7 +128,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning HelloWorld @echo Cleaning HelloWorld


+ 2
- 0
examples/HelloWorld/Builds/VisualStudio2015/HelloWorld_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\HelloWorld.bsc</OutputFile> <OutputFile>$(IntDir)\HelloWorld.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\HelloWorld.bsc</OutputFile> <OutputFile>$(IntDir)\HelloWorld.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/HelloWorld/Builds/VisualStudio2015/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "HelloWorld\0" VALUE "FileDescription", "HelloWorld\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "HelloWorld\0" VALUE "ProductName", "HelloWorld\0"


+ 2
- 0
examples/HelloWorld/Builds/VisualStudio2017/HelloWorld_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\HelloWorld.bsc</OutputFile> <OutputFile>$(IntDir)\HelloWorld.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\HelloWorld.bsc</OutputFile> <OutputFile>$(IntDir)\HelloWorld.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/HelloWorld/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "HelloWorld\0" VALUE "FileDescription", "HelloWorld\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "HelloWorld\0" VALUE "ProductName", "HelloWorld\0"


+ 30
- 0
examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 4
- 2
examples/HelloWorld/HelloWorld.jucer View File

@@ -3,7 +3,8 @@
<JUCERPROJECT id="tTAKTK1s" name="HelloWorld" projectType="guiapp" juceFolder="../../../juce" <JUCERPROJECT id="tTAKTK1s" name="HelloWorld" projectType="guiapp" juceFolder="../../../juce"
jucerVersion="5.1.2" version="1.0.0" bundleIdentifier="com.roli.jucehelloworld" jucerVersion="5.1.2" version="1.0.0" bundleIdentifier="com.roli.jucehelloworld"
companyName="ROLI Ltd." includeBinaryInAppConfig="1" displaySplashScreen="0" companyName="ROLI Ltd." includeBinaryInAppConfig="1" displaySplashScreen="0"
reportAppUsage="0" splashScreenColour="Dark" cppLanguageStandard="11">
reportAppUsage="0" splashScreenColour="Dark" cppLanguageStandard="11"
companyCopyright="ROLI Ltd.">
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
objCExtraSuffix="JtTAKTK1s"> objCExtraSuffix="JtTAKTK1s">
@@ -23,7 +24,8 @@
</MODULEPATHS> </MODULEPATHS>
</XCODE_MAC> </XCODE_MAC>
<XCODE_IPHONE targetFolder="Builds/iOS" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" <XCODE_IPHONE targetFolder="Builds/iOS" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
objCExtraSuffix="JtTAKTK1s" iosScreenOrientation="portraitlandscape">
objCExtraSuffix="JtTAKTK1s" iosScreenOrientation="portraitlandscape"
iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="HelloWorld" <CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="HelloWorld"
osxSDK="1" osxCompatibility="1" osxArchitecture="default" iosCompatibility="default"/> osxSDK="1" osxCompatibility="1" osxArchitecture="default" iosCompatibility="default"/>


+ 23
- 1
examples/InAppPurchase/Builds/Android/app/src/main/java/com/roli/juceinapppurchasesample/InAppPurchase.java View File

@@ -400,6 +400,8 @@ public class InAppPurchase extends Activity
public final void deleteView (ComponentPeerView view) public final void deleteView (ComponentPeerView view)
{ {
view.host = 0;
ViewGroup group = (ViewGroup) (view.getParent()); ViewGroup group = (ViewGroup) (view.getParent());
if (group != null) if (group != null)
@@ -629,7 +631,6 @@ public class InAppPurchase extends Activity
setFocusable (true); setFocusable (true);
setFocusableInTouchMode (true); setFocusableInTouchMode (true);
setOnFocusChangeListener (this); setOnFocusChangeListener (this);
requestFocus();
// swap red and blue colours to match internal opengl texture format // swap red and blue colours to match internal opengl texture format
ColorMatrix colorMatrix = new ColorMatrix(); ColorMatrix colorMatrix = new ColorMatrix();
@@ -649,6 +650,9 @@ public class InAppPurchase extends Activity
@Override @Override
public void onDraw (Canvas canvas) public void onDraw (Canvas canvas)
{ {
if (host == 0)
return;
handlePaint (host, canvas, paint); handlePaint (host, canvas, paint);
} }
@@ -670,6 +674,9 @@ public class InAppPurchase extends Activity
@Override @Override
public boolean onTouchEvent (MotionEvent event) public boolean onTouchEvent (MotionEvent event)
{ {
if (host == 0)
return false;
int action = event.getAction(); int action = event.getAction();
long time = event.getEventTime(); long time = event.getEventTime();
@@ -740,6 +747,9 @@ public class InAppPurchase extends Activity
@Override @Override
public boolean onKeyDown (int keyCode, KeyEvent event) public boolean onKeyDown (int keyCode, KeyEvent event)
{ {
if (host == 0)
return false;
switch (keyCode) switch (keyCode)
{ {
case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_UP:
@@ -762,6 +772,9 @@ public class InAppPurchase extends Activity
@Override @Override
public boolean onKeyUp (int keyCode, KeyEvent event) public boolean onKeyUp (int keyCode, KeyEvent event)
{ {
if (host == 0)
return false;
handleKeyUp (host, keyCode, event.getUnicodeChar()); handleKeyUp (host, keyCode, event.getUnicodeChar());
return true; return true;
} }
@@ -769,6 +782,9 @@ public class InAppPurchase extends Activity
@Override @Override
public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) public boolean onKeyMultiple (int keyCode, int count, KeyEvent event)
{ {
if (host == 0)
return false;
if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE)
return super.onKeyMultiple (keyCode, count, event); return super.onKeyMultiple (keyCode, count, event);
@@ -801,6 +817,9 @@ public class InAppPurchase extends Activity
@Override @Override
protected void onSizeChanged (int w, int h, int oldw, int oldh) protected void onSizeChanged (int w, int h, int oldw, int oldh)
{ {
if (host == 0)
return;
super.onSizeChanged (w, h, oldw, oldh); super.onSizeChanged (w, h, oldw, oldh);
viewSizeChanged (host); viewSizeChanged (host);
} }
@@ -817,6 +836,9 @@ public class InAppPurchase extends Activity
@Override @Override
public void onFocusChange (View v, boolean hasFocus) public void onFocusChange (View v, boolean hasFocus)
{ {
if (host == 0)
return;
if (v == this) if (v == this)
focusChanged (host, hasFocus); focusChanged (host, hasFocus);
} }


+ 30
- 0
examples/InAppPurchase/Builds/iOS/InAppPurchase/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 3
- 2
examples/InAppPurchase/InAppPurchase.jucer View File

@@ -4,7 +4,7 @@
splashScreenColour="Dark" projectType="guiapp" version="0.0.2" splashScreenColour="Dark" projectType="guiapp" version="0.0.2"
bundleIdentifier="com.roli.juceInAppPurchaseSample" includeBinaryInAppConfig="1" bundleIdentifier="com.roli.juceInAppPurchaseSample" includeBinaryInAppConfig="1"
cppLanguageStandard="11" jucerVersion="5.1.2" companyName="ROLI Ltd." cppLanguageStandard="11" jucerVersion="5.1.2" companyName="ROLI Ltd."
companyWebsite="www.juce.com" companyEmail="info@juce.com">
companyWebsite="www.juce.com" companyEmail="info@juce.com" companyCopyright="ROLI Ltd.">
<MAINGROUP id="y4sxBT" name="InAppPurchase"> <MAINGROUP id="y4sxBT" name="InAppPurchase">
<GROUP id="{D5BB0A26-3258-B6DA-ED7A-A306325E64AE}" name="BinaryData"> <GROUP id="{D5BB0A26-3258-B6DA-ED7A-A306325E64AE}" name="BinaryData">
<FILE id="V6ODJ9" name="Ed.png" compile="0" resource="1" file="BinaryData/Ed.png"/> <FILE id="V6ODJ9" name="Ed.png" compile="0" resource="1" file="BinaryData/Ed.png"/>
@@ -42,7 +42,8 @@
<EXPORTFORMATS> <EXPORTFORMATS>
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape" <XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape"
enableGNUExtensions="0" extraDefs="" iosInAppPurchases="1" extraCompilerFlags="-pedantic -Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wextra-semi" enableGNUExtensions="0" extraDefs="" iosInAppPurchases="1" extraCompilerFlags="-pedantic -Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wextra-semi"
bigIcon="OqeN3h" smallIcon="OqeN3h">
bigIcon="OqeN3h" smallIcon="OqeN3h" iPadScreenOrientation="portraitlandscape"
iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="InAppPurchase"/> <CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="InAppPurchase"/>
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="InAppPurchase"/> <CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="InAppPurchase"/>


+ 1
- 1
examples/MPETest/Builds/LinuxMakefile/Makefile View File

@@ -170,7 +170,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning MPETest @echo Cleaning MPETest


+ 3
- 2
examples/MPETest/Builds/VisualStudio2015/MPETest_App.vcxproj View File

@@ -69,7 +69,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -94,13 +94,13 @@
<ProgramDatabaseFile>$(IntDir)\MPETest.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)\MPETest.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\MPETest.bsc</OutputFile> <OutputFile>$(IntDir)\MPETest.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl> <Midl>
@@ -144,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\MPETest.bsc</OutputFile> <OutputFile>$(IntDir)\MPETest.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/MPETest/Builds/VisualStudio2015/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "MPETest\0" VALUE "FileDescription", "MPETest\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "MPETest\0" VALUE "ProductName", "MPETest\0"


+ 2
- 0
examples/MPETest/Builds/VisualStudio2017/MPETest_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\MPETest.bsc</OutputFile> <OutputFile>$(IntDir)\MPETest.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\MPETest.bsc</OutputFile> <OutputFile>$(IntDir)\MPETest.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/MPETest/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "MPETest\0" VALUE "FileDescription", "MPETest\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "MPETest\0" VALUE "ProductName", "MPETest\0"


+ 2
- 1
examples/MPETest/MPETest.jucer View File

@@ -3,7 +3,8 @@
<JUCERPROJECT id="IilE7R" name="MPETest" projectType="guiapp" version="1.0.0" <JUCERPROJECT id="IilE7R" name="MPETest" projectType="guiapp" version="1.0.0"
bundleIdentifier="com.roli.MPETest" includeBinaryInAppConfig="1" bundleIdentifier="com.roli.MPETest" includeBinaryInAppConfig="1"
jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0"
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11">
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11"
companyCopyright="ROLI Ltd.">
<MAINGROUP id="VCQQcn" name="MPETest"> <MAINGROUP id="VCQQcn" name="MPETest">
<GROUP id="{D43238F0-992F-BC5A-F1AA-31BBBD3D17B0}" name="Source"> <GROUP id="{D43238F0-992F-BC5A-F1AA-31BBBD3D17B0}" name="Source">
<FILE id="uRxR7V" name="Main.cpp" compile="1" resource="0" file="Source/Main.cpp"/> <FILE id="uRxR7V" name="Main.cpp" compile="1" resource="0" file="Source/Main.cpp"/>


+ 23
- 1
examples/MidiTest/Builds/Android/app/src/main/java/com/yourcompany/miditest/MidiTest.java View File

@@ -1329,6 +1329,8 @@ public class MidiTest extends Activity
public final void deleteView (ComponentPeerView view) public final void deleteView (ComponentPeerView view)
{ {
view.host = 0;
ViewGroup group = (ViewGroup) (view.getParent()); ViewGroup group = (ViewGroup) (view.getParent());
if (group != null) if (group != null)
@@ -1558,7 +1560,6 @@ public class MidiTest extends Activity
setFocusable (true); setFocusable (true);
setFocusableInTouchMode (true); setFocusableInTouchMode (true);
setOnFocusChangeListener (this); setOnFocusChangeListener (this);
requestFocus();
// swap red and blue colours to match internal opengl texture format // swap red and blue colours to match internal opengl texture format
ColorMatrix colorMatrix = new ColorMatrix(); ColorMatrix colorMatrix = new ColorMatrix();
@@ -1578,6 +1579,9 @@ public class MidiTest extends Activity
@Override @Override
public void onDraw (Canvas canvas) public void onDraw (Canvas canvas)
{ {
if (host == 0)
return;
handlePaint (host, canvas, paint); handlePaint (host, canvas, paint);
} }
@@ -1599,6 +1603,9 @@ public class MidiTest extends Activity
@Override @Override
public boolean onTouchEvent (MotionEvent event) public boolean onTouchEvent (MotionEvent event)
{ {
if (host == 0)
return false;
int action = event.getAction(); int action = event.getAction();
long time = event.getEventTime(); long time = event.getEventTime();
@@ -1669,6 +1676,9 @@ public class MidiTest extends Activity
@Override @Override
public boolean onKeyDown (int keyCode, KeyEvent event) public boolean onKeyDown (int keyCode, KeyEvent event)
{ {
if (host == 0)
return false;
switch (keyCode) switch (keyCode)
{ {
case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_UP:
@@ -1691,6 +1701,9 @@ public class MidiTest extends Activity
@Override @Override
public boolean onKeyUp (int keyCode, KeyEvent event) public boolean onKeyUp (int keyCode, KeyEvent event)
{ {
if (host == 0)
return false;
handleKeyUp (host, keyCode, event.getUnicodeChar()); handleKeyUp (host, keyCode, event.getUnicodeChar());
return true; return true;
} }
@@ -1698,6 +1711,9 @@ public class MidiTest extends Activity
@Override @Override
public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) public boolean onKeyMultiple (int keyCode, int count, KeyEvent event)
{ {
if (host == 0)
return false;
if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE)
return super.onKeyMultiple (keyCode, count, event); return super.onKeyMultiple (keyCode, count, event);
@@ -1730,6 +1746,9 @@ public class MidiTest extends Activity
@Override @Override
protected void onSizeChanged (int w, int h, int oldw, int oldh) protected void onSizeChanged (int w, int h, int oldw, int oldh)
{ {
if (host == 0)
return;
super.onSizeChanged (w, h, oldw, oldh); super.onSizeChanged (w, h, oldw, oldh);
viewSizeChanged (host); viewSizeChanged (host);
} }
@@ -1746,6 +1765,9 @@ public class MidiTest extends Activity
@Override @Override
public void onFocusChange (View v, boolean hasFocus) public void onFocusChange (View v, boolean hasFocus)
{ {
if (host == 0)
return;
if (v == this) if (v == this)
focusChanged (host, hasFocus); focusChanged (host, hasFocus);
} }


+ 1
- 1
examples/MidiTest/Builds/LinuxMakefile/Makefile View File

@@ -158,7 +158,7 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning MidiTest @echo Cleaning MidiTest


+ 3
- 2
examples/MidiTest/Builds/VisualStudio2015/MidiTest_App.vcxproj View File

@@ -69,7 +69,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -94,13 +94,13 @@
<ProgramDatabaseFile>$(IntDir)\MidiTest.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)\MidiTest.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\MidiTest.bsc</OutputFile> <OutputFile>$(IntDir)\MidiTest.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl> <Midl>
@@ -144,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\MidiTest.bsc</OutputFile> <OutputFile>$(IntDir)\MidiTest.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/MidiTest/Builds/VisualStudio2015/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "MidiTest\0" VALUE "FileDescription", "MidiTest\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "MidiTest\0" VALUE "ProductName", "MidiTest\0"


+ 2
- 0
examples/MidiTest/Builds/VisualStudio2017/MidiTest_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\MidiTest.bsc</OutputFile> <OutputFile>$(IntDir)\MidiTest.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\MidiTest.bsc</OutputFile> <OutputFile>$(IntDir)\MidiTest.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/MidiTest/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "MidiTest\0" VALUE "FileDescription", "MidiTest\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "MidiTest\0" VALUE "ProductName", "MidiTest\0"


+ 30
- 0
examples/MidiTest/Builds/iOS/MidiTest/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 4
- 2
examples/MidiTest/MidiTest.jucer View File

@@ -3,7 +3,8 @@
<JUCERPROJECT id="wHE0ay" name="MidiTest" projectType="guiapp" version="1.0.0" <JUCERPROJECT id="wHE0ay" name="MidiTest" projectType="guiapp" version="1.0.0"
bundleIdentifier="com.roli.MidiTest" includeBinaryInAppConfig="1" bundleIdentifier="com.roli.MidiTest" includeBinaryInAppConfig="1"
jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0"
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11">
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11"
companyCopyright="ROLI Ltd.">
<MAINGROUP id="s3xxCh" name="MidiTest"> <MAINGROUP id="s3xxCh" name="MidiTest">
<GROUP id="{7D29F5BC-1B05-AE8F-9202-5CF152AB1103}" name="Source"> <GROUP id="{7D29F5BC-1B05-AE8F-9202-5CF152AB1103}" name="Source">
<FILE id="kpmJ3T" name="Main.cpp" compile="1" resource="0" file="Source/Main.cpp"/> <FILE id="kpmJ3T" name="Main.cpp" compile="1" resource="0" file="Source/Main.cpp"/>
@@ -100,7 +101,8 @@
<MODULEPATH id="juce_dsp" path="../../modules"/> <MODULEPATH id="juce_dsp" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</XCODE_MAC> </XCODE_MAC>
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape">
<XCODE_IPHONE targetFolder="Builds/iOS" iosScreenOrientation="portraitlandscape"
iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" iosCompatibility="8.0" isDebug="1" optimisation="1" <CONFIGURATION name="Debug" iosCompatibility="8.0" isDebug="1" optimisation="1"
targetName="MidiTest"/> targetName="MidiTest"/>


+ 23
- 1
examples/NetworkGraphicsDemo/Builds/Android/app/src/main/java/com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo.java View File

@@ -400,6 +400,8 @@ public class JUCENetworkGraphicsDemo extends Activity
public final void deleteView (ComponentPeerView view) public final void deleteView (ComponentPeerView view)
{ {
view.host = 0;
ViewGroup group = (ViewGroup) (view.getParent()); ViewGroup group = (ViewGroup) (view.getParent());
if (group != null) if (group != null)
@@ -629,7 +631,6 @@ public class JUCENetworkGraphicsDemo extends Activity
setFocusable (true); setFocusable (true);
setFocusableInTouchMode (true); setFocusableInTouchMode (true);
setOnFocusChangeListener (this); setOnFocusChangeListener (this);
requestFocus();
// swap red and blue colours to match internal opengl texture format // swap red and blue colours to match internal opengl texture format
ColorMatrix colorMatrix = new ColorMatrix(); ColorMatrix colorMatrix = new ColorMatrix();
@@ -649,6 +650,9 @@ public class JUCENetworkGraphicsDemo extends Activity
@Override @Override
public void onDraw (Canvas canvas) public void onDraw (Canvas canvas)
{ {
if (host == 0)
return;
handlePaint (host, canvas, paint); handlePaint (host, canvas, paint);
} }
@@ -670,6 +674,9 @@ public class JUCENetworkGraphicsDemo extends Activity
@Override @Override
public boolean onTouchEvent (MotionEvent event) public boolean onTouchEvent (MotionEvent event)
{ {
if (host == 0)
return false;
int action = event.getAction(); int action = event.getAction();
long time = event.getEventTime(); long time = event.getEventTime();
@@ -740,6 +747,9 @@ public class JUCENetworkGraphicsDemo extends Activity
@Override @Override
public boolean onKeyDown (int keyCode, KeyEvent event) public boolean onKeyDown (int keyCode, KeyEvent event)
{ {
if (host == 0)
return false;
switch (keyCode) switch (keyCode)
{ {
case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_UP:
@@ -762,6 +772,9 @@ public class JUCENetworkGraphicsDemo extends Activity
@Override @Override
public boolean onKeyUp (int keyCode, KeyEvent event) public boolean onKeyUp (int keyCode, KeyEvent event)
{ {
if (host == 0)
return false;
handleKeyUp (host, keyCode, event.getUnicodeChar()); handleKeyUp (host, keyCode, event.getUnicodeChar());
return true; return true;
} }
@@ -769,6 +782,9 @@ public class JUCENetworkGraphicsDemo extends Activity
@Override @Override
public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) public boolean onKeyMultiple (int keyCode, int count, KeyEvent event)
{ {
if (host == 0)
return false;
if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE)
return super.onKeyMultiple (keyCode, count, event); return super.onKeyMultiple (keyCode, count, event);
@@ -801,6 +817,9 @@ public class JUCENetworkGraphicsDemo extends Activity
@Override @Override
protected void onSizeChanged (int w, int h, int oldw, int oldh) protected void onSizeChanged (int w, int h, int oldw, int oldh)
{ {
if (host == 0)
return;
super.onSizeChanged (w, h, oldw, oldh); super.onSizeChanged (w, h, oldw, oldh);
viewSizeChanged (host); viewSizeChanged (host);
} }
@@ -817,6 +836,9 @@ public class JUCENetworkGraphicsDemo extends Activity
@Override @Override
public void onFocusChange (View v, boolean hasFocus) public void onFocusChange (View v, boolean hasFocus)
{ {
if (host == 0)
return;
if (v == this) if (v == this)
focusChanged (host, hasFocus); focusChanged (host, hasFocus);
} }


+ 1
- 1
examples/NetworkGraphicsDemo/Builds/LinuxMakefile/Makefile View File

@@ -176,7 +176,7 @@ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o: ../../JuceLibraryCode/include_juce_o
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning JUCE Network Graphics Demo @echo Cleaning JUCE Network Graphics Demo


+ 3
- 2
examples/NetworkGraphicsDemo/Builds/VisualStudio2013/JUCE Network Graphics Demo_App.vcxproj View File

@@ -69,7 +69,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2013_78A5020=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -94,13 +94,13 @@
<ProgramDatabaseFile>$(IntDir)\JUCE Network Graphics Demo.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)\JUCE Network Graphics Demo.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\JUCE Network Graphics Demo.bsc</OutputFile> <OutputFile>$(IntDir)\JUCE Network Graphics Demo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl> <Midl>
@@ -144,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\JUCE Network Graphics Demo.bsc</OutputFile> <OutputFile>$(IntDir)\JUCE Network Graphics Demo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/NetworkGraphicsDemo/Builds/VisualStudio2013/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "JUCE Network Graphics Demo\0" VALUE "FileDescription", "JUCE Network Graphics Demo\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "JUCE Network Graphics Demo\0" VALUE "ProductName", "JUCE Network Graphics Demo\0"


+ 2
- 0
examples/NetworkGraphicsDemo/Builds/VisualStudio2017/JUCE Network Graphics Demo_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\JUCE Network Graphics Demo.bsc</OutputFile> <OutputFile>$(IntDir)\JUCE Network Graphics Demo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\JUCE Network Graphics Demo.bsc</OutputFile> <OutputFile>$(IntDir)\JUCE Network Graphics Demo.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/NetworkGraphicsDemo/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "JUCE Network Graphics Demo\0" VALUE "FileDescription", "JUCE Network Graphics Demo\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "JUCE Network Graphics Demo\0" VALUE "ProductName", "JUCE Network Graphics Demo\0"


+ 30
- 0
examples/NetworkGraphicsDemo/Builds/iOS/JUCE Network Graphics Demo/Images.xcassets/AppIcon.appiconset/Contents.json View File

@@ -1,5 +1,17 @@
{ {
"images": [ "images": [
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@2x.png",
"scale": "2x"
},
{
"idiom": "iphone",
"size": "20x20",
"filename": "Icon-Notification-20@3x.png",
"scale": "3x"
},
{ {
"idiom": "iphone", "idiom": "iphone",
"size": "29x29", "size": "29x29",
@@ -54,6 +66,18 @@
"filename": "Icon-@3x.png", "filename": "Icon-@3x.png",
"scale": "3x" "scale": "3x"
}, },
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20.png",
"scale": "1x"
},
{
"idiom": "ipad",
"size": "20x20",
"filename": "Icon-Notifications-20@2x.png",
"scale": "2x"
},
{ {
"idiom": "ipad", "idiom": "ipad",
"size": "29x29", "size": "29x29",
@@ -119,6 +143,12 @@
"size": "83.5x83.5", "size": "83.5x83.5",
"filename": "Icon-83.5@2x.png", "filename": "Icon-83.5@2x.png",
"scale": "2x" "scale": "2x"
},
{
"idiom": "ios-marketing",
"size": "1024x1024",
"filename": "Icon-AppStore-1024.png",
"scale": "1x"
} }
], ],
"info": { "info": {


+ 3
- 2
examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer View File

@@ -4,7 +4,7 @@
version="1.0.0" bundleIdentifier="com.juce.NetworkGraphicsDemo" version="1.0.0" bundleIdentifier="com.juce.NetworkGraphicsDemo"
includeBinaryInAppConfig="1" jucerVersion="5.1.2" displaySplashScreen="0" includeBinaryInAppConfig="1" jucerVersion="5.1.2" displaySplashScreen="0"
reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd." reportAppUsage="0" splashScreenColour="Dark" companyName="ROLI Ltd."
cppLanguageStandard="11">
cppLanguageStandard="11" companyCopyright="ROLI Ltd.">
<MAINGROUP id="OT9rJ2" name="JUCE Network Graphics Demo"> <MAINGROUP id="OT9rJ2" name="JUCE Network Graphics Demo">
<GROUP id="{48D54E6E-37F4-B20A-E038-C63E4EDFD4D9}" name="Source"> <GROUP id="{48D54E6E-37F4-B20A-E038-C63E4EDFD4D9}" name="Source">
<FILE id="BfclEZ" name="Demos.h" compile="0" resource="0" file="Source/Demos.h"/> <FILE id="BfclEZ" name="Demos.h" compile="0" resource="0" file="Source/Demos.h"/>
@@ -90,7 +90,8 @@
<MODULEPATH id="juce_audio_basics" path="../../modules"/> <MODULEPATH id="juce_audio_basics" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</VS2017> </VS2017>
<XCODE_IPHONE targetFolder="Builds/iOS" bigIcon="Ww6bQw" iosScreenOrientation="portraitlandscape">
<XCODE_IPHONE targetFolder="Builds/iOS" bigIcon="Ww6bQw" iosScreenOrientation="portraitlandscape"
iPadScreenOrientation="portraitlandscape" iosDeviceFamily="1,2">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" iosCompatibility="default" isDebug="1" optimisation="1" <CONFIGURATION name="Debug" iosCompatibility="default" isDebug="1" optimisation="1"
targetName="JUCE Network Graphics Demo"/> targetName="JUCE Network Graphics Demo"/>


+ 1
- 1
examples/OSCMonitor/Builds/LinuxMakefile/Makefile View File

@@ -170,7 +170,7 @@ $(JUCE_OBJDIR)/include_juce_video_be78589.o: ../../JuceLibraryCode/include_juce_
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning OSCMonitor @echo Cleaning OSCMonitor


+ 3
- 2
examples/OSCMonitor/Builds/VisualStudio2015/OSCMonitor_App.vcxproj View File

@@ -69,7 +69,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -94,13 +94,13 @@
<ProgramDatabaseFile>$(IntDir)\OSCMonitor.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)\OSCMonitor.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\OSCMonitor.bsc</OutputFile> <OutputFile>$(IntDir)\OSCMonitor.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl> <Midl>
@@ -144,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\OSCMonitor.bsc</OutputFile> <OutputFile>$(IntDir)\OSCMonitor.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/OSCMonitor/Builds/VisualStudio2015/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "OSCMonitor\0" VALUE "FileDescription", "OSCMonitor\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "OSCMonitor\0" VALUE "ProductName", "OSCMonitor\0"


+ 2
- 0
examples/OSCMonitor/Builds/VisualStudio2017/OSCMonitor_App.vcxproj View File

@@ -101,6 +101,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\OSCMonitor.bsc</OutputFile> <OutputFile>$(IntDir)\OSCMonitor.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl> <Midl>
@@ -143,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\OSCMonitor.bsc</OutputFile> <OutputFile>$(IntDir)\OSCMonitor.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


+ 1
- 0
examples/OSCMonitor/Builds/VisualStudio2017/resources.rc View File

@@ -14,6 +14,7 @@ BEGIN
BLOCK "040904E4" BLOCK "040904E4"
BEGIN BEGIN
VALUE "CompanyName", "ROLI Ltd.\0" VALUE "CompanyName", "ROLI Ltd.\0"
VALUE "LegalCopyright", "ROLI Ltd.\0"
VALUE "FileDescription", "OSCMonitor\0" VALUE "FileDescription", "OSCMonitor\0"
VALUE "FileVersion", "1.0.0\0" VALUE "FileVersion", "1.0.0\0"
VALUE "ProductName", "OSCMonitor\0" VALUE "ProductName", "OSCMonitor\0"


+ 2
- 1
examples/OSCMonitor/OSCMonitor.jucer View File

@@ -3,7 +3,8 @@
<JUCERPROJECT id="IhmIkj" name="OSCMonitor" projectType="guiapp" version="1.0.0" <JUCERPROJECT id="IhmIkj" name="OSCMonitor" projectType="guiapp" version="1.0.0"
bundleIdentifier="com.roli.OSCMonitor" includeBinaryInAppConfig="1" bundleIdentifier="com.roli.OSCMonitor" includeBinaryInAppConfig="1"
jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0" jucerVersion="5.1.2" displaySplashScreen="0" reportAppUsage="0"
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11">
splashScreenColour="Dark" companyName="ROLI Ltd." cppLanguageStandard="11"
companyCopyright="ROLI Ltd.">
<MAINGROUP id="N9NMMk" name="OSCMonitor"> <MAINGROUP id="N9NMMk" name="OSCMonitor">
<GROUP id="{2B92546C-6B49-72D9-ACD0-0F2FCE9AD0D5}" name="Source"> <GROUP id="{2B92546C-6B49-72D9-ACD0-0F2FCE9AD0D5}" name="Source">
<FILE id="fqVB21" name="OSCLogListBox.h" compile="0" resource="0" file="Source/OSCLogListBox.h"/> <FILE id="fqVB21" name="OSCLogListBox.h" compile="0" resource="0" file="Source/OSCLogListBox.h"/>


+ 23
- 1
examples/OSCReceiver/Builds/Android/app/src/main/java/com/yourcompany/oscreceiver/OSCReceiver.java View File

@@ -400,6 +400,8 @@ public class OSCReceiver extends Activity
public final void deleteView (ComponentPeerView view) public final void deleteView (ComponentPeerView view)
{ {
view.host = 0;
ViewGroup group = (ViewGroup) (view.getParent()); ViewGroup group = (ViewGroup) (view.getParent());
if (group != null) if (group != null)
@@ -629,7 +631,6 @@ public class OSCReceiver extends Activity
setFocusable (true); setFocusable (true);
setFocusableInTouchMode (true); setFocusableInTouchMode (true);
setOnFocusChangeListener (this); setOnFocusChangeListener (this);
requestFocus();
// swap red and blue colours to match internal opengl texture format // swap red and blue colours to match internal opengl texture format
ColorMatrix colorMatrix = new ColorMatrix(); ColorMatrix colorMatrix = new ColorMatrix();
@@ -649,6 +650,9 @@ public class OSCReceiver extends Activity
@Override @Override
public void onDraw (Canvas canvas) public void onDraw (Canvas canvas)
{ {
if (host == 0)
return;
handlePaint (host, canvas, paint); handlePaint (host, canvas, paint);
} }
@@ -670,6 +674,9 @@ public class OSCReceiver extends Activity
@Override @Override
public boolean onTouchEvent (MotionEvent event) public boolean onTouchEvent (MotionEvent event)
{ {
if (host == 0)
return false;
int action = event.getAction(); int action = event.getAction();
long time = event.getEventTime(); long time = event.getEventTime();
@@ -740,6 +747,9 @@ public class OSCReceiver extends Activity
@Override @Override
public boolean onKeyDown (int keyCode, KeyEvent event) public boolean onKeyDown (int keyCode, KeyEvent event)
{ {
if (host == 0)
return false;
switch (keyCode) switch (keyCode)
{ {
case KeyEvent.KEYCODE_VOLUME_UP: case KeyEvent.KEYCODE_VOLUME_UP:
@@ -762,6 +772,9 @@ public class OSCReceiver extends Activity
@Override @Override
public boolean onKeyUp (int keyCode, KeyEvent event) public boolean onKeyUp (int keyCode, KeyEvent event)
{ {
if (host == 0)
return false;
handleKeyUp (host, keyCode, event.getUnicodeChar()); handleKeyUp (host, keyCode, event.getUnicodeChar());
return true; return true;
} }
@@ -769,6 +782,9 @@ public class OSCReceiver extends Activity
@Override @Override
public boolean onKeyMultiple (int keyCode, int count, KeyEvent event) public boolean onKeyMultiple (int keyCode, int count, KeyEvent event)
{ {
if (host == 0)
return false;
if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE) if (keyCode != KeyEvent.KEYCODE_UNKNOWN || event.getAction() != KeyEvent.ACTION_MULTIPLE)
return super.onKeyMultiple (keyCode, count, event); return super.onKeyMultiple (keyCode, count, event);
@@ -801,6 +817,9 @@ public class OSCReceiver extends Activity
@Override @Override
protected void onSizeChanged (int w, int h, int oldw, int oldh) protected void onSizeChanged (int w, int h, int oldw, int oldh)
{ {
if (host == 0)
return;
super.onSizeChanged (w, h, oldw, oldh); super.onSizeChanged (w, h, oldw, oldh);
viewSizeChanged (host); viewSizeChanged (host);
} }
@@ -817,6 +836,9 @@ public class OSCReceiver extends Activity
@Override @Override
public void onFocusChange (View v, boolean hasFocus) public void onFocusChange (View v, boolean hasFocus)
{ {
if (host == 0)
return;
if (v == this) if (v == this)
focusChanged (host, hasFocus); focusChanged (host, hasFocus);
} }


+ 1
- 1
examples/OSCReceiver/Builds/LinuxMakefile/Makefile View File

@@ -134,7 +134,7 @@ $(JUCE_OBJDIR)/include_juce_osc_f3df604d.o: ../../JuceLibraryCode/include_juce_o
check-pkg-config: check-pkg-config:
@command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; }
@pkg-config --print-errors freetype2 libcurl x11 xext xinerama
@pkg-config --print-errors freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0
clean: clean:
@echo Cleaning OSCReceiver @echo Cleaning OSCReceiver


+ 3
- 2
examples/OSCReceiver/Builds/VisualStudio2015/OSCReceiver_App.vcxproj View File

@@ -69,7 +69,7 @@
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions> <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2015_78A5022=1;JUCE_APP_VERSION=1.0.0;JUCE_APP_VERSION_HEX=0x10000;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)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -94,13 +94,13 @@
<ProgramDatabaseFile>$(IntDir)\OSCReceiver.pdb</ProgramDatabaseFile> <ProgramDatabaseFile>$(IntDir)\OSCReceiver.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<LargeAddressAware>true</LargeAddressAware> <LargeAddressAware>true</LargeAddressAware>
</Link> </Link>
<Bscmake> <Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\OSCReceiver.bsc</OutputFile> <OutputFile>$(IntDir)\OSCReceiver.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl> <Midl>
@@ -144,6 +144,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner> <SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\OSCReceiver.bsc</OutputFile> <OutputFile>$(IntDir)\OSCReceiver.bsc</OutputFile>
</Bscmake> </Bscmake>
<Lib/>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Source\Main.cpp"/> <ClCompile Include="..\..\Source\Main.cpp"/>


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save