Merge pull request #58 from ffAudio/develop

Release 1.3
ffAudio · Mar 1, 2021 · 9ba1996 · 9ba1996
2 parents b069da1 + 73352fd
commit 9ba1996
Show file tree

Hide file tree

Showing 89 changed files with 736 additions and 277 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -20,10 +20,10 @@ Ownership
 ---------
 
 Since this project is under a dual license (free for non-commercial use, paid license for commercial use),
-the sole ownership is with Foleys Finest Audio Ltd. By submitting your contributions you will not gain ownership
+the sole ownership is with Foleys Finest Audio. By submitting your contributions you will not gain ownership
 over parts or the entirety of foleys_gui_magic.
 Any compensation is solely on the discretion of the owner.
-Contributors declare, that they had ownership over the contributed code. Foleys Finest Audio Ltd. shall not be liable
+Contributors declare, that they had ownership over the contributed code. Foleys Finest Audio shall not be liable
 for copyright or patent infringements through external contributors.
 If you have claims to any part inside the project, please get in touch and the code will be removed, if the claims are valid.
 

diff --git a/Editor/foleys_GUITreeEditor.cpp b/Editor/foleys_GUITreeEditor.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_GUITreeEditor.h b/Editor/foleys_GUITreeEditor.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_MultiListPropertyComponent.cpp b/Editor/foleys_MultiListPropertyComponent.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_MultiListPropertyComponent.h b/Editor/foleys_MultiListPropertyComponent.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_Palette.cpp b/Editor/foleys_Palette.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_Palette.h b/Editor/foleys_Palette.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_PropertiesEditor.cpp b/Editor/foleys_PropertiesEditor.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_PropertiesEditor.h b/Editor/foleys_PropertiesEditor.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StyleBoolPropertyComponent.cpp b/Editor/foleys_StyleBoolPropertyComponent.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StyleBoolPropertyComponent.h b/Editor/foleys_StyleBoolPropertyComponent.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StyleChoicePropertyComponent.cpp b/Editor/foleys_StyleChoicePropertyComponent.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StyleChoicePropertyComponent.h b/Editor/foleys_StyleChoicePropertyComponent.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StyleColourPropertyComponent.cpp b/Editor/foleys_StyleColourPropertyComponent.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StyleColourPropertyComponent.h b/Editor/foleys_StyleColourPropertyComponent.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StyleGradientPropertyComponent.cpp b/Editor/foleys_StyleGradientPropertyComponent.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StyleGradientPropertyComponent.h b/Editor/foleys_StyleGradientPropertyComponent.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StylePropertyComponent.cpp b/Editor/foleys_StylePropertyComponent.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StylePropertyComponent.h b/Editor/foleys_StylePropertyComponent.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StyleTextPropertyComponent.cpp b/Editor/foleys_StyleTextPropertyComponent.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_StyleTextPropertyComponent.h b/Editor/foleys_StyleTextPropertyComponent.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/Editor/foleys_ToolBox.cpp b/Editor/foleys_ToolBox.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:
@@ -193,7 +193,7 @@ void ToolBox::loadGUI (const juce::File& xmlFile)
 
     if (tree.isValid() && tree.getType() == IDs::magic)
     {
-        builder.setConfigTree (tree);
+        builder.getMagicState().setGuiValueTree (tree);
         stateWasReloaded();
     }
 

diff --git a/Editor/foleys_ToolBox.h b/Editor/foleys_ToolBox.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2019-2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2019-2021 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:

diff --git a/General/foleys_ApplicationSettings.cpp b/General/foleys_ApplicationSettings.cpp
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2020 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:
@@ -54,13 +54,17 @@ void ApplicationSettings::setFileName (juce::File file)
         return;
 
     settingsFile = file;
-    load();
+    startTimerHz (1);
 }
 
 void ApplicationSettings::load()
 {
     juce::InterProcessLock lock (settingsFile.getFileName() + ".lock");
 
+    auto newChecksum = juce::MD5 (settingsFile).toHexString();
+    if (checksum == newChecksum)
+        return;
+
     auto stream = settingsFile.createInputStream();
     if (stream.get() == nullptr)
         return;
@@ -70,6 +74,10 @@ void ApplicationSettings::load()
         return;
 
     settings.copyPropertiesAndChildrenFrom (tree, nullptr);
+    settings.addListener (this);
+
+    checksum = newChecksum;
+    sendChangeMessage();
 }
 
 void ApplicationSettings::save()
@@ -86,6 +94,13 @@ void ApplicationSettings::save()
     stream->setPosition (0);
     stream->truncate();
     stream->writeString (settings.toXmlString());
+
+    checksum = juce::MD5 (settingsFile).toHexString();
+}
+
+void ApplicationSettings::timerCallback()
+{
+    load();
 }
 
 void ApplicationSettings::valueTreeChildAdded (juce::ValueTree&, juce::ValueTree&)

diff --git a/General/foleys_ApplicationSettings.h b/General/foleys_ApplicationSettings.h
@@ -1,6 +1,6 @@
 /*
  ==============================================================================
-    Copyright (c) 2020 Foleys Finest Audio Ltd. - Daniel Walz
+    Copyright (c) 2020 Foleys Finest Audio - Daniel Walz
     All rights reserved.
 
     License for non-commercial projects:
@@ -44,7 +44,9 @@ namespace foleys
  They are hierarchically ordered in a ValueTree and loaded via SharedResourcePointer,
  so they don't exist duplicated in one process.
  */
-class ApplicationSettings : private juce::ValueTree::Listener
+class ApplicationSettings : public juce::ChangeBroadcaster,
+                            private juce::Timer,
+                            private juce::ValueTree::Listener
 {
 public:
     ApplicationSettings();
@@ -60,6 +62,7 @@ class ApplicationSettings : private juce::ValueTree::Listener
     void setFileName (juce::File file);
 
 private:
+    void timerCallback() override;
 
     void load();
     void save();
@@ -70,6 +73,7 @@ class ApplicationSettings : private juce::ValueTree::Listener
     void valueTreePropertyChanged (juce::ValueTree&, const juce::Identifier&) override;
 
     juce::File   settingsFile;
+    juce::String checksum;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ApplicationSettings)
 };