Skip to content

Commit

Permalink
tweak colours, change bypass text
Browse files Browse the repository at this point in the history
  • Loading branch information
abhinavnatarajan committed Nov 11, 2022
1 parent fb92ac9 commit 36f6cc7
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 38 deletions.
4 changes: 2 additions & 2 deletions JuceLibraryCode/JuceHeader.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions JuceLibraryCode/JuceLV2Defines.h

This file was deleted.

14 changes: 7 additions & 7 deletions JuceLibraryCode/JucePluginDefines.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 ""
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand All @@ -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:
Expand Down Expand Up @@ -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

25 changes: 15 additions & 10 deletions Source/PluginEditor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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::forestgreen;
//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);
Expand Down Expand Up @@ -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);

Expand All @@ -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();
}
}

Expand Down
10 changes: 4 additions & 6 deletions Source/PluginEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Source/PluginProcessor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ void XfeedAudioProcessor::updateFilterCoeffs(float sampleRate)
gain = juce::Decibels::decibelsToGain(static_cast<float>(*gaindB));
}

void XfeedAudioProcessor::updateBypassRamps() {
void XfeedAudioProcessor::updateBypassRamp() {
if (*bypass) {
wetLevel.setTargetValue(0.0f);
dryLevel.setTargetValue(1.0f);
Expand Down
2 changes: 1 addition & 1 deletion Source/PluginProcessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class XfeedAudioProcessor : public juce::AudioProcessor
juce::AudioParameterBool* bypass;

void updateFilterCoeffs(float sampleRate);
void updateBypassRamps();
void updateBypassRamp();

private:
float gain;
Expand Down
6 changes: 3 additions & 3 deletions Xfeed.jucer
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="ouCn2y" name="Xfeed" projectType="audioplug" useAppConfig="0"
addUsingNamespaceToJuceHeader="0" jucerFormatVersion="1" version="0.1.1"
companyWebsite="abhinavnatarajan.org" pluginFormats="buildAU,buildAUv3,buildLV2,buildStandalone,buildVST3"
addUsingNamespaceToJuceHeader="0" jucerFormatVersion="1" version="0.1.2"
companyWebsite="abhinavnatarajan.org" pluginFormats="buildStandalone,buildVST3"
pluginVST3Category="Fx,Spatial,Stereo,Tools" cppLanguageStandard="20"
pluginAUIsSandboxSafe="1" pluginManufacturer="Abhinav Natarajan"
pluginDesc="Crossfeed for externalisation of headphone audio"
Expand Down Expand Up @@ -50,7 +50,7 @@
<VS2022 targetFolder="Builds/VisualStudio2022" smallIcon="" bigIcon="I8ao0z">
<CONFIGURATIONS>
<CONFIGURATION isDebug="1" name="Debug" targetName="Xfeed"/>
<CONFIGURATION isDebug="0" name="Release" targetName="Xfeed" enablePluginBinaryCopyStep="0"/>
<CONFIGURATION isDebug="0" name="Release" targetName="Xfeed" vst3BinaryLocation="%CommonProgramW6432%\VST3"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_audio_basics" path="../../../../../../../juce-7.0.2-windows/JUCE/modules"/>
Expand Down

0 comments on commit 36f6cc7

Please sign in to comment.