Upstream sync

.codespellrc

@@ -0,0 +1,3 @@
+[codespell]
+skip = ./.git,./.deps,./.libs,./autom4te.cache,./build,./third_party,./yasb,./cava_win/packages,./cava_win/x64,./cava_win/vcpkg_installed,./cava_win/meson-private,./m4,./Makefile,./Makefile.in,./aclocal.m4,./ar-lib,./compile,./config.guess,./config.sub,./configure,./depcomp,./install-sh,./libtool,./ltmain.sh,./missing,./version,./cava
+ignore-words-list = datas

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/workflows/android.yml

@@ -1,6 +1,7 @@
+---
 name: Build CAVA Android
 
-on:
+'on':
   workflow_dispatch:
 
 jobs:
@@ -32,12 +33,13 @@ jobs:
 
       - name: Export NDK path
         run: |
-          echo "ANDROID_NDK_HOME=$ANDROID_SDK_ROOT/ndk/25.2.9519653" >> $GITHUB_ENV
-          echo "$ANDROID_SDK_ROOT/ndk/25.2.9519653" >> $GITHUB_PATH
+          echo "ANDROID_NDK_HOME=${ANDROID_SDK_ROOT}/ndk/25.2.9519653" \
+            >> "${GITHUB_ENV}"
+          echo "${ANDROID_SDK_ROOT}/ndk/25.2.9519653" >> "${GITHUB_PATH}"
 
       - name: Clone fftw3-android
         run: |
-          cd $GITHUB_WORKSPACE
+          cd "${GITHUB_WORKSPACE}"
           git clone https://github.com/Lauszus/fftw3-android
 
       - name: Build fftw3-android
@@ -50,7 +52,7 @@ jobs:
         run: |
           cd cava/cavandroid
           ./gradlew assembleRelease \
-            -Pcmake.fftw3.dir="$GITHUB_WORKSPACE/fftw3-android"
+            -Pcmake.fftw3.dir="${GITHUB_WORKSPACE}/fftw3-android"
 
       - name: Upload APK
         uses: actions/upload-artifact@v4

.github/workflows/build-and-test.yml

@@ -1,106 +1,181 @@
+---
 name: build-and-test
-on: [push, pull_request, workflow_dispatch]
+
+'on':
+  push:
+  pull_request:
+  workflow_dispatch:
+
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: DoozyX/clang-format-lint-action@v0.5
-      with:
-        source: '.'
-        exclude: './third_party'
-        extensions: 'h,c'
+      - uses: actions/checkout@v4
+      - uses: DoozyX/clang-format-lint-action@v0.5
+        with:
+          source: .
+          exclude: ./third_party
+          extensions: h,c
+
   build-linux:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install libfftw3-dev libasound2-dev libncursesw5-dev libpulse-dev libtool automake autoconf-archive libiniparser-dev portaudio19-dev libsndio-dev libsdl2-2.0-0 libsdl2-dev squeezelite pulseaudio libpipewire-0.3-dev
-    - name: Generate configure
-      run: ./autogen.sh
-    - name: Run ./configure
-      run: ./configure
-    - name: Run make
-      run: make CFLAGS='-Werror'
-#    - name: Run make distcheck
-#      run: make distcheck
-    - name: Prepare tests
-      run: |
-        pulseaudio -D
-        squeezelite -o pulse -v -m 51:fb:32:f8:e6:9f -z
-    - name: run non zero test
-      run: ./cava -p example_files/test_configs/non_zero_test > /dev/null
-    - name: run pulseaudio test
-      run: ./cava -p example_files/test_configs/pulse_zero_test > /dev/null
-    - name: run fifo test
-      run: ./cava -p example_files/test_configs/fifo_zero_test > /dev/null
-    - name: run shmem test
-      run: ./cava -p example_files/test_configs/shmem_zero_test > /dev/null
-    - name: build cavacore test application
-      run: gcc -I include -c -g cavacore_test.c
-    - name: link cavacore test application
-      run: gcc -o cavacore_test cavacore_test.o cava-cavacore.o -lm -lfftw3
-    - name: run cavacore test application
-      run: ./cavacore_test
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libfftw3-dev \
+            libasound2-dev \
+            libncursesw5-dev \
+            libpulse-dev \
+            libtool \
+            automake \
+            autoconf-archive \
+            libiniparser-dev \
+            portaudio19-dev \
+            libsndio-dev \
+            libsdl2-2.0-0 \
+            libsdl2-dev \
+            squeezelite \
+            pulseaudio \
+            libpipewire-0.3-dev
+      - name: Generate configure
+        run: ./autogen.sh
+      - name: Run ./configure
+        run: ./configure
+      - name: Run make
+        run: make CFLAGS='-Werror'
+#      - name: Run make distcheck
+#        run: make distcheck
+      - name: Prepare tests
+        run: |
+          pulseaudio -D
+          squeezelite -o pulse -v -m 51:fb:32:f8:e6:9f -z
+      - name: run non zero test
+        run: ./cava -p example_files/test_configs/non_zero_test > /dev/null
+      - name: run pulseaudio test
+        run: ./cava -p example_files/test_configs/pulse_zero_test > /dev/null
+      - name: run fifo test
+        run: ./cava -p example_files/test_configs/fifo_zero_test > /dev/null
+      - name: run shmem test
+        run: ./cava -p example_files/test_configs/shmem_zero_test > /dev/null
+      - name: build cavacore test application
+        run: gcc -I include -c -g cavacore_test.c
+      - name: link cavacore test application
+        run: gcc -o cavacore_test cavacore_test.o cava-cavacore.o -lm -lfftw3
+      - name: run cavacore test application
+        run: ./cavacore_test
+
   build-linux-meson:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - name: Install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install libfftw3-dev libasound2-dev libncursesw5-dev libpulse-dev libtool automake autoconf-archive libiniparser-dev portaudio19-dev libsndio-dev libsdl2-2.0-0 libsdl2-dev squeezelite pulseaudio libpipewire-0.3-dev meson
-    - name: configure project
-      run: meson setup -Dcpp_std=c++20 -Dbuild_target=all build
-    - name: Run make
-      run: ninja -C build
-    - name: Prepare tests
-      run: |
-        pulseaudio -D
-        squeezelite -o pulse -v -m 51:fb:32:f8:e6:9f -z
-    - name: run non zero test
-      run: ./build/cava -p example_files/test_configs/non_zero_test > /dev/null
-    - name: run pulseaudio test
-      run: ./build/cava -p example_files/test_configs/pulse_zero_test > /dev/null
-    - name: run fifo test
-      run: ./build/cava -p example_files/test_configs/fifo_zero_test > /dev/null
-    - name: run shmem test
-      run: ./build/cava -p example_files/test_configs/shmem_zero_test > /dev/null
-    - name: build cavacore test application
-      run: gcc -I include -c -g cavacore_test.c
-    - name: link cavacore test application
-      run: gcc -I include -o cavacore_test cavacore_test.c build/libcava.so.p/cavacore.c.o -lm -lfftw3
-    - name: run cavacore test application
-      run: ./cavacore_test
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libfftw3-dev \
+            libasound2-dev \
+            libncursesw5-dev \
+            libpulse-dev \
+            libtool \
+            automake \
+            autoconf-archive \
+            libiniparser-dev \
+            portaudio19-dev \
+            libsndio-dev \
+            libsdl2-2.0-0 \
+            libsdl2-dev \
+            squeezelite \
+            pulseaudio \
+            libpipewire-0.3-dev \
+            meson
+      - name: Generate configure
+        run: meson setup -Dcpp_std=c++20 -Dbuild_target=all build
+      - name: Run make
+        run: ninja -C build
+      - name: Prepare tests
+        run: |
+          pulseaudio -D
+          squeezelite -o pulse -v -m 51:fb:32:f8:e6:9f -z
+      - name: run non zero test
+        run: ./build/cava -p example_files/test_configs/non_zero_test > /dev/null
+      - name: run pulseaudio test
+        run: ./build/cava -p example_files/test_configs/pulse_zero_test > /dev/null
+      - name: run fifo test
+        run: ./build/cava -p example_files/test_configs/fifo_zero_test > /dev/null
+      - name: run shmem test
+        run: ./build/cava -p example_files/test_configs/shmem_zero_test > /dev/null
+      - name: build cavacore test application
+        run: gcc -I include -c -g cavacore_test.c
+      - name: link cavacore test application
+        run: |
+          gcc -I include -o cavacore_test cavacore_test.c -L./build -lcava -lm -lfftw3
+        env:
+          LD_LIBRARY_PATH: ./build:$LD_LIBRARY_PATH
+      - name: run cavacore test application
+        run: |
+          LD_LIBRARY_PATH=./build:$LD_LIBRARY_PATH ./cavacore_test
+
   build-macos:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Install dependencies
-      run: |
-        brew install fftw libtool automake portaudio iniparser sdl2
-        ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
-    - name: Generate configuresdl2
-      run: PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" ./autogen.sh
-    - name: Run ./configure
-      run: LDFLAGS="-L/opt/homebrew/lib" CPPFLAGS="-I/opt/homebrew/include" ./configure
-    - name: Run make
-      run:  make CFLAGS='-Werror'
-    - name: run non zero test
-      run: ./cava -p example_files/test_configs/non_zero_test > /dev/null
+      - uses: actions/checkout@v4
+      - name: Install dependencies
+        run: |
+          brew install fftw libtool automake portaudio iniparser sdl2
+          ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize
+      - name: Generate configuresdl2
+        run: |
+          PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" ./autogen.sh
+      - name: Run ./configure
+        run: |
+          LDFLAGS="-L/opt/homebrew/lib" \
+          CPPFLAGS="-I/opt/homebrew/include" \
+          ./configure
+      - name: Run make
+        run: make CFLAGS='-Werror'
+      - name: run non zero test
+        run: ./cava -p example_files/test_configs/non_zero_test > /dev/null
 
   build-windows:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v2
-    - name: Install dependencies
-      run: nuget restore cava_win\cava_win.sln
-    - name: Run msbuild
-      run: msbuild /p:Configuration=Debug cava_win\cava_win.sln
+      - uses: actions/checkout@v4
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v2
+      - name: Install vcpkg
+        run: |
+          git clone https://github.com/microsoft/vcpkg.git
+          .\vcpkg\bootstrap-vcpkg.bat
+      - name: Set VCPKG_ROOT
+        run: |
+          echo "VCPKG_ROOT=$(pwd)\vcpkg" >> $env:GITHUB_ENV
+      - name: Install vcpkg dependencies
+        run: |
+          cd cava_win
+          & $env:VCPKG_ROOT\\vcpkg install
+          cd ..
+      - name: Run msbuild with vcpkg
+        run: |
+          msbuild /p:Configuration=Release /p:VcpkgEnabled=true /p:VcpkgRoot=$env:VCPKG_ROOT /p:VcpkgTriplet=x64-windows cava_win\cava_win.sln
+      - name: Install WiX Toolset
+        run: dotnet tool install --global wix --version 6.0.2
+      - name: Install WiX extensions
+        run: |
+          wix extension add WixToolset.UI.wixext/6.0.2
+          wix extension add WixToolset.Util.wixext/6.0.2
+      - name: Build MSI installer
+        run: |
+          $versionLine = Select-String -Path cava_win\setup.iss -Pattern '^AppVersion=' | Select-Object -First 1
+          $cavaVersion = $versionLine.Line.Split('=')[1].Trim()
+          wix build -arch x64 cava_win\cava.wxs -d CavaVersion=$cavaVersion -ext WixToolset.UI.wixext -ext WixToolset.Util.wixext -o cava_win\cava_win_x64_install.msi
+      - name: Upload MSI artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: cava-msi
+          path: cava_win\cava_win_x64_install.msi
 
   build-mingw:
     runs-on: windows-latest
@@ -111,12 +186,12 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-    - uses: actions/checkout@v4
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: ${{matrix.msystem}}
-        pacboy: cc cmake fftw glew ninja SDL2
-    - name: Run cmake build
-      run: |
-        cmake -B bin
-        cmake --build bin
+      - uses: actions/checkout@v4
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{ matrix.msystem }}
+          pacboy: cc cmake fftw glew ninja SDL2
+      - name: Run cmake build
+        run: |
+          cmake -B bin
+          cmake --build bin

.gitignore

@@ -28,5 +28,14 @@ cava
 build/*
 cava_win/packages/*
 cava_win/x64/*
-yasb/*
 cava_win/vcpkg_installed/vcpkg/*
+cava_win/vcpkg_installed/x64-windows/*
+cava_win/meson-private
+
+*~
+*.orig
+*.rej
+
+!.codespellrc
+!.github/
+!.github/**

CAVACORE.md

@@ -11,17 +11,17 @@ the raw output data from fftw will not look very nice when used directly in a vi
 to improve the look of the visualization:
 
 
-## adjustable bandwith
+## adjustable bandwidth
 
-Theoretically the human ear can hear frequencies up to 20kHz, but the information above 10k is hard to separate from eachother
+Theoretically the human ear can hear frequencies up to 20kHz, but the information above 10k is hard to separate from each other
 and does not give much feedback by itself when visualizing audio. Similarly audio down to 20Hz can be heard, but the frequencies
 below 50Hz does not directly provide anything to the visualizing of the audio.
 
 
 ## spread the output logarithmically
 
-The human ear hears different frequencies logarithmically, so notes that are 2x and 4x higher than eachother, will be preceived
-as beeing a fixed amount higher than eachother. Therefore cavacore outputs the frequencies logarithmically. Cavacore will also
+The human ear hears different frequencies logarithmically, so notes that are 2x and 4x higher than each other will be perceived
+as being a fixed amount higher than each other. Therefore cavacore outputs the frequencies logarithmically. Cavacore will also
 group the output in the desired number of samples.