Skip to content

Commit

Permalink
Add about page, upf logo and increase version to 0.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@ffont
ffont committed Feb 11, 2021
1 parent 6c41e44 commit 2fe2ae7
Show file tree
Hide file tree
Showing 18 changed files with 108 additions and 61 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ freesound_api_key.py
recent_queries_and_filters.json
sound_usage_log
tokens.json
sm_settings.json
sm_settings.json
last_commit_info
4 changes: 2 additions & 2 deletions SourceSampler/Builds/ELKAudioOS/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ifeq ($(CONFIG),Debug)
TARGET_ARCH :=
endif

JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCER_LINUX_MAKE_84E12380=1" "-DJUCE_APP_VERSION=0.2" "-DJUCE_APP_VERSION_HEX=0x200" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I$(HOME)/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I/code/VST2_SDK -I../../JuceLibraryCode -I$(HOME)/JUCE/modules -I/workdir/sysroots/aarch64-elk-linux/usr/include/freetype2/ -I../../3rdParty/cpp-httplib/ -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ $(CPPFLAGS)
JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCER_LINUX_MAKE_84E12380=1" "-DJUCE_APP_VERSION=0.4" "-DJUCE_APP_VERSION_HEX=0x400" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I$(HOME)/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I/code/VST2_SDK -I../../JuceLibraryCode -I$(HOME)/JUCE/modules -I/workdir/sysroots/aarch64-elk-linux/usr/include/freetype2/ -I../../3rdParty/cpp-httplib/ -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ $(CPPFLAGS)

JUCE_CPPFLAGS_VST := "-DJucePlugin_Build_VST=1" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0"
JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden
Expand Down Expand Up @@ -77,7 +77,7 @@ ifeq ($(CONFIG),Release)
TARGET_ARCH :=
endif

JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_84E12380=1" "-DJUCE_APP_VERSION=0.2" "-DJUCE_APP_VERSION_HEX=0x200" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I$(HOME)/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I/code/VST2_SDK -I../../JuceLibraryCode -I$(HOME)/JUCE/modules -I/workdir/sysroots/aarch64-elk-linux/usr/include/freetype2/ -I../../3rdParty/cpp-httplib/ -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ $(CPPFLAGS)
JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCER_LINUX_MAKE_84E12380=1" "-DJUCE_APP_VERSION=0.4" "-DJUCE_APP_VERSION_HEX=0x400" $(shell pkg-config --cflags alsa freetype2 libcurl webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I$(HOME)/JUCE/modules/juce_audio_processors/format_types/VST3_SDK -I/code/VST2_SDK -I../../JuceLibraryCode -I$(HOME)/JUCE/modules -I/workdir/sysroots/aarch64-elk-linux/usr/include/freetype2/ -I../../3rdParty/cpp-httplib/ -I../../3rdParty/ff_meters/LevelMeter/ -I../../3rdParty/twine/include/ $(CPPFLAGS)

JUCE_CPPFLAGS_VST := "-DJucePlugin_Build_VST=1" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0"
JUCE_CFLAGS_VST := -fPIC -fvisibility=hidden
Expand Down
8 changes: 4 additions & 4 deletions SourceSampler/Builds/MacOSX/Info-AU.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>0.2</string>
<string>0.4</string>
<key>CFBundleVersion</key>
<string>0.2</string>
<string>0.4</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
Expand All @@ -40,7 +40,7 @@
<array>
<dict>
<key>name</key>
<string>Rita &amp; Aurora: SourceSampler</string>
<string>Music Technology Group: SourceSampler</string>
<key>description</key>
<string>SourceSampler</string>
<key>factoryFunction</key>
Expand All @@ -52,7 +52,7 @@
<key>subtype</key>
<string>SoSa</string>
<key>version</key>
<integer>512</integer>
<integer>1024</integer>
<key>resourceUsage</key>
<dict>
<key>network.client</key>
Expand Down
4 changes: 2 additions & 2 deletions SourceSampler/Builds/MacOSX/Info-Standalone_Plugin.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>0.2</string>
<string>0.4</string>
<key>CFBundleVersion</key>
<string>0.2</string>
<string>0.4</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
Expand Down
4 changes: 2 additions & 2 deletions SourceSampler/Builds/MacOSX/Info-VST.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>0.2</string>
<string>0.4</string>
<key>CFBundleVersion</key>
<string>0.2</string>
<string>0.4</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
Expand Down
4 changes: 2 additions & 2 deletions SourceSampler/Builds/MacOSX/Info-VST3.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>0.2</string>
<string>0.4</string>
<key>CFBundleVersion</key>
<string>0.2</string>
<string>0.4</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>NSHighResolutionCapable</key>
Expand Down
42 changes: 21 additions & 21 deletions SourceSampler/Builds/MacOSX/SourceSampler.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1071,8 +1071,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.2",
"JUCE_APP_VERSION_HEX=0x200",
"JUCE_APP_VERSION=0.4",
"JUCE_APP_VERSION_HEX=0x400",
"JucePlugin_Build_VST=1",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=0",
Expand Down Expand Up @@ -1139,8 +1139,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.2",
"JUCE_APP_VERSION_HEX=0x200",
"JUCE_APP_VERSION=0.4",
"JUCE_APP_VERSION_HEX=0x400",
"JucePlugin_Build_VST=1",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=0",
Expand Down Expand Up @@ -1208,8 +1208,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.2",
"JUCE_APP_VERSION_HEX=0x200",
"JUCE_APP_VERSION=0.4",
"JUCE_APP_VERSION_HEX=0x400",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=1",
"JucePlugin_Build_AU=0",
Expand Down Expand Up @@ -1276,8 +1276,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.2",
"JUCE_APP_VERSION_HEX=0x200",
"JUCE_APP_VERSION=0.4",
"JUCE_APP_VERSION_HEX=0x400",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=1",
"JucePlugin_Build_AU=0",
Expand Down Expand Up @@ -1345,8 +1345,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.2",
"JUCE_APP_VERSION_HEX=0x200",
"JUCE_APP_VERSION=0.4",
"JUCE_APP_VERSION_HEX=0x400",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=1",
Expand Down Expand Up @@ -1414,8 +1414,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.2",
"JUCE_APP_VERSION_HEX=0x200",
"JUCE_APP_VERSION=0.4",
"JUCE_APP_VERSION_HEX=0x400",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=1",
Expand Down Expand Up @@ -1482,8 +1482,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.2",
"JUCE_APP_VERSION_HEX=0x200",
"JUCE_APP_VERSION=0.4",
"JUCE_APP_VERSION_HEX=0x400",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=0",
Expand Down Expand Up @@ -1544,8 +1544,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.2",
"JUCE_APP_VERSION_HEX=0x200",
"JUCE_APP_VERSION=0.4",
"JUCE_APP_VERSION_HEX=0x400",
"JucePlugin_Build_VST=0",
"JucePlugin_Build_VST3=0",
"JucePlugin_Build_AU=0",
Expand Down Expand Up @@ -1607,8 +1607,8 @@
"_DEBUG=1",
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.2",
"JUCE_APP_VERSION_HEX=0x200",
"JUCE_APP_VERSION=0.4",
"JUCE_APP_VERSION_HEX=0x400",
"JucePlugin_Build_VST=1",
"JucePlugin_Build_VST3=1",
"JucePlugin_Build_AU=1",
Expand Down Expand Up @@ -1670,8 +1670,8 @@
"_NDEBUG=1",
"NDEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1",
"JUCE_APP_VERSION=0.2",
"JUCE_APP_VERSION_HEX=0x200",
"JUCE_APP_VERSION=0.4",
"JUCE_APP_VERSION_HEX=0x400",
"JucePlugin_Build_VST=1",
"JucePlugin_Build_VST3=1",
"JucePlugin_Build_AU=1",
Expand Down Expand Up @@ -2216,7 +2216,7 @@
4D22425EA7392363132D755F = {
isa = PBXProject;
buildConfigurationList = EE2B91D07397D35923255829;
attributes = { LastUpgradeCheck = 1200; ORGANIZATIONNAME = "Rita & Aurora"; TargetAttributes = { 034D5AB0BCB3DF887A4A7B4F = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; };E0D6C29DF8A80D34E3DBE2C0 = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; };41C90D3B8B74A302D5929C63 = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; };7C4075FF8191AB2554EF5CF5 = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; };F448398A8CB917793106AE71 = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; };CE14504F5397B3D485DEDF04 = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; }; }; };
attributes = { LastUpgradeCheck = 1200; ORGANIZATIONNAME = "Music Technology Group"; TargetAttributes = { 034D5AB0BCB3DF887A4A7B4F = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; };E0D6C29DF8A80D34E3DBE2C0 = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; };41C90D3B8B74A302D5929C63 = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; };7C4075FF8191AB2554EF5CF5 = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; };F448398A8CB917793106AE71 = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; };CE14504F5397B3D485DEDF04 = { SystemCapabilities = {com.apple.ApplicationGroups.iOS = { enabled = 0; }; com.apple.InAppPurchase = { enabled = 0; }; com.apple.InterAppAudio = { enabled = 0; }; com.apple.Push = { enabled = 0; }; com.apple.Sandbox = { enabled = 0; }; com.apple.HardenedRuntime = { enabled = 0; }; }; }; }; };
compatibilityVersion = "Xcode 3.2";
hasScannedForEncodings = 0;
mainGroup = EE281F9F5F2E0753353448A0;
Expand Down
6 changes: 3 additions & 3 deletions SourceSampler/JuceLibraryCode/JuceHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
namespace ProjectInfo
{
const char* const projectName = "SourceSampler";
const char* const companyName = "Rita & Aurora";
const char* const versionString = "0.2";
const int versionNumber = 0x200;
const char* const companyName = "Music Technology Group";
const char* const versionString = "0.4";
const int versionNumber = 0x400;
}
#endif
16 changes: 8 additions & 8 deletions SourceSampler/JuceLibraryCode/JucePluginDefines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
#define JucePlugin_Desc "SourceSampler"
#endif
#ifndef JucePlugin_Manufacturer
#define JucePlugin_Manufacturer "Rita & Aurora"
#define JucePlugin_Manufacturer "Music Technology Group"
#endif
#ifndef JucePlugin_ManufacturerWebsite
#define JucePlugin_ManufacturerWebsite "https://ritaandaurora.github.io"
#define JucePlugin_ManufacturerWebsite "http://mtg.upf.edu"
#endif
#ifndef JucePlugin_ManufacturerEmail
#define JucePlugin_ManufacturerEmail "frederic.font@gmail.com"
#define JucePlugin_ManufacturerEmail "frederic.font@upf.edu"
#endif
#ifndef JucePlugin_ManufacturerCode
#define JucePlugin_ManufacturerCode 0x52614175
Expand All @@ -74,13 +74,13 @@
#define JucePlugin_EditorRequiresKeyboardFocus 0
#endif
#ifndef JucePlugin_Version
#define JucePlugin_Version 0.2
#define JucePlugin_Version 0.4
#endif
#ifndef JucePlugin_VersionCode
#define JucePlugin_VersionCode 0x200
#define JucePlugin_VersionCode 0x400
#endif
#ifndef JucePlugin_VersionString
#define JucePlugin_VersionString "0.2"
#define JucePlugin_VersionString "0.4"
#endif
#ifndef JucePlugin_VSTUniqueID
#define JucePlugin_VSTUniqueID JucePlugin_PluginCode
Expand Down Expand Up @@ -125,7 +125,7 @@
#define JucePlugin_RTASDisableMultiMono 0
#endif
#ifndef JucePlugin_AAXIdentifier
#define JucePlugin_AAXIdentifier com.RitaAurora.SourceSampler
#define JucePlugin_AAXIdentifier com.MusicTechnologyGroup.SourceSampler
#endif
#ifndef JucePlugin_AAXManufacturerCode
#define JucePlugin_AAXManufacturerCode JucePlugin_ManufacturerCode
Expand All @@ -149,7 +149,7 @@
#define JucePlugin_IAASubType JucePlugin_PluginCode
#endif
#ifndef JucePlugin_IAAName
#define JucePlugin_IAAName "Rita & Aurora: SourceSampler"
#define JucePlugin_IAAName "Music Technology Group: SourceSampler"
#endif
#ifndef JucePlugin_VSTNumMidiInputs
#define JucePlugin_VSTNumMidiInputs 16
Expand Down
1 change: 1 addition & 0 deletions SourceSampler/Source/PluginProcessor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ ValueTree SourceSamplerAudioProcessor::collectGlobalSettingsStateInformation ()
settings.setProperty(STATE_SOUNDS_DATA_LOCATION, soundsDownloadLocation.getFullPathName(), nullptr);
settings.setProperty(STATE_PRESETS_DATA_LOCATION, presetFilesLocation.getFullPathName(), nullptr);
settings.setProperty(STATE_TMP_DATA_LOCATION, tmpFilesLocation.getFullPathName(), nullptr);
settings.setProperty(STATE_PLUGIN_VERSION, String(JucePlugin_VersionString), nullptr);
settings.appendChild(presetNumberMapping.createCopy(), nullptr);
return settings;
}
Expand Down
1 change: 1 addition & 0 deletions SourceSampler/Source/defines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@
#define NOTE_MAPPING_INTERLEAVED_ROOT_NOTE 36 // C2 (the note from which sounds start being mapped (also in backwards direction)

#define STATE_FULL_STATE "SourceFullState"
#define STATE_PLUGIN_VERSION "PluginVersion"

#define STATE_PRESET_IDENTIFIER "SourcePresetState"
#define STATE_SAMPLER "Sampler"
Expand Down
7 changes: 4 additions & 3 deletions SourceSampler/SourceSampler.jucer
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="y2t4cQ" name="SourceSampler" projectType="audioplug" version="0.2"
projectLineFeed="&#10;" companyName="Rita &amp; Aurora" companyWebsite="https://ritaandaurora.github.io"
companyEmail="[email protected]" reportAppUsage="0" pluginFormats="buildAU,buildStandalone,buildVST,buildVST3"
<JUCERPROJECT id="y2t4cQ" name="SourceSampler" projectType="audioplug" version="0.4"
projectLineFeed="&#10;" companyName="Music Technology Group"
companyWebsite="http://mtg.upf.edu" companyEmail="[email protected]"
reportAppUsage="0" pluginFormats="buildAU,buildStandalone,buildVST,buildVST3"
pluginCharacteristicsValue="pluginIsSynth,pluginProducesMidiOut,pluginWantsMidiIn"
pluginManufacturerCode="RaAu" pluginCode="SoSa" headerPath="../../3rdParty/cpp-httplib/&#10;../../3rdParty/ff_meters/LevelMeter/&#10;../../3rdParty/twine/include/"
jucerFormatVersion="1" bundleIdentifier="com.RitaAurora.SourceSampler">
Expand Down
24 changes: 17 additions & 7 deletions elk_platform/helpers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ class StateNames(Enum):
PRESETS_DATA_LOCATION = auto()
TMP_DATA_LOCATION = auto()

PLUGIN_VERSION = auto()

USE_ORIGINAL_FILES_PREFERENCE = auto()
MIDI_IN_CHANNEL = auto()

Expand Down Expand Up @@ -163,6 +165,7 @@ def process_xml_state_from_plugin(plugin_state_xml, sound_parameters_info_dict,

source_state[StateNames.USE_ORIGINAL_FILES_PREFERENCE] = global_state.get('useOriginalFiles'.lower(), 'never')
source_state[StateNames.MIDI_IN_CHANNEL] = int(global_state.get('midiInChannel'.lower(), -1))
source_state[StateNames.PLUGIN_VERSION] = global_state.get('pluginVersion'.lower(), '0.0')

# Get properties from the volatile state
source_state.update(process_xml_volatile_state_from_plugin(plugin_state_xml))
Expand Down Expand Up @@ -284,10 +287,12 @@ def process_xml_state_from_plugin(plugin_state_xml, sound_parameters_info_dict,
FONT_SIZE_BIG = 25
FONT_PATH_TITLE = 'FuturaHeavyfont.ttf'
FONT_SIZE_TITLE = 64 - 10
RA_LOGO_PATH = 'logo_oled.png'
RA_LOGO_B_PATH = 'logo_oled_b.png'
RA_LOGO_PATH = 'logo_oled_ra.png'
RA_LOGO_B_PATH = 'logo_oled_ra_b.png'
FS_LOGO_PATH = 'logo_oled_fs.png'
TITLE_TEXT = ' SOURCE, by Rita & Aurora '
UPF_LOGO_PATH = 'logo_oled_upf.png'
#TITLE_TEXT = ' SOURCE, by Rita & Aurora
TITLE_TEXT = ' SOURCE '
START_ANIMATION_DURATION = 8

font = ImageFont.truetype(FONT_PATH, FONT_SIZE)
Expand All @@ -304,6 +309,7 @@ def process_xml_state_from_plugin(plugin_state_xml, sound_parameters_info_dict,
ra_logo = Image.open(RA_LOGO_PATH).resize(DISPLAY_SIZE, Image.NEAREST).convert('1')
ra_logo_b = Image.open(RA_LOGO_B_PATH).resize(DISPLAY_SIZE, Image.NEAREST).convert('1')
fs_logo = Image.open(FS_LOGO_PATH).resize(DISPLAY_SIZE, Image.NEAREST).convert('1')
upf_logo = Image.open(UPF_LOGO_PATH).resize(DISPLAY_SIZE, Image.NEAREST).convert('1')

moving_text_position_cache = {}

Expand Down Expand Up @@ -367,18 +373,22 @@ def frame_from_start_animation(progress, counter):

im = Image.new(mode='1', size=DISPLAY_SIZE)
draw = ImageDraw.Draw(im)
if progress < 0.3:
# Show logo
if progress < 0.15:
# Show UPF logo
draw.bitmap((0, 0), upf_logo, fill="white")
elif 0.15 <= progress <= 0.45:
# Show R&A logo
if counter % 2 == 0:
draw.bitmap((0, 0), ra_logo, fill="white")
else:
draw.bitmap((0, 0), ra_logo_b, fill="white")
elif 0.3 <= progress <= 0.7:
# Show text
elif 0.45 <= progress <= 0.75:
# Show title text
if title_text_width is None:
title_text_width = draw.textsize(TITLE_TEXT, font=title_font)[0]
draw.text((int(progress * -1 * title_text_width), int((DISPLAY_SIZE[1] - FONT_SIZE_TITLE)/2) - 5), TITLE_TEXT, font=title_font, fill="white")
else:
# Show Freesound logo
text = " powered by:"
text_width = draw.textsize(text, font=font)[0]
draw.text(((DISPLAY_SIZE[0] - text_width) / 2, font_heihgt_px), text, font=font, fill="white")
Expand Down
0 elk_platform/logo_oled.png → elk_platform/logo_oled_ra.png
View file
File renamed without changes
0 elk_platform/logo_oled_b.png → elk_platform/logo_oled_ra_b.png
View file
File renamed without changes
Binary file added elk_platform/logo_oled_upf.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2fe2ae7

Please sign in to comment.