Integrate new preset parser and rewrite/refactor preset rendering.

.github/workflows/build_emscripten.yml

@@ -18,6 +18,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
 
       - name: Setup emsdk
         uses: mymindstorm/setup-emsdk@v11

.github/workflows/build_linux.yml

@@ -18,6 +18,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
 
       - name: Install Packages
         run: |
@@ -53,6 +55,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
 
       - name: Install Packages
         run: |

.github/workflows/build_osx.yml

@@ -18,6 +18,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
 
       - name: Install Packages
         run: brew install sdl2 ninja googletest
@@ -51,6 +53,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
 
       - name: Install Packages
         run: brew install sdl2 ninja googletest

.github/workflows/build_windows.yml

@@ -18,6 +18,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
 
       - name: Install Dependencies
         run: vcpkg --triplet=x64-windows install glew gtest
@@ -51,6 +53,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
 
       - name: Install Dependencies
         run: vcpkg --triplet=x64-windows-static install glew gtest

.github/workflows/run_tests.cmake

@@ -0,0 +1,11 @@
+execute_process(COMMAND "${CMAKE_CTEST_COMMAND}" --build "$ENV{GITHUB_WORKSPACE}/cmake-build"
+        --build-config $ENV{BUILD_TYPE}
+        -V
+        WORKING_DIRECTORY "$ENV{GITHUB_WORKSPACE}/cmake-build"
+
+        RESULT_VARIABLE result
+        )
+
+if(NOT result EQUAL 0)
+    message(FATAL_ERROR "CTest returned bad exit status")
+endif()

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vendor/projectm-eval"]
+	path = vendor/projectm-eval
+	url = https://github.com/projectM-visualizer/projectm-eval.git

BUILDING.md

@@ -32,13 +32,16 @@ If you want to use a stable version of projectM, download the latest release fro
 the [Releases page on GitHub](https://github.com/projectM-visualizer/projectm/releases) and unpack it. You can then skip
 to the next step.
 
-If you prefer a bleeding-edge version or want to modify the code, clone the Git repository:
+If you prefer a bleeding-edge version or want to modify the code, clone the Git repository and initialize any
+submodules:
 
 ```bash
 sudo apt install git # Probably already installed
 git clone https://github.com/projectM-visualizer/projectm.git /path/to/local/repo
 cd /path/to/local/repo
 git fetch --all --tags
+git submodule init
+git submodule update
 ```
 
 ### Build and install projectM

CMakeLists.txt

@@ -65,7 +65,6 @@ option(ENABLE_SYSTEM_GLM "Enable use of system-install GLM library" OFF)
 cmake_dependent_option(ENABLE_LLVM "Enable experimental LLVM JIT support" OFF "NOT ENABLE_EMSCRIPTEN" OFF)
 option(ENABLE_CXX_INTERFACE "Enable exporting C++ symbols for ProjectM and PCM classes, not only the C API. Warning: This is not very portable." OFF)
 
-
 if(ENABLE_SYSTEM_GLM)
     find_package(GLM REQUIRED)
 else()

src/libprojectM/Audio/AudioConstants.hpp

@@ -0,0 +1,10 @@
+#pragma once
+
+namespace libprojectM {
+namespace Audio {
+
+static constexpr int WaveformSamples = 576; //!< Number of waveform data samples available for rendering a frame.
+static constexpr int SpectrumSamples = 512; //!< Number of spectrum analyzer samples.
+
+} // namespace Audio
+} // namespace libprojectM

src/libprojectM/Renderer/BeatDetect.cpp → src/libprojectM/Audio/BeatDetect.cpp

@@ -26,20 +26,16 @@
  * you'll find it online
  */
 
-#include <numeric>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "wipemalloc.h"
-
 #include "BeatDetect.hpp"
 #include "PCM.hpp"
 
 #include <algorithm>
-#include <cmath>
+#include <numeric>
 
+namespace libprojectM {
+namespace Audio {
 
-BeatDetect::BeatDetect(Pcm& _pcm)
+BeatDetect::BeatDetect(PCM& _pcm)
     : pcm(_pcm)
 {
 }
@@ -64,6 +60,28 @@ auto BeatDetect::GetPCMScale() const noexcept -> float
 }
 
 
+auto BeatDetect::GetFrameAudioData() const -> FrameAudioData
+{
+    FrameAudioData data{};
+
+    pcm.GetPcm(data.waveformLeft.data(), CHANNEL_L, WaveformSamples);
+    pcm.GetPcm(data.waveformRight.data(), CHANNEL_R, WaveformSamples);
+    pcm.GetSpectrum(data.spectrumLeft.data(), CHANNEL_L, SpectrumSamples);
+    pcm.GetSpectrum(data.spectrumRight.data(), CHANNEL_R, SpectrumSamples);
+
+    data.vol = vol;
+    data.volAtt = volAtt;
+
+    data.bass = bass;
+    data.bassAtt = bassAtt;
+    data.mid = mid;
+    data.midAtt = midAtt;
+    data.treb = treb;
+    data.trebAtt = trebAtt;
+
+    return data;
+}
+
 auto BeatDetect::CalculateBeatStatistics() -> void
 {
     volOld = vol;
@@ -112,6 +130,7 @@ auto BeatDetect::CalculateBeatStatistics() -> void
 }
 
 
+
 auto BeatDetect::LowPassFilter::Update(float nextValue) noexcept -> void
 {
     m_current -= m_buffer[m_bufferPos] / bufferLength;
@@ -127,3 +146,6 @@ auto BeatDetect::LowPassFilter::Get() const noexcept -> float
 {
     return m_current;
 }
+
+} // namespace Audio
+} // namespace libprojectM

src/libprojectM/Renderer/BeatDetect.hpp → src/libprojectM/Audio/BeatDetect.hpp

@@ -1,4 +1,7 @@
 /**
+ * @file BeatDetect.cpp
+ * @brief Beat detection class. Takes decompressed sound buffers and returns various characteristics.
+ *
  * projectM -- Milkdrop-esque visualisation SDK
  * Copyright (C)2003-2007 projectM Team
  *
@@ -18,28 +21,22 @@
  * See 'LICENSE.txt' included within this release
  *
  */
-/**
- * $Id$
- *
- * Beat detection class. Takes decompressed sound buffers and returns
- * various characteristics
- *
- * $Log$
- *
- */
+#pragma once
 
-#ifndef _BEAT_DETECT_H
-#define _BEAT_DETECT_H
+#include "FrameAudioData.hpp"
+#include "PCM.hpp"
 
-#include "../PCM.hpp"
 #include <array>
 
+namespace libprojectM {
+namespace Audio {
+
 class BeatDetect
 {
 public:
     // We should probably remove pcm from the constructor,
     // and just pass it as an argument to CalculateBeatStatistics.
-    explicit BeatDetect(Pcm& pcm);
+    explicit BeatDetect(PCM& pcm);
 
     auto Reset() noexcept -> void;
 
@@ -54,6 +51,13 @@ class BeatDetect
     [[nodiscard]]
     auto GetPCMScale() const noexcept -> float;
 
+    /**
+     * @brief Returns a filled FrameAudioData structure for the current frame.
+     * @return A FrameAudioData structure with waveform, spectrum beat detection data.
+     */
+    [[nodiscard]]
+    auto GetFrameAudioData() const -> FrameAudioData;
+
     float beatSensitivity{1.f};
 
     float treb{0.f};
@@ -67,7 +71,7 @@ class BeatDetect
     float vol{0.f};
     float volAtt{0.f};
 
-    Pcm& pcm;
+    PCM& pcm;
 
 private:
     class LowPassFilter
@@ -92,4 +96,5 @@ class BeatDetect
     LowPassFilter volSmoothed;
 };
 
-#endif /** !_BEAT_DETECT_H */
+} // namespace Audio
+} // namespace libprojectM

src/libprojectM/Audio/FrameAudioData.cpp

@@ -0,0 +1,7 @@
+#include "FrameAudioData.hpp"
+
+namespace libprojectM {
+namespace Audio {
+
+} // namespace Audio
+} // namespace libprojectM

src/libprojectM/Audio/FrameAudioData.hpp

@@ -0,0 +1,38 @@
+/**
+ * @file FrameAudioData.hpp
+ * @brief Holds all audio data to be used to render a single frame.
+ *
+ * This includes the actual waveform data, spectrum and beat detection values.
+ */
+#pragma once
+
+#include "projectM-4/projectM_export.h"
+#include "AudioConstants.hpp"
+
+#include <array>
+
+namespace libprojectM {
+namespace Audio {
+
+class PROJECTM_EXPORT FrameAudioData
+{
+public:
+    float bass{0.f};
+    float bassAtt{0.f};
+    float mid{0.f};
+    float midAtt{0.f};
+    float treb{0.f};
+    float trebAtt{0.f};
+
+    float vol{0.f};
+    float volAtt{0.f};
+
+    std::array<float, WaveformSamples> waveformLeft;
+    std::array<float, WaveformSamples> waveformRight;
+
+    std::array<float, SpectrumSamples> spectrumLeft;
+    std::array<float, SpectrumSamples> spectrumRight;
+};
+
+} // namespace Audio
+} // namespace libprojectM