From 90c458d92e7ff32fd029d5555974034a4ed33434 Mon Sep 17 00:00:00 2001 From: Anthony Nicholls Date: Fri, 6 Oct 2023 08:58:08 +0100 Subject: [PATCH] Includes: Move some miscellaneous includes into module header and source files --- modules/juce_audio_basics/juce_audio_basics.cpp | 17 +++++++++++------ .../utilities/juce_AudioWorkgroup.cpp | 5 ----- .../juce_audio_devices/juce_audio_devices.cpp | 6 ++++++ .../native/juce_Audio_ios.cpp | 8 -------- .../native/juce_CoreAudio_mac.cpp | 3 --- modules/juce_audio_utils/juce_audio_utils.cpp | 6 ++++-- ...ce_BluetoothMidiDevicePairingDialogue_ios.mm | 2 -- modules/juce_core/juce_core.h | 1 + modules/juce_core/memory/juce_ByteOrder.h | 4 ---- modules/juce_core/native/juce_ObjCHelpers_mac.h | 2 -- modules/juce_core/system/juce_StandardHeader.h | 1 + modules/juce_dsp/juce_dsp.cpp | 1 + modules/juce_dsp/juce_dsp.h | 1 + modules/juce_gui_basics/juce_gui_basics.cpp | 4 ++++ .../native/juce_NSViewComponentPeer_mac.mm | 2 -- .../native/juce_UIViewComponentPeer_ios.mm | 2 -- .../native/juce_Windowing_windows.cpp | 4 ---- modules/juce_gui_extra/juce_gui_extra.cpp | 5 +++++ .../native/juce_WebBrowserComponent_linux.cpp | 4 ---- .../native/juce_WebBrowserComponent_windows.cpp | 2 -- 20 files changed, 34 insertions(+), 46 deletions(-) diff --git a/modules/juce_audio_basics/juce_audio_basics.cpp b/modules/juce_audio_basics/juce_audio_basics.cpp index 6e4b3cb8b6..323351306a 100644 --- a/modules/juce_audio_basics/juce_audio_basics.cpp +++ b/modules/juce_audio_basics/juce_audio_basics.cpp @@ -39,13 +39,18 @@ #include #endif -#ifndef JUCE_USE_VDSP_FRAMEWORK - #define JUCE_USE_VDSP_FRAMEWORK 1 -#endif +#if JUCE_MAC || JUCE_IOS + #ifndef JUCE_USE_VDSP_FRAMEWORK + #define JUCE_USE_VDSP_FRAMEWORK 1 + #endif -#if (JUCE_MAC || JUCE_IOS) && JUCE_USE_VDSP_FRAMEWORK - #include -#else + #if JUCE_USE_VDSP_FRAMEWORK + #include + #endif + + #include "native/juce_AudioWorkgroup_mac.h" + +#elif JUCE_USE_VDSP_FRAMEWORK #undef JUCE_USE_VDSP_FRAMEWORK #endif diff --git a/modules/juce_audio_basics/utilities/juce_AudioWorkgroup.cpp b/modules/juce_audio_basics/utilities/juce_AudioWorkgroup.cpp index 65027bb5c1..3306e2439a 100644 --- a/modules/juce_audio_basics/utilities/juce_AudioWorkgroup.cpp +++ b/modules/juce_audio_basics/utilities/juce_AudioWorkgroup.cpp @@ -20,11 +20,6 @@ ============================================================================== */ - -#if JUCE_MAC || JUCE_IOS - #include "../native/juce_AudioWorkgroup_mac.h" -#endif - namespace juce { diff --git a/modules/juce_audio_devices/juce_audio_devices.cpp b/modules/juce_audio_devices/juce_audio_devices.cpp index ba60b96e3f..8a4ec9da6c 100644 --- a/modules/juce_audio_devices/juce_audio_devices.cpp +++ b/modules/juce_audio_devices/juce_audio_devices.cpp @@ -50,6 +50,8 @@ //============================================================================== #if JUCE_MAC || JUCE_IOS + #include + #include #include #include #include "midi_io/ump/juce_UMPBytestreamInputHandler.h" @@ -77,6 +79,10 @@ #import #endif + #if JUCE_MODULE_AVAILABLE_juce_graphics + #include + #endif + #include "native/juce_Audio_ios.cpp" #include "native/juce_CoreMidi_mac.mm" diff --git a/modules/juce_audio_devices/native/juce_Audio_ios.cpp b/modules/juce_audio_devices/native/juce_Audio_ios.cpp index 96ed23dc69..12f9df8995 100644 --- a/modules/juce_audio_devices/native/juce_Audio_ios.cpp +++ b/modules/juce_audio_devices/native/juce_Audio_ios.cpp @@ -20,10 +20,6 @@ ============================================================================== */ -#include -#include - - namespace juce { @@ -197,10 +193,6 @@ JUCE_END_IGNORE_WARNINGS_GCC_LIKE @end //============================================================================== -#if JUCE_MODULE_AVAILABLE_juce_graphics - #include -#endif - namespace juce { #ifndef JUCE_IOS_AUDIO_LOGGING diff --git a/modules/juce_audio_devices/native/juce_CoreAudio_mac.cpp b/modules/juce_audio_devices/native/juce_CoreAudio_mac.cpp index bec57749f5..56cd029303 100644 --- a/modules/juce_audio_devices/native/juce_CoreAudio_mac.cpp +++ b/modules/juce_audio_devices/native/juce_CoreAudio_mac.cpp @@ -20,9 +20,6 @@ ============================================================================== */ -#include -#include - namespace juce { diff --git a/modules/juce_audio_utils/juce_audio_utils.cpp b/modules/juce_audio_utils/juce_audio_utils.cpp index 39afebc4d6..78f40a2e5a 100644 --- a/modules/juce_audio_utils/juce_audio_utils.cpp +++ b/modules/juce_audio_utils/juce_audio_utils.cpp @@ -41,8 +41,10 @@ #include #if JUCE_MAC - #import - #import + #import + #import +#elif JUCE_IOS + #import #elif JUCE_WINDOWS #if JUCE_USE_CDBURNER /* You'll need the Platform SDK for these headers - if you don't have it and don't diff --git a/modules/juce_audio_utils/native/juce_BluetoothMidiDevicePairingDialogue_ios.mm b/modules/juce_audio_utils/native/juce_BluetoothMidiDevicePairingDialogue_ios.mm index 2eebd944cc..06b908c988 100644 --- a/modules/juce_audio_utils/native/juce_BluetoothMidiDevicePairingDialogue_ios.mm +++ b/modules/juce_audio_utils/native/juce_BluetoothMidiDevicePairingDialogue_ios.mm @@ -25,8 +25,6 @@ #if ! TARGET_IPHONE_SIMULATOR -#include - namespace juce { diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h index bd4d52856e..07015eee5b 100644 --- a/modules/juce_core/juce_core.h +++ b/modules/juce_core/juce_core.h @@ -354,6 +354,7 @@ JUCE_END_IGNORE_WARNINGS_MSVC #include "streams/juce_AndroidDocumentInputSource.h" #if JUCE_CORE_INCLUDE_OBJC_HELPERS && (JUCE_MAC || JUCE_IOS) + #include "native/juce_CFHelpers_mac.h" #include "native/juce_ObjCHelpers_mac.h" #endif diff --git a/modules/juce_core/memory/juce_ByteOrder.h b/modules/juce_core/memory/juce_ByteOrder.h index ef05ca288f..baa1296219 100644 --- a/modules/juce_core/memory/juce_ByteOrder.h +++ b/modules/juce_core/memory/juce_ByteOrder.h @@ -20,10 +20,6 @@ ============================================================================== */ -#if ! defined (DOXYGEN) && (JUCE_MAC || JUCE_IOS) - #include -#endif - namespace juce { diff --git a/modules/juce_core/native/juce_ObjCHelpers_mac.h b/modules/juce_core/native/juce_ObjCHelpers_mac.h index 0b56b71340..c72ccd0769 100644 --- a/modules/juce_core/native/juce_ObjCHelpers_mac.h +++ b/modules/juce_core/native/juce_ObjCHelpers_mac.h @@ -20,8 +20,6 @@ ============================================================================== */ -#include "juce_CFHelpers_mac.h" - /* This file contains a few helper functions that are used internally but which need to be kept away from the public headers because they use obj-C symbols. */ diff --git a/modules/juce_core/system/juce_StandardHeader.h b/modules/juce_core/system/juce_StandardHeader.h index 4770a7e753..46fbd8afa6 100644 --- a/modules/juce_core/system/juce_StandardHeader.h +++ b/modules/juce_core/system/juce_StandardHeader.h @@ -92,6 +92,7 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4514 4245 4100) #if JUCE_MAC || JUCE_IOS #include + #include #include #include #endif diff --git a/modules/juce_dsp/juce_dsp.cpp b/modules/juce_dsp/juce_dsp.cpp index e34bfe56a7..235b81c6f9 100644 --- a/modules/juce_dsp/juce_dsp.cpp +++ b/modules/juce_dsp/juce_dsp.cpp @@ -56,6 +56,7 @@ #include "processors/juce_FIRFilter.cpp" #include "processors/juce_IIRFilter.cpp" +#include "processors/juce_IIRFilter_Impl.h" #include "processors/juce_FirstOrderTPTFilter.cpp" #include "processors/juce_Panner.cpp" #include "processors/juce_Oversampling.cpp" diff --git a/modules/juce_dsp/juce_dsp.h b/modules/juce_dsp/juce_dsp.h index 21307ba74f..86b9d5a14d 100644 --- a/modules/juce_dsp/juce_dsp.h +++ b/modules/juce_dsp/juce_dsp.h @@ -239,6 +239,7 @@ namespace juce #endif #include "containers/juce_SIMDRegister.h" + #include "containers/juce_SIMDRegister_Impl.h" #endif #include "maths/juce_SpecialFunctions.h" diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp index 62580d7640..518f393972 100644 --- a/modules/juce_gui_basics/juce_gui_basics.cpp +++ b/modules/juce_gui_basics/juce_gui_basics.cpp @@ -138,6 +138,7 @@ #if JUCE_MAC || JUCE_IOS #include "native/accessibility/juce_AccessibilitySharedCode_mac.mm" + #include "native/juce_CGMetalLayerRenderer_mac.h" #if JUCE_IOS #include "native/juce_UIViewComponentPeer_ios.mm" @@ -166,6 +167,9 @@ #include "native/juce_MouseCursor_mac.mm" #elif JUCE_WINDOWS + #if JUCE_MODULE_AVAILABLE_juce_audio_plugin_client + #include + #endif #include "native/accessibility/juce_ComInterfaces_windows.h" #include "native/accessibility/juce_WindowsUIAWrapper_windows.h" #include "native/accessibility/juce_AccessibilityElement_windows.h" diff --git a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm index f5c64234b7..6718f99fe5 100644 --- a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm +++ b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm @@ -23,8 +23,6 @@ ============================================================================== */ -#include "juce_CGMetalLayerRenderer_mac.h" - @interface NSEvent (DeviceDelta) - (float)deviceDeltaX; - (float)deviceDeltaY; diff --git a/modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm b/modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm index f824d64091..2b799c8ac3 100644 --- a/modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm +++ b/modules/juce_gui_basics/native/juce_UIViewComponentPeer_ios.mm @@ -23,8 +23,6 @@ ============================================================================== */ -#include "juce_CGMetalLayerRenderer_mac.h" - #if TARGET_OS_SIMULATOR && JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS #warning JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS uses parts of the Metal API that are currently unsupported in the simulator - falling back to JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS=0 #undef JUCE_COREGRAPHICS_RENDER_WITH_MULTIPLE_PAINT_CALLS diff --git a/modules/juce_gui_basics/native/juce_Windowing_windows.cpp b/modules/juce_gui_basics/native/juce_Windowing_windows.cpp index 500dfa8dc6..44070735a5 100644 --- a/modules/juce_gui_basics/native/juce_Windowing_windows.cpp +++ b/modules/juce_gui_basics/native/juce_Windowing_windows.cpp @@ -23,10 +23,6 @@ ============================================================================== */ -#if JUCE_MODULE_AVAILABLE_juce_audio_plugin_client - #include -#endif - namespace juce { diff --git a/modules/juce_gui_extra/juce_gui_extra.cpp b/modules/juce_gui_extra/juce_gui_extra.cpp index f1a08c6604..c34f12f574 100644 --- a/modules/juce_gui_extra/juce_gui_extra.cpp +++ b/modules/juce_gui_extra/juce_gui_extra.cpp @@ -94,6 +94,7 @@ #if JUCE_USE_WIN_WEBVIEW2 #include #include + #include JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4265) #include @@ -176,6 +177,10 @@ #include "native/juce_XEmbedComponent_linux.cpp" #if JUCE_WEB_BROWSER + #if JUCE_USE_EXTERNAL_TEMPORARY_SUBPROCESS + #include "juce_LinuxSubprocessHelperBinaryData.h" + #endif + #include "native/juce_WebBrowserComponent_linux.cpp" #endif diff --git a/modules/juce_gui_extra/native/juce_WebBrowserComponent_linux.cpp b/modules/juce_gui_extra/native/juce_WebBrowserComponent_linux.cpp index b44a5cc4de..79718f40cd 100644 --- a/modules/juce_gui_extra/native/juce_WebBrowserComponent_linux.cpp +++ b/modules/juce_gui_extra/native/juce_WebBrowserComponent_linux.cpp @@ -23,10 +23,6 @@ ============================================================================== */ -#if JUCE_USE_EXTERNAL_TEMPORARY_SUBPROCESS - #include "juce_LinuxSubprocessHelperBinaryData.h" -#endif - namespace juce { diff --git a/modules/juce_gui_extra/native/juce_WebBrowserComponent_windows.cpp b/modules/juce_gui_extra/native/juce_WebBrowserComponent_windows.cpp index 917c6bbf21..fdabb5f4a0 100644 --- a/modules/juce_gui_extra/native/juce_WebBrowserComponent_windows.cpp +++ b/modules/juce_gui_extra/native/juce_WebBrowserComponent_windows.cpp @@ -351,8 +351,6 @@ private: #if JUCE_USE_WIN_WEBVIEW2 -#include - using namespace Microsoft::WRL; static std::vector getDirectChildWindows (HWND hwnd)