diff --git a/Delay Time Calculator.jucer b/Delay Time Calculator.jucer index 5f52a08..f84f51f 100644 --- a/Delay Time Calculator.jucer +++ b/Delay Time Calculator.jucer @@ -8,7 +8,7 @@ - + @@ -36,8 +36,10 @@ - - + + diff --git a/Font/Calisto MT b/Font/CalistoMT.ttf similarity index 100% rename from Font/Calisto MT rename to Font/CalistoMT.ttf diff --git a/README.md b/README.md index 3d69d62..1816122 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ A simple application that calculates delay and reverb pre-delay times based on t ## Features still to add: * Scaleable UI +* Embed custom font * Analyze MusicMath features * Remove slider and use a text box that can be changed by clicking and dragging? * Change to whole BPM values and use modifier buttons to access 1/10th notes (or any other method to access these values? @@ -33,6 +34,7 @@ A simple application that calculates delay and reverb pre-delay times based on t 2. Added option to display values in Hertz - to set LFOs on your synths 3. Added key support for changing from ms to Hz (using keys 'M' and 'H' respectively) 4. Made information section a text editor instead of a label so I can add more information to this and take advantage of scrolling, vesus having to make the GUI taller each line I add. +5. Switched font to Arial for the time being since I can't seem to figure how to embed fonts in JUCE. I wanted to get this update out to fix the current bugs, so I'm just using a 'safe' font that should be on everyone's system.' ### May 09, 2017 - V 1.3: 1. Keys: 1 = 1/2x, 2 = 2x, T = Tap Tempo, R = Reset Tap Tempo, Spacebar = Round Value, Up Arrow = +1, Down Arrow = -1, Right Arrow = +5, Left Arrow = -5; diff --git a/Source/EmbeddedFonts.cpp b/Source/EmbeddedFonts.cpp new file mode 100644 index 0000000..9ba2b0e --- /dev/null +++ b/Source/EmbeddedFonts.cpp @@ -0,0 +1,22 @@ +// +// EmbeddedFonts.cpp +// The Lyons' Den Delay Time Calculator +// +// Created by Joseph Lyons on 5/9/17. +// +// + +// Dismiss this file until future versions that will have embedded fonts + +#include "EmbeddedFonts.hpp" + +EmbeddedFonts::EmbeddedFonts() +{ + calistoMT = Font(Typeface::createSystemTypefaceFor(BinaryData::CalistoMT_ttf, + BinaryData::CalistoMT_ttfSize)); +} + +Font& EmbeddedFonts::getCalistoMT() +{ + return calistoMT; +} diff --git a/Source/EmbeddedFonts.hpp b/Source/EmbeddedFonts.hpp new file mode 100644 index 0000000..58ef49f --- /dev/null +++ b/Source/EmbeddedFonts.hpp @@ -0,0 +1,48 @@ +// +// EmbeddedFonts.hpp +// The Lyons' Den Delay Time Calculator +// +// Created by Joseph Lyons on 5/9/17. +// +// + +#ifndef EmbeddedFonts_hpp +#define EmbeddedFonts_hpp + +#include "../JuceLibraryCode/JuceHeader.h" + +// Dismiss this file until future versions that will have embedded fonts + +class EmbeddedFonts +{ +private: + static ScopedPointer instance_; + Font calistoMT; + +public: + EmbeddedFonts(); + + static EmbeddedFonts* instance() + { + static EmbeddedFonts instance; + return &instance; + } + + Font& getCalistoMT(); +}; + +//struct CalistoMT +//{ +// Font font; +// +// CalistoMT() +// { +// Typeface::Ptr ptr = Typeface::createSystemTypefaceFor(BinaryData::Calisto_MT, +// BinaryData::Calisto_MTSize); +// +// font = Font(ptr); +// } +//}; + + +#endif /* EmbeddedFonts_hpp */ diff --git a/Source/Fonts.cpp b/Source/Fonts.cpp deleted file mode 100644 index a493651..0000000 --- a/Source/Fonts.cpp +++ /dev/null @@ -1,15 +0,0 @@ -// -// Fonts.cpp -// The Lyons' Den Delay Time Calculator -// -// Created by Joseph Lyons on 5/9/17. -// -// - -#include "Fonts.hpp" - -Fonts::Fonts() -{ - calistoMT = Font(Typeface::createSystemTypefaceFor(BinaryData::Calisto_MT, - BinaryData::Calisto_MTSize)); -} diff --git a/Source/Fonts.hpp b/Source/Fonts.hpp deleted file mode 100644 index 624ba07..0000000 --- a/Source/Fonts.hpp +++ /dev/null @@ -1,37 +0,0 @@ -// -// Fonts.hpp -// The Lyons' Den Delay Time Calculator -// -// Created by Joseph Lyons on 5/9/17. -// -// - -#ifndef Fonts_hpp -#define Fonts_hpp - -#include "../JuceLibraryCode/JuceHeader.h" - -class Fonts -{ -private: - static ScopedPointer instance_; - - Font calistoMT; - -public: - Fonts(); - - virtual ~Fonts() {} - - Font& getCalistoMT() { return calistoMT; } - - static Fonts* instance() - { - static Fonts instance; - - return &instance; - } -}; - - -#endif /* Fonts_hpp */ diff --git a/Source/InformationComponent.cpp b/Source/InformationComponent.cpp index 8b64b73..8d8f512 100644 --- a/Source/InformationComponent.cpp +++ b/Source/InformationComponent.cpp @@ -34,7 +34,7 @@ InformationComponent::InformationComponent () addAndMakeVisible (informationLabel = new Label ("informationLabel", TRANS("Information"))); - informationLabel->setFont (Font ("Calisto MT", 47.40f, Font::plain).withTypefaceStyle ("Regular").withExtraKerningFactor (0.043f)); + informationLabel->setFont (Font ("Arial", 47.40f, Font::plain).withTypefaceStyle ("Regular").withExtraKerningFactor (0.043f)); informationLabel->setJustificationType (Justification::centred); informationLabel->setEditable (false, false, false); informationLabel->setColour (Label::textColourId, Colour (0xffadaaaa)); @@ -164,7 +164,7 @@ BEGIN_JUCER_METADATA