Skip to content

Commit

Permalink
start cleaning up UI + add APVTS for parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
hollance committed Apr 10, 2024
1 parent d332a90 commit b7aa37a
Show file tree
Hide file tree
Showing 19 changed files with 698 additions and 949 deletions.
18 changes: 6 additions & 12 deletions Builds/MacOSX/KissOfShame.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
/* End PBXAggregateTarget section */

/* Begin PBXBuildFile section */
03E6EB0EEFD555B28EE3F895 /* EnvironmentsComponent.cpp */ = {isa = PBXBuildFile; fileRef = C7E43654E7C483E965ADEB41; };
041E4CD5AB11166BD4E9DE0C /* include_juce_audio_plugin_client_VST3.mm */ = {isa = PBXBuildFile; fileRef = CED1C6939DD3E239B136A351; };
04D4EF2EFE4C2A5A37243D65 /* include_juce_audio_formats.mm */ = {isa = PBXBuildFile; fileRef = 3FFE5E1529CC7516417FD553; };
0D03EF1D3EF2AB31FA92FD7D /* include_juce_graphics.mm */ = {isa = PBXBuildFile; fileRef = 2C27D2945A225CA2C61DFF49; };
Expand All @@ -39,6 +38,7 @@
376925021FC9AD4498C2BBEC /* include_juce_opengl.mm */ = {isa = PBXBuildFile; fileRef = 167AE383636028D5C90B520E; };
399CBA271B2E751C3D905943 /* VST3 Manifest Helper */ = {isa = PBXBuildFile; fileRef = 5F0391138B48CB576E901DFB; };
399EDC17848C9A2A41720EE4 /* include_juce_audio_plugin_client_AU_1.mm */ = {isa = PBXBuildFile; fileRef = 99A435C2257916B5BE729250; };
42BF717C8101257F5F090C0F /* Parameters.cpp */ = {isa = PBXBuildFile; fileRef = 987DD2ABDE0A8369AB1D9F93; };
4CF09E8F1C7C233868DB8F80 /* include_juce_audio_utils.mm */ = {isa = PBXBuildFile; fileRef = 537B49FC05383E6CE7493875; };
4F1718F938A7CDA0228AD1EB /* Standalone Plugin */ = {isa = PBXBuildFile; fileRef = 9B37E8302837AD1827067B5E; };
50046824C52830B68311A699 /* CoreAudio.framework */ = {isa = PBXBuildFile; fileRef = 554B86C95DDE4C7CC3D8148F; };
Expand All @@ -49,11 +49,9 @@
7A0902581D585E22E4D5E202 /* CoreMIDI.framework */ = {isa = PBXBuildFile; fileRef = B73D9938ECEE8878ABCE13F7; };
808AAB03AD08D8B99CA27662 /* Shared Code */ = {isa = PBXBuildFile; fileRef = 345E4F9F8EF9C79750610C10; };
813E63011B7148EBC9C7A9CA /* include_juce_audio_devices.mm */ = {isa = PBXBuildFile; fileRef = 82C7CC92DAAB1E8AB3476423; };
83D329E80BFCDB1C8ED3F4CF /* ImageAnimator.cpp */ = {isa = PBXBuildFile; fileRef = B24EC566986DC0DB604F82D6; };
8CC3F162E6431F2AEB28A7E4 /* VST3 */ = {isa = PBXBuildFile; fileRef = 5CCFF585DDD1FC676E5087CB; };
93DC240EB0635A5C5F2E4A6A /* ImageInteractor.cpp */ = {isa = PBXBuildFile; fileRef = F40D2B96F5C29C0F960737DE; };
979126D242AFBC11EB0717D5 /* include_juce_events.mm */ = {isa = PBXBuildFile; fileRef = CC31C32CC4387ED11C4B0700; };
99BDCEFEFE4F4F9D74047207 /* BacklightComponent.cpp */ = {isa = PBXBuildFile; fileRef = 38D46F6528A185EAE648DB32; };
A2C192D31EFD76755DB618C6 /* AudioUnit.framework */ = {isa = PBXBuildFile; fileRef = 2C23CC87E10CDF2364B2A28A; };
A98C430254CAEEB212E5F374 /* Cocoa.framework */ = {isa = PBXBuildFile; fileRef = F7178A4226C14C2EA396362A; };
B00D75FC3FA1C890CFA5E205 /* juce_VST3ManifestHelper.mm */ = {isa = PBXBuildFile; fileRef = EA3A78232EF8A80661F765F4; settings = { COMPILER_FLAGS = "-std=c++17 -fobjc-arc -w -DJUCE_SKIP_PRECOMPILED_HEADER"; }; };
Expand Down Expand Up @@ -90,6 +88,7 @@
11ACB0A02C3424DE081F5D6A /* Biquads.h */ /* Biquads.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Biquads.h; path = ../../Source/AudioProcessing/Biquads.h; sourceTree = SOURCE_ROOT; };
1367CCBF6BB639E52680406B /* AudioUtils.cpp */ /* AudioUtils.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = AudioUtils.cpp; path = ../../Source/AudioProcessing/AudioUtils.cpp; sourceTree = SOURCE_ROOT; };
167AE383636028D5C90B520E /* include_juce_opengl.mm */ /* include_juce_opengl.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_opengl.mm; path = ../../JuceLibraryCode/include_juce_opengl.mm; sourceTree = SOURCE_ROOT; };
16BA4A52A0B8B6D5A7FCC982 /* Parameters.h */ /* Parameters.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Parameters.h; path = ../../Source/Parameters.h; sourceTree = SOURCE_ROOT; };
191A35549A9633C3A1A168DC /* BinaryData3.cpp */ /* BinaryData3.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BinaryData3.cpp; path = ../../JuceLibraryCode/BinaryData3.cpp; sourceTree = SOURCE_ROOT; };
1D5EA8A7F19FCF9E30C9F089 /* WebKit.framework */ /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
25409BFCD270EDFD5FDB14F5 /* juce_audio_plugin_client */ /* juce_audio_plugin_client */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_audio_plugin_client; path = "~/JUCE/modules/juce_audio_plugin_client"; sourceTree = "<absolute>"; };
Expand All @@ -99,7 +98,6 @@
2C27D2945A225CA2C61DFF49 /* include_juce_graphics.mm */ /* include_juce_graphics.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_graphics.mm; path = ../../JuceLibraryCode/include_juce_graphics.mm; sourceTree = SOURCE_ROOT; };
2FCE3E2B9F89BFE58373CA7E /* LowLevelGrainNoise.wav */ /* LowLevelGrainNoise.wav */ = {isa = PBXFileReference; lastKnownFileType = file.wav; name = LowLevelGrainNoise.wav; path = ../../Audio_Resources/LowLevelGrainNoise.wav; sourceTree = SOURCE_ROOT; };
345E4F9F8EF9C79750610C10 /* Shared Code */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libKissOfShame.a; sourceTree = BUILT_PRODUCTS_DIR; };
38D46F6528A185EAE648DB32 /* BacklightComponent.cpp */ /* BacklightComponent.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = BacklightComponent.cpp; path = ../../Source/GUIUtilities/BacklightComponent.cpp; sourceTree = SOURCE_ROOT; };
391F3F07CA42D22184F7179B /* LoopCrossfade.h */ /* LoopCrossfade.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LoopCrossfade.h; path = ../../Source/AudioProcessing/LoopCrossfade.h; sourceTree = SOURCE_ROOT; };
3A74EEB030A3582BEF07C90C /* juce_gui_extra */ /* juce_gui_extra */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_gui_extra; path = "~/JUCE/modules/juce_gui_extra"; sourceTree = "<absolute>"; };
3AA19A4B435BF55130283DD1 /* CustomKnob.h */ /* CustomKnob.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CustomKnob.h; path = ../../Source/GUIUtilities/CustomKnob.h; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -133,6 +131,7 @@
8E68520AE777BC70F218A0BB /* AudioGraph.h */ /* AudioGraph.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AudioGraph.h; path = ../../Source/AudioProcessing/AudioGraph.h; sourceTree = SOURCE_ROOT; };
943E537F197F1AC0E0B403DD /* include_juce_gui_extra.mm */ /* include_juce_gui_extra.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_gui_extra.mm; path = ../../JuceLibraryCode/include_juce_gui_extra.mm; sourceTree = SOURCE_ROOT; };
95D00723D07BFC6CE0552D7D /* Flange.h */ /* Flange.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Flange.h; path = ../../Source/AudioProcessing/Flange.h; sourceTree = SOURCE_ROOT; };
987DD2ABDE0A8369AB1D9F93 /* Parameters.cpp */ /* Parameters.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Parameters.cpp; path = ../../Source/Parameters.cpp; sourceTree = SOURCE_ROOT; };
9975FC4BB50EEB4E4C12BDE9 /* Info-VST3_Manifest_Helper.plist */ /* Info-VST3_Manifest_Helper.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-VST3_Manifest_Helper.plist"; path = "Info-VST3_Manifest_Helper.plist"; sourceTree = SOURCE_ROOT; };
99A435C2257916B5BE729250 /* include_juce_audio_plugin_client_AU_1.mm */ /* include_juce_audio_plugin_client_AU_1.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_audio_plugin_client_AU_1.mm; path = ../../JuceLibraryCode/include_juce_audio_plugin_client_AU_1.mm; sourceTree = SOURCE_ROOT; };
9AF3586C600D1807D7B5E5DC /* DiscRecording.framework */ /* DiscRecording.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = System/Library/Frameworks/DiscRecording.framework; sourceTree = SDKROOT; };
Expand All @@ -145,7 +144,6 @@
AF7B5DB1ABD5B61B82D4484A /* RecentFilesMenuTemplate.nib */ /* RecentFilesMenuTemplate.nib */ = {isa = PBXFileReference; lastKnownFileType = file.nib; name = RecentFilesMenuTemplate.nib; path = RecentFilesMenuTemplate.nib; sourceTree = SOURCE_ROOT; };
B04EB6EC963D031CC44551DF /* Info-AU.plist */ /* Info-AU.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Info-AU.plist"; path = "Info-AU.plist"; sourceTree = SOURCE_ROOT; };
B176E700B7D8E856223D7FBF /* ImageAnimator.h */ /* ImageAnimator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ImageAnimator.h; path = ../../Source/GUIUtilities/ImageAnimator.h; sourceTree = SOURCE_ROOT; };
B24EC566986DC0DB604F82D6 /* ImageAnimator.cpp */ /* ImageAnimator.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ImageAnimator.cpp; path = ../../Source/GUIUtilities/ImageAnimator.cpp; sourceTree = SOURCE_ROOT; };
B3953F0C62C4A82C19D8B9BE /* PluginEditor.cpp */ /* PluginEditor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PluginEditor.cpp; path = ../../Source/PluginEditor.cpp; sourceTree = SOURCE_ROOT; };
B44FE72BF900B950E2848C63 /* EnvelopeDips.h */ /* EnvelopeDips.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = EnvelopeDips.h; path = ../../Source/AudioProcessing/EnvelopeDips.h; sourceTree = SOURCE_ROOT; };
B464659D7A2B34422E68E05D /* PluginProcessor.h */ /* PluginProcessor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PluginProcessor.h; path = ../../Source/PluginProcessor.h; sourceTree = SOURCE_ROOT; };
Expand All @@ -156,7 +154,6 @@
C3F2044F1EC707465486EF40 /* IOKit.framework */ /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
C5C3C1144ED7AA27DCD9B3E0 /* Security.framework */ /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
C63C7BDD7B28D9ED122617CB /* juce_core */ /* juce_core */ = {isa = PBXFileReference; lastKnownFileType = folder; name = juce_core; path = "~/JUCE/modules/juce_core"; sourceTree = "<absolute>"; };
C7E43654E7C483E965ADEB41 /* EnvironmentsComponent.cpp */ /* EnvironmentsComponent.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EnvironmentsComponent.cpp; path = ../../Source/GUIUtilities/EnvironmentsComponent.cpp; sourceTree = SOURCE_ROOT; };
CC31C32CC4387ED11C4B0700 /* include_juce_events.mm */ /* include_juce_events.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_events.mm; path = ../../JuceLibraryCode/include_juce_events.mm; sourceTree = SOURCE_ROOT; };
CED1C6939DD3E239B136A351 /* include_juce_audio_plugin_client_VST3.mm */ /* include_juce_audio_plugin_client_VST3.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = include_juce_audio_plugin_client_VST3.mm; path = ../../JuceLibraryCode/include_juce_audio_plugin_client_VST3.mm; sourceTree = SOURCE_ROOT; };
CFAA772D9224BE1B365440B8 /* CoreAudioKit.framework */ /* CoreAudioKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioKit.framework; path = System/Library/Frameworks/CoreAudioKit.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -335,15 +332,12 @@
3CF6753A41170A2C11162B66 /* GUIUtilities */ = {
isa = PBXGroup;
children = (
38D46F6528A185EAE648DB32,
EA7835208E14FCB215EECD87,
AB0BDD5D8D1B7C4617398ED1,
B5F04A2B831483FC82928463,
3AA19A4B435BF55130283DD1,
C7E43654E7C483E965ADEB41,
F2BF8C596E465F74A66EB026,
FCBE723A58FDA3E82663743D,
B24EC566986DC0DB604F82D6,
B176E700B7D8E856223D7FBF,
F40D2B96F5C29C0F960737DE,
10386317805A634DF011A08E,
Expand Down Expand Up @@ -401,6 +395,8 @@
children = (
62A66B1209AA5CA6E9448218,
3CF6753A41170A2C11162B66,
987DD2ABDE0A8369AB1D9F93,
16BA4A52A0B8B6D5A7FCC982,
B3953F0C62C4A82C19D8B9BE,
0D7FF77BFDA5405556D56142,
F384422D283BE67F518211ED,
Expand Down Expand Up @@ -807,11 +803,9 @@
files = (
65771AE5DFD756656FC13171,
1DD7F3CE20E033A17B0B880B,
99BDCEFEFE4F4F9D74047207,
D36817DDDA4722E755925800,
03E6EB0EEFD555B28EE3F895,
83D329E80BFCDB1C8ED3F4CF,
93DC240EB0635A5C5F2E4A6A,
42BF717C8101257F5F090C0F,
61BF6947488B29110966FD13,
61C3584349C40BAA728FF771,
CF4119253A1B8BA514849A78,
Expand Down
5 changes: 2 additions & 3 deletions Builds/VisualStudio2022/KissOfShame_SharedCode.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,9 @@
<ItemGroup>
<ClCompile Include="..\..\Source\AudioProcessing\AudioUtils.cpp"/>
<ClCompile Include="..\..\Source\AudioProcessing\Granulate.cpp"/>
<ClCompile Include="..\..\Source\GUIUtilities\BacklightComponent.cpp"/>
<ClCompile Include="..\..\Source\GUIUtilities\CustomKnob.cpp"/>
<ClCompile Include="..\..\Source\GUIUtilities\EnvironmentsComponent.cpp"/>
<ClCompile Include="..\..\Source\GUIUtilities\ImageAnimator.cpp"/>
<ClCompile Include="..\..\Source\GUIUtilities\ImageInteractor.cpp"/>
<ClCompile Include="..\..\Source\Parameters.cpp"/>
<ClCompile Include="..\..\Source\PluginEditor.cpp"/>
<ClCompile Include="..\..\Source\PluginProcessor.cpp"/>
<ClCompile Include="C:\JUCE\modules\juce_audio_basics\audio_play_head\juce_AudioPlayHead.cpp">
Expand Down Expand Up @@ -2474,6 +2472,7 @@
<ClInclude Include="..\..\Source\GUIUtilities\ImageAnimationComponent.h"/>
<ClInclude Include="..\..\Source\GUIUtilities\ImageAnimator.h"/>
<ClInclude Include="..\..\Source\GUIUtilities\ImageInteractor.h"/>
<ClInclude Include="..\..\Source\Parameters.h"/>
<ClInclude Include="..\..\Source\PluginEditor.h"/>
<ClInclude Include="..\..\Source\PluginProcessor.h"/>
<ClInclude Include="..\..\Source\shameConfig.h"/>
Expand Down
15 changes: 6 additions & 9 deletions Builds/VisualStudio2022/KissOfShame_SharedCode.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -625,21 +625,15 @@
<ClCompile Include="..\..\Source\AudioProcessing\Granulate.cpp">
<Filter>KissOfShame\Source\AudioProcessing</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\GUIUtilities\BacklightComponent.cpp">
<Filter>KissOfShame\Source\GUIUtilities</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\GUIUtilities\CustomKnob.cpp">
<Filter>KissOfShame\Source\GUIUtilities</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\GUIUtilities\EnvironmentsComponent.cpp">
<Filter>KissOfShame\Source\GUIUtilities</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\GUIUtilities\ImageAnimator.cpp">
<Filter>KissOfShame\Source\GUIUtilities</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\GUIUtilities\ImageInteractor.cpp">
<Filter>KissOfShame\Source\GUIUtilities</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\Parameters.cpp">
<Filter>KissOfShame\Source</Filter>
</ClCompile>
<ClCompile Include="..\..\Source\PluginEditor.cpp">
<Filter>KissOfShame\Source</Filter>
</ClCompile>
Expand Down Expand Up @@ -3189,6 +3183,9 @@
<ClInclude Include="..\..\Source\GUIUtilities\ImageInteractor.h">
<Filter>KissOfShame\Source\GUIUtilities</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\Parameters.h">
<Filter>KissOfShame\Source</Filter>
</ClInclude>
<ClInclude Include="..\..\Source\PluginEditor.h">
<Filter>KissOfShame\Source</Filter>
</ClInclude>
Expand Down
8 changes: 2 additions & 6 deletions KissOfShame.jucer
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,23 @@
<FILE id="OZDTyP" name="Shame.h" compile="0" resource="0" file="Source/AudioProcessing/Shame.h"/>
</GROUP>
<GROUP id="{DD75611A-075D-2941-7361-14A374697CB9}" name="GUIUtilities">
<FILE id="Z4ZQ9p" name="BacklightComponent.cpp" compile="1" resource="0"
file="Source/GUIUtilities/BacklightComponent.cpp"/>
<FILE id="FP9e9G" name="BacklightComponent.h" compile="0" resource="0"
file="Source/GUIUtilities/BacklightComponent.h"/>
<FILE id="k8JLNa" name="CustomButton.h" compile="0" resource="0" file="Source/GUIUtilities/CustomButton.h"/>
<FILE id="jNjwRv" name="CustomKnob.cpp" compile="1" resource="0" file="Source/GUIUtilities/CustomKnob.cpp"/>
<FILE id="s0vJvZ" name="CustomKnob.h" compile="0" resource="0" file="Source/GUIUtilities/CustomKnob.h"/>
<FILE id="AKy6PO" name="EnvironmentsComponent.cpp" compile="1" resource="0"
file="Source/GUIUtilities/EnvironmentsComponent.cpp"/>
<FILE id="idGCDw" name="EnvironmentsComponent.h" compile="0" resource="0"
file="Source/GUIUtilities/EnvironmentsComponent.h"/>
<FILE id="IF8wYi" name="ImageAnimationComponent.h" compile="0" resource="0"
file="Source/GUIUtilities/ImageAnimationComponent.h"/>
<FILE id="QnLchj" name="ImageAnimator.cpp" compile="1" resource="0"
file="Source/GUIUtilities/ImageAnimator.cpp"/>
<FILE id="GpAnmn" name="ImageAnimator.h" compile="0" resource="0" file="Source/GUIUtilities/ImageAnimator.h"/>
<FILE id="VRxWrl" name="ImageInteractor.cpp" compile="1" resource="0"
file="Source/GUIUtilities/ImageInteractor.cpp"/>
<FILE id="d3vYfS" name="ImageInteractor.h" compile="0" resource="0"
file="Source/GUIUtilities/ImageInteractor.h"/>
</GROUP>
<FILE id="uF47bP" name="Parameters.cpp" compile="1" resource="0" file="Source/Parameters.cpp"/>
<FILE id="B3sTuH" name="Parameters.h" compile="0" resource="0" file="Source/Parameters.h"/>
<FILE id="XFFNVz" name="PluginEditor.cpp" compile="1" resource="0"
file="Source/PluginEditor.cpp"/>
<FILE id="rlfOcK" name="PluginEditor.h" compile="0" resource="0" file="Source/PluginEditor.h"/>
Expand Down
13 changes: 7 additions & 6 deletions Source/AudioProcessing/AudioGraph.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include "../shameConfig.h"
#include "../Parameters.h"
#include "Hiss.h"
#include "Shame.h"
#include "InputSaturation.h"
Expand All @@ -11,12 +12,11 @@
class AudioGraph
{
public:
AudioGraph()
AudioGraph(Parameters& params_) : params(params_)
{
shame.setInterpolatedParameters(0.0f);

currentEnvironment = eEnvironmentOff;
bypassGraph = false;
outputLevel = 1.0f;
inputDrive = 1.0f;
}
Expand All @@ -31,7 +31,7 @@ class AudioGraph

void processGraph(juce::AudioBuffer<float>& audioBuffer, int numChannels)
{
if (bypassGraph) return;
if (params.bypassed) return;

// Apply the input drive. This is a simple linear gain.
audioBuffer.applyGain(inputDrive);
Expand Down Expand Up @@ -110,7 +110,7 @@ class AudioGraph

bool isGraphBypassed() const noexcept
{
return bypassGraph;
return params.bypassed;
}

void setCurrentEnvironment(EShameEnvironments env)
Expand Down Expand Up @@ -143,7 +143,7 @@ class AudioGraph
case eHissLevel: hiss.setHissLevel(paramLevel); break;
case eBlendLevel: blend.setBlendLevel(paramLevel); break;
case eFlangeDepth: flange.setDepth(paramLevel); break;
case eBypass: bypassGraph = (paramLevel >= 0.5f); break;
// case eBypass: bypassGraph = (paramLevel >= 0.5f); break;
case eInputDrive: setInputDrive(paramLevel); break;
case eOutputLevel: setOutputLevel(paramLevel); break;

Expand All @@ -152,6 +152,8 @@ class AudioGraph
}

private:
Parameters& params;

juce::AudioBuffer<float> audioGraphProcessingBuffer;

InputSaturation inSaturation { 0.0f, 2.0f, 0.272f };
Expand All @@ -162,7 +164,6 @@ class AudioGraph
Blend blend;

EShameEnvironments currentEnvironment;
bool bypassGraph;
float inputDrive;
float outputLevel;
};
Loading

0 comments on commit b7aa37a

Please sign in to comment.