kopia lustrzana https://github.com/jameshball/osci-render
Fix compilation issues on linux
James H Ball
rodzic
cdafdd52f8
commit
59c5c97881
|
|
@ -1,201 +1,200 @@
|
|||
#include "MainComponent.h"
|
||||
|
||||
#include "PluginEditor.h"
|
||||
#include "parser/FileParser.h"
|
||||
#include "parser/FrameProducer.h"
|
||||
#include "PluginEditor.h"
|
||||
|
||||
MainComponent::MainComponent(OscirenderAudioProcessor& p, OscirenderAudioProcessorEditor& editor) : audioProcessor(p), pluginEditor(editor) {
|
||||
setText("Main Settings");
|
||||
setText("Main Settings");
|
||||
|
||||
addAndMakeVisible(editor.volume);
|
||||
addAndMakeVisible(editor.volume);
|
||||
|
||||
addAndMakeVisible(fileButton);
|
||||
fileButton.setButtonText("Choose File(s)");
|
||||
|
||||
fileButton.onClick = [this] {
|
||||
juce::String fileFormats;
|
||||
for (auto& ext : audioProcessor.FILE_EXTENSIONS) {
|
||||
fileFormats += "*." + ext + ";";
|
||||
}
|
||||
chooser = std::make_unique<juce::FileChooser>("Open", audioProcessor.getLastOpenedDirectory(), fileFormats);
|
||||
auto flags = juce::FileBrowserComponent::openMode | juce::FileBrowserComponent::canSelectMultipleItems |
|
||||
juce::FileBrowserComponent::canSelectFiles;
|
||||
|
||||
chooser->launchAsync(flags, [this](const juce::FileChooser& chooser) {
|
||||
#if OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock);
|
||||
fileButton.onClick = [this] {
|
||||
juce::String fileFormats;
|
||||
for (auto& ext : audioProcessor.FILE_EXTENSIONS) {
|
||||
fileFormats += "*." + ext + ";";
|
||||
}
|
||||
chooser = std::make_unique<juce::FileChooser>("Open", audioProcessor.getLastOpenedDirectory(), fileFormats);
|
||||
auto flags = juce::FileBrowserComponent::openMode | juce::FileBrowserComponent::canSelectMultipleItems |
|
||||
juce::FileBrowserComponent::canSelectFiles;
|
||||
|
||||
chooser->launchAsync(flags, [this](const juce::FileChooser& chooser) {
|
||||
#if (JUCE_MAC || JUCE_WINDOWS) && OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock);
|
||||
#endif
|
||||
juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock);
|
||||
bool fileAdded = false;
|
||||
for (auto& file : chooser.getResults()) {
|
||||
if (file != juce::File()) {
|
||||
juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock);
|
||||
bool fileAdded = false;
|
||||
for (auto& file : chooser.getResults()) {
|
||||
if (file != juce::File()) {
|
||||
audioProcessor.setLastOpenedDirectory(file.getParentDirectory());
|
||||
audioProcessor.addFile(file);
|
||||
pluginEditor.addCodeEditor(audioProcessor.getCurrentFileIndex());
|
||||
fileAdded = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (fileAdded) {
|
||||
pluginEditor.fileUpdated(audioProcessor.getCurrentFileName());
|
||||
}
|
||||
});
|
||||
};
|
||||
audioProcessor.addFile(file);
|
||||
pluginEditor.addCodeEditor(audioProcessor.getCurrentFileIndex());
|
||||
fileAdded = true;
|
||||
}
|
||||
}
|
||||
|
||||
addAndMakeVisible(closeFileButton);
|
||||
|
||||
closeFileButton.onClick = [this] {
|
||||
juce::SpinLock::ScopedLockType lock(audioProcessor.parsersLock);
|
||||
int index = audioProcessor.getCurrentFileIndex();
|
||||
if (index == -1) {
|
||||
return;
|
||||
}
|
||||
audioProcessor.removeFile(audioProcessor.getCurrentFileIndex());
|
||||
};
|
||||
if (fileAdded) {
|
||||
pluginEditor.fileUpdated(audioProcessor.getCurrentFileName());
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
closeFileButton.setTooltip("Close the currently open file.");
|
||||
addAndMakeVisible(closeFileButton);
|
||||
|
||||
addAndMakeVisible(inputEnabled);
|
||||
inputEnabled.onClick = [this] {
|
||||
audioProcessor.inputEnabled->setBoolValueNotifyingHost(!audioProcessor.inputEnabled->getBoolValue());
|
||||
};
|
||||
|
||||
addAndMakeVisible(fileLabel);
|
||||
fileLabel.setJustificationType(juce::Justification::centred);
|
||||
updateFileLabel();
|
||||
closeFileButton.onClick = [this] {
|
||||
juce::SpinLock::ScopedLockType lock(audioProcessor.parsersLock);
|
||||
int index = audioProcessor.getCurrentFileIndex();
|
||||
if (index == -1) {
|
||||
return;
|
||||
}
|
||||
audioProcessor.removeFile(audioProcessor.getCurrentFileIndex());
|
||||
};
|
||||
|
||||
addAndMakeVisible(leftArrow);
|
||||
leftArrow.onClick = [this] {
|
||||
#if OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType lock(audioProcessor.syphonLock);
|
||||
closeFileButton.setTooltip("Close the currently open file.");
|
||||
|
||||
addAndMakeVisible(inputEnabled);
|
||||
inputEnabled.onClick = [this] {
|
||||
audioProcessor.inputEnabled->setBoolValueNotifyingHost(!audioProcessor.inputEnabled->getBoolValue());
|
||||
};
|
||||
|
||||
addAndMakeVisible(fileLabel);
|
||||
fileLabel.setJustificationType(juce::Justification::centred);
|
||||
updateFileLabel();
|
||||
|
||||
addAndMakeVisible(leftArrow);
|
||||
leftArrow.onClick = [this] {
|
||||
#if (JUCE_MAC || JUCE_WINDOWS) && OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType lock(audioProcessor.syphonLock);
|
||||
#endif
|
||||
juce::SpinLock::ScopedLockType parserLock(audioProcessor.parsersLock);
|
||||
juce::SpinLock::ScopedLockType effectsLock(audioProcessor.effectsLock);
|
||||
juce::SpinLock::ScopedLockType parserLock(audioProcessor.parsersLock);
|
||||
juce::SpinLock::ScopedLockType effectsLock(audioProcessor.effectsLock);
|
||||
|
||||
int index = audioProcessor.getCurrentFileIndex();
|
||||
int index = audioProcessor.getCurrentFileIndex();
|
||||
|
||||
if (index > 0) {
|
||||
audioProcessor.changeCurrentFile(index - 1);
|
||||
pluginEditor.fileUpdated(audioProcessor.getCurrentFileName());
|
||||
}
|
||||
};
|
||||
leftArrow.setTooltip("Change to previous file (k).");
|
||||
|
||||
addAndMakeVisible(rightArrow);
|
||||
rightArrow.onClick = [this] {
|
||||
#if OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType lock(audioProcessor.syphonLock);
|
||||
if (index > 0) {
|
||||
audioProcessor.changeCurrentFile(index - 1);
|
||||
pluginEditor.fileUpdated(audioProcessor.getCurrentFileName());
|
||||
}
|
||||
};
|
||||
leftArrow.setTooltip("Change to previous file (k).");
|
||||
|
||||
addAndMakeVisible(rightArrow);
|
||||
rightArrow.onClick = [this] {
|
||||
#if (JUCE_MAC || JUCE_WINDOWS) && OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType lock(audioProcessor.syphonLock);
|
||||
#endif
|
||||
juce::SpinLock::ScopedLockType parserLock(audioProcessor.parsersLock);
|
||||
juce::SpinLock::ScopedLockType effectsLock(audioProcessor.effectsLock);
|
||||
juce::SpinLock::ScopedLockType parserLock(audioProcessor.parsersLock);
|
||||
juce::SpinLock::ScopedLockType effectsLock(audioProcessor.effectsLock);
|
||||
|
||||
int index = audioProcessor.getCurrentFileIndex();
|
||||
int index = audioProcessor.getCurrentFileIndex();
|
||||
|
||||
if (index < audioProcessor.numFiles() - 1) {
|
||||
audioProcessor.changeCurrentFile(index + 1);
|
||||
pluginEditor.fileUpdated(audioProcessor.getCurrentFileName());
|
||||
}
|
||||
};
|
||||
rightArrow.setTooltip("Change to next file (j).");
|
||||
if (index < audioProcessor.numFiles() - 1) {
|
||||
audioProcessor.changeCurrentFile(index + 1);
|
||||
pluginEditor.fileUpdated(audioProcessor.getCurrentFileName());
|
||||
}
|
||||
};
|
||||
rightArrow.setTooltip("Change to next file (j).");
|
||||
|
||||
|
||||
addAndMakeVisible(fileName);
|
||||
fileType.addItem(".lua", 1);
|
||||
fileType.addItem(".svg", 2);
|
||||
fileType.addItem(".obj", 3);
|
||||
addAndMakeVisible(fileName);
|
||||
fileType.addItem(".lua", 1);
|
||||
fileType.addItem(".svg", 2);
|
||||
fileType.addItem(".obj", 3);
|
||||
fileType.addItem(".txt", 4);
|
||||
fileType.setSelectedId(1);
|
||||
addAndMakeVisible(fileType);
|
||||
addAndMakeVisible(createFile);
|
||||
fileType.setSelectedId(1);
|
||||
addAndMakeVisible(fileType);
|
||||
addAndMakeVisible(createFile);
|
||||
|
||||
createFile.onClick = [this] {
|
||||
#if OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock);
|
||||
createFile.onClick = [this] {
|
||||
#if (JUCE_MAC || JUCE_WINDOWS) && OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock);
|
||||
#endif
|
||||
juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock);
|
||||
auto fileNameText = fileName.getText();
|
||||
auto fileTypeText = fileType.getText();
|
||||
auto fileName = fileNameText + fileTypeText;
|
||||
if (fileTypeText == ".lua") {
|
||||
audioProcessor.addFile(fileNameText + fileTypeText, BinaryData::demo_lua, BinaryData::demo_luaSize);
|
||||
} else if (fileTypeText == ".svg") {
|
||||
audioProcessor.addFile(fileNameText + fileTypeText, BinaryData::demo_svg, BinaryData::demo_svgSize);
|
||||
} else if (fileTypeText == ".obj") {
|
||||
audioProcessor.addFile(fileNameText + fileTypeText, BinaryData::cube_obj, BinaryData::cube_objSize);
|
||||
} else if (fileTypeText == ".txt") {
|
||||
audioProcessor.addFile(fileNameText + fileTypeText, BinaryData::helloworld_txt, BinaryData::helloworld_txtSize);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock);
|
||||
auto fileNameText = fileName.getText();
|
||||
auto fileTypeText = fileType.getText();
|
||||
auto fileName = fileNameText + fileTypeText;
|
||||
if (fileTypeText == ".lua") {
|
||||
audioProcessor.addFile(fileNameText + fileTypeText, BinaryData::demo_lua, BinaryData::demo_luaSize);
|
||||
} else if (fileTypeText == ".svg") {
|
||||
audioProcessor.addFile(fileNameText + fileTypeText, BinaryData::demo_svg, BinaryData::demo_svgSize);
|
||||
} else if (fileTypeText == ".obj") {
|
||||
audioProcessor.addFile(fileNameText + fileTypeText, BinaryData::cube_obj, BinaryData::cube_objSize);
|
||||
} else if (fileTypeText == ".txt") {
|
||||
audioProcessor.addFile(fileNameText + fileTypeText, BinaryData::helloworld_txt, BinaryData::helloworld_txtSize);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
pluginEditor.addCodeEditor(audioProcessor.getCurrentFileIndex());
|
||||
pluginEditor.addCodeEditor(audioProcessor.getCurrentFileIndex());
|
||||
pluginEditor.fileUpdated(fileName, fileTypeText == ".lua" || fileTypeText == ".txt");
|
||||
};
|
||||
};
|
||||
|
||||
fileName.setFont(juce::Font(16.0f, juce::Font::plain));
|
||||
fileName.setText("filename");
|
||||
fileName.setFont(juce::Font(16.0f, juce::Font::plain));
|
||||
fileName.setText("filename");
|
||||
|
||||
fileName.onReturnKey = [this] {
|
||||
createFile.triggerClick();
|
||||
};
|
||||
fileName.onReturnKey = [this] {
|
||||
createFile.triggerClick();
|
||||
};
|
||||
|
||||
osci::BooleanParameter* visualiserFullScreen = audioProcessor.visualiserParameters.visualiserFullScreen;
|
||||
osci::BooleanParameter* visualiserFullScreen = audioProcessor.visualiserParameters.visualiserFullScreen;
|
||||
pluginEditor.visualiser.setFullScreen(visualiserFullScreen->getBoolValue());
|
||||
|
||||
addAndMakeVisible(pluginEditor.visualiser);
|
||||
pluginEditor.visualiser.setFullScreenCallback([this, visualiserFullScreen](FullScreenMode mode) {
|
||||
if (mode == FullScreenMode::TOGGLE) {
|
||||
visualiserFullScreen->setBoolValueNotifyingHost(!visualiserFullScreen->getBoolValue());
|
||||
} else if (mode == FullScreenMode::FULL_SCREEN) {
|
||||
visualiserFullScreen->setBoolValueNotifyingHost(true);
|
||||
} else if (mode == FullScreenMode::MAIN_COMPONENT) {
|
||||
visualiserFullScreen->setBoolValueNotifyingHost(false);
|
||||
pluginEditor.visualiser.setFullScreenCallback([this, visualiserFullScreen](FullScreenMode mode) {
|
||||
if (mode == FullScreenMode::TOGGLE) {
|
||||
visualiserFullScreen->setBoolValueNotifyingHost(!visualiserFullScreen->getBoolValue());
|
||||
} else if (mode == FullScreenMode::FULL_SCREEN) {
|
||||
visualiserFullScreen->setBoolValueNotifyingHost(true);
|
||||
} else if (mode == FullScreenMode::MAIN_COMPONENT) {
|
||||
visualiserFullScreen->setBoolValueNotifyingHost(false);
|
||||
}
|
||||
|
||||
|
||||
pluginEditor.visualiser.setFullScreen(visualiserFullScreen->getBoolValue());
|
||||
|
||||
pluginEditor.resized();
|
||||
pluginEditor.repaint();
|
||||
resized();
|
||||
repaint();
|
||||
|
||||
pluginEditor.resized();
|
||||
pluginEditor.repaint();
|
||||
resized();
|
||||
repaint();
|
||||
});
|
||||
|
||||
visualiserFullScreen->addListener(this);
|
||||
visualiserFullScreen->addListener(this);
|
||||
}
|
||||
|
||||
MainComponent::~MainComponent() {
|
||||
audioProcessor.visualiserParameters.visualiserFullScreen->removeListener(this);
|
||||
audioProcessor.visualiserParameters.visualiserFullScreen->removeListener(this);
|
||||
}
|
||||
|
||||
// syphonLock must be held when calling this function
|
||||
void MainComponent::updateFileLabel() {
|
||||
showLeftArrow = audioProcessor.getCurrentFileIndex() > 0;
|
||||
showRightArrow = audioProcessor.getCurrentFileIndex() < audioProcessor.numFiles() - 1;
|
||||
|
||||
showLeftArrow = audioProcessor.getCurrentFileIndex() > 0;
|
||||
showRightArrow = audioProcessor.getCurrentFileIndex() < audioProcessor.numFiles() - 1;
|
||||
|
||||
{
|
||||
#if (JUCE_MAC || JUCE_WINDOWS) && OSCI_PREMIUM
|
||||
if (audioProcessor.isSyphonInputActive()) {
|
||||
fileLabel.setText(audioProcessor.getSyphonSourceName(), juce::dontSendNotification);
|
||||
} else
|
||||
#endif
|
||||
if (audioProcessor.objectServerRendering) {
|
||||
fileLabel.setText("Rendering from Blender", juce::dontSendNotification);
|
||||
}else if (audioProcessor.getCurrentFileIndex() == -1) {
|
||||
if (audioProcessor.objectServerRendering) {
|
||||
fileLabel.setText("Rendering from Blender", juce::dontSendNotification);
|
||||
} else if (audioProcessor.getCurrentFileIndex() == -1) {
|
||||
fileLabel.setText("No file open", juce::dontSendNotification);
|
||||
} else {
|
||||
fileLabel.setText(audioProcessor.getCurrentFileName(), juce::dontSendNotification);
|
||||
}
|
||||
}
|
||||
|
||||
resized();
|
||||
resized();
|
||||
}
|
||||
|
||||
void MainComponent::parameterValueChanged(int parameterIndex, float newValue) {
|
||||
juce::MessageManager::callAsync([this] {
|
||||
pluginEditor.resized();
|
||||
pluginEditor.repaint();
|
||||
resized();
|
||||
repaint();
|
||||
juce::MessageManager::callAsync([this] {
|
||||
pluginEditor.resized();
|
||||
pluginEditor.repaint();
|
||||
resized();
|
||||
repaint();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -203,62 +202,62 @@ void MainComponent::parameterGestureChanged(int parameterIndex, bool gestureIsSt
|
|||
|
||||
void MainComponent::resized() {
|
||||
juce::Rectangle<int> bounds = getLocalBounds().withTrimmedTop(20).reduced(20);
|
||||
auto buttonWidth = 120;
|
||||
auto buttonHeight = 30;
|
||||
auto padding = 10;
|
||||
auto rowPadding = 10;
|
||||
|
||||
auto row = bounds.removeFromTop(buttonHeight);
|
||||
auto buttonWidth = 120;
|
||||
auto buttonHeight = 30;
|
||||
auto padding = 10;
|
||||
auto rowPadding = 10;
|
||||
|
||||
auto row = bounds.removeFromTop(buttonHeight);
|
||||
fileButton.setBounds(row.removeFromLeft(buttonWidth));
|
||||
row.removeFromLeft(rowPadding);
|
||||
inputEnabled.setBounds(row.removeFromLeft(20));
|
||||
row.removeFromLeft(rowPadding);
|
||||
if (audioProcessor.getCurrentFileIndex() != -1) {
|
||||
closeFileButton.setBounds(row.removeFromRight(20));
|
||||
row.removeFromRight(rowPadding);
|
||||
} else {
|
||||
closeFileButton.setBounds(juce::Rectangle<int>());
|
||||
}
|
||||
|
||||
auto arrowLeftBounds = row.removeFromLeft(15);
|
||||
if (showLeftArrow) {
|
||||
leftArrow.setBounds(arrowLeftBounds);
|
||||
} else {
|
||||
leftArrow.setBounds(0, 0, 0, 0);
|
||||
}
|
||||
row.removeFromLeft(rowPadding);
|
||||
|
||||
auto arrowRightBounds = row.removeFromRight(15);
|
||||
if (showRightArrow) {
|
||||
rightArrow.setBounds(arrowRightBounds);
|
||||
} else {
|
||||
rightArrow.setBounds(0, 0, 0, 0);
|
||||
}
|
||||
row.removeFromRight(rowPadding);
|
||||
|
||||
fileLabel.setBounds(row);
|
||||
row.removeFromLeft(rowPadding);
|
||||
inputEnabled.setBounds(row.removeFromLeft(20));
|
||||
row.removeFromLeft(rowPadding);
|
||||
if (audioProcessor.getCurrentFileIndex() != -1) {
|
||||
closeFileButton.setBounds(row.removeFromRight(20));
|
||||
row.removeFromRight(rowPadding);
|
||||
} else {
|
||||
closeFileButton.setBounds(juce::Rectangle<int>());
|
||||
}
|
||||
|
||||
bounds.removeFromTop(padding);
|
||||
row = bounds.removeFromTop(buttonHeight);
|
||||
fileName.setBounds(row.removeFromLeft(buttonWidth));
|
||||
row.removeFromLeft(rowPadding);
|
||||
fileType.setBounds(row.removeFromLeft(buttonWidth / 2));
|
||||
row.removeFromLeft(rowPadding);
|
||||
createFile.setBounds(row.removeFromLeft(buttonWidth));
|
||||
auto arrowLeftBounds = row.removeFromLeft(15);
|
||||
if (showLeftArrow) {
|
||||
leftArrow.setBounds(arrowLeftBounds);
|
||||
} else {
|
||||
leftArrow.setBounds(0, 0, 0, 0);
|
||||
}
|
||||
row.removeFromLeft(rowPadding);
|
||||
|
||||
bounds.removeFromTop(padding);
|
||||
bounds.expand(15, 0);
|
||||
auto arrowRightBounds = row.removeFromRight(15);
|
||||
if (showRightArrow) {
|
||||
rightArrow.setBounds(arrowRightBounds);
|
||||
} else {
|
||||
rightArrow.setBounds(0, 0, 0, 0);
|
||||
}
|
||||
row.removeFromRight(rowPadding);
|
||||
|
||||
auto volumeArea = bounds.removeFromLeft(30);
|
||||
pluginEditor.volume.setBounds(volumeArea.withSizeKeepingCentre(volumeArea.getWidth(), juce::jmin(volumeArea.getHeight(), 300)));
|
||||
|
||||
if (!audioProcessor.visualiserParameters.visualiserFullScreen->getBoolValue()) {
|
||||
auto minDim = juce::jmin(bounds.getWidth(), bounds.getHeight());
|
||||
fileLabel.setBounds(row);
|
||||
|
||||
bounds.removeFromTop(padding);
|
||||
row = bounds.removeFromTop(buttonHeight);
|
||||
fileName.setBounds(row.removeFromLeft(buttonWidth));
|
||||
row.removeFromLeft(rowPadding);
|
||||
fileType.setBounds(row.removeFromLeft(buttonWidth / 2));
|
||||
row.removeFromLeft(rowPadding);
|
||||
createFile.setBounds(row.removeFromLeft(buttonWidth));
|
||||
|
||||
bounds.removeFromTop(padding);
|
||||
bounds.expand(15, 0);
|
||||
|
||||
auto volumeArea = bounds.removeFromLeft(30);
|
||||
pluginEditor.volume.setBounds(volumeArea.withSizeKeepingCentre(volumeArea.getWidth(), juce::jmin(volumeArea.getHeight(), 300)));
|
||||
|
||||
if (!audioProcessor.visualiserParameters.visualiserFullScreen->getBoolValue()) {
|
||||
auto minDim = juce::jmin(bounds.getWidth(), bounds.getHeight());
|
||||
juce::Point<int> localTopLeft = {bounds.getX(), bounds.getY()};
|
||||
juce::Point<int> topLeft = pluginEditor.getLocalPoint(this, localTopLeft);
|
||||
auto shiftedBounds = bounds;
|
||||
shiftedBounds.setX(topLeft.getX());
|
||||
shiftedBounds.setY(topLeft.getY());
|
||||
pluginEditor.visualiser.setBounds(shiftedBounds.withSizeKeepingCentre(minDim, minDim + 25).reduced(10));
|
||||
}
|
||||
pluginEditor.visualiser.setBounds(shiftedBounds.withSizeKeepingCentre(minDim, minDim + 25).reduced(10));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ OscirenderAudioProcessorEditor::OscirenderAudioProcessorEditor(OscirenderAudioPr
|
|||
colourScheme = lookAndFeel.getDefaultColourScheme();
|
||||
|
||||
{
|
||||
#if OSCI_PREMIUM
|
||||
#if (JUCE_MAC || JUCE_WINDOWS) && OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock);
|
||||
#endif
|
||||
juce::SpinLock::ScopedLockType lock(audioProcessor.parsersLock);
|
||||
|
|
@ -143,7 +143,7 @@ void OscirenderAudioProcessorEditor::filesDropped(const juce::StringArray& files
|
|||
if (file.hasFileExtension("osci")) {
|
||||
openProject(file);
|
||||
} else {
|
||||
#if OSCI_PREMIUM
|
||||
#if (JUCE_MAC || JUCE_WINDOWS) && OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock);
|
||||
#endif
|
||||
juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock);
|
||||
|
|
@ -379,7 +379,7 @@ void OscirenderAudioProcessorEditor::handleAsyncUpdate() {
|
|||
void OscirenderAudioProcessorEditor::changeListenerCallback(juce::ChangeBroadcaster* source) {
|
||||
if (source == &audioProcessor.broadcaster) {
|
||||
{
|
||||
#if OSCI_PREMIUM
|
||||
#if (JUCE_MAC || JUCE_WINDOWS) && OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock);
|
||||
#endif
|
||||
juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock);
|
||||
|
|
@ -389,7 +389,7 @@ void OscirenderAudioProcessorEditor::changeListenerCallback(juce::ChangeBroadcas
|
|||
resized();
|
||||
repaint();
|
||||
} else if (source == &audioProcessor.fileChangeBroadcaster) {
|
||||
#if OSCI_PREMIUM
|
||||
#if (JUCE_MAC || JUCE_WINDOWS) && OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType syphonLock(audioProcessor.syphonLock);
|
||||
#endif
|
||||
juce::SpinLock::ScopedLockType parsersLock(audioProcessor.parsersLock);
|
||||
|
|
@ -462,7 +462,7 @@ void OscirenderAudioProcessorEditor::updateCodeDocument() {
|
|||
bool OscirenderAudioProcessorEditor::keyPressed(const juce::KeyPress& key) {
|
||||
bool consumeKey = false;
|
||||
{
|
||||
#if OSCI_PREMIUM
|
||||
#if (JUCE_MAC || JUCE_WINDOWS) && OSCI_PREMIUM
|
||||
juce::SpinLock::ScopedLockType lock(audioProcessor.syphonLock);
|
||||
#endif
|
||||
juce::SpinLock::ScopedLockType parserLock(audioProcessor.parsersLock);
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue