0.31.4

Author: atkAudioUser

.gitignore

@@ -10,6 +10,7 @@
 !/src
 !.clang-format
 !.cmake-format.json
+!.gersemirc
 !.gitattributes
 !.gitignore
 !buildspec.json

CMakeLists.txt

@@ -8,7 +8,12 @@ project(${_name} VERSION ${_version})
 # Set default build type to RelWithDebInfo for local development
 # RelWithDebInfo provides optimized code with debug symbols (PDB files on Windows)
 if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build (Debug, Release, or RelWithDebInfo)" FORCE)
+    set(CMAKE_BUILD_TYPE
+        "RelWithDebInfo"
+        CACHE STRING
+        "Choose the type of build (Debug, Release, or RelWithDebInfo)"
+        FORCE
+    )
 endif()
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 
@@ -20,29 +25,85 @@ include(helpers)
 
 # Read buildspec.json early for Qt configuration
 file(READ "${CMAKE_SOURCE_DIR}/buildspec.json" buildspec)
-string(JSON QT6_VERSION GET ${buildspec} dependencies qt6 version)
+string(
+    JSON QT6_VERSION
+    GET ${buildspec}
+    dependencies
+    qt6
+    version
+)
 
-# Persistent dependency directory (survives cache clears)
-if(WIN32)
-    set(DEPS_DIR "${CMAKE_SOURCE_DIR}/_deps/${CMAKE_VS_PLATFORM_NAME}")
-else()
-    set(DEPS_DIR "${CMAKE_SOURCE_DIR}/_deps")
-endif()
+# Define architecture-specific dependency directory in the build directory
+# Use CMAKE_BINARY_DIR so it works with any configured build directory
+set(DEPS_DIR "${CMAKE_BINARY_DIR}/obs-deps")
 
-# Qt paths for Windows builds
+# Configure Qt paths for cross-compilation on Windows
 if(WIN32)
     if(CMAKE_VS_PLATFORM_NAME STREQUAL "ARM64")
-        # ARM64 cross-compilation: use x64 Qt tools with ARM64 libraries
+        # ARM64 Cross-compilation setup
+        # x64 Qt host tools are in source-dir/_deps/x64 (persistent across builds)
         set(QT_HOST_PATH "${CMAKE_SOURCE_DIR}/_deps/x64/obs-deps-qt6-${QT6_VERSION}-x64")
-        set(Qt6_DIR "${DEPS_DIR}/obs-deps-qt6-${QT6_VERSION}-ARM64/lib/cmake/Qt6" CACHE PATH "" FORCE)
-        set(Qt6CoreTools_DIR "${QT_HOST_PATH}/lib/cmake/Qt6CoreTools" CACHE PATH "" FORCE)
-        set(Qt6GuiTools_DIR "${QT_HOST_PATH}/lib/cmake/Qt6GuiTools" CACHE PATH "" FORCE)
-        set(Qt6WidgetsTools_DIR "${QT_HOST_PATH}/lib/cmake/Qt6WidgetsTools" CACHE PATH "" FORCE)
-        set(CMAKE_AUTOMOC_MOC_EXECUTABLE "${QT_HOST_PATH}/bin/moc.exe" CACHE FILEPATH "" FORCE)
-        set(CMAKE_AUTOUIC_UIC_EXECUTABLE "${QT_HOST_PATH}/bin/uic.exe" CACHE FILEPATH "" FORCE)
-        set(CMAKE_AUTORCC_RCC_EXECUTABLE "${QT_HOST_PATH}/bin/rcc.exe" CACHE FILEPATH "" FORCE)
+        set(Qt6_DIR
+            "${DEPS_DIR}/obs-deps-qt6-${QT6_VERSION}-ARM64/lib/cmake/Qt6"
+            CACHE STRING
+            "Qt6 ARM64 CMake directory"
+            FORCE
+        )
+
+        message(STATUS "ARM64 Cross-compilation detected")
+        message(STATUS "QT_HOST_PATH: ${QT_HOST_PATH}")
+        message(STATUS "Qt6_DIR: ${Qt6_DIR}")
+
+        # Check if x64 Qt host tools exist
+        if(EXISTS "${QT_HOST_PATH}/bin/moc.exe")
+            message(STATUS "Found x64 Qt host tools at: ${QT_HOST_PATH}")
+        else()
+            message(
+                FATAL_ERROR
+                "x64 Qt host tools not found at: ${QT_HOST_PATH}. ARM64 cross-compilation requires both x64 and ARM64 Qt dependencies."
+            )
+        endif()
+
+        # Set Qt host tools for cross-compilation (use x64 tools for ARM64 builds)
+        set(Qt6CoreTools_DIR "${QT_HOST_PATH}/lib/cmake/Qt6CoreTools" CACHE STRING "Qt6 x64 Core Tools" FORCE)
+        set(Qt6GuiTools_DIR "${QT_HOST_PATH}/lib/cmake/Qt6GuiTools" CACHE STRING "Qt6 x64 GUI Tools" FORCE)
+        set(Qt6WidgetsTools_DIR "${QT_HOST_PATH}/lib/cmake/Qt6WidgetsTools" CACHE STRING "Qt6 x64 Widget Tools" FORCE)
+
+        # Explicitly set tool executables that AUTOMOC/AUTOUIC/AUTORCC will use
+        set(CMAKE_AUTOMOC_MOC_EXECUTABLE
+            "${QT_HOST_PATH}/bin/moc.exe"
+            CACHE FILEPATH
+            "MOC executable for ARM64 cross-compilation"
+            FORCE
+        )
+        set(CMAKE_AUTOUIC_UIC_EXECUTABLE
+            "${QT_HOST_PATH}/bin/uic.exe"
+            CACHE FILEPATH
+            "UIC executable for ARM64 cross-compilation"
+            FORCE
+        )
+        set(CMAKE_AUTORCC_RCC_EXECUTABLE
+            "${QT_HOST_PATH}/bin/rcc.exe"
+            CACHE FILEPATH
+            "RCC executable for ARM64 cross-compilation"
+            FORCE
+        )
+
+        # Also set the legacy variables for compatibility
+        set(QT_MOC_EXECUTABLE "${QT_HOST_PATH}/bin/moc.exe")
+        set(QT_RCC_EXECUTABLE "${QT_HOST_PATH}/bin/rcc.exe")
+        set(QT_UIC_EXECUTABLE "${QT_HOST_PATH}/bin/uic.exe")
+
+        message(STATUS "Set CMAKE_AUTOMOC_MOC_EXECUTABLE to: ${CMAKE_AUTOMOC_MOC_EXECUTABLE}")
     else()
-        set(Qt6_DIR "${DEPS_DIR}/obs-deps-qt6-${QT6_VERSION}-x64/lib/cmake/Qt6" CACHE PATH "" FORCE)
+        # x64 build - set paths to x64 Qt
+        set(Qt6_DIR
+            "${DEPS_DIR}/obs-deps-qt6-${QT6_VERSION}-x64/lib/cmake/Qt6"
+            CACHE STRING
+            "Qt6 x64 CMake directory"
+            FORCE
+        )
+        message(STATUS "x64 build detected - using x64 Qt at: ${Qt6_DIR}")
     endif()
 endif()
 
@@ -58,8 +119,19 @@ if(ENABLE_FRONTEND_API)
 endif()
 
 # Qt is always required for proper window parenting
-find_package(Qt6 COMPONENTS Widgets Core REQUIRED)
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt6::Core Qt6::Widgets)
+find_package(
+    Qt6
+    COMPONENTS
+        Widgets
+        Core
+    REQUIRED
+)
+target_link_libraries(
+    ${CMAKE_PROJECT_NAME}
+    PRIVATE
+        Qt6::Core
+        Qt6::Widgets
+)
 target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE ENABLE_QT)
 target_compile_options(
     ${CMAKE_PROJECT_NAME}
@@ -69,57 +141,86 @@ target_compile_options(
 )
 set_target_properties(
     ${CMAKE_PROJECT_NAME}
-    PROPERTIES AUTOMOC ON AUTOUIC ON AUTORCC ON
+    PROPERTIES
+        AUTOMOC
+            ON
+        AUTOUIC
+            ON
+        AUTORCC
+            ON
 )
 
 file(GLOB_RECURSE _sources CONFIGURE_DEPENDS src/*.cpp)
 target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${_sources})
 
 set_target_properties_plugin(${CMAKE_PROJECT_NAME} PROPERTIES OUTPUT_NAME ${_name})
 
-set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES CXX_STANDARD 23)
+set_target_properties(
+    ${CMAKE_PROJECT_NAME}
+    PROPERTIES
+        CXX_STANDARD
+            23
+)
 
 add_subdirectory(lib/atkaudio)
 
 string(JSON PLUGIN_DISPLAY_NAME GET ${buildspec} displayName)
 string(JSON PLUGIN_AUTHOR GET ${buildspec} author)
-string(JSON PLUGIN_OBS_VERSION_REQUIRED GET ${buildspec} dependencies obs-studio version)
+string(
+    JSON PLUGIN_OBS_VERSION_REQUIRED
+    GET ${buildspec}
+    dependencies
+    obs-studio
+    version
+)
 string(TIMESTAMP PLUGIN_YEAR "%Y")
 set(PLUGIN_AUTHOR "${PLUGIN_AUTHOR}")
 
 configure_file(src/config.h.in config.h @ONLY)
 
 include(./lib/atkaudio/cmake/cpack.cmake)
 
-
 # Build tests
 include(CTest)
 add_subdirectory(tests)
 
 # Automatically run install after build (skip in CI or when installing to system directories without permissions)
 if(NOT DEFINED ENV{CI} AND NOT DEFINED ENV{GITHUB_ACTIONS} AND NOT CMAKE_INSTALL_PREFIX MATCHES "^/usr")
-    add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --config $<CONFIG> --component plugin
+    add_custom_command(
+        TARGET ${CMAKE_PROJECT_NAME}
+        POST_BUILD
+        COMMAND
+            ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --config $<CONFIG> --component plugin
         COMMENT "Installing plugin after build..."
     )
 endif()
 
-# On non-CI Linux builds, copy plugin to user home directory after build
+# On non-CI Linux builds, copy plugin and scanner to user home directory after build
 if(NOT DEFINED ENV{CI} AND NOT DEFINED ENV{GITHUB_ACTIONS} AND UNIX AND NOT APPLE)
     message(STATUS "Configuring post-build copy to ~/.config/obs-studio/plugins/")
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(_user_arch "64bit")
     else()
         set(_user_arch "32bit")
     endif()
-    
-    add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory "$ENV{HOME}/.config/obs-studio/plugins/${_name}/bin/${_user_arch}"
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${CMAKE_PROJECT_NAME}>" "$ENV{HOME}/.config/obs-studio/plugins/${_name}/bin/${_user_arch}/"
-        COMMAND ${CMAKE_COMMAND} -E make_directory "$ENV{HOME}/.config/obs-studio/plugins/${_name}/data"
-        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/data" "$ENV{HOME}/.config/obs-studio/plugins/${_name}/data"
-        COMMENT "Copying ${_name} to user home OBS plugins directory..."
+
+    add_custom_command(
+        TARGET ${CMAKE_PROJECT_NAME}
+        POST_BUILD
+        COMMAND
+            ${CMAKE_COMMAND} -E make_directory "$ENV{HOME}/.config/obs-studio/plugins/${_name}/bin/${_user_arch}"
+        COMMAND
+            ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${CMAKE_PROJECT_NAME}>"
+            "$ENV{HOME}/.config/obs-studio/plugins/${_name}/bin/${_user_arch}/"
+        COMMAND
+            ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${CMAKE_PROJECT_NAME}_scanner>"
+            "$ENV{HOME}/.config/obs-studio/plugins/${_name}/bin/${_user_arch}/"
+        COMMAND
+            ${CMAKE_COMMAND} -E make_directory "$ENV{HOME}/.config/obs-studio/plugins/${_name}/data"
+        COMMAND
+            ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/data"
+            "$ENV{HOME}/.config/obs-studio/plugins/${_name}/data"
+        COMMENT "Copying ${_name} and scanner to user home OBS plugins directory..."
         VERBATIM
     )
 endif()
-

CMakePresets.json

@@ -204,6 +204,13 @@
       "description": "Windows build for x64",
       "configuration": "RelWithDebInfo"
     },
+    {
+      "name": "windows-x64-release",
+      "configurePreset": "windows-x64",
+      "displayName": "Windows x64 Release",
+      "description": "Windows build for x64 (full Release configuration)",
+      "configuration": "Release"
+    },
     {
       "name": "windows-ci-x64",
       "configurePreset": "windows-ci-x64",

build-aux/pre-commit

@@ -0,0 +1,77 @@
+#!/bin/sh
+# Pre-commit hook for clang-format and gersemi
+# Runs formatters on staged files before commit
+# This file should be copied or symlinked to .git/hooks/pre-commit
+
+set -e
+
+ROOT_DIR=$(git rev-parse --show-toplevel)
+
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[0;33m'
+NC='\033[0m'
+
+echo "Running pre-commit formatting checks..."
+
+# --- clang-format check ---
+CPP_FILES=$(git diff --cached --name-only --diff-filter=ACMR | grep -E '\.(c|cpp|h|hpp|cc|cxx|hxx)$' || true)
+
+if [ -n "$CPP_FILES" ]; then
+    echo "Checking C/C++ files with clang-format..."
+    
+    if command -v clang-format >/dev/null 2>&1; then
+        CLANG_FORMAT="clang-format"
+    elif command -v clang-format-19 >/dev/null 2>&1; then
+        CLANG_FORMAT="clang-format-19"
+    elif command -v clang-format-18 >/dev/null 2>&1; then
+        CLANG_FORMAT="clang-format-18"
+    else
+        echo "${YELLOW}Warning: clang-format not found, skipping C/C++ formatting check${NC}"
+        CLANG_FORMAT=""
+    fi
+    
+    if [ -n "$CLANG_FORMAT" ]; then
+        for file in $CPP_FILES; do
+            if [ -f "$ROOT_DIR/$file" ]; then
+                if ! $CLANG_FORMAT --style=file --dry-run --Werror "$ROOT_DIR/$file" 2>/dev/null; then
+                    echo "${RED}Formatting required: $file${NC}"
+                    $CLANG_FORMAT --style=file -i "$ROOT_DIR/$file"
+                    git add "$ROOT_DIR/$file"
+                    echo "${GREEN}Formatted and re-staged: $file${NC}"
+                fi
+            fi
+        done
+    fi
+fi
+
+# --- gersemi check ---
+CMAKE_FILES=$(git diff --cached --name-only --diff-filter=ACMR | grep -E '(CMakeLists\.txt|\.cmake)$' || true)
+
+if [ -n "$CMAKE_FILES" ]; then
+    echo "Checking CMake files with gersemi..."
+    
+    if command -v gersemi >/dev/null 2>&1; then
+        GERSEMI="gersemi"
+    else
+        echo "${YELLOW}Warning: gersemi not found, skipping CMake formatting check${NC}"
+        echo "${YELLOW}Install with: pip install gersemi${NC}"
+        GERSEMI=""
+    fi
+    
+    if [ -n "$GERSEMI" ]; then
+        for file in $CMAKE_FILES; do
+            if [ -f "$ROOT_DIR/$file" ]; then
+                if ! $GERSEMI --check "$ROOT_DIR/$file" 2>/dev/null; then
+                    echo "${RED}Formatting required: $file${NC}"
+                    $GERSEMI -i "$ROOT_DIR/$file"
+                    git add "$ROOT_DIR/$file"
+                    echo "${GREEN}Formatted and re-staged: $file${NC}"
+                fi
+            fi
+        done
+    fi
+fi
+
+echo "${GREEN}Pre-commit checks completed.${NC}"
+exit 0

build-aux/run-clang-format

@@ -0,0 +1,49 @@
+#!/bin/sh
+# Run clang-format on all C/C++ files in the project
+# Usage: ./run-clang-format [--check]
+
+set -e
+
+ROOT_DIR=$(git rev-parse --show-toplevel 2>/dev/null || dirname "$(dirname "$0")")
+
+# Find clang-format
+if command -v clang-format >/dev/null 2>&1; then
+    CLANG_FORMAT="clang-format"
+elif command -v clang-format-19 >/dev/null 2>&1; then
+    CLANG_FORMAT="clang-format-19"
+elif command -v clang-format-18 >/dev/null 2>&1; then
+    CLANG_FORMAT="clang-format-18"
+else
+    echo "Error: clang-format not found"
+    exit 1
+fi
+
+echo "Using: $($CLANG_FORMAT --version)"
+
+# Find all C/C++ files
+CPP_FILES=$(find "$ROOT_DIR/src" "$ROOT_DIR/lib" "$ROOT_DIR/tests" -type f \( -name "*.c" -o -name "*.cpp" -o -name "*.h" -o -name "*.hpp" \) 2>/dev/null || true)
+
+if [ -z "$CPP_FILES" ]; then
+    echo "No C/C++ files found"
+    exit 0
+fi
+
+if [ "$1" = "--check" ]; then
+    echo "Checking formatting..."
+    FAILED=0
+    for file in $CPP_FILES; do
+        if ! $CLANG_FORMAT --style=file --dry-run --Werror "$file" 2>/dev/null; then
+            echo "Needs formatting: $file"
+            FAILED=1
+        fi
+    done
+    if [ $FAILED -eq 1 ]; then
+        echo "Some files need formatting. Run without --check to format."
+        exit 1
+    fi
+    echo "All files are properly formatted."
+else
+    echo "Formatting files..."
+    echo "$CPP_FILES" | xargs $CLANG_FORMAT --style=file -i
+    echo "Done."
+fi