From 6589b6d64bbef3066b5298b8f12957862f36b2ab Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Mon, 23 May 2022 16:37:15 +0100 Subject: [PATCH] VS2022: Work around a compiler bug --- extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp | 5 ----- extras/AudioPluginHost/Source/UI/GraphEditorPanel.h | 1 - extras/AudioPluginHost/Source/UI/MainHostWindow.cpp | 2 +- modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp | 3 +-- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp index 7060ac7454..dba4fbc7ad 100644 --- a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp +++ b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.cpp @@ -1285,11 +1285,6 @@ void GraphDocumentComponent::createNewPlugin (const PluginDescription& desc, Poi graphPanel->createNewPlugin (desc, pos); } -void GraphDocumentComponent::unfocusKeyboardComponent() -{ - keyboardComp->unfocusAllComponents(); -} - void GraphDocumentComponent::releaseGraph() { deviceManager.removeAudioCallback (&graphPlayer); diff --git a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h index 0cc2a50860..b2b38a421b 100644 --- a/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h +++ b/extras/AudioPluginHost/Source/UI/GraphEditorPanel.h @@ -118,7 +118,6 @@ public: std::unique_ptr graph; void resized() override; - void unfocusKeyboardComponent(); void releaseGraph(); //============================================================================== diff --git a/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp b/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp index 0c7da61de9..c3f0bb009b 100644 --- a/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp +++ b/extras/AudioPluginHost/Source/UI/MainHostWindow.cpp @@ -592,7 +592,7 @@ void MainHostWindow::menuItemSelected (int menuItemID, int /*topLevelMenuIndex*/ void MainHostWindow::menuBarActivated (bool isActivated) { if (isActivated && graphHolder != nullptr) - graphHolder->unfocusKeyboardComponent(); + Component::unfocusAllComponents(); } void MainHostWindow::createPlugin (const PluginDescription& desc, Point pos) diff --git a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp index ff22efdb82..1d4feade7e 100644 --- a/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/AAX/juce_AAX_Wrapper.cpp @@ -1191,8 +1191,7 @@ namespace AAXClasses if (data != nullptr && size == sizeof (AAX_EProcessingState)) { const auto state = *static_cast (data); - const auto nonRealtime = state == AAX_eProcessingState_Start - || state == AAX_eProcessingState_StartPass + const auto nonRealtime = state == AAX_eProcessingState_StartPass || state == AAX_eProcessingState_BeginPassGroup; pluginInstance->setNonRealtime (nonRealtime); }