diff --git a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt index 27fc0b07f9..6a63a1c9cf 100644 --- a/examples/DemoRunner/Builds/Android/app/CMakeLists.txt +++ b/examples/DemoRunner/Builds/Android/app/CMakeLists.txt @@ -133,11 +133,10 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp" "../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h" "../../../../../modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiInput.h" + "../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp" + "../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.h" "../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp" "../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h" "../../../../../modules/juce_audio_devices/native/juce_android_Audio.cpp" "../../../../../modules/juce_audio_devices/native/juce_android_Midi.cpp" "../../../../../modules/juce_audio_devices/native/juce_android_Oboe.cpp" @@ -1727,11 +1726,10 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/ set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiInput.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Audio.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Midi.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Oboe.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj index 55817693cb..38be3c930d 100644 --- a/examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj @@ -264,10 +264,10 @@ true - + true - + true @@ -2282,9 +2282,8 @@ - + - diff --git a/examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj.filters index c8f2035d85..f2a66ca4e7 100644 --- a/examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2013/DemoRunner_App.vcxproj.filters @@ -670,10 +670,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2961,15 +2961,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native diff --git a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj index 4030349e66..67bd3fe694 100644 --- a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj @@ -264,10 +264,10 @@ true - + true - + true @@ -2282,9 +2282,8 @@ - + - diff --git a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters index 24323835c0..f00443af0f 100644 --- a/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2015/DemoRunner_App.vcxproj.filters @@ -670,10 +670,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2961,15 +2961,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native diff --git a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj index ced606034e..fee446664a 100644 --- a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj +++ b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj @@ -266,10 +266,10 @@ true - + true - + true @@ -2284,9 +2284,8 @@ - + - diff --git a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters index ddcc5975cf..cc4849e99f 100644 --- a/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters +++ b/examples/DemoRunner/Builds/VisualStudio2017/DemoRunner_App.vcxproj.filters @@ -670,10 +670,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2961,15 +2961,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index 0617159fc4..c32d7a92f8 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -114,11 +114,10 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp" "../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h" "../../../../../modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiInput.h" + "../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp" + "../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.h" "../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp" "../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h" "../../../../../modules/juce_audio_devices/native/juce_android_Audio.cpp" "../../../../../modules/juce_audio_devices/native/juce_android_Midi.cpp" "../../../../../modules/juce_audio_devices/native/juce_android_Oboe.cpp" @@ -1395,11 +1394,10 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/ set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiInput.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Audio.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Midi.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Oboe.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj b/extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj index fc619d1230..6c2d661932 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj @@ -247,10 +247,10 @@ true - + true - + true @@ -1887,9 +1887,8 @@ - + - diff --git a/extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj.filters b/extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj.filters index 7590f406da..91e7e2154a 100644 --- a/extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj.filters +++ b/extras/AudioPerformanceTest/Builds/VisualStudio2017/AudioPerformanceTest_App.vcxproj.filters @@ -502,10 +502,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2364,15 +2364,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native diff --git a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt index c078448f89..06ee3535ce 100644 --- a/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt @@ -131,11 +131,10 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp" "../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h" "../../../../../modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiInput.h" + "../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp" + "../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.h" "../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp" "../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h" "../../../../../modules/juce_audio_devices/native/juce_android_Audio.cpp" "../../../../../modules/juce_audio_devices/native/juce_android_Midi.cpp" "../../../../../modules/juce_audio_devices/native/juce_android_Oboe.cpp" @@ -1485,11 +1484,10 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/ set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiInput.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Audio.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Midi.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Oboe.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/AudioPluginHost/Builds/MacOSX/AudioPluginHost.xcodeproj/project.pbxproj b/extras/AudioPluginHost/Builds/MacOSX/AudioPluginHost.xcodeproj/project.pbxproj index 14a4b82466..bbcabdbbb8 100644 --- a/extras/AudioPluginHost/Builds/MacOSX/AudioPluginHost.xcodeproj/project.pbxproj +++ b/extras/AudioPluginHost/Builds/MacOSX/AudioPluginHost.xcodeproj/project.pbxproj @@ -793,7 +793,6 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( "../../../../modules/juce_audio_processors/format_types/VST3_SDK", - "$(HOME)/SDKs/VST_SDK/VST2_SDK", "../../JuceLibraryCode", "../../../../modules", "$(inherited)", @@ -839,7 +838,6 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( "../../../../modules/juce_audio_processors/format_types/VST3_SDK", - "$(HOME)/SDKs/VST_SDK/VST2_SDK", "../../JuceLibraryCode", "../../../../modules", "$(inherited)", diff --git a/extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj index 8c7f5c79db..3504181c66 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj @@ -254,10 +254,10 @@ true - + true - + true @@ -1963,9 +1963,8 @@ - + - diff --git a/extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj.filters index 7d1bf0ee99..247ea5cca4 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2013/AudioPluginHost_App.vcxproj.filters @@ -559,10 +559,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2517,15 +2517,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native diff --git a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj index f03dd91af4..0bde3a202a 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj @@ -252,10 +252,10 @@ true - + true - + true @@ -1961,9 +1961,8 @@ - + - diff --git a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters index cd5c548c25..839d5518eb 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2015/AudioPluginHost_App.vcxproj.filters @@ -559,10 +559,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2517,15 +2517,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native diff --git a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj index 64d06fd4dc..95701acc4b 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj +++ b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj @@ -254,10 +254,10 @@ true - + true - + true @@ -1963,9 +1963,8 @@ - + - diff --git a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters index 61feab961f..d4f1a2a450 100644 --- a/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters +++ b/extras/AudioPluginHost/Builds/VisualStudio2017/AudioPluginHost_App.vcxproj.filters @@ -559,10 +559,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2517,15 +2517,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native diff --git a/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj b/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj index 34599efb2f..ee371837a4 100644 --- a/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj +++ b/extras/AudioPluginHost/Builds/iOS/AudioPluginHost.xcodeproj/project.pbxproj @@ -807,7 +807,6 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( "../../../../modules/juce_audio_processors/format_types/VST3_SDK", - "$(HOME)/SDKs/VST_SDK/VST2_SDK", "../../JuceLibraryCode", "../../../../modules", "$(inherited)", @@ -853,7 +852,6 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( "../../../../modules/juce_audio_processors/format_types/VST3_SDK", - "$(HOME)/SDKs/VST_SDK/VST2_SDK", "../../JuceLibraryCode", "../../../../modules", "$(inherited)", diff --git a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index c96ae8548c..29b2700a71 100644 --- a/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -118,11 +118,10 @@ add_library( ${BINARY_NAME} "../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp" "../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h" "../../../../../modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiInput.h" + "../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp" + "../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.h" "../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp" "../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp" - "../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h" "../../../../../modules/juce_audio_devices/native/juce_android_Audio.cpp" "../../../../../modules/juce_audio_devices/native/juce_android_Midi.cpp" "../../../../../modules/juce_audio_devices/native/juce_android_Oboe.cpp" @@ -1474,11 +1473,10 @@ set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/ set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_AudioIODeviceType.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/audio_io/juce_SystemAudioVolume.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiInput.h" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) +set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiDevices.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiMessageCollector.h" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) -set_source_files_properties("../../../../../modules/juce_audio_devices/midi_io/juce_MidiOutput.h" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Audio.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Midi.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties("../../../../../modules/juce_audio_devices/native/juce_android_Oboe.cpp" PROPERTIES HEADER_FILE_ONLY TRUE) diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj b/extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj index a3bc90f72e..4c77aa4d9f 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj @@ -247,10 +247,10 @@ true - + true - + true @@ -1972,9 +1972,8 @@ - + - diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj.filters b/extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj.filters index f9e2642522..b5bf744fcc 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj.filters +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2013/NetworkGraphicsDemo_App.vcxproj.filters @@ -532,10 +532,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2499,15 +2499,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj b/extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj index 3d968fe678..3ebd68494a 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj @@ -247,10 +247,10 @@ true - + true - + true @@ -1972,9 +1972,8 @@ - + - diff --git a/extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj.filters b/extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj.filters index 6a9229ced2..6ba32e712b 100644 --- a/extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj.filters +++ b/extras/NetworkGraphicsDemo/Builds/VisualStudio2017/NetworkGraphicsDemo_App.vcxproj.filters @@ -532,10 +532,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2499,15 +2499,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj index 678eebe1e1..2e96a94ebb 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj @@ -263,10 +263,10 @@ true - + true - + true @@ -2134,9 +2134,8 @@ - + - diff --git a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters index 7ed7cfcce0..10d1d479b7 100644 --- a/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters +++ b/extras/UnitTestRunner/Builds/VisualStudio2017/UnitTestRunner_ConsoleApp.vcxproj.filters @@ -619,10 +619,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2751,15 +2751,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native diff --git a/extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj b/extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj index 923c9f7ebb..6c211e0c05 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj +++ b/extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj @@ -246,10 +246,10 @@ true - + true - + true @@ -1948,9 +1948,8 @@ - + - diff --git a/extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj.filters b/extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj.filters index 02874ed45b..f5e0f38db5 100644 --- a/extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj.filters +++ b/extras/WindowsDLL/Builds/VisualStudio2017/WindowsDLL_StaticLibrary.vcxproj.filters @@ -529,10 +529,10 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io - + JUCE Modules\juce_audio_devices\midi_io @@ -2466,15 +2466,12 @@ JUCE Modules\juce_audio_devices\audio_io - + JUCE Modules\juce_audio_devices\midi_io JUCE Modules\juce_audio_devices\midi_io - - JUCE Modules\juce_audio_devices\midi_io - JUCE Modules\juce_audio_devices\native