mirror
/
osci-render
kopia lustrzana https://github.com/jameshball/osci-render
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix binary name, fix AU type, hide full screen and popout

pull/263/head
James H Ball 2024-09-29 17:05:09 +01:00
rodzic 08ef65c377
commit da8cb4f861
6 zmienionych plików z 24 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
Resources/oscilloscope/oscilloscope.html
Wyświetl plik

@ -180,6 +180,13 @@
}
});
Juce.getNativeFunction("isVisualiserOnly")().then(visualiserOnly => {
if (visualiserOnly) {
popout.remove();
fullscreen.remove();
}
});
window.__JUCE__.backend.addEventListener("childPresent", hasChild => {
openInAnotherWindow = hasChild;
if (hasChild) {

2
Resources/oscilloscope/oscilloscope.js
Wyświetl plik

@ -702,7 +702,7 @@ function doScriptProcessor(bufferBase64) {
if (numChannels === 3) {
zSamples[i] = dataView.getFloat32(i * stride + 8, true);
} else {
zSamples[i] = 1;
zSamples[i] = 1;
}
}

2
Source/SosciPluginEditor.h
Wyświetl plik

@ -29,7 +29,7 @@ public:
VisualiserSettings visualiserSettings = VisualiserSettings(audioProcessor.parameters, 3);
SettingsWindow visualiserSettingsWindow = SettingsWindow("Visualiser Settings");
VisualiserComponent visualiser{audioProcessor, audioProcessor, visualiserSettings, nullptr, audioProcessor.parameters.legacyVisualiserEnabled->getBoolValue()};
VisualiserComponent visualiser{audioProcessor, audioProcessor, visualiserSettings, nullptr, false, true};
std::unique_ptr<juce::FileChooser> chooser;
SosciMainMenuBarModel menuBarModel{*this};

5
Source/components/VisualiserComponent.cpp
Wyświetl plik

@ -1,7 +1,7 @@
#include "../LookAndFeel.h"
#include "VisualiserComponent.h"
VisualiserComponent::VisualiserComponent(SampleRateManager& sampleRateManager, ConsumerManager& consumerManager, VisualiserSettings& settings, VisualiserComponent* parent, bool useOldVisualiser) : settings(settings), backgroundColour(juce::Colours::black), waveformColour(juce::Colour(0xff00ff00)), sampleRateManager(sampleRateManager), consumerManager(consumerManager), oldVisualiser(useOldVisualiser), juce::Thread("VisualiserComponent"), parent(parent) {
VisualiserComponent::VisualiserComponent(SampleRateManager& sampleRateManager, ConsumerManager& consumerManager, VisualiserSettings& settings, VisualiserComponent* parent, bool useOldVisualiser, bool visualiserOnly) : settings(settings), backgroundColour(juce::Colours::black), waveformColour(juce::Colour(0xff00ff00)), sampleRateManager(sampleRateManager), consumerManager(consumerManager), oldVisualiser(useOldVisualiser), visualiserOnly(visualiserOnly), juce::Thread("VisualiserComponent"), parent(parent) {
resetBuffer();
if (!oldVisualiser) {
initialiseBrowser();
@ -320,6 +320,9 @@ void VisualiserComponent::initialiseBrowser() {
.withNativeFunction("sampleRate", [this](auto& var, auto complete) {
complete(sampleRate);
})
.withNativeFunction("isVisualiserOnly", [this](auto& var, auto complete) {
complete(visualiserOnly);
})
);
addAndMakeVisible(*browser);

4
Source/components/VisualiserComponent.h
Wyświetl plik

@ -18,7 +18,7 @@ enum class FullScreenMode {
class VisualiserWindow;
class VisualiserComponent : public juce::Component, public juce::Timer, public juce::Thread, public juce::MouseListener, public juce::SettableTooltipClient, public juce::AsyncUpdater {
public:
VisualiserComponent(SampleRateManager& sampleRateManager, ConsumerManager& consumerManager, VisualiserSettings& settings, VisualiserComponent* parent = nullptr, bool useOldVisualiser = false);
VisualiserComponent(SampleRateManager& sampleRateManager, ConsumerManager& consumerManager, VisualiserSettings& settings, VisualiserComponent* parent = nullptr, bool useOldVisualiser = false, bool visualiserOnly = false);
~VisualiserComponent() override;
std::function<void()> openSettings;
@ -61,6 +61,8 @@ private:
std::atomic<bool> oldVisualiser;
bool visualiserOnly;
juce::CriticalSection lock;
std::vector<Point> buffer;
std::vector<juce::Line<float>> prevLines;

15
sosci.jucer
Wyświetl plik

@ -5,7 +5,8 @@
aaxIdentifier="sh.ball.sosci" cppLanguageStandard="20" projectLineFeed="&#10;"
headerPath="./include" version="1.0.0" companyName="James H Ball"
companyWebsite="https://osci-render.com" companyEmail="james@ball.sh"
defines="NOMINMAX=1" pluginAUMainType="'aumf'">
defines="NOMINMAX=1" pluginManufacturerCode="Jhba" pluginCode="Sosc"
pluginAUMainType="'aufx'">
<MAINGROUP id="j5Ge2T" name="sosci">
<GROUP id="{5ABCED88-0059-A7AF-9596-DBF91DDB0292}" name="Resources">
<GROUP id="{525C568C-29E9-D0A2-9773-8A04981C5575}" name="images">
@ -116,8 +117,8 @@
<LINUX_MAKE targetFolder="Builds/sosci/LinuxMakefile" smallIcon="pSc1mq"
bigIcon="pSc1mq">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render"/>
<CONFIGURATION isDebug="0" name="Release" targetName="osci-render"/>
<CONFIGURATION isDebug="1" name="Debug" targetName="sosci"/>
<CONFIGURATION isDebug="0" name="Release" targetName="sosci"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/>
@ -139,8 +140,8 @@
<VS2022 targetFolder="Builds/sosci/VisualStudio2022" smallIcon="pSc1mq"
bigIcon="pSc1mq">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render"/>
<CONFIGURATION isDebug="0" name="Release" targetName="osci-render" alwaysGenerateDebugSymbols="1"
<CONFIGURATION isDebug="1" name="Debug" targetName="sosci"/>
<CONFIGURATION isDebug="0" name="Release" targetName="sosci" alwaysGenerateDebugSymbols="1"
debugInformationFormat="ProgramDatabase"/>
</CONFIGURATIONS>
<MODULEPATHS>
@ -164,8 +165,8 @@
extraDefs="JUCE_SILENCE_XCODE_15_LINKER_WARNING=1" smallIcon="pSc1mq"
bigIcon="pSc1mq" applicationCategory="public.app-category.music">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="osci-render"/>
<CONFIGURATION name="Release" targetName="osci-render"/>
<CONFIGURATION isDebug="1" name="Debug" targetName="sosci"/>
<CONFIGURATION name="Release" targetName="sosci"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="../../../JUCE/modules"/>