Session: Allow Setting The Tempo Using Lua

include/element/session.hpp

@@ -107,9 +107,6 @@ class Session : public Model,
     Session();
     friend class Context;
 
-    /** Set a property. */
-    inline void setProperty (const juce::Identifier& prop, const juce::var& val) { objectData.setProperty (prop, val, nullptr); }
-
     friend class juce::ValueTree;
     virtual void valueTreePropertyChanged (juce::ValueTree& treeWhosePropertyHasChanged, const juce::Identifier& property);
     virtual void valueTreeChildAdded (juce::ValueTree& parentTree, juce::ValueTree& childWhichHasBeenAdded);

include/element/ui/preferences.hpp

@@ -5,12 +5,12 @@
 
 #include <element/juce/gui_basics.hpp>
 
-#define EL_GENERAL_SETTINGS_NAME      "General"
-#define EL_AUDIO_SETTINGS_NAME        "Audio"
-#define EL_MIDI_SETTINGS_NAME         "MIDI"
-#define EL_OSC_SETTINGS_NAME          "OSC"
-#define EL_PLUGINS_PREFERENCE_NAME    "Plugins"
-#define EL_REPOSITORY_PREFERENCE_NAME "Updates"
+#define ELEMENT_GENERAL_SETTINGS_NAME      "General"
+#define ELEMENT_AUDIO_SETTINGS_NAME        "Audio"
+#define ELEMENT_MIDI_SETTINGS_NAME         "MIDI"
+#define ELEMENT_OSC_SETTINGS_NAME          "OSC"
+#define ELEMENT_PLUGINS_PREFERENCE_NAME    "Plugins"
+#define ELEMENT_REPOSITORY_PREFERENCE_NAME "Updates"
 
 namespace element {
 

src/el/Session.cpp

@@ -6,6 +6,8 @@
 // @classmod el.Session
 // @pragma nostrip
 
+#include <algorithm>
+
 #include <element/element.h>
 #include <element/node.hpp>
 #include <element/session.hpp>
@@ -31,14 +33,25 @@ int luaopen_el_Session (lua_State* L)
                        : std::shared_ptr<Node>();
         },
 
-        /// The sessions name.
+        /// The session's name.
         // @tfield string Session.name
         // @within Attributes
         "name", sol::property (
             [](Session& self) { return self.getName().toStdString(); },
             [](Session& self, const char* name) { self.setName (name); }
         ),
 
+        /// The session's current tempo.
+        // @tfield string Session.tempo
+        // @within Attributes
+        "tempo", sol::property (
+            [](Session& self) { return self.getProperty(tags::tempo).toString().toStdString(); },
+            [](Session& self, double tempo) { 
+                tempo = std::clamp (tempo, 20.0, 999.0);
+                self.setProperty (tags::tempo, tempo); 
+            }
+        ),
+
         /// Convert to an XML string.
         // @function Session:toXmlString
         // @treturn string XML string of the session data.

src/nodes/midisetlist.cpp

@@ -112,15 +112,15 @@ void MidiSetListProcessor::maybeSendTempoAndPosition (int program)
     if (auto* entry = entries[program])
     {
         if (entry->tempo >= 20.0)
-            s->getValueTree().setProperty (tags::tempo, entry->tempo, nullptr);
+            s->setProperty (tags::tempo, entry->tempo);
 
         if (entry->tsNum > 0 && entry->tsDen > 0)
         {
-            const int div = BeatType::fromDivisor (entry->tsDen); // raw denom -> BeatType enum
-            s->getValueTree().setProperty (tags::beatsPerBar, entry->tsNum, nullptr);
-            s->getValueTree().setProperty (tags::beatDivisor, div, nullptr);
+            const auto beatType = BeatType::fromDivisor (entry->tsDen);
+            s->setProperty (tags::beatsPerBar, entry->tsNum);
+            s->setProperty (tags::beatDivisor, beatType);
             if (auto e = _context.audio())
-                e->setMeter (entry->tsNum, div);
+                e->setMeter (entry->tsNum, beatType);
         }
 
         if (auto e = _context.audio())

src/services/deviceservice.hpp

@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include <element/juce/audio_devices.hpp>
 #include <element/services.hpp>
 #include <element/signals.hpp>
-#include <element/juce/audio_devices.hpp>
 
 namespace element {
 

src/services/engineservice.cpp

@@ -3,17 +3,17 @@
 
 #include <element/context.hpp>
 #include <element/devices.hpp>
+#include <element/engine.hpp>
 #include <element/graph.hpp>
 #include <element/node.hpp>
 #include <element/plugins.hpp>
 #include <element/services.hpp>
 #include <element/settings.hpp>
+#include <element/ui.hpp>
 
 #include "engine/graphmanager.hpp"
-#include "nodes/mididevice.hpp"
 #include "engine/rootgraph.hpp"
-#include <element/engine.hpp>
-#include <element/ui.hpp>
+#include "nodes/mididevice.hpp"
 
 #define ELEMENT_TRACE_SESSION_LOAD 0
 

src/services/guiservice.cpp

@@ -6,8 +6,6 @@
 #include <element/engine.hpp>
 #include <element/services.hpp>
 #include <element/settings.hpp>
-#include <element/version.hpp>
-
 #include <element/ui.hpp>
 #include <element/ui/commands.hpp>
 #include <element/ui/content.hpp>
@@ -16,8 +14,8 @@
 #include <element/ui/standard.hpp>
 #include <element/ui/style.hpp>
 #include <element/ui/updater.hpp>
+#include <element/version.hpp>
 
-#include "appinfo.hpp"
 #include "auth.hpp"
 #include "engine/midipanic.hpp"
 #include "messages.hpp"
@@ -30,8 +28,8 @@
 #include "ui/virtualkeyboardview.hpp"
 #include "ui/windowmanager.hpp"
 
-#ifndef EL_USE_SYSTEM_TRAY
-#define EL_USE_SYSTEM_TRAY 1
+#ifndef ELEMENT_USE_SYSTEM_TRAY
+#define ELEMENT_USE_SYSTEM_TRAY 1
 #endif
 
 namespace element {
@@ -1124,7 +1122,7 @@ void GuiService::refreshSystemTray()
 {
     // stabilize systray
     auto& settings = context().settings();
-#if EL_USE_SYSTEM_TRAY
+#if ELEMENT_USE_SYSTEM_TRAY
     SystemTray::setEnabled (settings.isSystrayEnabled());
 #else
     juce::ignoreUnused (settings);

src/services/mappingservice.cpp

@@ -1,15 +1,17 @@
 // Copyright 2023 Kushview, LLC <info@kushview.net>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "services/mappingservice.hpp"
-#include "services/deviceservice.hpp"
-#include "services/sessionservice.hpp"
-#include <element/ui.hpp>
-#include "engine/mappingengine.hpp"
+#include <element/juce/audio_devices.hpp>
+
 #include <element/context.hpp>
 #include <element/session.hpp>
 #include <element/signals.hpp>
-#include <element/juce/audio_devices.hpp>
+#include <element/ui.hpp>
+
+#include "engine/mappingengine.hpp"
+#include "services/deviceservice.hpp"
+#include "services/mappingservice.hpp"
+#include "services/sessionservice.hpp"
 
 using namespace juce;
 
@@ -349,7 +351,7 @@ void MappingService::tapTempo()
 {
     if (auto bpm = context().mapping().tapTempo (Time::getMillisecondCounterHiRes()))
         if (auto session = context().session())
-            session->data().setProperty (tags::tempo, *bpm, nullptr);
+            session->setProperty (tags::tempo, *bpm);
 }
 
 void MappingService::learnTempo()

src/services/mappingservice.hpp

@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include <element/services.hpp>
-#include <element/processor.hpp>
 #include <element/midimapping.hpp>
+#include <element/processor.hpp>
+#include <element/services.hpp>
 #include <element/signals.hpp>
 
 namespace element {

src/services/oscservice.cpp

@@ -3,16 +3,15 @@
 
 #include <element/juce/osc.hpp>
 
-#include <element/ui/commands.hpp>
-
 #include <element/context.hpp>
 #include <element/devices.hpp>
 #include <element/settings.hpp>
+#include <element/ui/commands.hpp>
 
 #include "services/oscservice.hpp"
 
-#define EL_OSC_ADDRESS_COMMAND "/element/command"
-#define EL_OSC_ADDRESS_ENGINE "/element/engine"
+#define ELEMENT_OSC_ADDRESS_COMMAND "/element/command"
+#define ELEMENT_OSC_ADDRESS_ENGINE "/element/engine"
 
 using namespace juce;
 
@@ -137,10 +136,10 @@ class OSCService::Impl
             return;
 
         application.reset (new CommandOSCListener (owner.context()));
-        receiver.addListener (application.get(), EL_OSC_ADDRESS_COMMAND);
+        receiver.addListener (application.get(), ELEMENT_OSC_ADDRESS_COMMAND);
 
         engine.reset (new EngineOSCListener (owner.context()));
-        receiver.addListener (engine.get(), EL_OSC_ADDRESS_ENGINE);
+        receiver.addListener (engine.get(), ELEMENT_OSC_ADDRESS_ENGINE);
 
         listenersReady = true;
     }

src/services/presetservice.cpp

@@ -1,13 +1,13 @@
 // Copyright 2023 Kushview, LLC <info@kushview.net>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+#include <element/context.hpp>
+#include <element/datapath.hpp>
+#include <element/session.hpp>
 #include <element/ui.hpp>
 #include <element/ui/content.hpp>
-#include <element/session.hpp>
-#include "presetmanager.hpp"
-#include <element/context.hpp>
 
-#include <element/datapath.hpp>
+#include "presetmanager.hpp"
 #include "services/presetservice.hpp"
 
 using juce::String;

src/services/sessionservice.cpp

@@ -1,12 +1,12 @@
 // Copyright 2023 Kushview, LLC <info@kushview.net>
 // SPDX-License-Identifier: GPL-3.0-or-later
 
+#include <element/context.hpp>
+#include <element/engine.hpp>
 #include <element/graph.hpp>
 #include <element/node.hpp>
-#include <element/context.hpp>
-#include <element/settings.hpp>
 #include <element/services.hpp>
-#include <element/engine.hpp>
+#include <element/settings.hpp>
 #include <element/ui.hpp>
 #include <element/ui/content.hpp>
 

src/ui/buttons.hpp

@@ -6,7 +6,6 @@
 #include <element/ui/style.hpp>
 #include <element/node.hpp>
 
-// #include "ElementApp.h"
 #include "ui/icons.hpp"
 #include "tempo.hpp"
 

src/ui/emptyview.hpp

@@ -16,7 +16,7 @@ class EmptyContentView : public ContentView
         setName ("EmptyView");
     }
 
-    inline void paint (Graphics& g) override
+    inline void paint (juce::Graphics& g) override
     {
         g.fillAll (Colors::contentBackgroundColor);
         g.setColour (Colors::textColor);
@@ -27,7 +27,7 @@ class EmptyContentView : public ContentView
 #else
         const String msg ("Session is empty.\nPress Shift+Ctl+N to add a graph.");
 #endif
-        g.drawFittedText (msg, 0, 0, getWidth(), getHeight(), Justification::centred, 2);
+        g.drawFittedText (msg, 0, 0, getWidth(), getHeight(), juce::Justification::centred, 2);
     }
 };
 

src/ui/preferences.cpp

@@ -1394,28 +1394,28 @@ void Preferences::addPage (const String& name)
 
 Component* Preferences::createPageForName (const String& name)
 {
-    if (name == EL_GENERAL_SETTINGS_NAME)
+    if (name == ELEMENT_GENERAL_SETTINGS_NAME)
     {
         return new GeneralSettingsPage (_context, _ui);
     }
-    else if (name == EL_AUDIO_SETTINGS_NAME)
+    else if (name == ELEMENT_AUDIO_SETTINGS_NAME)
     {
         return new AudioSettingsComponent (_context.devices());
     }
-    else if (name == EL_PLUGINS_PREFERENCE_NAME)
+    else if (name == ELEMENT_PLUGINS_PREFERENCE_NAME)
     {
         return new PluginSettingsComponent (_context);
     }
-    else if (name == EL_MIDI_SETTINGS_NAME)
+    else if (name == ELEMENT_MIDI_SETTINGS_NAME)
     {
         return new MidiSettingsPage (_context);
     }
-    else if (name == EL_OSC_SETTINGS_NAME)
+    else if (name == ELEMENT_OSC_SETTINGS_NAME)
     {
         return new OSCSettingsPage (_context, _ui);
     }
 #if ELEMENT_UPDATER
-    else if (name == EL_REPOSITORY_PREFERENCE_NAME)
+    else if (name == ELEMENT_REPOSITORY_PREFERENCE_NAME)
     {
         return new UpdatesSettingsPage (_context);
     }
@@ -1428,17 +1428,17 @@ void Preferences::addDefaultPages()
     if (pageList->getNumRows() > 0)
         return;
 
-    addPage (EL_GENERAL_SETTINGS_NAME);
-    addPage (EL_AUDIO_SETTINGS_NAME);
-    addPage (EL_MIDI_SETTINGS_NAME);
+    addPage (ELEMENT_GENERAL_SETTINGS_NAME);
+    addPage (ELEMENT_AUDIO_SETTINGS_NAME);
+    addPage (ELEMENT_MIDI_SETTINGS_NAME);
 #if ! ELEMENT_SE
-    addPage (EL_OSC_SETTINGS_NAME);
+    addPage (ELEMENT_OSC_SETTINGS_NAME);
 #endif
 #if ELEMENT_UPDATER
-    addPage (EL_REPOSITORY_PREFERENCE_NAME);
+    addPage (ELEMENT_REPOSITORY_PREFERENCE_NAME);
 #endif
 
-    setPage (EL_GENERAL_SETTINGS_NAME);
+    setPage (ELEMENT_GENERAL_SETTINGS_NAME);
 }
 
 void Preferences::setPage (const String& name)