diff --git a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt index 5d9b281438..c1140eae52 100644 --- a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt +++ b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt @@ -233,6 +233,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResampler.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.h" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.cpp" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/FlowGraphNode.cpp" @@ -241,6 +243,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ManyToMultiConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.h" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.cpp" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/SampleRateConverter.cpp" @@ -2011,6 +2015,8 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/native/ob set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResampler.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/FlowGraphNode.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -2019,6 +2025,8 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/native/ob set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ManyToMultiConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/SampleRateConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj index df10965eec..0774abe975 100644 --- a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj @@ -381,6 +381,9 @@ true + + true + true @@ -393,6 +396,9 @@ true + + true + true @@ -2586,10 +2592,12 @@ + + diff --git a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters index d922c25ba8..9310341a14 100644 --- a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters @@ -823,6 +823,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -835,6 +838,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3420,6 +3426,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3432,6 +3441,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph diff --git a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj index 9d7370fe82..7601d94ea8 100644 --- a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj @@ -381,6 +381,9 @@ true + + true + true @@ -393,6 +396,9 @@ true + + true + true @@ -2586,10 +2592,12 @@ + + diff --git a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters index 6adf87e480..62774310f5 100644 --- a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters @@ -823,6 +823,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -835,6 +838,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3420,6 +3426,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3432,6 +3441,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj index a852802b02..11d2b8e39a 100644 --- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj @@ -381,6 +381,9 @@ true + + true + true @@ -393,6 +396,9 @@ true + + true + true @@ -2586,10 +2592,12 @@ + + diff --git a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters index f12d764ead..4e0d0b75ca 100644 --- a/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2019/DemoRunner_App.vcxproj.filters @@ -823,6 +823,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -835,6 +838,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3420,6 +3426,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3432,6 +3441,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index fbacdd8727..d06b6e07cd 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -214,6 +214,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResampler.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.h" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.cpp" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/FlowGraphNode.cpp" @@ -222,6 +224,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ManyToMultiConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.h" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.cpp" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/SampleRateConverter.cpp" @@ -1649,6 +1653,8 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/native/ob set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResampler.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/FlowGraphNode.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1657,6 +1663,8 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/native/ob set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ManyToMultiConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/SampleRateConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj index 1436dc75dd..8d6322d105 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj @@ -362,6 +362,9 @@ true + + true + true @@ -374,6 +377,9 @@ true + + true + true @@ -2138,10 +2144,12 @@ + + diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj.filters b/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj.filters index 038bc49a76..37e04f009d 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj.filters +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2019/AudioPerformanceTest_App.vcxproj.filters @@ -652,6 +652,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -664,6 +667,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -2769,6 +2775,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -2781,6 +2790,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph diff --git a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt index 46f7832fd7..1cb6f4b015 100644 --- a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt @@ -231,6 +231,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResampler.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.h" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.cpp" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/FlowGraphNode.cpp" @@ -239,6 +241,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ManyToMultiConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.h" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.cpp" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/SampleRateConverter.cpp" @@ -1809,6 +1813,8 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/native/ob set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResampler.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/FlowGraphNode.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1817,6 +1823,8 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/native/ob set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ManyToMultiConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/SampleRateConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj index 8a041e70a1..5503506175 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj @@ -369,6 +369,9 @@ true + + true + true @@ -381,6 +384,9 @@ true + + true + true @@ -2313,10 +2319,12 @@ + + diff --git a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters index bd8cd8434a..43d5b8eaec 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters @@ -721,6 +721,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -733,6 +736,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3033,6 +3039,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3045,6 +3054,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph diff --git a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj index b19c348171..b825778fef 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj @@ -369,6 +369,9 @@ true + + true + true @@ -381,6 +384,9 @@ true + + true + true @@ -2313,10 +2319,12 @@ + + diff --git a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters index 65fe85181b..767740f418 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters @@ -721,6 +721,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -733,6 +736,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3033,6 +3039,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3045,6 +3054,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj index 16d7295bdc..379e1c7152 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj @@ -369,6 +369,9 @@ true + + true + true @@ -381,6 +384,9 @@ true + + true + true @@ -2313,10 +2319,12 @@ + + diff --git a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters index 3c8dfdaa0d..4eefc221fb 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2019/AudioPluginHost_App.vcxproj.filters @@ -721,6 +721,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -733,6 +736,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3033,6 +3039,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3045,6 +3054,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index 592c5d3bcd..e494dadc47 100644 --- a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -218,6 +218,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResampler.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.h" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.cpp" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/FlowGraphNode.cpp" @@ -226,6 +228,8 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ManyToMultiConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.h" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.cpp" + "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.cpp" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.h" "../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/SampleRateConverter.cpp" @@ -1728,6 +1732,8 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/native/ob set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResampler.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/resampler/SincResamplerStereo.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ChannelCountConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ClipToRange.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/FlowGraphNode.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) @@ -1736,6 +1742,8 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/native/ob set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/ManyToMultiConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MonoToMultiConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/MultiToMonoConverter.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/RampLinear.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/oboe/src/flowgraph/SampleRateConverter.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj b/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj index 73f782a72d..284f0a5869 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj @@ -362,6 +362,9 @@ true + + true + true @@ -374,6 +377,9 @@ true + + true + true @@ -2223,10 +2229,12 @@ + + diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj.filters b/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj.filters index b7c198ff16..51a8abb03d 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj.filters +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2019/NetworkGraphicsDemo_App.vcxproj.filters @@ -682,6 +682,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -694,6 +697,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -2904,6 +2910,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -2916,6 +2925,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj index e22d49d35e..7d90c92f49 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj @@ -378,6 +378,9 @@ true + + true + true @@ -390,6 +393,9 @@ true + + true + true @@ -2436,10 +2442,12 @@ + + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters index 70fccba1f0..e68a1b4a03 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -772,6 +772,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -784,6 +787,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3210,6 +3216,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3222,6 +3231,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj index c78ef6d57a..fb7d1c862b 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj @@ -378,6 +378,9 @@ true + + true + true @@ -390,6 +393,9 @@ true + + true + true @@ -2436,10 +2442,12 @@ + + diff --git a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters index 492a9ef44a..256ff7f966 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2019/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -772,6 +772,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -784,6 +787,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3210,6 +3216,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -3222,6 +3231,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph diff --git a/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj b/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj index 71fdb743be..d1ee7b8e4d 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj +++ b/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj @@ -361,6 +361,9 @@ true + + true + true @@ -373,6 +376,9 @@ true + + true + true @@ -2199,10 +2205,12 @@ + + diff --git a/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj.filters b/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj.filters index a1e543f035..74ed3bb9e2 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj.filters +++ b/extras/WindowsDLL/Builds/VisualStudio2019/WindowsDLL_StaticLibrary.vcxproj.filters @@ -679,6 +679,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -691,6 +694,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -2871,6 +2877,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph\resampler + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph @@ -2883,6 +2892,9 @@ JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph + JUCE Modules\juce_audio_devices\native\oboe\src\flowgraph