diff --git a/Source/MainComponent.cpp b/Source/MainComponent.cpp index 639cf143..1c8d39c4 100644 --- a/Source/MainComponent.cpp +++ b/Source/MainComponent.cpp @@ -21,7 +21,9 @@ MainComponent::MainComponent(OscirenderAudioProcessor& p, OscirenderAudioProcess juce::FileBrowserComponent::canSelectFiles; chooser->launchAsync(flags, [this](const juce::FileChooser& chooser) { +#if OSCI_PREMIUM juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock); +#endif juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock); bool fileAdded = false; for (auto& file : chooser.getResults()) { @@ -64,7 +66,9 @@ MainComponent::MainComponent(OscirenderAudioProcessor& p, OscirenderAudioProcess addAndMakeVisible(leftArrow); leftArrow.onClick = [this] { +#if OSCI_PREMIUM juce::SpinLock::ScopedLockType lock(audioProcessor.syphonLock); +#endif juce::SpinLock::ScopedLockType parserLock(audioProcessor.parsersLock); juce::SpinLock::ScopedLockType effectsLock(audioProcessor.effectsLock); @@ -79,7 +83,9 @@ MainComponent::MainComponent(OscirenderAudioProcessor& p, OscirenderAudioProcess addAndMakeVisible(rightArrow); rightArrow.onClick = [this] { +#if OSCI_PREMIUM juce::SpinLock::ScopedLockType lock(audioProcessor.syphonLock); +#endif juce::SpinLock::ScopedLockType parserLock(audioProcessor.parsersLock); juce::SpinLock::ScopedLockType effectsLock(audioProcessor.effectsLock); @@ -103,7 +109,9 @@ MainComponent::MainComponent(OscirenderAudioProcessor& p, OscirenderAudioProcess addAndMakeVisible(createFile); createFile.onClick = [this] { +#if OSCI_PREMIUM juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock); +#endif juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock); auto fileNameText = fileName.getText(); auto fileTypeText = fileType.getText(); diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp index 7e1d15f1..0055049f 100644 --- a/Source/PluginEditor.cpp +++ b/Source/PluginEditor.cpp @@ -54,7 +54,9 @@ OscirenderAudioProcessorEditor::OscirenderAudioProcessorEditor(OscirenderAudioPr colourScheme = lookAndFeel.getDefaultColourScheme(); { +#if OSCI_PREMIUM juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock); +#endif juce::SpinLock::ScopedLockType lock(audioProcessor.parsersLock); initialiseCodeEditors(); } @@ -141,7 +143,9 @@ void OscirenderAudioProcessorEditor::filesDropped(const juce::StringArray& files if (file.hasFileExtension("osci")) { openProject(file); } else { +#if OSCI_PREMIUM juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock); +#endif juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock); juce::SpinLock::ScopedLockType effectsLock(audioProcessor.effectsLock); @@ -375,7 +379,9 @@ void OscirenderAudioProcessorEditor::handleAsyncUpdate() { void OscirenderAudioProcessorEditor::changeListenerCallback(juce::ChangeBroadcaster* source) { if (source == &audioProcessor.broadcaster) { { +#if OSCI_PREMIUM juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock); +#endif juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock); initialiseCodeEditors(); settings.update(); @@ -383,7 +389,9 @@ void OscirenderAudioProcessorEditor::changeListenerCallback(juce::ChangeBroadcas resized(); repaint(); } else if (source == &audioProcessor.fileChangeBroadcaster) { +#if OSCI_PREMIUM juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock); +#endif juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock); // triggered when the audioProcessor changes the current file (e.g. to Blender) settings.fileUpdated(audioProcessor.getCurrentFileName()); @@ -454,7 +462,9 @@ void OscirenderAudioProcessorEditor::updateCodeDocument() { bool OscirenderAudioProcessorEditor::keyPressed(const juce::KeyPress& key) { bool consumeKey = false; { +#if OSCI_PREMIUM juce::SpinLock::ScopedLockType lock(audioProcessor.syphonLock); +#endif juce::SpinLock::ScopedLockType parserLock(audioProcessor.parsersLock); juce::SpinLock::ScopedLockType effectsLock(audioProcessor.effectsLock); diff --git a/osci-render.jucer b/osci-render.jucer index 3089e7f9..f26c74c9 100644 --- a/osci-render.jucer +++ b/osci-render.jucer @@ -5,7 +5,7 @@ pluginManufacturer="jameshball" aaxIdentifier="sh.ball.oscirender" cppLanguageStandard="20" projectLineFeed=" " headerPath="./include" version="2.5.0.0" companyName="James H Ball" companyWebsite="https://osci-render.com" - companyEmail="james@ball.sh" defines="NOMINMAX=1 INTERNET_FLAG_NO_AUTO_REDIRECT=0 OSCI_PREMIUM=1 JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1 JUCE_MODAL_LOOPS_PERMITTED=1" + companyEmail="james@ball.sh" defines="NOMINMAX=1 INTERNET_FLAG_NO_AUTO_REDIRECT=0 OSCI_PREMIUM=0 JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1 JUCE_MODAL_LOOPS_PERMITTED=1" pluginAUMainType="'aumf'">