diff --git a/CMakeLists.txt b/CMakeLists.txt index 822faae9..301f98fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ include(PamplejuceMacOS) # This is the internal name of the project and the name of JUCE's shared code target # Note: This cannot have spaces (it may be 2024, but you can't have it all!) # Worry not, JUCE's PRODUCT_NAME can have spaces (and is what DAWs display) -set(PROJECT_NAME "Pamplejuce") +set(PROJECT_NAME "ProPhat") # Worry not, JUCE's PRODUCT_NAME can have spaces (and is what DAWs will display) # You can also just have it be the same thing as PROJECT_NAME @@ -21,13 +21,13 @@ set(PROJECT_NAME "Pamplejuce") # set(PROJECT_NAME "MyPlugin_v${MAJOR_VERSION}") # Doing so enables major versions to show up in IDEs and DAWs as separate plugins # allowing you to change parameters and behavior without breaking existing user projects -set(PRODUCT_NAME "Pamplejuce Demo") +set(PRODUCT_NAME "ProPhat") # Change me! Used for the MacOS bundle name and Installers -set(COMPANY_NAME "Pamplejuce Company") +set(COMPANY_NAME "BMP4") # Change me! Used for the MacOS bundle identifier (and signing) -set(BUNDLE_ID "com.pamplejuce.pamplejuce") +set(BUNDLE_ID "com.BMP4.ProPhat") # Change me! Set the plugin formats you want built # Valid choices: AAX Unity VST VST3 AU AUv3 Standalone @@ -66,12 +66,12 @@ juce_add_plugin("${PROJECT_NAME}" # Change me! # A four-character plugin id # First character MUST be uppercase for AU formats - PLUGIN_MANUFACTURER_CODE Pamp + PLUGIN_MANUFACTURER_CODE BMP4 # Change me! # A unique four-character plugin id # Note: this must have at least one upper-case character - PLUGIN_CODE P001 + PLUGIN_CODE Bvql FORMATS "${FORMATS}" # The name of your final executable @@ -154,3 +154,6 @@ include(Benchmarks) # Pass some config to GA (like our PRODUCT_NAME) include(GitHubENV) + +# add_compile_definitions(_SILENCE_ALL_CXX23_DEPRECATION_WARNINGS=1) #This silences a bunch of warnings shown by MSVC when building juce with c++23 +add_compile_definitions(JUCE_USE_CUSTOM_PLUGIN_STANDALONE_APP=1) diff --git a/zzz - bak/Assets/Poppins-Black.ttf b/assets/images/Poppins-Black.ttf similarity index 100% rename from zzz - bak/Assets/Poppins-Black.ttf rename to assets/images/Poppins-Black.ttf diff --git a/zzz - bak/Assets/Poppins-Medium.ttf b/assets/images/Poppins-Medium.ttf similarity index 100% rename from zzz - bak/Assets/Poppins-Medium.ttf rename to assets/images/Poppins-Medium.ttf diff --git a/zzz - bak/Assets/Poppins-Thin.ttf b/assets/images/Poppins-Thin.ttf similarity index 100% rename from zzz - bak/Assets/Poppins-Thin.ttf rename to assets/images/Poppins-Thin.ttf diff --git a/zzz - bak/Assets/ProPhatKnob.svg b/assets/images/ProPhatKnob.svg similarity index 100% rename from zzz - bak/Assets/ProPhatKnob.svg rename to assets/images/ProPhatKnob.svg diff --git a/zzz - bak/Assets/ProPhatKnobUniform.svg b/assets/images/ProPhatKnobUniform.svg similarity index 100% rename from zzz - bak/Assets/ProPhatKnobUniform.svg rename to assets/images/ProPhatKnobUniform.svg diff --git a/zzz - bak/Assets/blackLight.png b/assets/images/blackLight.png similarity index 100% rename from zzz - bak/Assets/blackLight.png rename to assets/images/blackLight.png diff --git a/zzz - bak/Assets/blackLight.svg b/assets/images/blackLight.svg similarity index 100% rename from zzz - bak/Assets/blackLight.svg rename to assets/images/blackLight.svg diff --git a/zzz - bak/Assets/blackMetal.jpg b/assets/images/blackMetal.jpg similarity index 100% rename from zzz - bak/Assets/blackMetal.jpg rename to assets/images/blackMetal.jpg diff --git a/zzz - bak/Assets/blackSquare.svg b/assets/images/blackSquare.svg similarity index 100% rename from zzz - bak/Assets/blackSquare.svg rename to assets/images/blackSquare.svg diff --git a/zzz - bak/Assets/blackTexture.jpg b/assets/images/blackTexture.jpg similarity index 100% rename from zzz - bak/Assets/blackTexture.jpg rename to assets/images/blackTexture.jpg diff --git a/zzz - bak/Assets/icon.png b/assets/images/icon.png similarity index 100% rename from zzz - bak/Assets/icon.png rename to assets/images/icon.png diff --git a/assets/images/icon.xcf b/assets/images/icon.xcf new file mode 100644 index 00000000..8c67e1de Binary files /dev/null and b/assets/images/icon.xcf differ diff --git a/zzz - bak/Assets/metalKnobFitted.png b/assets/images/metalKnobFitted.png similarity index 100% rename from zzz - bak/Assets/metalKnobFitted.png rename to assets/images/metalKnobFitted.png diff --git a/assets/images/pamplejuce.png b/assets/images/pamplejuce.png deleted file mode 100644 index 3d573e0f..00000000 Binary files a/assets/images/pamplejuce.png and /dev/null differ diff --git a/zzz - bak/Assets/phatKnob.svg b/assets/images/phatKnob.svg similarity index 100% rename from zzz - bak/Assets/phatKnob.svg rename to assets/images/phatKnob.svg diff --git a/zzz - bak/Assets/redLight.png b/assets/images/redLight.png similarity index 100% rename from zzz - bak/Assets/redLight.png rename to assets/images/redLight.png diff --git a/zzz - bak/Assets/redLight.svg b/assets/images/redLight.svg similarity index 100% rename from zzz - bak/Assets/redLight.svg rename to assets/images/redLight.svg diff --git a/zzz - bak/Assets/redSquare.svg b/assets/images/redSquare.svg similarity index 100% rename from zzz - bak/Assets/redSquare.svg rename to assets/images/redSquare.svg diff --git a/zzz - bak/Assets/redTexture.png b/assets/images/redTexture.png similarity index 100% rename from zzz - bak/Assets/redTexture.png rename to assets/images/redTexture.png diff --git a/benchmarks/Benchmarks.cpp b/benchmarks/Benchmarks.cpp index 17b90188..327d8633 100644 --- a/benchmarks/Benchmarks.cpp +++ b/benchmarks/Benchmarks.cpp @@ -1,4 +1,4 @@ -#include "PluginEditor.h" +#include "UI/ProPhatEditor.h" #include "catch2/benchmark/catch_benchmark_all.hpp" #include "catch2/catch_test_macros.hpp" @@ -8,7 +8,7 @@ TEST_CASE ("Boot performance") (Catch::Benchmark::Chronometer meter) { auto gui = juce::ScopedJuceInitialiser_GUI {}; - std::vector> storage (size_t (meter.runs())); + std::vector> storage (size_t (meter.runs())); meter.measure ([&] (int i) { storage[(size_t) i].construct(); }); }; @@ -16,7 +16,7 @@ TEST_CASE ("Boot performance") (Catch::Benchmark::Chronometer meter) { auto gui = juce::ScopedJuceInitialiser_GUI {}; - std::vector> storage (size_t (meter.runs())); + std::vector> storage (size_t (meter.runs())); for (auto& s : storage) s.construct(); meter.measure ([&] (int i) { storage[(size_t) i].destruct(); }); @@ -27,7 +27,7 @@ TEST_CASE ("Boot performance") { auto gui = juce::ScopedJuceInitialiser_GUI {}; - PluginProcessor plugin; + ProPhatProcessor plugin; // due to complex construction logic of the editor, let's measure open/close together meter.measure ([&] (int /* i */) { diff --git a/zzz - bak/Source/DSP/GainedOscillator.h b/source/DSP/GainedOscillator.h similarity index 100% rename from zzz - bak/Source/DSP/GainedOscillator.h rename to source/DSP/GainedOscillator.h diff --git a/zzz - bak/Source/DSP/PhatOscillators.h b/source/DSP/PhatOscillators.h similarity index 100% rename from zzz - bak/Source/DSP/PhatOscillators.h rename to source/DSP/PhatOscillators.h diff --git a/zzz - bak/Source/DSP/ProPhatProcessor.cpp b/source/DSP/ProPhatProcessor.cpp similarity index 100% rename from zzz - bak/Source/DSP/ProPhatProcessor.cpp rename to source/DSP/ProPhatProcessor.cpp diff --git a/zzz - bak/Source/DSP/ProPhatProcessor.h b/source/DSP/ProPhatProcessor.h similarity index 100% rename from zzz - bak/Source/DSP/ProPhatProcessor.h rename to source/DSP/ProPhatProcessor.h diff --git a/zzz - bak/Source/DSP/ProPhatSynthesiser.h b/source/DSP/ProPhatSynthesiser.h similarity index 100% rename from zzz - bak/Source/DSP/ProPhatSynthesiser.h rename to source/DSP/ProPhatSynthesiser.h diff --git a/zzz - bak/Source/DSP/ProPhatVoice.cpp b/source/DSP/ProPhatVoice.cpp similarity index 100% rename from zzz - bak/Source/DSP/ProPhatVoice.cpp rename to source/DSP/ProPhatVoice.cpp diff --git a/zzz - bak/Source/DSP/ProPhatVoice.h b/source/DSP/ProPhatVoice.h similarity index 100% rename from zzz - bak/Source/DSP/ProPhatVoice.h rename to source/DSP/ProPhatVoice.h diff --git a/source/PluginEditor.cpp b/source/PluginEditor.cpp deleted file mode 100644 index b12e1aba..00000000 --- a/source/PluginEditor.cpp +++ /dev/null @@ -1,48 +0,0 @@ -#include "PluginEditor.h" - -PluginEditor::PluginEditor (PluginProcessor& p) - : AudioProcessorEditor (&p), processorRef (p) -{ - juce::ignoreUnused (processorRef); - - addAndMakeVisible (inspectButton); - - // this chunk of code instantiates and opens the melatonin inspector - inspectButton.onClick = [&] { - if (!inspector) - { - inspector = std::make_unique (*this); - inspector->onClose = [this]() { inspector.reset(); }; - } - - inspector->setVisible (true); - }; - - // Make sure that before the constructor has finished, you've set the - // editor's size to whatever you need it to be. - setSize (400, 300); -} - -PluginEditor::~PluginEditor() -{ -} - -void PluginEditor::paint (juce::Graphics& g) -{ - // (Our component is opaque, so we must completely fill the background with a solid colour) - g.fillAll (getLookAndFeel().findColour (juce::ResizableWindow::backgroundColourId)); - - auto area = getLocalBounds(); - g.setColour (juce::Colours::white); - g.setFont (16.0f); - auto helloWorld = juce::String ("Hello from ") + PRODUCT_NAME_WITHOUT_VERSION + " v" VERSION + " running in " + CMAKE_BUILD_TYPE; - g.drawText (helloWorld, area.removeFromTop (150), juce::Justification::centred, false); -} - -void PluginEditor::resized() -{ - // layout the positions of your child components here - auto area = getLocalBounds(); - area.removeFromBottom(50); - inspectButton.setBounds (getLocalBounds().withSizeKeepingCentre(100, 50)); -} diff --git a/source/PluginEditor.h b/source/PluginEditor.h deleted file mode 100644 index 1f8e786e..00000000 --- a/source/PluginEditor.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "PluginProcessor.h" -#include "BinaryData.h" -#include "melatonin_inspector/melatonin_inspector.h" - -//============================================================================== -class PluginEditor : public juce::AudioProcessorEditor -{ -public: - explicit PluginEditor (PluginProcessor&); - ~PluginEditor() override; - - //============================================================================== - void paint (juce::Graphics&) override; - void resized() override; - -private: - // This reference is provided as a quick way for your editor to - // access the processor object that created it. - PluginProcessor& processorRef; - std::unique_ptr inspector; - juce::TextButton inspectButton { "Inspect the UI" }; - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PluginEditor) -}; diff --git a/source/PluginProcessor.cpp b/source/PluginProcessor.cpp deleted file mode 100644 index 16fe17c1..00000000 --- a/source/PluginProcessor.cpp +++ /dev/null @@ -1,186 +0,0 @@ -#include "PluginProcessor.h" -#include "PluginEditor.h" - -//============================================================================== -PluginProcessor::PluginProcessor() - : AudioProcessor (BusesProperties() - #if ! JucePlugin_IsMidiEffect - #if ! JucePlugin_IsSynth - .withInput ("Input", juce::AudioChannelSet::stereo(), true) - #endif - .withOutput ("Output", juce::AudioChannelSet::stereo(), true) - #endif - ) -{ -} - -PluginProcessor::~PluginProcessor() -{ -} - -//============================================================================== -const juce::String PluginProcessor::getName() const -{ - return JucePlugin_Name; -} - -bool PluginProcessor::acceptsMidi() const -{ - #if JucePlugin_WantsMidiInput - return true; - #else - return false; - #endif -} - -bool PluginProcessor::producesMidi() const -{ - #if JucePlugin_ProducesMidiOutput - return true; - #else - return false; - #endif -} - -bool PluginProcessor::isMidiEffect() const -{ - #if JucePlugin_IsMidiEffect - return true; - #else - return false; - #endif -} - -double PluginProcessor::getTailLengthSeconds() const -{ - return 0.0; -} - -int PluginProcessor::getNumPrograms() -{ - return 1; // NB: some hosts don't cope very well if you tell them there are 0 programs, - // so this should be at least 1, even if you're not really implementing programs. -} - -int PluginProcessor::getCurrentProgram() -{ - return 0; -} - -void PluginProcessor::setCurrentProgram (int index) -{ - juce::ignoreUnused (index); -} - -const juce::String PluginProcessor::getProgramName (int index) -{ - juce::ignoreUnused (index); - return {}; -} - -void PluginProcessor::changeProgramName (int index, const juce::String& newName) -{ - juce::ignoreUnused (index, newName); -} - -//============================================================================== -void PluginProcessor::prepareToPlay (double sampleRate, int samplesPerBlock) -{ - // Use this method as the place to do any pre-playback - // initialisation that you need.. - juce::ignoreUnused (sampleRate, samplesPerBlock); -} - -void PluginProcessor::releaseResources() -{ - // When playback stops, you can use this as an opportunity to free up any - // spare memory, etc. -} - -bool PluginProcessor::isBusesLayoutSupported (const BusesLayout& layouts) const -{ - #if JucePlugin_IsMidiEffect - juce::ignoreUnused (layouts); - return true; - #else - // This is the place where you check if the layout is supported. - // In this template code we only support mono or stereo. - if (layouts.getMainOutputChannelSet() != juce::AudioChannelSet::mono() - && layouts.getMainOutputChannelSet() != juce::AudioChannelSet::stereo()) - return false; - - // This checks if the input layout matches the output layout - #if ! JucePlugin_IsSynth - if (layouts.getMainOutputChannelSet() != layouts.getMainInputChannelSet()) - return false; - #endif - - return true; - #endif -} - -void PluginProcessor::processBlock (juce::AudioBuffer& buffer, - juce::MidiBuffer& midiMessages) -{ - juce::ignoreUnused (midiMessages); - - juce::ScopedNoDenormals noDenormals; - auto totalNumInputChannels = getTotalNumInputChannels(); - auto totalNumOutputChannels = getTotalNumOutputChannels(); - - // In case we have more outputs than inputs, this code clears any output - // channels that didn't contain input data, (because these aren't - // guaranteed to be empty - they may contain garbage). - // This is here to avoid people getting screaming feedback - // when they first compile a plugin, but obviously you don't need to keep - // this code if your algorithm always overwrites all the output channels. - for (auto i = totalNumInputChannels; i < totalNumOutputChannels; ++i) - buffer.clear (i, 0, buffer.getNumSamples()); - - // This is the place where you'd normally do the guts of your plugin's - // audio processing... - // Make sure to reset the state if your inner loop is processing - // the samples and the outer loop is handling the channels. - // Alternatively, you can process the samples with the channels - // interleaved by keeping the same state. - for (int channel = 0; channel < totalNumInputChannels; ++channel) - { - auto* channelData = buffer.getWritePointer (channel); - juce::ignoreUnused (channelData); - // ..do something to the data... - } -} - -//============================================================================== -bool PluginProcessor::hasEditor() const -{ - return true; // (change this to false if you choose to not supply an editor) -} - -juce::AudioProcessorEditor* PluginProcessor::createEditor() -{ - return new PluginEditor (*this); -} - -//============================================================================== -void PluginProcessor::getStateInformation (juce::MemoryBlock& destData) -{ - // You should use this method to store your parameters in the memory block. - // You could do that either as raw data, or use the XML or ValueTree classes - // as intermediaries to make it easy to save and load complex data. - juce::ignoreUnused (destData); -} - -void PluginProcessor::setStateInformation (const void* data, int sizeInBytes) -{ - // You should use this method to restore your parameters from this memory block, - // whose contents will have been created by the getStateInformation() call. - juce::ignoreUnused (data, sizeInBytes); -} - -//============================================================================== -// This creates new instances of the plugin.. -juce::AudioProcessor* JUCE_CALLTYPE createPluginFilter() -{ - return new PluginProcessor(); -} diff --git a/source/PluginProcessor.h b/source/PluginProcessor.h deleted file mode 100644 index 5c95cee3..00000000 --- a/source/PluginProcessor.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include - -#if (MSVC) -#include "ipps.h" -#endif - -class PluginProcessor : public juce::AudioProcessor -{ -public: - PluginProcessor(); - ~PluginProcessor() override; - - void prepareToPlay (double sampleRate, int samplesPerBlock) override; - void releaseResources() override; - - bool isBusesLayoutSupported (const BusesLayout& layouts) const override; - - void processBlock (juce::AudioBuffer&, juce::MidiBuffer&) override; - - juce::AudioProcessorEditor* createEditor() override; - bool hasEditor() const override; - - const juce::String getName() const override; - - bool acceptsMidi() const override; - bool producesMidi() const override; - bool isMidiEffect() const override; - double getTailLengthSeconds() const override; - - int getNumPrograms() override; - int getCurrentProgram() override; - void setCurrentProgram (int index) override; - const juce::String getProgramName (int index) override; - void changeProgramName (int index, const juce::String& newName) override; - - void getStateInformation (juce::MemoryBlock& destData) override; - void setStateInformation (const void* data, int sizeInBytes) override; - -private: - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PluginProcessor) -}; diff --git a/zzz - bak/Source/UI/ButtonGroupComponent.cpp b/source/UI/ButtonGroupComponent.cpp similarity index 100% rename from zzz - bak/Source/UI/ButtonGroupComponent.cpp rename to source/UI/ButtonGroupComponent.cpp diff --git a/zzz - bak/Source/UI/ButtonGroupComponent.h b/source/UI/ButtonGroupComponent.h similarity index 100% rename from zzz - bak/Source/UI/ButtonGroupComponent.h rename to source/UI/ButtonGroupComponent.h diff --git a/zzz - bak/Source/UI/ProPhatApplication.cpp b/source/UI/ProPhatApplication.cpp similarity index 100% rename from zzz - bak/Source/UI/ProPhatApplication.cpp rename to source/UI/ProPhatApplication.cpp diff --git a/zzz - bak/Source/UI/ProPhatApplication.h b/source/UI/ProPhatApplication.h similarity index 100% rename from zzz - bak/Source/UI/ProPhatApplication.h rename to source/UI/ProPhatApplication.h diff --git a/zzz - bak/Source/UI/ProPhatEditor.cpp b/source/UI/ProPhatEditor.cpp similarity index 100% rename from zzz - bak/Source/UI/ProPhatEditor.cpp rename to source/UI/ProPhatEditor.cpp diff --git a/zzz - bak/Source/UI/ProPhatEditor.h b/source/UI/ProPhatEditor.h similarity index 100% rename from zzz - bak/Source/UI/ProPhatEditor.h rename to source/UI/ProPhatEditor.h diff --git a/zzz - bak/Source/UI/ProPhatLookAndFeel.cpp b/source/UI/ProPhatLookAndFeel.cpp similarity index 100% rename from zzz - bak/Source/UI/ProPhatLookAndFeel.cpp rename to source/UI/ProPhatLookAndFeel.cpp diff --git a/zzz - bak/Source/UI/ProPhatLookAndFeel.h b/source/UI/ProPhatLookAndFeel.h similarity index 100% rename from zzz - bak/Source/UI/ProPhatLookAndFeel.h rename to source/UI/ProPhatLookAndFeel.h diff --git a/zzz - bak/Source/UI/ProPhatWindow.cpp b/source/UI/ProPhatWindow.cpp similarity index 97% rename from zzz - bak/Source/UI/ProPhatWindow.cpp rename to source/UI/ProPhatWindow.cpp index f6abbce1..70ad884a 100644 --- a/zzz - bak/Source/UI/ProPhatWindow.cpp +++ b/source/UI/ProPhatWindow.cpp @@ -17,8 +17,10 @@ */ #include "ProPhatWindow.h" -#if USE_NATIVE_TITLE_BAR && JUCE_WINDOWS -#include "dwmapi.h" +#define RESPOND_DARK_MODE JUCE_WINDOWS && 0 + +#if USE_NATIVE_TITLE_BAR && RESPOND_DARK_MODE + #include "dwmapi.h" #endif ProPhatWindow::ProPhatWindow (const juce::String& title, @@ -165,7 +167,7 @@ void ProPhatWindow::updateContent () #if USE_NATIVE_TITLE_BAR void ProPhatWindow::darkModeSettingChanged () { -#if JUCE_WINDOWS +#if RESPOND_DARK_MODE auto hwnd = getPeer ()->getNativeHandle (); BOOL USE_DARK_MODE = juce::Desktop::getInstance ().isDarkModeActive (); diff --git a/zzz - bak/Source/UI/ProPhatWindow.h b/source/UI/ProPhatWindow.h similarity index 96% rename from zzz - bak/Source/UI/ProPhatWindow.h rename to source/UI/ProPhatWindow.h index aa6f3bda..8ec86977 100644 --- a/zzz - bak/Source/UI/ProPhatWindow.h +++ b/source/UI/ProPhatWindow.h @@ -18,10 +18,17 @@ #pragma once -#include -#include "../submodules/JUCE/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h" +#include "juce_audio_basics/juce_audio_basics.h" +#include "juce_core/juce_core.h" + +#include "juce_audio_devices/juce_audio_devices.h" +#include "juce_audio_processors/juce_audio_processors.h" #include "../Utility/Macros.h" +#include "juce_audio_plugin_client/juce_audio_plugin_client.h" +#include +//#include "juce_audio_plugin_client/ + /** * @brief The main window when running the plugin in standalone mode. */ diff --git a/zzz - bak/Source/UI/SliderLabel.cpp b/source/UI/SliderLabel.cpp similarity index 100% rename from zzz - bak/Source/UI/SliderLabel.cpp rename to source/UI/SliderLabel.cpp diff --git a/zzz - bak/Source/UI/SliderLabel.h b/source/UI/SliderLabel.h similarity index 100% rename from zzz - bak/Source/UI/SliderLabel.h rename to source/UI/SliderLabel.h diff --git a/zzz - bak/Source/UI/SnappingSlider.cpp b/source/UI/SnappingSlider.cpp similarity index 100% rename from zzz - bak/Source/UI/SnappingSlider.cpp rename to source/UI/SnappingSlider.cpp diff --git a/zzz - bak/Source/UI/SnappingSlider.h b/source/UI/SnappingSlider.h similarity index 96% rename from zzz - bak/Source/UI/SnappingSlider.h rename to source/UI/SnappingSlider.h index 18d025c9..31264b1f 100644 --- a/zzz - bak/Source/UI/SnappingSlider.h +++ b/source/UI/SnappingSlider.h @@ -18,7 +18,7 @@ #pragma once -#include +#include "juce_gui_basics/juce_gui_basics.h" class SnappingSlider : public juce::Slider { diff --git a/zzz - bak/Source/Utility/Helpers.h b/source/Utility/Helpers.h similarity index 98% rename from zzz - bak/Source/Utility/Helpers.h rename to source/Utility/Helpers.h index eae70478..6ba73fa7 100644 --- a/zzz - bak/Source/Utility/Helpers.h +++ b/source/Utility/Helpers.h @@ -17,7 +17,10 @@ */ #pragma once -#include +#include "BinaryData.h" +#include "juce_audio_processors/juce_audio_processors.h" +#include "juce_core/juce_core.h" +#include "juce_dsp/juce_dsp.h" namespace Constants { diff --git a/zzz - bak/Source/Utility/Macros.h b/source/Utility/Macros.h similarity index 100% rename from zzz - bak/Source/Utility/Macros.h rename to source/Utility/Macros.h diff --git a/tests/PluginBasics.cpp b/tests/PluginBasics.cpp index 77e387bb..333b1afc 100644 --- a/tests/PluginBasics.cpp +++ b/tests/PluginBasics.cpp @@ -1,5 +1,5 @@ #include "helpers/test_helpers.h" -#include +#include #include #include @@ -10,7 +10,7 @@ TEST_CASE ("one is equal to one", "[dummy]") TEST_CASE ("Plugin instance", "[instance]") { - PluginProcessor testPlugin; + ProPhatProcessor testPlugin; // This lets us use JUCE's MessageManager without leaking. // PluginProcessor might need this if you use the APVTS for example. @@ -20,7 +20,7 @@ TEST_CASE ("Plugin instance", "[instance]") SECTION ("name") { CHECK_THAT (testPlugin.getName().toStdString(), - Catch::Matchers::Equals ("Pamplejuce Demo")); + Catch::Matchers::Equals ("ProPhat")); } } diff --git a/tests/helpers/test_helpers.h b/tests/helpers/test_helpers.h index 1292fc32..374e72df 100644 --- a/tests/helpers/test_helpers.h +++ b/tests/helpers/test_helpers.h @@ -1,5 +1,5 @@ #pragma once -#include +#include /* This is a helper function to run tests within the context of a plugin editor. * @@ -19,9 +19,9 @@ }); */ -[[maybe_unused]] void runWithinPluginEditor (const std::function& testCode) +[[maybe_unused]] void runWithinPluginEditor (const std::function& testCode) { - PluginProcessor plugin; + ProPhatProcessor plugin; auto gui = juce::ScopedJuceInitialiser_GUI {}; auto editor = plugin.createEditorIfNeeded();