Housekeeping MIDI clock, tests, and macro updates.

- Format the code
- fix a datapath testing problem with archlinux in docker
- Refactor code for consistency and clarity in various files

Author: mfisher31

include/element/element.h

@@ -19,13 +19,13 @@ extern "C" {
 #ifdef _WIN32
     // windows exports
     #if defined(EL_SHARED_BUILD)
-        #define EL_API __declspec(dllexport)
+        #define EL_API __declspec (dllexport)
         #pragma warning(disable : 4251)
     #elif defined(EL_SHARED)
-        #define EL_API __declspec(dllimport)
+        #define EL_API __declspec (dllimport)
         #pragma warning(disable : 4251)
     #endif
-    #define EL_PLUGIN_EXPORT EL_EXTERN __declspec(dllexport)
+    #define EL_PLUGIN_EXPORT EL_EXTERN __declspec (dllexport)
 #else
     #if defined(EL_SHARED) || defined(EL_SHARED_BUILD)
         #define EL_API __attribute__ ((visibility ("default")))

include/element/porttype.hpp

@@ -101,7 +101,7 @@ class PortType {
     inline bool operator!= (const ID& id) const { return (type != id); }
     inline bool operator== (const PortType& t) const { return (type == t.type); }
     inline bool operator!= (const PortType& t) const { return (type != t.type); }
-    inline bool operator<(const PortType& t) const { return (type < t.type); }
+    inline bool operator< (const PortType& t) const { return (type < t.type); }
 
     inline operator int() const { return (int) this->type; }
 

include/element/version.hpp

@@ -95,7 +95,7 @@ class Version {
     inline bool operator== (const Version& o) const noexcept { return _hex == o._hex; }
     inline bool operator!= (const Version& o) const noexcept { return _hex != o._hex; }
     inline bool operator> (const Version& o) const noexcept { return _hex > o._hex; }
-    inline bool operator<(const Version& o) const noexcept { return _hex < o._hex; }
+    inline bool operator< (const Version& o) const noexcept { return _hex < o._hex; }
     inline bool operator>= (const Version& o) const noexcept { return _hex >= o._hex; }
     inline bool operator<= (const Version& o) const noexcept { return _hex <= o._hex; }
 

src/delaylockedloop.hpp

@@ -106,9 +106,9 @@ class DelayLockedLoop
 
 private:
     // Timing state
-    double e2 = 0;           ///< Estimated period
-    double t0 = 0;           ///< Previous filtered timestamp
-    double t1 = 0;           ///< Current filtered timestamp
+    double e2 = 0; ///< Estimated period
+    double t0 = 0; ///< Previous filtered timestamp
+    double t1 = 0; ///< Current filtered timestamp
 
     // Parameters
     double expectedPeriod = 1.0 / 24.0;
@@ -121,9 +121,9 @@ class DelayLockedLoop
     // Adaptive bandwidth settings
     // Higher initial bandwidth = faster convergence but more jitter
     // Lower locked bandwidth = more stable but slower to track changes
-    static constexpr double initialBandwidth = 0.5;  // Fast convergence
-    double lockedBandwidth = 0.1;   // Stable tracking
-    static constexpr int lockThreshold = 24;         // Lock after ~1 beat
+    static constexpr double initialBandwidth = 0.5; // Fast convergence
+    double lockedBandwidth = 0.1; // Stable tracking
+    static constexpr int lockThreshold = 24; // Lock after ~1 beat
 
     int updateCount = 0;
     bool locked = false;

src/filesystemwatcher.cpp

@@ -137,9 +137,7 @@ class FileSystemWatcher::Impl
     CFArrayRef paths { nullptr };
     dispatch_queue_t queue { nullptr };
     FSEventStreamRef stream { nullptr };
-    struct FSEventStreamContext context
-    {
-    };
+    struct FSEventStreamContext context {};
 };
 #endif
 

src/scripting/bindings.cpp

@@ -65,7 +65,7 @@ namespace element {
 namespace Lua {
 
 //==============================================================================
-#if defined(EL_APPIMAGE)
+#if defined(ELEMENT_APPIMAGE)
 static File getAppImageLuaPath()
 {
     return File::getSpecialLocation (File::currentExecutableFile)
@@ -112,7 +112,7 @@ static String getApplicationLuaDir()
 static File getSystemLuaDir()
 {
     File dir;
-#if defined(EL_APPIMAGE)
+#if defined(ELEMENT_APPIMAGE)
     dir = getAppImageLuaPath().getFullPathName();
 
 #elif defined(EL_LUADIR)

src/scripting/scriptmanager.cpp

@@ -127,7 +127,7 @@ File ScriptManager::getSystemScriptsDir()
 {
     File dir;
 
-#if defined(EL_APPIMAGE)
+#if defined(ELEMENT_APPIMAGE)
     dir = File::getSpecialLocation (File::currentExecutableFile)
               .getParentDirectory() // bin
               .getParentDirectory() // usr

test/datapathtests.cpp

@@ -14,7 +14,7 @@ BOOST_AUTO_TEST_SUITE (DataPathTests)
 
 BOOST_AUTO_TEST_CASE (PathsMatch)
 {
-#if ! EL_APPIMAGE
+#if ! ELEMENT_APPIMAGE
     Settings s;
     auto params = s.getStorageParameters();
     params.folderName = params.folderName.replace ("\\", "/");
@@ -23,8 +23,11 @@ BOOST_AUTO_TEST_CASE (PathsMatch)
     BOOST_REQUIRE_MESSAGE (params.folderName.endsWith (EL_APP_DATA_SUBDIR),
                            params.folderName.toStdString());
     BOOST_REQUIRE_MESSAGE (fullPath.endsWith (EL_APP_DATA_SUBDIR), fullPath.toStdString());
-    BOOST_REQUIRE_EQUAL (DataPath::defaultSettingsFile().getFullPathName().toStdString(),
-                         s.getUserSettings()->getFile().getFullPathName().toStdString());
+    // Some CI systems, like the archlinux docker container running on github, might have double
+    // slashes in the settings file path... e.g. when the $HOME is blank.
+    BOOST_REQUIRE_EQUAL (
+        DataPath::defaultSettingsFile().getFullPathName().replace("//", "/").toStdString(),
+        s.getUserSettings()->getFile().getFullPathName().replace("//", "/").toStdString());
 #else
     BOOST_REQUIRE (true);
 #endif