From be2fa7f1851ec72df6cf495f4cab43e25b7ddf92 Mon Sep 17 00:00:00 2001 From: polygon Date: Sat, 28 Oct 2023 21:43:34 +0200 Subject: [PATCH 1/2] Linux adaptations --- CMakeLists.txt | 36 +++++++++++++----- Lib/Components/Knob.cpp | 2 +- Lib/Components/MinMaxNoteSlider.cpp | 2 +- Lib/Components/QuantizeForceSlider.cpp | 2 +- Lib/Components/UIDefines.cpp | 11 ++++++ Lib/Components/UIDefines.h | 38 ++++++++++++------- NeuralNote/PluginSources/PluginEditor.cpp | 2 +- NeuralNote/Source/Components/AudioRegion.cpp | 2 +- NeuralNote/Source/Components/MidiFileDrag.cpp | 2 +- NeuralNote/Source/Components/NeuralNoteLNF.h | 8 ++-- .../Source/Components/NeuralNoteMainView.cpp | 2 +- .../Components/Views/NoteOptionsView.cpp | 4 +- .../Components/Views/RhythmOptionsView.cpp | 4 +- .../Views/TranscriptionOptionsView.cpp | 4 +- .../Components/Views/VisualizationPanel.cpp | 4 +- 15 files changed, 81 insertions(+), 42 deletions(-) create mode 100644 Lib/Components/UIDefines.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 47ee216..9982dd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,21 +129,37 @@ elseif (WIN32) MAP_IMPORTED_CONFIG_MINSIZEREL Release MAP_IMPORTED_CONFIG_RELWITHDEBINFO Release ) +elseif (UNIX) + set_property(TARGET onnxruntime PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/ThirdParty/onnxruntime/lib/libonnxruntime.a) endif () target_include_directories("${BaseTargetName}" PRIVATE ${CMAKE_CURRENT_LIST_DIR}/ThirdParty/onnxruntime/include) -target_link_libraries(${BaseTargetName} - PRIVATE - juce::juce_audio_utils - juce::juce_dsp - BasicPitchCNN - onnxruntime - bin_data - PUBLIC - juce_recommended_config_flags - juce_recommended_lto_flags) +if (UNIX AND NOT APPLE) + target_link_libraries(${BaseTargetName} + PRIVATE + juce::juce_audio_utils + juce::juce_dsp + BasicPitchCNN + onnxruntime + bin_data + PUBLIC + juce_recommended_config_flags + ) +else () + target_link_libraries(${BaseTargetName} + PRIVATE + juce::juce_audio_utils + juce::juce_dsp + BasicPitchCNN + onnxruntime + bin_data + PUBLIC + juce_recommended_config_flags + juce_recommended_lto_flags + ) +endif () # juce_recommended_warning_flags) if (BUILD_UNIT_TESTS) diff --git a/Lib/Components/Knob.cpp b/Lib/Components/Knob.cpp index 2ffc451..9b20f64 100644 --- a/Lib/Components/Knob.cpp +++ b/Lib/Components/Knob.cpp @@ -55,7 +55,7 @@ void Knob::paint(Graphics& g) mSlider.setAlpha(alpha); g.setColour(juce::Colours::black.withAlpha(alpha)); - g.setFont(LABEL_FONT); + g.setFont(UIFonts::get().LABEL_FONT()); if (!mIsMouseOver || !isEnabled()) { g.drawMultiLineText(mLabel, 0, 73, 66, juce::Justification::centred, 0.0f); diff --git a/Lib/Components/MinMaxNoteSlider.cpp b/Lib/Components/MinMaxNoteSlider.cpp index f7656bd..624756b 100644 --- a/Lib/Components/MinMaxNoteSlider.cpp +++ b/Lib/Components/MinMaxNoteSlider.cpp @@ -34,7 +34,7 @@ void MinMaxNoteSlider::resized() void MinMaxNoteSlider::paint(Graphics& g) { g.setColour(juce::Colours::black); - g.setFont(DROPDOWN_FONT); + g.setFont(UIFonts::get().DROPDOWN_FONT()); g.drawText(NoteUtils::midiNoteToStr(int(mSlider.getMinValue())), Rectangle(0, 0, 22, 12), diff --git a/Lib/Components/QuantizeForceSlider.cpp b/Lib/Components/QuantizeForceSlider.cpp index e74bb9f..1f4e263 100644 --- a/Lib/Components/QuantizeForceSlider.cpp +++ b/Lib/Components/QuantizeForceSlider.cpp @@ -31,7 +31,7 @@ void QuantizeForceSlider::resized() void QuantizeForceSlider::paint(Graphics& g) { g.setColour(juce::Colours::black); - g.setFont(DROPDOWN_FONT); + g.setFont(UIFonts::get().DROPDOWN_FONT()); g.drawText( std::to_string(int(mSlider.getValue())), Rectangle(133, 0, 23, 17), juce::Justification::centredRight); diff --git a/Lib/Components/UIDefines.cpp b/Lib/Components/UIDefines.cpp new file mode 100644 index 0000000..a59c072 --- /dev/null +++ b/Lib/Components/UIDefines.cpp @@ -0,0 +1,11 @@ +#include "UIDefines.h" + +UIFonts* UIFonts::fts = nullptr;; + +UIFonts& UIFonts::get() { + if (nullptr == fts) { + fts = new UIFonts(); + } + + return *fts; + } diff --git a/Lib/Components/UIDefines.h b/Lib/Components/UIDefines.h index 7890e31..17f26d7 100644 --- a/Lib/Components/UIDefines.h +++ b/Lib/Components/UIDefines.h @@ -9,20 +9,32 @@ #include "BinaryData.h" // Fonts -const juce::Typeface::Ptr MONTSERRAT_BOLD = - juce::Typeface::createSystemTypefaceFor(BinaryData::MontserratBold_ttf, BinaryData::MontserratBold_ttfSize); -const juce::Typeface::Ptr MONTSERRAT_SEMIBOLD = - juce::Typeface::createSystemTypefaceFor(BinaryData::MontserratSemiBold_ttf, BinaryData::MontserratSemiBold_ttfSize); - -const juce::Typeface::Ptr MONTSERRAT_REGULAR = - juce::Typeface::createSystemTypefaceFor(BinaryData::MontserratRegular_ttf, BinaryData::MontserratRegular_ttfSize); - -const Font TITLE_FONT = Font(MONTSERRAT_BOLD).withPointHeight(18.0f); -const Font LARGE_FONT = Font(MONTSERRAT_BOLD).withPointHeight(20.0f); -const Font LABEL_FONT = Font(MONTSERRAT_SEMIBOLD).withPointHeight(10.0f); -const Font DROPDOWN_FONT = Font(MONTSERRAT_REGULAR).withPointHeight(10.0f); -const Font BUTTON_FONT = Font(MONTSERRAT_BOLD).withPointHeight(12.0f); +class UIFonts { +public: + static UIFonts& get(); + + Font TITLE_FONT() { return Font(pMONTSERRAT_BOLD).withPointHeight(18.0f); } + Font LARGE_FONT() { return Font(pMONTSERRAT_BOLD).withPointHeight(20.0f); } + Font LABEL_FONT() { return Font(pMONTSERRAT_SEMIBOLD).withPointHeight(10.0f); } + Font DROPDOWN_FONT() { return Font(pMONTSERRAT_REGULAR).withPointHeight(10.0f); } + Font BUTTON_FONT() { return Font(pMONTSERRAT_BOLD).withPointHeight(12.0f); } + juce::Typeface::Ptr MONTSERRAT_BOLD() { return pMONTSERRAT_BOLD; } + juce::Typeface::Ptr MONTSERRAT_SEMIBOLD() { return pMONTSERRAT_SEMIBOLD; } + juce::Typeface::Ptr MONTSERRAT_REGULAR() { return pMONTSERRAT_REGULAR; } +protected: + UIFonts() : + pMONTSERRAT_BOLD(juce::Typeface::createSystemTypefaceFor(BinaryData::MontserratBold_ttf, BinaryData::MontserratBold_ttfSize)), + pMONTSERRAT_SEMIBOLD(juce::Typeface::createSystemTypefaceFor(BinaryData::MontserratSemiBold_ttf, BinaryData::MontserratSemiBold_ttfSize)), + pMONTSERRAT_REGULAR(juce::Typeface::createSystemTypefaceFor(BinaryData::MontserratRegular_ttf, BinaryData::MontserratRegular_ttfSize)) + { } + static UIFonts* fts; + +private: + juce::Typeface::Ptr pMONTSERRAT_BOLD; + juce::Typeface::Ptr pMONTSERRAT_SEMIBOLD; + juce::Typeface::Ptr pMONTSERRAT_REGULAR; +}; // Colors static const juce::Colour BLACK(juce::uint8(14), juce::uint8(14), juce::uint8(14)); diff --git a/NeuralNote/PluginSources/PluginEditor.cpp b/NeuralNote/PluginSources/PluginEditor.cpp index 795c1a5..f49ad04 100644 --- a/NeuralNote/PluginSources/PluginEditor.cpp +++ b/NeuralNote/PluginSources/PluginEditor.cpp @@ -9,7 +9,7 @@ NeuralNoteEditor::NeuralNoteEditor(NeuralNoteAudioProcessor& p) addAndMakeVisible(*mMainView); setSize(1000, 640); - getLookAndFeel().setDefaultSansSerifTypeface(MONTSERRAT_REGULAR); + getLookAndFeel().setDefaultSansSerifTypeface(UIFonts::get().MONTSERRAT_REGULAR()); mMainView->setLookAndFeel(&mNeuralNoteLnF); } diff --git a/NeuralNote/Source/Components/AudioRegion.cpp b/NeuralNote/Source/Components/AudioRegion.cpp index a34339d..9314e29 100644 --- a/NeuralNote/Source/Components/AudioRegion.cpp +++ b/NeuralNote/Source/Components/AudioRegion.cpp @@ -51,7 +51,7 @@ void AudioRegion::paint(Graphics& g) g.fillRoundedRectangle(getLocalBounds().toFloat(), 4.0f); g.setColour(BLACK); - g.setFont(LARGE_FONT); + g.setFont(UIFonts::get().LARGE_FONT()); if (mIsFileOver) g.drawText("YUMMY!", getLocalBounds(), juce::Justification::centred); diff --git a/NeuralNote/Source/Components/MidiFileDrag.cpp b/NeuralNote/Source/Components/MidiFileDrag.cpp index e13ef4c..d050c14 100644 --- a/NeuralNote/Source/Components/MidiFileDrag.cpp +++ b/NeuralNote/Source/Components/MidiFileDrag.cpp @@ -26,7 +26,7 @@ void MidiFileDrag::paint(Graphics& g) g.fillRoundedRectangle(getLocalBounds().toFloat(), 4.0f); g.setColour(BLACK); - g.setFont(LABEL_FONT); + g.setFont(UIFonts::get().LABEL_FONT()); g.drawText("DRAG THE MIDI FILE FROM HERE", getLocalBounds(), juce::Justification::centred); } diff --git a/NeuralNote/Source/Components/NeuralNoteLNF.h b/NeuralNote/Source/Components/NeuralNoteLNF.h index ada5129..0a81547 100644 --- a/NeuralNote/Source/Components/NeuralNoteLNF.h +++ b/NeuralNote/Source/Components/NeuralNoteLNF.h @@ -13,13 +13,13 @@ class NeuralNoteLNF : public juce::LookAndFeel_V4 public: NeuralNoteLNF(); - Font getComboBoxFont(ComboBox& /*box*/) override { return LABEL_FONT; } + Font getComboBoxFont(ComboBox& /*box*/) override { return UIFonts::get().LABEL_FONT(); } - Font getPopupMenuFont() override { return LABEL_FONT; } + Font getPopupMenuFont() override { return UIFonts::get().LABEL_FONT(); } - Font getTextButtonFont(TextButton&, int buttonHeight) override { return LARGE_FONT; }; + Font getTextButtonFont(TextButton&, int buttonHeight) override { return UIFonts::get().LARGE_FONT(); }; - Font getLabelFont(juce::Label&) override { return DROPDOWN_FONT; }; + Font getLabelFont(juce::Label&) override { return UIFonts::get().DROPDOWN_FONT(); }; void drawRotarySlider(Graphics&, int x, diff --git a/NeuralNote/Source/Components/NeuralNoteMainView.cpp b/NeuralNote/Source/Components/NeuralNoteMainView.cpp index 188e124..ab31869 100644 --- a/NeuralNote/Source/Components/NeuralNoteMainView.cpp +++ b/NeuralNote/Source/Components/NeuralNoteMainView.cpp @@ -159,7 +159,7 @@ void NeuralNoteMainView::paint(Graphics& g) auto background_image = juce::ImageCache::getFromMemory(BinaryData::background_png, BinaryData::background_pngSize); g.drawImage(background_image, getLocalBounds().toFloat()); - g.setFont(LABEL_FONT); + g.setFont(UIFonts::get().LABEL_FONT()); g.drawFittedText("MUTE OUT", juce::Rectangle(939, 63, 31, 23), juce::Justification::centred, 2); } diff --git a/NeuralNote/Source/Components/Views/NoteOptionsView.cpp b/NeuralNote/Source/Components/Views/NoteOptionsView.cpp index bcee04b..8fa0211 100644 --- a/NeuralNote/Source/Components/Views/NoteOptionsView.cpp +++ b/NeuralNote/Source/Components/Views/NoteOptionsView.cpp @@ -74,7 +74,7 @@ void NoteOptionsView::paint(Graphics& g) mMinMaxNoteSlider->setAlpha(alpha); g.setColour(BLACK.withAlpha(alpha)); - g.setFont(TITLE_FONT); + g.setFont(UIFonts::get().TITLE_FONT()); g.drawText("SCALE QUANTIZE", Rectangle(24, 0, 274, 17), juce::Justification::centredLeft); auto enable_rectangle = juce::Rectangle(0, 0, 17, 17); @@ -83,7 +83,7 @@ void NoteOptionsView::paint(Graphics& g) else g.drawRoundedRectangle(enable_rectangle.toFloat(), 4.0f, 1.0f); - g.setFont(LABEL_FONT); + g.setFont(UIFonts::get().LABEL_FONT()); g.drawText("RANGE", juce::Rectangle(19, mMinMaxNoteSlider->getY(), 80, 17), juce::Justification::centredLeft); g.drawText("KEY", juce::Rectangle(19, mKeyDropdown->getY(), 80, 17), juce::Justification::centredLeft); diff --git a/NeuralNote/Source/Components/Views/RhythmOptionsView.cpp b/NeuralNote/Source/Components/Views/RhythmOptionsView.cpp index 08e20c4..4002e97 100644 --- a/NeuralNote/Source/Components/Views/RhythmOptionsView.cpp +++ b/NeuralNote/Source/Components/Views/RhythmOptionsView.cpp @@ -44,7 +44,7 @@ void RhythmOptionsView::paint(Graphics& g) mQuantizationForceSlider->setAlpha(alpha); g.setColour(BLACK.withAlpha(alpha)); - g.setFont(TITLE_FONT); + g.setFont(UIFonts::get().TITLE_FONT()); g.drawText("TIME QUANTIZE", Rectangle(24, 0, 210, 17), juce::Justification::centredLeft); auto enable_rectangle = juce::Rectangle(0, 0, 17, 17); @@ -53,7 +53,7 @@ void RhythmOptionsView::paint(Graphics& g) else g.drawRoundedRectangle(enable_rectangle.toFloat(), 4.0f, 1.0f); - g.setFont(LABEL_FONT); + g.setFont(UIFonts::get().LABEL_FONT()); g.drawText("TEMPO " + mProcessor.getTempoStr(), juce::Rectangle(19, LEFT_SECTIONS_TOP_PAD + 47, 75, 10), diff --git a/NeuralNote/Source/Components/Views/TranscriptionOptionsView.cpp b/NeuralNote/Source/Components/Views/TranscriptionOptionsView.cpp index 0a0763a..2791ffd 100644 --- a/NeuralNote/Source/Components/Views/TranscriptionOptionsView.cpp +++ b/NeuralNote/Source/Components/Views/TranscriptionOptionsView.cpp @@ -73,7 +73,7 @@ void TranscriptionOptionsView::paint(Graphics& g) float alpha = isEnabled() ? 1.0f : 0.5f; g.setColour(BLACK.withAlpha(alpha)); - g.setFont(TITLE_FONT); + g.setFont(UIFonts::get().TITLE_FONT()); g.drawText("TRANSCRIPTION", Rectangle(24, 0, 250, 17), juce::Justification::centredLeft); auto enable_rectangle = juce::Rectangle(0, 0, 17, 17); @@ -82,7 +82,7 @@ void TranscriptionOptionsView::paint(Graphics& g) else g.drawRoundedRectangle(enable_rectangle.toFloat(), 4.0f, 1.0f); - g.setFont(LABEL_FONT); + g.setFont(UIFonts::get().LABEL_FONT()); g.drawText( "PITCH BEND", juce::Rectangle(19, mPitchBendDropDown->getY(), 67, 17), juce::Justification::centredLeft); } diff --git a/NeuralNote/Source/Components/Views/VisualizationPanel.cpp b/NeuralNote/Source/Components/Views/VisualizationPanel.cpp index e8fd53e..9b55988 100644 --- a/NeuralNote/Source/Components/Views/VisualizationPanel.cpp +++ b/NeuralNote/Source/Components/Views/VisualizationPanel.cpp @@ -23,7 +23,7 @@ VisualizationPanel::VisualizationPanel(NeuralNoteAudioProcessor* processor) mFileTempo->setMultiLine(false, false); mFileTempo->setReadOnly(false); - mFileTempo->setFont(LABEL_FONT); + mFileTempo->setFont(UIFonts::get().LABEL_FONT()); mFileTempo->setJustification(juce::Justification::centred); mFileTempo->setColour(TextEditor::backgroundColourId, juce::Colours::transparentWhite); @@ -110,7 +110,7 @@ void VisualizationPanel::paint(Graphics& g) Rectangle(0, 0, KEYBOARD_WIDTH, mCombinedAudioMidiRegion.mAudioRegionHeight).toFloat(), 4); g.setColour(BLACK); - g.setFont(LABEL_FONT); + g.setFont(UIFonts::get().LABEL_FONT()); g.drawFittedText( "MIDI\nFILE\nTEMPO", Rectangle(0, 0, KEYBOARD_WIDTH, 55), juce::Justification::centred, 3); } From 162e2c93083358c9e3e4c0bd9ff4f4016ead2c32 Mon Sep 17 00:00:00 2001 From: polygon Date: Wed, 1 Nov 2023 09:56:28 +0100 Subject: [PATCH 2/2] Create folder in temp for NeuralNote Avoids NeuralNote attemtping to delete the whole assigned temp directory --- NeuralNote/Source/Components/MidiFileDrag.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuralNote/Source/Components/MidiFileDrag.h b/NeuralNote/Source/Components/MidiFileDrag.h index 35ae0c3..89c5dfe 100644 --- a/NeuralNote/Source/Components/MidiFileDrag.h +++ b/NeuralNote/Source/Components/MidiFileDrag.h @@ -31,7 +31,7 @@ class MidiFileDrag : public Component private: NeuralNoteAudioProcessor* mProcessor; - juce::File mTempDirectory = juce::File::getSpecialLocation(juce::File::tempDirectory); + juce::File mTempDirectory = juce::File::getSpecialLocation(juce::File::tempDirectory).getChildFile("neuralnote"); MidiFileWriter mMidiFileWriter; };