From 3591bfb81e950576c469ea0128a02c479966c7d5 Mon Sep 17 00:00:00 2001 From: George Reales Date: Tue, 5 Apr 2022 14:04:58 +0200 Subject: [PATCH] JUCE 6.1.6 update and fixes JUCE framework updated to 6.1.6 Standalone preset changing issue fix --- OPL.jucer | 19 +++++++++++-------- Source/InstrumentLoader.h | 0 Source/PluginEditor.cpp | 8 ++++---- Source/PluginEditor.h | 6 +++--- Source/PluginProcessor.cpp | 11 ++++++++++- Source/PluginProcessor.h | 3 +++ 6 files changed, 31 insertions(+), 16 deletions(-) mode change 100755 => 100644 Source/InstrumentLoader.h diff --git a/OPL.jucer b/OPL.jucer index 1e8b6d0..61b13fb 100644 --- a/OPL.jucer +++ b/OPL.jucer @@ -104,10 +104,12 @@ iPadScreenOrientation="UIInterfaceOrientationLandscapeLeft,UIInterfaceOrientationLandscapeRight" UIStatusBarHidden="1" iosBackgroundAudio="1" iosBackgroundBle="1" smallIcon="lWChlc" bigIcon="lWChlc" iosAppGroupsId="group.com.discodsp.opl" - extraDefs="JUCE_DISABLE_NATIVE_FILECHOOSERS=1" customXcodeResourceFolders="sbi" - iCloudPermissions="0" UISupportsDocumentBrowser="0" UIFileSharingEnabled="0"> + extraDefs="JUCE_DISABLE_NATIVE_FILECHOOSERS=1 JUCE_MODAL_LOOPS_PERMITTED=1" + customXcodeResourceFolders="sbi" iCloudPermissions="0" UISupportsDocumentBrowser="0" + UIFileSharingEnabled="0"> - + @@ -130,13 +132,14 @@ + aaxFolder="modules/aax" xcodeValidArchs="arm64,x86_64" extraDefs="JUCE_MODAL_LOOPS_PERMITTED=1"> + optimisation="6" enablePluginBinaryCopyStep="0" macOSDeploymentTarget="10.9"/> + binaryPath="Bin/MacOS/Demo" optimisation="6" enablePluginBinaryCopyStep="0" + macOSDeploymentTarget="10.9"/> @@ -157,7 +160,7 @@ + extraLinkerFlags="-no-pie" extraDefs="JUCE_MODAL_LOOPS_PERMITTED=1"> + aaxFolder="modules/aax" extraDefs="JUCE_MODAL_LOOPS_PERMITTED=1"> diff --git a/Source/InstrumentLoader.h b/Source/InstrumentLoader.h old mode 100755 new mode 100644 diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp index ed6dd19..8b37188 100644 --- a/Source/PluginEditor.cpp +++ b/Source/PluginEditor.cpp @@ -7,12 +7,12 @@ the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded and re-saved. - Created with Projucer version: 5.4.7 + Created with Projucer version: 6.0.7 ------------------------------------------------------------------------------ The Projucer is part of the JUCE library. - Copyright (c) 2017 - ROLI Ltd. + Copyright (c) 2020 - Raw Material Software Limited. ============================================================================== */ @@ -87,12 +87,12 @@ PluginEditor::~PluginEditor() } //============================================================================== -void PluginEditor::paint (Graphics& g) +void PluginEditor::paint (juce::Graphics& g) { //[UserPrePaint] Add your own custom painting code here.. //[/UserPrePaint] - g.fillAll (Colours::black); + g.fillAll (juce::Colours::black); //[UserPaint] Add your own custom painting code here.. //[/UserPaint] diff --git a/Source/PluginEditor.h b/Source/PluginEditor.h index a4aae7f..1a9c20b 100644 --- a/Source/PluginEditor.h +++ b/Source/PluginEditor.h @@ -7,12 +7,12 @@ the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded and re-saved. - Created with Projucer version: 5.4.7 + Created with Projucer version: 6.0.7 ------------------------------------------------------------------------------ The Projucer is part of the JUCE library. - Copyright (c) 2017 - ROLI Ltd. + Copyright (c) 2020 - Raw Material Software Limited. ============================================================================== */ @@ -50,7 +50,7 @@ public: }; //[/UserMethods] - void paint (Graphics& g) override; + void paint (juce::Graphics& g) override; void resized() override; diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp index f704bd6..45e7dbf 100644 --- a/Source/PluginProcessor.cpp +++ b/Source/PluginProcessor.cpp @@ -511,6 +511,9 @@ AdlibBlasterAudioProcessor::AdlibBlasterAudioProcessor() for (int i = 1; i <= Hiopl::CHANNELS; ++i) available_channels.push_back(i); + + + workaround_flag = true; } void AdlibBlasterAudioProcessor::initPrograms() @@ -869,7 +872,10 @@ void AdlibBlasterAudioProcessor::endChangeGesture (String name) { // Parameters which apply directly to the OPL void AdlibBlasterAudioProcessor::setParameter (int index, float newValue, bool notify, bool updatetoHost) { - FloatParameter* p = params[index]; + + if (workaround_flag) return; + + FloatParameter* p = params[index]; p->setParameter(newValue); String name = p->getName(); if (updatetoHost) { @@ -1253,6 +1259,9 @@ Identifier stringToIdentifier(const String &s) void AdlibBlasterAudioProcessor::getStateInformation(MemoryBlock& destData) { + + if (workaround_flag) workaround_flag = false; + ReferenceCountedObjectPtr v(new DynamicObject); v->setProperty(stringToIdentifier(PROGRAM_INDEX), i_program); diff --git a/Source/PluginProcessor.h b/Source/PluginProcessor.h index b50c15a..d3e32ac 100755 --- a/Source/PluginProcessor.h +++ b/Source/PluginProcessor.h @@ -116,6 +116,9 @@ private: std::unique_ptr undoManager; std::unique_ptr valueTree; + + bool workaround_flag; + //============================================================================== JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AdlibBlasterAudioProcessor) };