0.32.3

Author: atkAudioUser

.gitignore

@@ -28,3 +28,4 @@
 
 !/lib
 !.vscode
+.vscode/settings.json

buildspec.json

@@ -47,6 +47,6 @@
   "uuids": {
     "windowsApp": "ad885c58-5ca9-44de-8f4f-1c12676626a9"
   },
-  "version": "0.32.2",
+  "version": "0.32.3",
   "website": "https://www.atkaudio.com"
 }

linux-cross-compile.sh

@@ -42,9 +42,23 @@ echo "Container architecture: $(uname -m)"
 # Configure environment
 export DEBIAN_FRONTEND=noninteractive
 
+repair_dpkg_state() {
+  if [ -d /var/lib/dpkg ] && [ -n "$(ls -A /var/lib/dpkg/updates 2>/dev/null)" ]; then
+    echo "Detected interrupted dpkg state; repairing"
+  fi
+
+  dpkg --configure -a || true
+  apt-get -f install -y || true
+}
+
+safe_apt_install() {
+  repair_dpkg_state
+  apt-get install -y --no-install-recommends "$@"
+}
+
 # Install base packages
 apt-get update
-apt-get install -y --no-install-recommends git software-properties-common
+safe_apt_install git software-properties-common
 git config --global --add safe.directory /workspace
 
 # Configure multi-arch for cross-compilation
@@ -97,7 +111,7 @@ OBS_DEPS=$(apply_arch_suffix "${OBS_DEPS[@]}")
 QT6_DEPS=$(apply_arch_suffix "${QT6_DEPS[@]}")
 
 # Install build dependencies
-apt-get install -y --no-install-recommends ${BUILD_DEPS_BASE}
+safe_apt_install ${BUILD_DEPS_BASE}
 
 # Install target architecture libraries
 if [ "${CROSS_COMPILE}" = "true" ]; then
@@ -117,15 +131,29 @@ Pin: release *
 Pin-Priority: -1
 EOF
 
-  apt-get install -y --no-install-recommends ${JUCE_DEPS} ${OBS_DEPS} ${QT6_DEPS}
-  apt-get install -y --no-install-recommends ${QT6_TOOLS[@]}  # x86_64 moc/uic/rcc
+  safe_apt_install ${JUCE_DEPS} ${OBS_DEPS} ${QT6_DEPS}
+  safe_apt_install ${QT6_TOOLS[@]}  # x86_64 moc/uic/rcc
 else
-  apt-get install -y --no-install-recommends ${JUCE_DEPS} ${OBS_DEPS} ${QT6_DEPS}
+  safe_apt_install ${JUCE_DEPS} ${OBS_DEPS} ${QT6_DEPS}
 fi
 
 # Configure CMake
 BUILD_CONFIG="${BUILD_CONFIG:-Release}"
-CMAKE_FLAGS="-B build_${TARGET_ARCH} -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_CONFIG}"
+BUILD_DIR="build_${TARGET_ARCH}"
+
+if [ -f "${BUILD_DIR}/CMakeCache.txt" ]; then
+  CACHEFILE_DIR=$(sed -n 's/^CMAKE_CACHEFILE_DIR:INTERNAL=//p' "${BUILD_DIR}/CMakeCache.txt")
+  CACHE_HOME_DIR=$(sed -n 's/^CMAKE_HOME_DIRECTORY:INTERNAL=//p' "${BUILD_DIR}/CMakeCache.txt")
+  CURRENT_BUILD_DIR="$(pwd)/${BUILD_DIR}"
+  CURRENT_SOURCE_DIR="$(pwd)"
+
+  if [ "${CACHEFILE_DIR}" != "${CURRENT_BUILD_DIR}" ] || [ "${CACHE_HOME_DIR}" != "${CURRENT_SOURCE_DIR}" ]; then
+    echo "Removing stale ${BUILD_DIR} because it was configured for a different workspace path"
+    rm -rf "${BUILD_DIR}"
+  fi
+fi
+
+CMAKE_FLAGS="-B ${BUILD_DIR} -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_CONFIG}"
 CMAKE_FLAGS="${CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX=/usr"
 
 # Cross-compilation configuration
@@ -176,12 +204,17 @@ fi
 
 # Build
 cmake ${CMAKE_FLAGS}
-cmake --build build_${TARGET_ARCH} --config ${BUILD_CONFIG} --parallel
+cmake --build ${BUILD_DIR} --config ${BUILD_CONFIG} --parallel
 
 # Verify and strip (only strip for Release builds, keep debug symbols for RelWithDebInfo)
-echo "Built binary: $(file build_${TARGET_ARCH}/${BUILD_CONFIG}/*.so || file build_${TARGET_ARCH}/obs-plugins/64bit/*.so || echo 'Not found')"
+BUILT_BINARY=$(find "${BUILD_DIR}" -name '*.so' | head -n 1)
+if [ -n "${BUILT_BINARY}" ]; then
+  echo "Built binary: $(file "${BUILT_BINARY}")"
+else
+  echo "Built binary: Not found"
+fi
 if [ "${CROSS_COMPILE}" = "true" ] && [ "${BUILD_CONFIG}" = "Release" ]; then
-  find build_${TARGET_ARCH} -name '*.so' -exec ${CROSS_TRIPLE}-strip --strip-debug {} \; 2>/dev/null || true
+  find ${BUILD_DIR} -name '*.so' -exec ${CROSS_TRIPLE}-strip --strip-debug {} \; 2>/dev/null || true
 fi
 
 

src/CMakeLists.txt

@@ -2,11 +2,7 @@
 file(GLOB_RECURSE OBS_PLUGIN_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 list(FILTER OBS_PLUGIN_SOURCES EXCLUDE REGEX [[.*/scanner/.*]])
 
-target_sources(
-    ${PROJECT_NAME}
-    PRIVATE
-        ${OBS_PLUGIN_SOURCES}
-)
+target_sources(${PROJECT_NAME} PRIVATE ${OBS_PLUGIN_SOURCES})
 
 target_include_directories(
     ${PROJECT_NAME}
@@ -26,8 +22,9 @@ FetchContent_Declare(
     juce
     EXCLUDE_FROM_ALL
     GIT_REPOSITORY https://github.com/juce-framework/JUCE.git
-    GIT_TAG 8.0.12
-    PATCH_COMMAND ${CMAKE_COMMAND} -P "${CMAKE_SOURCE_DIR}/cmake/patches/apply-juce-patches.cmake"
+    GIT_TAG 8.0.13
+    PATCH_COMMAND
+        ${CMAKE_COMMAND} -P "${CMAKE_SOURCE_DIR}/cmake/patches/apply-juce-patches.cmake"
 )
 FetchContent_MakeAvailable(juce)
 
@@ -53,15 +50,19 @@ target_compile_definitions(
         JUCE_USE_CURL=1
         JUCE_WEB_BROWSER=0
         JUCE_MODAL_LOOPS_PERMITTED=1
+        $<$<OR:$<BOOL:$ENV{CI}>,$<BOOL:$ENV{GITHUB_ACTIONS}>>:ATKAUDIO_CI_BUILD=1>
         $<$<AND:$<CONFIG:RelWithDebInfo>,$<OR:$<BOOL:$ENV{CI}>,$<BOOL:$ENV{GITHUB_ACTIONS}>>>:JUCE_DISABLE_ASSERTIONS>
 )
 
 set_target_properties(
     ${PROJECT_NAME}
     PROPERTIES
-        JUCE_NEEDS_WEB_BROWSER FALSE
-        JUCE_NEEDS_CURL TRUE
-        JUCE_IS_PLUGIN TRUE
+        JUCE_NEEDS_WEB_BROWSER
+            FALSE
+        JUCE_NEEDS_CURL
+            TRUE
+        JUCE_IS_PLUGIN
+            TRUE
 )
 
 if(UNIX AND NOT APPLE)
@@ -76,7 +77,13 @@ endif()
 if(MSVC)
     # This target does not use C++ modules. Disabling MSVC's module scan avoids
     # spurious `*.module.json` warnings when multiple sources share a basename.
-    set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_SCAN_FOR_MODULES OFF)
+    set_property(
+        TARGET
+            ${PROJECT_NAME}
+        PROPERTY
+            CXX_SCAN_FOR_MODULES
+                OFF
+    )
 
     target_compile_options(
         ${PROJECT_NAME}
@@ -100,8 +107,17 @@ if(NOT WIN32)
 endif()
 
 if(WIN32)
-    file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" _sanitized_prefix)
-    string(REGEX REPLACE "/$" "" _sanitized_prefix "${_sanitized_prefix}")
+    file(
+        TO_CMAKE_PATH
+        "${CMAKE_INSTALL_PREFIX}"
+        _sanitized_prefix
+    )
+    string(
+        REGEX REPLACE "/$"
+        ""
+        _sanitized_prefix
+        "${_sanitized_prefix}"
+    )
     set(CMAKE_INSTALL_PREFIX "${_sanitized_prefix}" CACHE PATH "Sanitized install prefix" FORCE)
 endif()
 

src/core/atkaudio.cpp

@@ -1,6 +1,7 @@
 #include "core/atkaudio/atkaudio.h"
 
 #include <atkaudio/AudioProcessorGraphMT/RealtimeThreadPool.h>
+#include <atkaudio/Logging.h>
 #include <atkaudio/LookAndFeel.h>
 #include <atkaudio/ModuleInfrastructure/AudioServer/AudioServer.h>
 #include <atkaudio/ModuleInfrastructure/MidiServer/MidiServer.h>
@@ -54,10 +55,12 @@ juce::File atk::getSettingsFile(const juce::String& name)
 
 bool atk::create()
 {
+    atk::logging::info("LIFECYCLE", "atk::create begin");
+
     auto& lifecycle = atk::ObsJucePluginFormatLifecycle::getInstance();
     if (!lifecycle.initialize())
     {
-        DBG("create: failed to initialize OBS JUCE format lifecycle");
+        atk::logging::error("LIFECYCLE", "atk::create failed to initialize OBS JUCE lifecycle");
         return false;
     }
 
@@ -83,6 +86,8 @@ bool atk::create()
     if (auto* threadPool = atk::RealtimeThreadPool::getInstance())
         threadPool->initialize();
 
+    atk::logging::info("LIFECYCLE", "atk::create completed");
+
     return true;
 }
 
@@ -96,10 +101,12 @@ bool atk::startMessagePump(QObject* qtParent)
     auto& lifecycle = atk::ObsJucePluginFormatLifecycle::getInstance();
     if (!lifecycle.startMessagePump(qtParent))
     {
-        DBG("startMessagePump: failed to start OBS JUCE format message pump");
+        atk::logging::error("LIFECYCLE", "atk::startMessagePump failed");
         return false;
     }
 
+    atk::logging::info("LIFECYCLE", "atk::startMessagePump completed");
+
     return true;
 }
 
@@ -115,6 +122,8 @@ bool atk::isShuttingDown()
 
 void atk::destroy()
 {
+    atk::logging::info("LIFECYCLE", "atk::destroy begin");
+
     auto& lifecycle = atk::ObsJucePluginFormatLifecycle::getInstance();
 
     if (auto* midiServer = atk::MidiServer::getInstance())
@@ -136,6 +145,8 @@ void atk::destroy()
     }
 
     lifecycle.shutdown();
+
+    atk::logging::info("LIFECYCLE", "atk::destroy completed");
 }
 
 void atk::update()
@@ -156,7 +167,7 @@ void* atk::getQtMainWindowHandle()
         QWidget* mainQWidget = (QWidget*)obs_frontend_get_main_window();
         if (!mainQWidget)
         {
-            DBG("getQtMainWindowHandle: obs_frontend_get_main_window() returned null");
+            atk::logging::warning("UI", "getQtMainWindowHandle: obs_frontend_get_main_window returned null");
             return nullptr;
         }
 
@@ -174,12 +185,11 @@ void* atk::getQtMainWindowHandle()
         if (nativeHandle)
         {
             g_qtMainWindowHandle = nativeHandle;
-            DBG("getQtMainWindowHandle: Extracted native handle on first access");
-            DBG("  Native handle: " + juce::String::toHexString((juce::pointer_sized_int)nativeHandle));
+            atk::logging::debug("UI", "getQtMainWindowHandle: extracted native handle");
         }
         else
         {
-            DBG("getQtMainWindowHandle: Failed to extract native handle");
+            atk::logging::warning("UI", "getQtMainWindowHandle: failed to extract native handle");
         }
 
         // Apply OBS theme colors to JUCE
@@ -191,7 +201,7 @@ void* atk::getQtMainWindowHandle()
         auto fgColour = juce::Colour(fgColor.red(), fgColor.green(), fgColor.blue());
         atk::LookAndFeel::applyColorsToInstance(bgColour, fgColour);
 
-        DBG("getQtMainWindowHandle: Applied OBS theme colors");
+        atk::logging::debug("UI", "getQtMainWindowHandle: applied OBS theme colors");
 #endif
     }
 
@@ -216,5 +226,5 @@ void atk::applyColors(uint8_t bgR, uint8_t bgG, uint8_t bgB, uint8_t fgR, uint8_
 
 void atk::logMessage(const juce::String& message)
 {
-    DBG(message);
+    atk::logging::info("ATK", message);
 }

src/core/atkaudio/AudioProcessorGraphMT/AudioProcessorGraphMT.cpp

@@ -1,5 +1,6 @@
 #include "AudioProcessorGraphMT.h"
 
+#include <atkaudio/Logging.h>
 #include "SubgraphExtractor.h"
 #include "RealtimeThreadPool.h"
 #include "DependencyTaskGraph.h"
@@ -156,15 +157,13 @@ class Connections
                    + String((int)c.destination.nodeID.uid)
                    + "."
                    + String(c.destination.channelIndex);
-        DBG(msg);
-        Logger::writeToLog(msg);
+        atk::logging::debug("AudioProcessorGraphMT::Connections", msg);
 #endif
 
         if (!canConnect(n, c))
         {
 #ifdef ATK_DEBUG
-            DBG("  canConnect returned FALSE");
-            Logger::writeToLog("  canConnect returned FALSE");
+            atk::logging::warning("AudioProcessorGraphMT::Connections", "rejected illegal graph connection");
 #endif
             return false;
         }
@@ -173,8 +172,7 @@ class Connections
 
 #ifdef ATK_DEBUG
         String countMsg = "  Connection added. Total connections: " + String(getConnections().size());
-        DBG(countMsg);
-        Logger::writeToLog(countMsg);
+        atk::logging::debug("AudioProcessorGraphMT::Connections", countMsg);
 #endif
         jassert(isConnected(c));
         return true;
@@ -3134,17 +3132,7 @@ class ParallelRenderSequence
             }
 
             if (currentLatencySum != chain->latencySum)
-            {
-#ifdef ATK_DEBUG
-                DBG("[PARALLEL] Latency changed in subgraph "
-                    << i
-                    << ": expected "
-                    << chain->latencySum
-                    << ", current "
-                    << currentLatencySum);
-#endif
                 return true;
-            }
         }
         return false;
     }
@@ -3730,11 +3718,6 @@ void AudioProcessorGraphMT::setStateInformation(const void*, int)
 
 void AudioProcessorGraphMT::processBlock(AudioBuffer<float>& audio, MidiBuffer& midi)
 {
-#ifdef ATK_DEBUG
-    if (!midi.isEmpty())
-        DBG("[AudioProcessorGraphMT::processBlock] Received MIDI: " << midi.getNumEvents() << " events");
-#endif
-
     return pimpl->processBlock(audio, midi, getPlayHead());
 }
 
@@ -4401,7 +4384,6 @@ class AudioProcessorGraphTests final : public UnitTest
 
             // No test here, but older versions of the graph would take forever to complete building
             // this graph, so we just want to make sure that we finish the test without timing out.
-            DBG("render sequence built in " + String(duration) + " ms");
         }
     }
 

src/core/atkaudio/AudioProcessorGraphMT/RealtimeThreadPool.h

@@ -3,6 +3,7 @@
 #pragma once
 
 #include "../CpuInfo.h"
+#include <atkaudio/Logging.h>
 #include "../RealtimeThread.h"
 #include "DependencyTaskGraph.h"
 
@@ -155,8 +156,14 @@ class RealtimeThreadPool
         auto physicalCores = getPhysicalCoreMapping();
         const int numPhysical = static_cast<int>(physicalCores.size());
 
-        DBG("[RealtimeThreadPool] Initializing with " << numWorkers << " workers");
-
+        atk::logging::info(
+            "RealtimeThreadPool::initialize",
+            juce::String::formatted(
+                "initializing worker pool with %d workers (physical cores: %d)",
+                numWorkers,
+                numPhysical
+            )
+        );
         for (int i = 0; i < numWorkers; ++i)
         {
             int coreId = -1;