From bece07828ae3cd935221933a58d3e7e624d69784 Mon Sep 17 00:00:00 2001 From: Abhinav Natarajan Date: Fri, 11 Nov 2022 19:12:58 +0530 Subject: [PATCH] tweak colours, change bypass text --- JuceLibraryCode/JuceHeader.h | 4 ++-- JuceLibraryCode/JuceLV2Defines.h | 5 ----- JuceLibraryCode/JucePluginDefines.h | 14 +++++++------- README.md | 6 +++--- Source/PluginEditor.cpp | 25 +++++++++++++++---------- Source/PluginEditor.h | 10 ++++------ Source/PluginProcessor.cpp | 2 +- Source/PluginProcessor.h | 2 +- Xfeed.jucer | 6 +++--- 9 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 JuceLibraryCode/JuceLV2Defines.h diff --git a/JuceLibraryCode/JuceHeader.h b/JuceLibraryCode/JuceHeader.h index fd1e5aa..0394bf0 100644 --- a/JuceLibraryCode/JuceHeader.h +++ b/JuceLibraryCode/JuceHeader.h @@ -44,7 +44,7 @@ namespace ProjectInfo { const char* const projectName = "Xfeed"; const char* const companyName = "Abhinav Natarajan"; - const char* const versionString = "0.1.1"; - const int versionNumber = 0x101; + const char* const versionString = "0.1.2"; + const int versionNumber = 0x102; } #endif diff --git a/JuceLibraryCode/JuceLV2Defines.h b/JuceLibraryCode/JuceLV2Defines.h deleted file mode 100644 index be4052a..0000000 --- a/JuceLibraryCode/JuceLV2Defines.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#ifndef JucePlugin_LV2URI - #define JucePlugin_LV2URI "abhinavnatarajan.org/plugins/Xfeed" -#endif diff --git a/JuceLibraryCode/JucePluginDefines.h b/JuceLibraryCode/JucePluginDefines.h index cf203b1..32229fa 100644 --- a/JuceLibraryCode/JucePluginDefines.h +++ b/JuceLibraryCode/JucePluginDefines.h @@ -17,10 +17,10 @@ #define JucePlugin_Build_VST3 1 #endif #ifndef JucePlugin_Build_AU - #define JucePlugin_Build_AU 1 + #define JucePlugin_Build_AU 0 #endif #ifndef JucePlugin_Build_AUv3 - #define JucePlugin_Build_AUv3 1 + #define JucePlugin_Build_AUv3 0 #endif #ifndef JucePlugin_Build_AAX #define JucePlugin_Build_AAX 0 @@ -32,7 +32,7 @@ #define JucePlugin_Build_Unity 0 #endif #ifndef JucePlugin_Build_LV2 - #define JucePlugin_Build_LV2 1 + #define JucePlugin_Build_LV2 0 #endif #ifndef JucePlugin_Enable_IAA #define JucePlugin_Enable_IAA 0 @@ -77,13 +77,13 @@ #define JucePlugin_EditorRequiresKeyboardFocus 0 #endif #ifndef JucePlugin_Version - #define JucePlugin_Version 0.1.1 + #define JucePlugin_Version 0.1.2 #endif #ifndef JucePlugin_VersionCode - #define JucePlugin_VersionCode 0x101 + #define JucePlugin_VersionCode 0x102 #endif #ifndef JucePlugin_VersionString - #define JucePlugin_VersionString "0.1.1" + #define JucePlugin_VersionString "0.1.2" #endif #ifndef JucePlugin_VSTUniqueID #define JucePlugin_VSTUniqueID JucePlugin_PluginCode @@ -155,7 +155,7 @@ #define JucePlugin_ARAFactoryID "com.AbhinavNatarajan.Xfeed.factory" #endif #ifndef JucePlugin_ARADocumentArchiveID - #define JucePlugin_ARADocumentArchiveID "com.AbhinavNatarajan.Xfeed.aradocumentarchive.0.1.0" + #define JucePlugin_ARADocumentArchiveID "com.AbhinavNatarajan.Xfeed.aradocumentarchive.0.1.1" #endif #ifndef JucePlugin_ARACompatibleArchiveIDs #define JucePlugin_ARACompatibleArchiveIDs "" diff --git a/README.md b/README.md index fc0de54..6c26fa3 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Xfeed is audio processing software for improving the experience of listening to [![Latest release][release-img]][release-url] ## Installation -There are multiple ways of using Xfeed. Dowload the VST3 plugin and/or Windows executable from the assets folder of the [latest release](https://github.com/abhinavnatarajan/Xfeed/releases). +There are multiple ways of using Xfeed. Dowload the VST3 plugin and/or Windows executable from the assets folder of the [latest release](https://github.com/abhinavnatarajan/Xfeed/releases/latest/). 1. To use the VST3 plugin, copy `Xfeed.vst3` into your VST3 folder. * On Windows this is usually `C:\Program Files\Common Files\VST3`. @@ -19,7 +19,7 @@ There are multiple ways of using Xfeed. Dowload the VST3 plugin and/or Windows e * You would like to build a standalone version for Mac OS. The source code for Xfeed includes the necessary files to create a standalone version on Mac. At the time of writing, I merely don't have a Mac to compile and build this standalone version. * You would like to build AAX, RTAS, or AU versions of Xfeed for use in Pro Tools. - Xfeed was built using the JUCE framework (v7.0.2) in C++ and compiled with MSVC C++20. The simplest way to generate the makefiles necessary to compile Xfeed is to use the program `Projucer.exe` (which is included with the JUCE library) to open `Xfeed.jucer` and generate the project structure. + Xfeed was built using the JUCE framework (v7.0.2) in C++ and compiled with MSVC C++20. Download the [source code](https://github.com/abhinavnatarajan/Xfeed/releases/latest/) and extract it. The simplest way to generate the makefiles necessary to compile Xfeed is to use the program `Projucer.exe` (which is included with the JUCE library) to open `Xfeed.jucer` and generate the project structure. ## Usage There are only three settings in Xfeed: @@ -56,5 +56,5 @@ There are only three settings in Xfeed: [//]: # (Add donation link) [release-img]: https://img.shields.io/github/v/release/abhinavnatarajan/Xfeed?display_name=tag&logo=SemVer&sort=semver -[release-url]: https://github.com/abhinavnatarajan/RedClust.jl/releases +[release-url]: https://github.com/abhinavnatarajan/Xfeed/releases diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp index 5d8a322..6259682 100644 --- a/Source/PluginEditor.cpp +++ b/Source/PluginEditor.cpp @@ -18,17 +18,21 @@ XfeedAudioProcessorEditor::XfeedAudioProcessorEditor (XfeedAudioProcessor& p) // Make sure that before the constructor has finished, you've set the // editor's size to whatever you need it to be. - // Set colours + // Set colours and labels bgcolour = juce::Colours::lightblue; - buttonOffColour = juce::Colour(0xff228b22); - buttonOnColour = juce::Colour(0xff42a2c8); + //buttonOffColour = juce::Colour(0xff228b22); + buttonOffColour = juce::Colours::darkseagreen; + //buttonOnColour = juce::Colour(0xff42a2c8); + buttonOnColour = juce::Colours::darksalmon; textColour = juce::Colour(0xff1e1e1e); textBoxBackgroundColour = juce::Colour(0xff263238); getLookAndFeel().setColour(juce::Label::textColourId, textColour); // labels getLookAndFeel().setColour(juce::Slider::textBoxBackgroundColourId, textBoxBackgroundColour); // slider text box background - getLookAndFeel().setColour(juce::TextButton::buttonColourId, buttonOffColour); // button engaged - getLookAndFeel().setColour(juce::TextButton::buttonOnColourId, buttonOnColour); // button disengaged - getLookAndFeel().setColour(juce::ComboBox::outlineColourId, juce::Colour(0x00000000)); // button outline + bypassButtonLookAndFeel.setColour(juce::TextButton::buttonColourId, buttonOffColour); // button engaged + bypassButtonLookAndFeel.setColour(juce::TextButton::buttonOnColourId, buttonOnColour); // button disengaged + bypassButtonLookAndFeel.setColour(juce::ComboBox::outlineColourId, juce::Colour(0x00000000)); // button outline + bypassButtonOnText = "Bypassed"; + bypassButtonOffText = "Active"; // Header addAndMakeVisible(&header); @@ -83,7 +87,8 @@ XfeedAudioProcessorEditor::XfeedAudioProcessorEditor (XfeedAudioProcessor& p) bypassButton.setToggleable(true); bypassButton.setToggleState(false, juce::sendNotification); bypassButton.setClickingTogglesState(true); - bypassButton.setButtonText("Bypass"); + bypassButton.setButtonText(bypassButtonOffText); + bypassButton.setLookAndFeel(&bypassButtonLookAndFeel); addAndMakeVisible(&bypassButton); bypassButton.addListener(this); @@ -110,13 +115,13 @@ void XfeedAudioProcessorEditor::buttonClicked(juce::Button* button) if (button == &bypassButton) { if (button->getToggleState()) { *(audioProcessor.bypass) = true; - button->setButtonText("Bypassed"); + button->setButtonText(bypassButtonOnText); } else { *(audioProcessor.bypass) = false; - button->setButtonText("Bypass"); + button->setButtonText(bypassButtonOffText); } - audioProcessor.updateBypassRamps(); + audioProcessor.updateBypassRamp(); } } diff --git a/Source/PluginEditor.h b/Source/PluginEditor.h index 60b72f1..96ebe94 100644 --- a/Source/PluginEditor.h +++ b/Source/PluginEditor.h @@ -32,13 +32,11 @@ class XfeedAudioProcessorEditor : public juce::AudioProcessorEditor, void sliderValueChanged(juce::Slider* slider) override; void buttonClicked(juce::Button* button) override; - //Drawable svg_drawable_play; - juce::Label header; - juce::Slider gainKnob; - juce::Label gainKnobLabel; - juce::Slider angleKnob; - juce::Label angleKnobLabel; + juce::Label header, gainKnobLabel, angleKnobLabel;; + juce::Slider gainKnob, angleKnob; juce::TextButton bypassButton; + juce::LookAndFeel_V4 bypassButtonLookAndFeel; + juce::String bypassButtonOffText, bypassButtonOnText; juce::Colour bgcolour, buttonOnColour, buttonOffColour, textColour, textBoxBackgroundColour; diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp index e4dc776..875e9aa 100644 --- a/Source/PluginProcessor.cpp +++ b/Source/PluginProcessor.cpp @@ -339,7 +339,7 @@ void XfeedAudioProcessor::updateFilterCoeffs(float sampleRate) gain = juce::Decibels::decibelsToGain(static_cast(*gaindB)); } -void XfeedAudioProcessor::updateBypassRamps() { +void XfeedAudioProcessor::updateBypassRamp() { if (*bypass) { wetLevel.setTargetValue(0.0f); dryLevel.setTargetValue(1.0f); diff --git a/Source/PluginProcessor.h b/Source/PluginProcessor.h index 1856eb6..6b87d96 100644 --- a/Source/PluginProcessor.h +++ b/Source/PluginProcessor.h @@ -65,7 +65,7 @@ class XfeedAudioProcessor : public juce::AudioProcessor juce::AudioParameterBool* bypass; void updateFilterCoeffs(float sampleRate); - void updateBypassRamps(); + void updateBypassRamp(); private: float gain; diff --git a/Xfeed.jucer b/Xfeed.jucer index 4722de2..f7aff90 100644 --- a/Xfeed.jucer +++ b/Xfeed.jucer @@ -1,8 +1,8 @@ - +