| @@ -189,8 +189,10 @@ | |||||
| A727F6B063FCDB816462D213, | A727F6B063FCDB816462D213, | ||||
| ED86208188082DE5EA9381E4, | ED86208188082DE5EA9381E4, | ||||
| E793574695108F202603BAA5, ); name = Source; sourceTree = "<group>"; }; | E793574695108F202603BAA5, ); name = Source; sourceTree = "<group>"; }; | ||||
| 7007C784A0219490DFD18C27 = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| 0ADE306E346FE4F925722F86 = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| 7007C784A0219490DFD18C27 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Debug; }; | |||||
| 0ADE306E346FE4F925722F86 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Release; }; | |||||
| 653C6C73C56BA201AB6F094C = {isa = XCBuildConfiguration; buildSettings = { | 653C6C73C56BA201AB6F094C = {isa = XCBuildConfiguration; buildSettings = { | ||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | ||||
| CLANG_LINK_OBJC_RUNTIME = NO; | CLANG_LINK_OBJC_RUNTIME = NO; | ||||
| @@ -168,8 +168,65 @@ | |||||
| A727F6B063FCDB816462D213, | A727F6B063FCDB816462D213, | ||||
| ED86208188082DE5EA9381E4, | ED86208188082DE5EA9381E4, | ||||
| E793574695108F202603BAA5, ); name = Source; sourceTree = "<group>"; }; | E793574695108F202603BAA5, ); name = Source; sourceTree = "<group>"; }; | ||||
| 7007C784A0219490DFD18C27 = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| 0ADE306E346FE4F925722F86 = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| 7007C784A0219490DFD18C27 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | |||||
| ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | |||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | |||||
| CLANG_LINK_OBJC_RUNTIME = NO; | |||||
| CODE_SIGN_IDENTITY = ""; | |||||
| COMBINE_HIDPI_IMAGES = YES; | |||||
| CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; | |||||
| COPY_PHASE_STRIP = NO; | |||||
| GCC_DYNAMIC_NO_PIC = NO; | |||||
| GCC_OPTIMIZATION_LEVEL = 0; | |||||
| GCC_PREPROCESSOR_DEFINITIONS = ( | |||||
| "_DEBUG=1", | |||||
| "DEBUG=1", | |||||
| "JUCER_XCODE_IPHONE_5BC26AE3=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", ); | |||||
| GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | |||||
| HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "../../../../modules/juce_audio_plugin_client", "$(inherited)"); | |||||
| OTHER_LDFLAGS = "-lAUv3Synth"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.roli.development.AUv3Synth; | |||||
| USE_HEADERMAP = NO; }; name = Debug; }; | |||||
| 0ADE306E346FE4F925722F86 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | |||||
| ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | |||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | |||||
| CLANG_LINK_OBJC_RUNTIME = NO; | |||||
| CODE_SIGN_IDENTITY = ""; | |||||
| COMBINE_HIDPI_IMAGES = YES; | |||||
| CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; | |||||
| DEAD_CODE_STRIPPING = YES; | |||||
| GCC_GENERATE_DEBUGGING_SYMBOLS = NO; | |||||
| GCC_OPTIMIZATION_LEVEL = 3; | |||||
| GCC_PREPROCESSOR_DEFINITIONS = ( | |||||
| "_NDEBUG=1", | |||||
| "NDEBUG=1", | |||||
| "JUCER_XCODE_IPHONE_5BC26AE3=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", ); | |||||
| GCC_SYMBOLS_PRIVATE_EXTERN = YES; | |||||
| GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | |||||
| HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "../../../../modules/juce_audio_plugin_client", "$(inherited)"); | |||||
| OTHER_LDFLAGS = "-lAUv3Synth"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.roli.development.AUv3Synth; | |||||
| USE_HEADERMAP = NO; }; name = Release; }; | |||||
| DC95EAEBECC74A55CADCD887 = {isa = XCBuildConfiguration; buildSettings = { | DC95EAEBECC74A55CADCD887 = {isa = XCBuildConfiguration; buildSettings = { | ||||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ||||
| ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | ||||
| @@ -2374,7 +2374,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"/> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | ||||
| @@ -3989,9 +3989,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | ||||
| </None> | </None> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"> | |||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | |||||
| </None> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | <Filter>Juce Modules\juce_blocks_basics</Filter> | ||||
| </None> | </None> | ||||
| @@ -2373,7 +2373,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"/> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | ||||
| @@ -3989,9 +3989,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | ||||
| </None> | </None> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"> | |||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | |||||
| </None> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | <Filter>Juce Modules\juce_blocks_basics</Filter> | ||||
| </None> | </None> | ||||
| @@ -2373,7 +2373,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"/> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | ||||
| @@ -3986,9 +3986,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | ||||
| </None> | </None> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"> | |||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | |||||
| </None> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | <Filter>Juce Modules\juce_blocks_basics</Filter> | ||||
| </None> | </None> | ||||
| @@ -2372,7 +2372,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"/> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | ||||
| @@ -3986,9 +3986,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | ||||
| </None> | </None> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"> | |||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | |||||
| </None> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | <Filter>Juce Modules\juce_blocks_basics</Filter> | ||||
| </None> | </None> | ||||
| @@ -2375,7 +2375,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"/> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | ||||
| @@ -3995,9 +3995,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | ||||
| </None> | </None> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"> | |||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | |||||
| </None> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | <Filter>Juce Modules\juce_blocks_basics</Filter> | ||||
| </None> | </None> | ||||
| @@ -2374,7 +2374,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | <None Include="..\..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"/> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | ||||
| <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | <None Include="..\..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | ||||
| @@ -3995,9 +3995,6 @@ | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | ||||
| </None> | </None> | ||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"> | |||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | |||||
| </None> | |||||
| <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | <None Include="..\..\..\..\..\modules\juce_blocks_basics\README.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | <Filter>Juce Modules\juce_blocks_basics</Filter> | ||||
| </None> | </None> | ||||
| @@ -196,8 +196,10 @@ | |||||
| 2C63AEF93C2B69C8D277B2E9, | 2C63AEF93C2B69C8D277B2E9, | ||||
| 9D498CA55622293EBF2B5541, | 9D498CA55622293EBF2B5541, | ||||
| ECAB40FE9EE9DADDD1A046A7, ); name = Source; sourceTree = "<group>"; }; | ECAB40FE9EE9DADDD1A046A7, ); name = Source; sourceTree = "<group>"; }; | ||||
| F9CE5A87AC1D6AC6825FFFC3 = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| A013BD29D257623287C95474 = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| F9CE5A87AC1D6AC6825FFFC3 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.9; }; name = Debug; }; | |||||
| A013BD29D257623287C95474 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.9; }; name = Release; }; | |||||
| CFDBE7ED06E755632B329B37 = {isa = XCBuildConfiguration; buildSettings = { | CFDBE7ED06E755632B329B37 = {isa = XCBuildConfiguration; buildSettings = { | ||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++14"; | CLANG_CXX_LANGUAGE_STANDARD = "c++14"; | ||||
| CLANG_LINK_OBJC_RUNTIME = NO; | CLANG_LINK_OBJC_RUNTIME = NO; | ||||
| @@ -996,6 +996,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -2253,6 +2256,7 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"/> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | ||||
| @@ -1306,6 +1306,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp</Filter> | <Filter>Juce Modules\juce_dsp</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -3456,6 +3459,9 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClInclude> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| @@ -997,6 +997,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -2254,6 +2257,7 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"/> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | ||||
| @@ -1306,6 +1306,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp</Filter> | <Filter>Juce Modules\juce_dsp</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -3456,6 +3459,9 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClInclude> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| @@ -933,6 +933,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -2113,6 +2116,7 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"/> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | ||||
| @@ -1225,6 +1225,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp</Filter> | <Filter>Juce Modules\juce_dsp</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -3201,6 +3204,9 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClInclude> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| @@ -1032,36 +1032,30 @@ public class JuceDemo extends Activity | |||||
| public final boolean connect() | public final boolean connect() | ||||
| { | { | ||||
| try | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| synchronized (createStreamLock) | |||||
| try | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| inputStream = getCancellableStream (true); | inputStream = getCancellableStream (true); | ||||
| } | } | ||||
| } | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | |||||
| } | |||||
| finally | |||||
| { | { | ||||
| statusCode[0] = connection.getResponseCode(); | statusCode[0] = connection.getResponseCode(); | ||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | } | ||||
| } | |||||
| finally | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| } | |||||
| synchronized (createStreamLock) | |||||
| { | |||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| @@ -1072,49 +1066,89 @@ public class JuceDemo extends Activity | |||||
| } | } | ||||
| catch (ExecutionException e) | catch (ExecutionException e) | ||||
| {} | {} | ||||
| } | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| public final void release() | |||||
| static class DisconnectionRunnable implements Runnable | |||||
| { | { | ||||
| hasBeenCancelled.set (true); | |||||
| public DisconnectionRunnable (HttpURLConnection theConnection, | |||||
| InputStream theInputStream, | |||||
| ReentrantLock theCreateStreamLock, | |||||
| Object theCreateFutureLock, | |||||
| Future<BufferedInputStream> theStreamFuture) | |||||
| { | |||||
| connectionToDisconnect = theConnection; | |||||
| inputStream = theInputStream; | |||||
| createStreamLock = theCreateStreamLock; | |||||
| createFutureLock = theCreateFutureLock; | |||||
| streamFuture = theStreamFuture; | |||||
| } | |||||
| try | |||||
| public void run() | |||||
| { | { | ||||
| if (! createStreamLock.tryLock()) | |||||
| try | |||||
| { | { | ||||
| synchronized (createFutureLock) | |||||
| if (! createStreamLock.tryLock()) | |||||
| { | { | ||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| synchronized (createFutureLock) | |||||
| { | |||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| } | |||||
| createStreamLock.lock(); | |||||
| } | } | ||||
| createStreamLock.lock(); | |||||
| } | |||||
| if (connectionToDisconnect != null) | |||||
| connectionToDisconnect.disconnect(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| } | |||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| { | |||||
| createStreamLock.unlock(); | |||||
| } | |||||
| } | } | ||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| private HttpURLConnection connectionToDisconnect; | |||||
| private InputStream inputStream; | |||||
| private ReentrantLock createStreamLock; | |||||
| private Object createFutureLock; | |||||
| Future<BufferedInputStream> streamFuture; | |||||
| } | |||||
| public final void release() | |||||
| { | |||||
| DisconnectionRunnable disconnectionRunnable = new DisconnectionRunnable (connection, | |||||
| inputStream, | |||||
| createStreamLock, | |||||
| createFutureLock, | |||||
| streamFuture); | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| createStreamLock.unlock(); | |||||
| hasBeenCancelled.set (true); | |||||
| connection = null; | |||||
| } | } | ||||
| connection.disconnect(); | |||||
| Thread disconnectionThread = new Thread(disconnectionRunnable); | |||||
| disconnectionThread.start(); | |||||
| } | } | ||||
| public final int read (byte[] buffer, int numBytes) | public final int read (byte[] buffer, int numBytes) | ||||
| @@ -1032,36 +1032,30 @@ public class InAppPurchase extends Activity | |||||
| public final boolean connect() | public final boolean connect() | ||||
| { | { | ||||
| try | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| synchronized (createStreamLock) | |||||
| try | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| inputStream = getCancellableStream (true); | inputStream = getCancellableStream (true); | ||||
| } | } | ||||
| } | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | |||||
| } | |||||
| finally | |||||
| { | { | ||||
| statusCode[0] = connection.getResponseCode(); | statusCode[0] = connection.getResponseCode(); | ||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | } | ||||
| } | |||||
| finally | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| } | |||||
| synchronized (createStreamLock) | |||||
| { | |||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| @@ -1072,49 +1066,89 @@ public class InAppPurchase extends Activity | |||||
| } | } | ||||
| catch (ExecutionException e) | catch (ExecutionException e) | ||||
| {} | {} | ||||
| } | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| public final void release() | |||||
| static class DisconnectionRunnable implements Runnable | |||||
| { | { | ||||
| hasBeenCancelled.set (true); | |||||
| public DisconnectionRunnable (HttpURLConnection theConnection, | |||||
| InputStream theInputStream, | |||||
| ReentrantLock theCreateStreamLock, | |||||
| Object theCreateFutureLock, | |||||
| Future<BufferedInputStream> theStreamFuture) | |||||
| { | |||||
| connectionToDisconnect = theConnection; | |||||
| inputStream = theInputStream; | |||||
| createStreamLock = theCreateStreamLock; | |||||
| createFutureLock = theCreateFutureLock; | |||||
| streamFuture = theStreamFuture; | |||||
| } | |||||
| try | |||||
| public void run() | |||||
| { | { | ||||
| if (! createStreamLock.tryLock()) | |||||
| try | |||||
| { | { | ||||
| synchronized (createFutureLock) | |||||
| if (! createStreamLock.tryLock()) | |||||
| { | { | ||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| synchronized (createFutureLock) | |||||
| { | |||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| } | |||||
| createStreamLock.lock(); | |||||
| } | } | ||||
| createStreamLock.lock(); | |||||
| } | |||||
| if (connectionToDisconnect != null) | |||||
| connectionToDisconnect.disconnect(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| } | |||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| { | |||||
| createStreamLock.unlock(); | |||||
| } | |||||
| } | } | ||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| private HttpURLConnection connectionToDisconnect; | |||||
| private InputStream inputStream; | |||||
| private ReentrantLock createStreamLock; | |||||
| private Object createFutureLock; | |||||
| Future<BufferedInputStream> streamFuture; | |||||
| } | |||||
| public final void release() | |||||
| { | |||||
| DisconnectionRunnable disconnectionRunnable = new DisconnectionRunnable (connection, | |||||
| inputStream, | |||||
| createStreamLock, | |||||
| createFutureLock, | |||||
| streamFuture); | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| createStreamLock.unlock(); | |||||
| hasBeenCancelled.set (true); | |||||
| connection = null; | |||||
| } | } | ||||
| connection.disconnect(); | |||||
| Thread disconnectionThread = new Thread(disconnectionRunnable); | |||||
| disconnectionThread.start(); | |||||
| } | } | ||||
| public final int read (byte[] buffer, int numBytes) | public final int read (byte[] buffer, int numBytes) | ||||
| @@ -1961,36 +1961,30 @@ public class MidiTest extends Activity | |||||
| public final boolean connect() | public final boolean connect() | ||||
| { | { | ||||
| try | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| synchronized (createStreamLock) | |||||
| try | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| inputStream = getCancellableStream (true); | inputStream = getCancellableStream (true); | ||||
| } | } | ||||
| } | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | |||||
| } | |||||
| finally | |||||
| { | { | ||||
| statusCode[0] = connection.getResponseCode(); | statusCode[0] = connection.getResponseCode(); | ||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | } | ||||
| } | |||||
| finally | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| } | |||||
| synchronized (createStreamLock) | |||||
| { | |||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| @@ -2001,49 +1995,89 @@ public class MidiTest extends Activity | |||||
| } | } | ||||
| catch (ExecutionException e) | catch (ExecutionException e) | ||||
| {} | {} | ||||
| } | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| public final void release() | |||||
| static class DisconnectionRunnable implements Runnable | |||||
| { | { | ||||
| hasBeenCancelled.set (true); | |||||
| public DisconnectionRunnable (HttpURLConnection theConnection, | |||||
| InputStream theInputStream, | |||||
| ReentrantLock theCreateStreamLock, | |||||
| Object theCreateFutureLock, | |||||
| Future<BufferedInputStream> theStreamFuture) | |||||
| { | |||||
| connectionToDisconnect = theConnection; | |||||
| inputStream = theInputStream; | |||||
| createStreamLock = theCreateStreamLock; | |||||
| createFutureLock = theCreateFutureLock; | |||||
| streamFuture = theStreamFuture; | |||||
| } | |||||
| try | |||||
| public void run() | |||||
| { | { | ||||
| if (! createStreamLock.tryLock()) | |||||
| try | |||||
| { | { | ||||
| synchronized (createFutureLock) | |||||
| if (! createStreamLock.tryLock()) | |||||
| { | { | ||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| synchronized (createFutureLock) | |||||
| { | |||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| } | |||||
| createStreamLock.lock(); | |||||
| } | } | ||||
| createStreamLock.lock(); | |||||
| } | |||||
| if (connectionToDisconnect != null) | |||||
| connectionToDisconnect.disconnect(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| } | |||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| { | |||||
| createStreamLock.unlock(); | |||||
| } | |||||
| } | } | ||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| private HttpURLConnection connectionToDisconnect; | |||||
| private InputStream inputStream; | |||||
| private ReentrantLock createStreamLock; | |||||
| private Object createFutureLock; | |||||
| Future<BufferedInputStream> streamFuture; | |||||
| } | |||||
| public final void release() | |||||
| { | |||||
| DisconnectionRunnable disconnectionRunnable = new DisconnectionRunnable (connection, | |||||
| inputStream, | |||||
| createStreamLock, | |||||
| createFutureLock, | |||||
| streamFuture); | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| createStreamLock.unlock(); | |||||
| hasBeenCancelled.set (true); | |||||
| connection = null; | |||||
| } | } | ||||
| connection.disconnect(); | |||||
| Thread disconnectionThread = new Thread(disconnectionRunnable); | |||||
| disconnectionThread.start(); | |||||
| } | } | ||||
| public final int read (byte[] buffer, int numBytes) | public final int read (byte[] buffer, int numBytes) | ||||
| @@ -1032,36 +1032,30 @@ public class JUCENetworkGraphicsDemo extends Activity | |||||
| public final boolean connect() | public final boolean connect() | ||||
| { | { | ||||
| try | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| synchronized (createStreamLock) | |||||
| try | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| inputStream = getCancellableStream (true); | inputStream = getCancellableStream (true); | ||||
| } | } | ||||
| } | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | |||||
| } | |||||
| finally | |||||
| { | { | ||||
| statusCode[0] = connection.getResponseCode(); | statusCode[0] = connection.getResponseCode(); | ||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | } | ||||
| } | |||||
| finally | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| } | |||||
| synchronized (createStreamLock) | |||||
| { | |||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| @@ -1072,49 +1066,89 @@ public class JUCENetworkGraphicsDemo extends Activity | |||||
| } | } | ||||
| catch (ExecutionException e) | catch (ExecutionException e) | ||||
| {} | {} | ||||
| } | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| public final void release() | |||||
| static class DisconnectionRunnable implements Runnable | |||||
| { | { | ||||
| hasBeenCancelled.set (true); | |||||
| public DisconnectionRunnable (HttpURLConnection theConnection, | |||||
| InputStream theInputStream, | |||||
| ReentrantLock theCreateStreamLock, | |||||
| Object theCreateFutureLock, | |||||
| Future<BufferedInputStream> theStreamFuture) | |||||
| { | |||||
| connectionToDisconnect = theConnection; | |||||
| inputStream = theInputStream; | |||||
| createStreamLock = theCreateStreamLock; | |||||
| createFutureLock = theCreateFutureLock; | |||||
| streamFuture = theStreamFuture; | |||||
| } | |||||
| try | |||||
| public void run() | |||||
| { | { | ||||
| if (! createStreamLock.tryLock()) | |||||
| try | |||||
| { | { | ||||
| synchronized (createFutureLock) | |||||
| if (! createStreamLock.tryLock()) | |||||
| { | { | ||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| synchronized (createFutureLock) | |||||
| { | |||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| } | |||||
| createStreamLock.lock(); | |||||
| } | } | ||||
| createStreamLock.lock(); | |||||
| } | |||||
| if (connectionToDisconnect != null) | |||||
| connectionToDisconnect.disconnect(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| } | |||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| { | |||||
| createStreamLock.unlock(); | |||||
| } | |||||
| } | } | ||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| private HttpURLConnection connectionToDisconnect; | |||||
| private InputStream inputStream; | |||||
| private ReentrantLock createStreamLock; | |||||
| private Object createFutureLock; | |||||
| Future<BufferedInputStream> streamFuture; | |||||
| } | |||||
| public final void release() | |||||
| { | |||||
| DisconnectionRunnable disconnectionRunnable = new DisconnectionRunnable (connection, | |||||
| inputStream, | |||||
| createStreamLock, | |||||
| createFutureLock, | |||||
| streamFuture); | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| createStreamLock.unlock(); | |||||
| hasBeenCancelled.set (true); | |||||
| connection = null; | |||||
| } | } | ||||
| connection.disconnect(); | |||||
| Thread disconnectionThread = new Thread(disconnectionRunnable); | |||||
| disconnectionThread.start(); | |||||
| } | } | ||||
| public final int read (byte[] buffer, int numBytes) | public final int read (byte[] buffer, int numBytes) | ||||
| @@ -1032,36 +1032,30 @@ public class OSCReceiver extends Activity | |||||
| public final boolean connect() | public final boolean connect() | ||||
| { | { | ||||
| try | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| synchronized (createStreamLock) | |||||
| try | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| inputStream = getCancellableStream (true); | inputStream = getCancellableStream (true); | ||||
| } | } | ||||
| } | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | |||||
| } | |||||
| finally | |||||
| { | { | ||||
| statusCode[0] = connection.getResponseCode(); | statusCode[0] = connection.getResponseCode(); | ||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | } | ||||
| } | |||||
| finally | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| } | |||||
| synchronized (createStreamLock) | |||||
| { | |||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| @@ -1072,49 +1066,89 @@ public class OSCReceiver extends Activity | |||||
| } | } | ||||
| catch (ExecutionException e) | catch (ExecutionException e) | ||||
| {} | {} | ||||
| } | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| public final void release() | |||||
| static class DisconnectionRunnable implements Runnable | |||||
| { | { | ||||
| hasBeenCancelled.set (true); | |||||
| public DisconnectionRunnable (HttpURLConnection theConnection, | |||||
| InputStream theInputStream, | |||||
| ReentrantLock theCreateStreamLock, | |||||
| Object theCreateFutureLock, | |||||
| Future<BufferedInputStream> theStreamFuture) | |||||
| { | |||||
| connectionToDisconnect = theConnection; | |||||
| inputStream = theInputStream; | |||||
| createStreamLock = theCreateStreamLock; | |||||
| createFutureLock = theCreateFutureLock; | |||||
| streamFuture = theStreamFuture; | |||||
| } | |||||
| try | |||||
| public void run() | |||||
| { | { | ||||
| if (! createStreamLock.tryLock()) | |||||
| try | |||||
| { | { | ||||
| synchronized (createFutureLock) | |||||
| if (! createStreamLock.tryLock()) | |||||
| { | { | ||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| synchronized (createFutureLock) | |||||
| { | |||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| } | |||||
| createStreamLock.lock(); | |||||
| } | } | ||||
| createStreamLock.lock(); | |||||
| } | |||||
| if (connectionToDisconnect != null) | |||||
| connectionToDisconnect.disconnect(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| } | |||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| { | |||||
| createStreamLock.unlock(); | |||||
| } | |||||
| } | } | ||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| private HttpURLConnection connectionToDisconnect; | |||||
| private InputStream inputStream; | |||||
| private ReentrantLock createStreamLock; | |||||
| private Object createFutureLock; | |||||
| Future<BufferedInputStream> streamFuture; | |||||
| } | |||||
| public final void release() | |||||
| { | |||||
| DisconnectionRunnable disconnectionRunnable = new DisconnectionRunnable (connection, | |||||
| inputStream, | |||||
| createStreamLock, | |||||
| createFutureLock, | |||||
| streamFuture); | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| createStreamLock.unlock(); | |||||
| hasBeenCancelled.set (true); | |||||
| connection = null; | |||||
| } | } | ||||
| connection.disconnect(); | |||||
| Thread disconnectionThread = new Thread(disconnectionRunnable); | |||||
| disconnectionThread.start(); | |||||
| } | } | ||||
| public final int read (byte[] buffer, int numBytes) | public final int read (byte[] buffer, int numBytes) | ||||
| @@ -1032,36 +1032,30 @@ public class OSCSender extends Activity | |||||
| public final boolean connect() | public final boolean connect() | ||||
| { | { | ||||
| try | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| synchronized (createStreamLock) | |||||
| try | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| inputStream = getCancellableStream (true); | inputStream = getCancellableStream (true); | ||||
| } | } | ||||
| } | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | |||||
| } | |||||
| finally | |||||
| { | { | ||||
| statusCode[0] = connection.getResponseCode(); | statusCode[0] = connection.getResponseCode(); | ||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | } | ||||
| } | |||||
| finally | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| } | |||||
| synchronized (createStreamLock) | |||||
| { | |||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| @@ -1072,49 +1066,89 @@ public class OSCSender extends Activity | |||||
| } | } | ||||
| catch (ExecutionException e) | catch (ExecutionException e) | ||||
| {} | {} | ||||
| } | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| public final void release() | |||||
| static class DisconnectionRunnable implements Runnable | |||||
| { | { | ||||
| hasBeenCancelled.set (true); | |||||
| public DisconnectionRunnable (HttpURLConnection theConnection, | |||||
| InputStream theInputStream, | |||||
| ReentrantLock theCreateStreamLock, | |||||
| Object theCreateFutureLock, | |||||
| Future<BufferedInputStream> theStreamFuture) | |||||
| { | |||||
| connectionToDisconnect = theConnection; | |||||
| inputStream = theInputStream; | |||||
| createStreamLock = theCreateStreamLock; | |||||
| createFutureLock = theCreateFutureLock; | |||||
| streamFuture = theStreamFuture; | |||||
| } | |||||
| try | |||||
| public void run() | |||||
| { | { | ||||
| if (! createStreamLock.tryLock()) | |||||
| try | |||||
| { | { | ||||
| synchronized (createFutureLock) | |||||
| if (! createStreamLock.tryLock()) | |||||
| { | { | ||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| synchronized (createFutureLock) | |||||
| { | |||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| } | |||||
| createStreamLock.lock(); | |||||
| } | } | ||||
| createStreamLock.lock(); | |||||
| } | |||||
| if (connectionToDisconnect != null) | |||||
| connectionToDisconnect.disconnect(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| } | |||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| { | |||||
| createStreamLock.unlock(); | |||||
| } | |||||
| } | } | ||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| private HttpURLConnection connectionToDisconnect; | |||||
| private InputStream inputStream; | |||||
| private ReentrantLock createStreamLock; | |||||
| private Object createFutureLock; | |||||
| Future<BufferedInputStream> streamFuture; | |||||
| } | |||||
| public final void release() | |||||
| { | |||||
| DisconnectionRunnable disconnectionRunnable = new DisconnectionRunnable (connection, | |||||
| inputStream, | |||||
| createStreamLock, | |||||
| createFutureLock, | |||||
| streamFuture); | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| createStreamLock.unlock(); | |||||
| hasBeenCancelled.set (true); | |||||
| connection = null; | |||||
| } | } | ||||
| connection.disconnect(); | |||||
| Thread disconnectionThread = new Thread(disconnectionRunnable); | |||||
| disconnectionThread.start(); | |||||
| } | } | ||||
| public final int read (byte[] buffer, int numBytes) | public final int read (byte[] buffer, int numBytes) | ||||
| @@ -176,8 +176,10 @@ | |||||
| 467A24411BA7A185B2C53178, | 467A24411BA7A185B2C53178, | ||||
| 61D8F5CF64FE3EC528B85D1B, | 61D8F5CF64FE3EC528B85D1B, | ||||
| 34E9DBEC61D3C0809DAF1AB4, ); name = Source; sourceTree = "<group>"; }; | 34E9DBEC61D3C0809DAF1AB4, ); name = Source; sourceTree = "<group>"; }; | ||||
| 6A83695CF366C87636A392BE = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| 024F8B1B5C243015CA8FEF35 = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| 6A83695CF366C87636A392BE = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.10; }; name = Debug; }; | |||||
| 024F8B1B5C243015CA8FEF35 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.10; }; name = Release; }; | |||||
| D83A1735FBD5B491316453B8 = {isa = XCBuildConfiguration; buildSettings = { | D83A1735FBD5B491316453B8 = {isa = XCBuildConfiguration; buildSettings = { | ||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | ||||
| CLANG_LINK_OBJC_RUNTIME = NO; | CLANG_LINK_OBJC_RUNTIME = NO; | ||||
| @@ -184,8 +184,10 @@ | |||||
| 1402E3C0F79281C4BD943CA0, | 1402E3C0F79281C4BD943CA0, | ||||
| 00DE399BF0EF1D2BB5C99DF6, | 00DE399BF0EF1D2BB5C99DF6, | ||||
| 48602625ABE5D301DEFFE36D, ); name = Source; sourceTree = "<group>"; }; | 48602625ABE5D301DEFFE36D, ); name = Source; sourceTree = "<group>"; }; | ||||
| 28E3B1FE50FFC5B2A58897A0 = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| 987E131B9EAD1C8CE9786F9C = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| 28E3B1FE50FFC5B2A58897A0 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.10; }; name = Debug; }; | |||||
| 987E131B9EAD1C8CE9786F9C = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.10; }; name = Release; }; | |||||
| 2258034E5AABF301ACB109C1 = {isa = XCBuildConfiguration; buildSettings = { | 2258034E5AABF301ACB109C1 = {isa = XCBuildConfiguration; buildSettings = { | ||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | ||||
| CLANG_LINK_OBJC_RUNTIME = NO; | CLANG_LINK_OBJC_RUNTIME = NO; | ||||
| @@ -149,8 +149,65 @@ | |||||
| E1CFC4C60E9EC5DBE60DB32F, | E1CFC4C60E9EC5DBE60DB32F, | ||||
| BF7815807DD5B5FAF4BC3669, | BF7815807DD5B5FAF4BC3669, | ||||
| 196E6AA022E8A0902AB15281, ); name = Source; sourceTree = "<group>"; }; | 196E6AA022E8A0902AB15281, ); name = Source; sourceTree = "<group>"; }; | ||||
| 22DBBF091193373BEA063A5B = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| 54D411166886E8F3BBC0E25F = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| 22DBBF091193373BEA063A5B = {isa = XCBuildConfiguration; buildSettings = { | |||||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | |||||
| ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | |||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | |||||
| CLANG_LINK_OBJC_RUNTIME = NO; | |||||
| COMBINE_HIDPI_IMAGES = YES; | |||||
| CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; | |||||
| COPY_PHASE_STRIP = NO; | |||||
| GCC_DYNAMIC_NO_PIC = NO; | |||||
| GCC_OPTIMIZATION_LEVEL = 0; | |||||
| GCC_PREPROCESSOR_DEFINITIONS = ( | |||||
| "_DEBUG=1", | |||||
| "DEBUG=1", | |||||
| "JUCER_XCODE_IPHONE_5BC26AE3=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", ); | |||||
| GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | |||||
| HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../../modules", "../../../../../modules/juce_audio_plugin_client", "$(inherited)"); | |||||
| OTHER_CPLUSPLUSFLAGS = "-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"; | |||||
| OTHER_LDFLAGS = "-lInterAppAudioEffect"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.roli.InterAppAudioEffect; | |||||
| USE_HEADERMAP = NO; }; name = Debug; }; | |||||
| 54D411166886E8F3BBC0E25F = {isa = XCBuildConfiguration; buildSettings = { | |||||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | |||||
| ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | |||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | |||||
| CLANG_LINK_OBJC_RUNTIME = NO; | |||||
| COMBINE_HIDPI_IMAGES = YES; | |||||
| CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; | |||||
| DEAD_CODE_STRIPPING = YES; | |||||
| GCC_GENERATE_DEBUGGING_SYMBOLS = NO; | |||||
| GCC_OPTIMIZATION_LEVEL = 3; | |||||
| GCC_PREPROCESSOR_DEFINITIONS = ( | |||||
| "_NDEBUG=1", | |||||
| "NDEBUG=1", | |||||
| "JUCER_XCODE_IPHONE_5BC26AE3=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", ); | |||||
| GCC_SYMBOLS_PRIVATE_EXTERN = YES; | |||||
| GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | |||||
| HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../../modules", "../../../../../modules/juce_audio_plugin_client", "$(inherited)"); | |||||
| OTHER_CPLUSPLUSFLAGS = "-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"; | |||||
| OTHER_LDFLAGS = "-lInterAppAudioEffect"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.roli.InterAppAudioEffect; | |||||
| USE_HEADERMAP = NO; }; name = Release; }; | |||||
| 8DA1E39A676F877EB549B8CA = {isa = XCBuildConfiguration; buildSettings = { | 8DA1E39A676F877EB549B8CA = {isa = XCBuildConfiguration; buildSettings = { | ||||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ||||
| ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | ||||
| @@ -201,8 +201,10 @@ | |||||
| 3374B9341BF8422BE6EC8CF5, | 3374B9341BF8422BE6EC8CF5, | ||||
| 649BBC267932DD53D319C8C1, | 649BBC267932DD53D319C8C1, | ||||
| AE89DBCAA3968A3BB77128E3, ); name = Source; sourceTree = "<group>"; }; | AE89DBCAA3968A3BB77128E3, ); name = Source; sourceTree = "<group>"; }; | ||||
| 326E2BA4D324D09F4A7F0A63 = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| B4227B6386A801962DC6DE9F = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| 326E2BA4D324D09F4A7F0A63 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Debug; }; | |||||
| B4227B6386A801962DC6DE9F = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Release; }; | |||||
| 5F2A5A5FDFB771E794E04854 = {isa = XCBuildConfiguration; buildSettings = { | 5F2A5A5FDFB771E794E04854 = {isa = XCBuildConfiguration; buildSettings = { | ||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | ||||
| CLANG_LINK_OBJC_RUNTIME = NO; | CLANG_LINK_OBJC_RUNTIME = NO; | ||||
| @@ -192,8 +192,10 @@ | |||||
| 9B6AD2ED2150F45A460973C6, | 9B6AD2ED2150F45A460973C6, | ||||
| 2D45B9382F864E0FC39A7D86, | 2D45B9382F864E0FC39A7D86, | ||||
| C54CA0425B4BECD39E226F8F, ); name = Source; sourceTree = "<group>"; }; | C54CA0425B4BECD39E226F8F, ); name = Source; sourceTree = "<group>"; }; | ||||
| D43C967D02EDDCC29FB7059C = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| EEA93C1E6EEC110939D1685F = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| D43C967D02EDDCC29FB7059C = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.10; }; name = Debug; }; | |||||
| EEA93C1E6EEC110939D1685F = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.10; }; name = Release; }; | |||||
| BA984224A933EC837F514164 = {isa = XCBuildConfiguration; buildSettings = { | BA984224A933EC837F514164 = {isa = XCBuildConfiguration; buildSettings = { | ||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | ||||
| CLANG_LINK_OBJC_RUNTIME = NO; | CLANG_LINK_OBJC_RUNTIME = NO; | ||||
| @@ -36,7 +36,7 @@ ifeq ($(CONFIG),Debug) | |||||
| JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) | JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) | ||||
| JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 | JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 | ||||
| JUCE_CFLAGS_VST := -fPIC | |||||
| JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden | |||||
| JUCE_LDFLAGS_VST := -shared -Wl,--no-undefined | JUCE_LDFLAGS_VST := -shared -Wl,--no-undefined | ||||
| JUCE_TARGET_VST := Surround.so | JUCE_TARGET_VST := Surround.so | ||||
| @@ -63,7 +63,7 @@ ifeq ($(CONFIG),Release) | |||||
| JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) | JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../../modules $(CPPFLAGS) | ||||
| JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 | JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 | ||||
| JUCE_CFLAGS_VST := -fPIC | |||||
| JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden | |||||
| JUCE_LDFLAGS_VST := -shared -Wl,--no-undefined | JUCE_LDFLAGS_VST := -shared -Wl,--no-undefined | ||||
| JUCE_TARGET_VST := Surround.so | JUCE_TARGET_VST := Surround.so | ||||
| @@ -194,8 +194,10 @@ | |||||
| 8EF2160AA74AD33ED1D63DE9, | 8EF2160AA74AD33ED1D63DE9, | ||||
| 18B9690A5C364D20F5C100E3, | 18B9690A5C364D20F5C100E3, | ||||
| 0F85B6E4F90C8E9CC5EB8C01, ); name = Source; sourceTree = "<group>"; }; | 0F85B6E4F90C8E9CC5EB8C01, ); name = Source; sourceTree = "<group>"; }; | ||||
| C73902ED4D2E8620A64FB955 = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| 10FD9778667189623A2CDD86 = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| C73902ED4D2E8620A64FB955 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Debug; }; | |||||
| 10FD9778667189623A2CDD86 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Release; }; | |||||
| EB917BF8D9134F341F138D54 = {isa = XCBuildConfiguration; buildSettings = { | EB917BF8D9134F341F138D54 = {isa = XCBuildConfiguration; buildSettings = { | ||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | ||||
| CLANG_CXX_LIBRARY = "libc++"; | CLANG_CXX_LIBRARY = "libc++"; | ||||
| @@ -924,6 +924,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -2101,6 +2104,7 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"/> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | ||||
| @@ -1189,6 +1189,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp</Filter> | <Filter>Juce Modules\juce_dsp</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -3156,6 +3159,9 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClInclude> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| @@ -923,6 +923,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -2100,6 +2103,7 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"/> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | ||||
| @@ -1189,6 +1189,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp</Filter> | <Filter>Juce Modules\juce_dsp</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -3156,6 +3159,9 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClInclude> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| @@ -1961,36 +1961,30 @@ public class JuceDemoPlugin extends Activity | |||||
| public final boolean connect() | public final boolean connect() | ||||
| { | { | ||||
| try | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| synchronized (createStreamLock) | |||||
| try | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| inputStream = getCancellableStream (true); | inputStream = getCancellableStream (true); | ||||
| } | } | ||||
| } | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | |||||
| } | |||||
| finally | |||||
| { | { | ||||
| statusCode[0] = connection.getResponseCode(); | statusCode[0] = connection.getResponseCode(); | ||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | } | ||||
| } | |||||
| finally | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| } | |||||
| synchronized (createStreamLock) | |||||
| { | |||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| @@ -2001,49 +1995,89 @@ public class JuceDemoPlugin extends Activity | |||||
| } | } | ||||
| catch (ExecutionException e) | catch (ExecutionException e) | ||||
| {} | {} | ||||
| } | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| public final void release() | |||||
| static class DisconnectionRunnable implements Runnable | |||||
| { | { | ||||
| hasBeenCancelled.set (true); | |||||
| public DisconnectionRunnable (HttpURLConnection theConnection, | |||||
| InputStream theInputStream, | |||||
| ReentrantLock theCreateStreamLock, | |||||
| Object theCreateFutureLock, | |||||
| Future<BufferedInputStream> theStreamFuture) | |||||
| { | |||||
| connectionToDisconnect = theConnection; | |||||
| inputStream = theInputStream; | |||||
| createStreamLock = theCreateStreamLock; | |||||
| createFutureLock = theCreateFutureLock; | |||||
| streamFuture = theStreamFuture; | |||||
| } | |||||
| try | |||||
| public void run() | |||||
| { | { | ||||
| if (! createStreamLock.tryLock()) | |||||
| try | |||||
| { | { | ||||
| synchronized (createFutureLock) | |||||
| if (! createStreamLock.tryLock()) | |||||
| { | { | ||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| synchronized (createFutureLock) | |||||
| { | |||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| } | |||||
| createStreamLock.lock(); | |||||
| } | } | ||||
| createStreamLock.lock(); | |||||
| } | |||||
| if (connectionToDisconnect != null) | |||||
| connectionToDisconnect.disconnect(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| } | |||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| { | |||||
| createStreamLock.unlock(); | |||||
| } | |||||
| } | } | ||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| private HttpURLConnection connectionToDisconnect; | |||||
| private InputStream inputStream; | |||||
| private ReentrantLock createStreamLock; | |||||
| private Object createFutureLock; | |||||
| Future<BufferedInputStream> streamFuture; | |||||
| } | |||||
| public final void release() | |||||
| { | |||||
| DisconnectionRunnable disconnectionRunnable = new DisconnectionRunnable (connection, | |||||
| inputStream, | |||||
| createStreamLock, | |||||
| createFutureLock, | |||||
| streamFuture); | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| createStreamLock.unlock(); | |||||
| hasBeenCancelled.set (true); | |||||
| connection = null; | |||||
| } | } | ||||
| connection.disconnect(); | |||||
| Thread disconnectionThread = new Thread(disconnectionRunnable); | |||||
| disconnectionThread.start(); | |||||
| } | } | ||||
| public final int read (byte[] buffer, int numBytes) | public final int read (byte[] buffer, int numBytes) | ||||
| @@ -36,7 +36,7 @@ ifeq ($(CONFIG),Debug) | |||||
| JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) | JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) | ||||
| JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 | JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 | ||||
| JUCE_CFLAGS_VST := -fPIC | |||||
| JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden | |||||
| JUCE_LDFLAGS_VST := -shared -Wl,--no-undefined | JUCE_LDFLAGS_VST := -shared -Wl,--no-undefined | ||||
| JUCE_TARGET_VST := JuceDemoPlugin.so | JUCE_TARGET_VST := JuceDemoPlugin.so | ||||
| @@ -66,7 +66,7 @@ ifeq ($(CONFIG),Release) | |||||
| JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) | JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=1.0.0 -DJUCE_APP_VERSION_HEX=0x10000 $(shell pkg-config --cflags alsa freetype2 libcurl x11 xext xinerama webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) | ||||
| JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 | JUCE_CPPFLAGS_VST := -DJucePlugin_Build_VST=1 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 | ||||
| JUCE_CFLAGS_VST := -fPIC | |||||
| JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden | |||||
| JUCE_LDFLAGS_VST := -shared -Wl,--no-undefined | JUCE_LDFLAGS_VST := -shared -Wl,--no-undefined | ||||
| JUCE_TARGET_VST := JuceDemoPlugin.so | JUCE_TARGET_VST := JuceDemoPlugin.so | ||||
| @@ -183,8 +183,10 @@ | |||||
| 239B4D5DE50B3B7A16114C15, | 239B4D5DE50B3B7A16114C15, | ||||
| 7EA0AEAFB626CDF5E0038ED5, | 7EA0AEAFB626CDF5E0038ED5, | ||||
| 227AE5B2ACBB7881D9552404, ); name = Source; sourceTree = "<group>"; }; | 227AE5B2ACBB7881D9552404, ); name = Source; sourceTree = "<group>"; }; | ||||
| 155E2212057EC38829899A3C = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| 103368FE85719AF0B91BA072 = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| 155E2212057EC38829899A3C = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Debug; }; | |||||
| 103368FE85719AF0B91BA072 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; }; name = Release; }; | |||||
| A4B12DFADE1730C6014F332B = {isa = XCBuildConfiguration; buildSettings = { | A4B12DFADE1730C6014F332B = {isa = XCBuildConfiguration; buildSettings = { | ||||
| ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; | ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; | ||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | ||||
| @@ -156,8 +156,63 @@ | |||||
| 239B4D5DE50B3B7A16114C15, | 239B4D5DE50B3B7A16114C15, | ||||
| 7EA0AEAFB626CDF5E0038ED5, | 7EA0AEAFB626CDF5E0038ED5, | ||||
| 227AE5B2ACBB7881D9552404, ); name = Source; sourceTree = "<group>"; }; | 227AE5B2ACBB7881D9552404, ); name = Source; sourceTree = "<group>"; }; | ||||
| 155E2212057EC38829899A3C = {isa = XCBuildConfiguration; buildSettings = { }; name = Debug; }; | |||||
| 103368FE85719AF0B91BA072 = {isa = XCBuildConfiguration; buildSettings = { }; name = Release; }; | |||||
| 155E2212057EC38829899A3C = {isa = XCBuildConfiguration; buildSettings = { | |||||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | |||||
| ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | |||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | |||||
| CLANG_LINK_OBJC_RUNTIME = NO; | |||||
| COMBINE_HIDPI_IMAGES = YES; | |||||
| CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; | |||||
| COPY_PHASE_STRIP = NO; | |||||
| GCC_DYNAMIC_NO_PIC = NO; | |||||
| GCC_OPTIMIZATION_LEVEL = 0; | |||||
| GCC_PREPROCESSOR_DEFINITIONS = ( | |||||
| "_DEBUG=1", | |||||
| "DEBUG=1", | |||||
| "JUCER_XCODE_IPHONE_5BC26AE3=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", ); | |||||
| GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | |||||
| HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "../../../../modules/juce_audio_plugin_client", "$(inherited)"); | |||||
| OTHER_LDFLAGS = "-lJuceDemoPlugin"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.juce.JuceDemoPlugin; | |||||
| USE_HEADERMAP = NO; }; name = Debug; }; | |||||
| 103368FE85719AF0B91BA072 = {isa = XCBuildConfiguration; buildSettings = { | |||||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | |||||
| ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | |||||
| CLANG_CXX_LANGUAGE_STANDARD = "c++11"; | |||||
| CLANG_LINK_OBJC_RUNTIME = NO; | |||||
| COMBINE_HIDPI_IMAGES = YES; | |||||
| CONFIGURATION_BUILD_DIR = "$(PROJECT_DIR)/build/$(CONFIGURATION)"; | |||||
| DEAD_CODE_STRIPPING = YES; | |||||
| GCC_GENERATE_DEBUGGING_SYMBOLS = NO; | |||||
| GCC_OPTIMIZATION_LEVEL = 3; | |||||
| GCC_PREPROCESSOR_DEFINITIONS = ( | |||||
| "_NDEBUG=1", | |||||
| "NDEBUG=1", | |||||
| "JUCER_XCODE_IPHONE_5BC26AE3=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", ); | |||||
| GCC_SYMBOLS_PRIVATE_EXTERN = YES; | |||||
| GCC_VERSION = com.apple.compilers.llvm.clang.1_0; | |||||
| HEADER_SEARCH_PATHS = ("../../JuceLibraryCode", "../../../../modules", "../../../../modules/juce_audio_plugin_client", "$(inherited)"); | |||||
| OTHER_LDFLAGS = "-lJuceDemoPlugin"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.juce.JuceDemoPlugin; | |||||
| USE_HEADERMAP = NO; }; name = Release; }; | |||||
| 9847BE636E2825D8B76947EE = {isa = XCBuildConfiguration; buildSettings = { | 9847BE636E2825D8B76947EE = {isa = XCBuildConfiguration; buildSettings = { | ||||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | ||||
| ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; | ||||
| @@ -1961,36 +1961,30 @@ public class AudioPerformanceTest extends Activity | |||||
| public final boolean connect() | public final boolean connect() | ||||
| { | { | ||||
| try | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| synchronized (createStreamLock) | |||||
| try | |||||
| { | { | ||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| inputStream = getCancellableStream (true); | inputStream = getCancellableStream (true); | ||||
| } | } | ||||
| } | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| catch (ExecutionException e) | |||||
| { | |||||
| if (connection.getResponseCode() < 400) | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | |||||
| } | |||||
| finally | |||||
| { | { | ||||
| statusCode[0] = connection.getResponseCode(); | statusCode[0] = connection.getResponseCode(); | ||||
| connection.disconnect(); | |||||
| return false; | |||||
| } | } | ||||
| } | |||||
| finally | |||||
| { | |||||
| statusCode[0] = connection.getResponseCode(); | |||||
| } | |||||
| synchronized (createStreamLock) | |||||
| { | |||||
| if (hasBeenCancelled.get()) | |||||
| return false; | |||||
| try | try | ||||
| { | { | ||||
| @@ -2001,49 +1995,89 @@ public class AudioPerformanceTest extends Activity | |||||
| } | } | ||||
| catch (ExecutionException e) | catch (ExecutionException e) | ||||
| {} | {} | ||||
| } | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| for (java.util.Map.Entry<String, java.util.List<String>> entry : connection.getHeaderFields().entrySet()) | |||||
| if (entry.getKey() != null && entry.getValue() != null) | |||||
| responseHeaders.append (entry.getKey() + ": " | |||||
| + android.text.TextUtils.join (",", entry.getValue()) + "\n"); | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| return true; | |||||
| } | |||||
| catch (IOException e) | |||||
| { | |||||
| return false; | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| public final void release() | |||||
| static class DisconnectionRunnable implements Runnable | |||||
| { | { | ||||
| hasBeenCancelled.set (true); | |||||
| public DisconnectionRunnable (HttpURLConnection theConnection, | |||||
| InputStream theInputStream, | |||||
| ReentrantLock theCreateStreamLock, | |||||
| Object theCreateFutureLock, | |||||
| Future<BufferedInputStream> theStreamFuture) | |||||
| { | |||||
| connectionToDisconnect = theConnection; | |||||
| inputStream = theInputStream; | |||||
| createStreamLock = theCreateStreamLock; | |||||
| createFutureLock = theCreateFutureLock; | |||||
| streamFuture = theStreamFuture; | |||||
| } | |||||
| try | |||||
| public void run() | |||||
| { | { | ||||
| if (! createStreamLock.tryLock()) | |||||
| try | |||||
| { | { | ||||
| synchronized (createFutureLock) | |||||
| if (! createStreamLock.tryLock()) | |||||
| { | { | ||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| synchronized (createFutureLock) | |||||
| { | |||||
| if (streamFuture != null) | |||||
| streamFuture.cancel (true); | |||||
| } | |||||
| createStreamLock.lock(); | |||||
| } | } | ||||
| createStreamLock.lock(); | |||||
| } | |||||
| if (connectionToDisconnect != null) | |||||
| connectionToDisconnect.disconnect(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| if (inputStream != null) | |||||
| inputStream.close(); | |||||
| } | |||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| { | |||||
| createStreamLock.unlock(); | |||||
| } | |||||
| } | } | ||||
| catch (IOException e) | |||||
| {} | |||||
| finally | |||||
| private HttpURLConnection connectionToDisconnect; | |||||
| private InputStream inputStream; | |||||
| private ReentrantLock createStreamLock; | |||||
| private Object createFutureLock; | |||||
| Future<BufferedInputStream> streamFuture; | |||||
| } | |||||
| public final void release() | |||||
| { | |||||
| DisconnectionRunnable disconnectionRunnable = new DisconnectionRunnable (connection, | |||||
| inputStream, | |||||
| createStreamLock, | |||||
| createFutureLock, | |||||
| streamFuture); | |||||
| synchronized (createStreamLock) | |||||
| { | { | ||||
| createStreamLock.unlock(); | |||||
| hasBeenCancelled.set (true); | |||||
| connection = null; | |||||
| } | } | ||||
| connection.disconnect(); | |||||
| Thread disconnectionThread = new Thread(disconnectionRunnable); | |||||
| disconnectionThread.start(); | |||||
| } | } | ||||
| public final int read (byte[] buffer, int numBytes) | public final int read (byte[] buffer, int numBytes) | ||||
| @@ -962,6 +962,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <ExcludedFromBuild>true</ExcludedFromBuild> | <ExcludedFromBuild>true</ExcludedFromBuild> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -2261,6 +2264,7 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter_Impl.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"/> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorChain.h"/> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessorDuplicator.h"/> | ||||
| @@ -2562,7 +2566,6 @@ | |||||
| <None Include="..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | <None Include="..\..\..\..\modules\juce_audio_formats\codecs\oggvorbis\Ogg Vorbis Licence.txt"/> | ||||
| <None Include="..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | <None Include="..\..\..\..\modules\juce_blocks_basics\littlefoot\LittleFoot Language README.txt"/> | ||||
| <None Include="..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | <None Include="..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"/> | ||||
| <None Include="..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"/> | |||||
| <None Include="..\..\..\..\modules\juce_blocks_basics\README.txt"/> | <None Include="..\..\..\..\modules\juce_blocks_basics\README.txt"/> | ||||
| <None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | <None Include="..\..\..\..\modules\juce_graphics\image_formats\jpglib\changes to libjpeg for JUCE.txt"/> | ||||
| <None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | <None Include="..\..\..\..\modules\juce_graphics\image_formats\pnglib\libpng_readme.txt"/> | ||||
| @@ -1303,6 +1303,9 @@ | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_IIRFilter.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.cpp"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClCompile> | |||||
| <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | <ClCompile Include="..\..\..\..\modules\juce_dsp\juce_dsp.cpp"> | ||||
| <Filter>Juce Modules\juce_dsp</Filter> | <Filter>Juce Modules\juce_dsp</Filter> | ||||
| </ClCompile> | </ClCompile> | ||||
| @@ -3471,6 +3474,9 @@ | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oscillator.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_Oversampling.h"> | |||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | |||||
| </ClInclude> | |||||
| <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | <ClInclude Include="..\..\..\..\modules\juce_dsp\processors\juce_ProcessContext.h"> | ||||
| <Filter>Juce Modules\juce_dsp\processors</Filter> | <Filter>Juce Modules\juce_dsp\processors</Filter> | ||||
| </ClInclude> | </ClInclude> | ||||
| @@ -4370,9 +4376,6 @@ | |||||
| <None Include="..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | <None Include="..\..\..\..\modules\juce_blocks_basics\protocol\Protocol Format.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | <Filter>Juce Modules\juce_blocks_basics\protocol</Filter> | ||||
| </None> | </None> | ||||
| <None Include="..\..\..\..\modules\juce_blocks_basics\LittleFootFunctions.txt"> | |||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | |||||
| </None> | |||||
| <None Include="..\..\..\..\modules\juce_blocks_basics\README.txt"> | <None Include="..\..\..\..\modules\juce_blocks_basics\README.txt"> | ||||
| <Filter>Juce Modules\juce_blocks_basics</Filter> | <Filter>Juce Modules\juce_blocks_basics</Filter> | ||||
| </None> | </None> | ||||