Created new, rewritten projectM SDL app.

Author: kblaschke

.gitignore

@@ -0,0 +1,65 @@
+cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+
+if(CMAKE_VERSION VERSION_LESS 3.19 AND CMAKE_GENERATOR STREQUAL "Xcode")
+    message(AUTHOR_WARNING "Using a CMake version before 3.19 with a recent Xcode SDK and the Xcode generator "
+            "will likely result in CMake failing to find the AppleClang compiler. Either upgrade CMake to at least "
+            "version 3.19 or use a different generator, e.g. \"Unix Makefiles\" or \"Ninja\".")
+endif()
+
+project(projectM_SDL)
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED YES)
+set(CMAKE_POSITION_INDEPENDENT_CODE YES)
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+project(projectMSDL
+        LANGUAGES C CXX
+        VERSION 2.0.0
+        )
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+set(PROJECTM_LINKAGE "shared" CACHE STRING "Set to either shared or static to specify how libprojectM should be linked. Defaults to shared.")
+set(SDL2_LINKAGE "shared" CACHE STRING "Set to either shared or static to specify how libSDL2 should be linked. Defaults to shared.")
+
+if(NOT PROJECTM_LINKAGE STREQUAL "shared" AND NOT PROJECTM_LINKAGE STREQUAL "static")
+    message(FATAL_ERROR "Invalid libprojectM linkage provided in PROJECTM_LINKAGE: \"${PROJECTM_LINKAGE}\".\n"
+                        "Please specify either \"shared\" or \"static\"."
+            )
+endif()
+
+if(NOT SDL2_LINKAGE STREQUAL "shared" AND NOT SDL2_LINKAGE STREQUAL "static")
+    message(FATAL_ERROR "Invalid libSDL2 linkage provided in SDL2_LINKAGE: \"${SDL2_LINKAGE}\".\n"
+            "Please specify either \"shared\" or \"static\"."
+            )
+endif()
+
+find_package(libprojectM REQUIRED)
+find_package(SDL2 REQUIRED)
+find_package(Poco REQUIRED COMPONENTS Util)
+
+if(SDL2_VERSION VERSION_LESS 2.0.5)
+    message(FATAL_ERROR "libSDL version 2.0.5 or higher is required. Version found: ${SDL2_VERSION}.")
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND SDL2_VERSION VERSION_LESS 2.0.16)
+    message(AUTHOR_WARNING
+            "NOTE: libSDL 2.0.15 and lower do not support capture from PulseAudio \"monitor\" devices.\n"
+            "It is highly recommended to use at least version 2.0.16!"
+            )
+endif()
+
+add_subdirectory(src)
+
+if(ENABLE_TESTING)
+    add_subdirectory(test)
+endif()
+
+include(install.cmake)
+include(packaging.cmake)
+
+message(STATUS "SDL version: ${SDL2_VERSION}")
+message(STATUS "Poco version: ${Poco_VERSION}")
+message(STATUS "projectM version: ${libprojectM_VERSION}")

CMakeLists.txt

@@ -0,0 +1,68 @@
+# Helper script to add the SDL2 CMake target and version variable as introduced in SDL 2.0.12.
+# Also fixes a wrong include path provided by the SDL2 config script.
+
+
+# Proper CMake target support was added in SDL 2.0.12, create one
+# Need to search again to find the full path of libSDL2
+if(NOT TARGET SDL2::SDL2)
+    # Remove -lSDL2 as that is handled by CMake, note the space at the end so it does not replace e.g. -lSDL2main
+    # This may require "libdir" being set (from above)
+    string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS " -lSDL2 ")
+    string(STRIP "${SDL2_EXTRA_LINK_FLAGS}" SDL2_EXTRA_LINK_FLAGS)
+    string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS_STATIC " -Wl,--no-undefined -lm -ldl  -lasound -lm -ldl -lpthread -lpulse-simple -lpulse  -lX11 -lXext -lXcursor -lXinerama -lXi -lXrandr -lXss -lXxf86vm -lpthread -lrt ")
+    string(STRIP "${SDL2_EXTRA_LINK_FLAGS_STATIC}" SDL2_EXTRA_LINK_FLAGS_STATIC)
+
+    find_library(SDL2_LIBRARY SDL2)
+    if(NOT SDL2_LIBRARY)
+        message(FATAL_ERROR "Could not determine the location of the SDL2 library.")
+    endif()
+
+    add_library(SDL2::SDL2 SHARED IMPORTED)
+    set_target_properties(SDL2::SDL2 PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
+            IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+            IMPORTED_LOCATION "${SDL2_LIBRARY}"
+            INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}")
+
+    find_library(SDL2MAIN_LIBRARY SDL2main)
+    if(NOT SDL2MAIN_LIBRARY)
+        message(FATAL_ERROR "Could not determine the location of the SDL2main library.")
+    endif()
+
+    add_library(SDL2::SDL2main STATIC IMPORTED)
+    set_target_properties(SDL2::SDL2main PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+            IMPORTED_LOCATION "${SDL2MAIN_LIBRARY}")
+
+    # Retrieve the version from the SDL2_version.h header
+    if(SDL2_INCLUDE_DIRS AND EXISTS "${SDL2_INCLUDE_DIRS}/SDL_version.h")
+        file(STRINGS "${SDL2_INCLUDE_DIRS}/SDL_version.h" SDL_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
+        file(STRINGS "${SDL2_INCLUDE_DIRS}/SDL_version.h" SDL_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
+        file(STRINGS "${SDL2_INCLUDE_DIRS}/SDL_version.h" SDL_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
+        string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_VERSION_MAJOR "${SDL_VERSION_MAJOR_LINE}")
+        string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_VERSION_MINOR "${SDL_VERSION_MINOR_LINE}")
+        string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL_VERSION_PATCH "${SDL_VERSION_PATCH_LINE}")
+        set(SDL2_VERSION ${SDL_VERSION_MAJOR}.${SDL_VERSION_MINOR}.${SDL_VERSION_PATCH})
+        unset(SDL_VERSION_MAJOR_LINE)
+        unset(SDL_VERSION_MINOR_LINE)
+        unset(SDL_VERSION_PATCH_LINE)
+        unset(SDL_VERSION_MAJOR)
+        unset(SDL_VERSION_MINOR)
+        unset(SDL_VERSION_PATCH)
+    endif()
+
+endif()
+
+# Temporary fix to deal with wrong include dir set by SDL2's CMake configuration.
+get_target_property(_SDL2_INCLUDE_DIR SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES)
+if(_SDL2_INCLUDE_DIR MATCHES "(.+)/SDL2\$")
+    message(STATUS "SDL2 include dir contains \"SDL2\" subdir (SDL bug #4004) - fixing to \"${CMAKE_MATCH_1}\".")
+    set_target_properties(SDL2::SDL2 PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_MATCH_1}"
+            )
+endif()
+
+if(SDL2_VERSION AND SDL2_VERSION VERSION_LESS "2.0.5")
+    message(FATAL_ERROR "SDL2 libraries were found, but have version ${SDL2_VERSION}. At least version 2.0.5 is required.")
+endif()
+

LICENSE.md

@@ -0,0 +1,16 @@
+#include "AudioCapture.h"
+
+const char* AudioCapture::name() const
+{
+    return "Audio Capturing";
+}
+
+void AudioCapture::initialize(Poco::Util::Application& app)
+{
+    _impl = std::make_unique<AudioCaptureImpl>();
+}
+
+void AudioCapture::uninitialize()
+{
+    _impl.reset();
+}

README.md

@@ -0,0 +1,22 @@
+#pragma once
+
+#include AUDIO_IMPL_INCLUDE
+
+#include <Poco/Util/Subsystem.h>
+
+#include <memory>
+
+class AudioCapture : public  Poco::Util::Subsystem
+{
+public:
+    const char* name() const override;
+
+protected:
+    void initialize(Poco::Util::Application& app) override;
+
+    void uninitialize() override;
+
+    std::unique_ptr<AudioCaptureImpl> _impl;
+};
+
+

cmake/SDL2Target.cmake

@@ -0,0 +1 @@
+#include "AudioCaptureImpl_SDL.h"

install.cmake

@@ -0,0 +1,13 @@
+#pragma once
+
+/**
+ * @brief SDL-based audio capturing thread.
+ *
+ * Uses SDL's audio API to capture PCM data from any supported drivers.
+ */
+class AudioCaptureImpl
+{
+
+};
+
+

packaging.cmake

@@ -0,0 +1 @@
+#include "AudioCaptureImpl_WASAPI.h"

src/AudioCapture.cpp

@@ -0,0 +1,17 @@
+#pragma once
+
+/**
+ * @brief WASAPI-based audio capturing thread.
+ *
+ * Uses the Windows Audio Session API to capture PCM data from either a loopback device or
+ * any pother available input device.
+ *
+ * The loopback device is always considered as the "first" available device. All other external audio
+ * sources come after that.
+ */
+class AudioCaptureImpl
+{
+
+};
+
+

src/AudioCapture.h

@@ -0,0 +1,44 @@
+add_executable(projectMSDL
+        AudioCapture.cpp
+        AudioCapture.h
+        AudioCaptureImpl_SDL.cpp
+        AudioCaptureImpl_SDL.h
+        AudioCaptureImpl_WASAPI.cpp
+        AudioCaptureImpl_WASAPI.h
+        ProjectMSDLApplication.cpp
+        ProjectMSDLApplication.h
+        ProjectMWrapper.cpp
+        ProjectMWrapper.h
+        SDLRenderingWindow.h
+        SDLRenderingWindow.cpp
+        )
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    target_sources(projectMSDL
+            PRIVATE
+            AudioCaptureImpl_WASAPI.h
+            AudioCaptureImpl_WASAPI.cpp
+            )
+    target_compile_definitions(projectMSDL
+            PRIVATE
+            AUDIO_IMPL_INCLUDE="AudioCaptureImpl_WASAPI.h"
+            )
+else()
+    target_sources(projectMSDL
+            PRIVATE
+            AudioCaptureImpl_SDL.h
+            AudioCaptureImpl_SDL.cpp
+            )
+    target_compile_definitions(projectMSDL
+            PRIVATE
+            AUDIO_IMPL_INCLUDE="AudioCaptureImpl_SDL.h"
+            )
+endif()
+
+
+target_link_libraries(projectMSDL
+        PRIVATE
+        libprojectM::${PROJECTM_LINKAGE}
+        Poco::Util
+        SDL2::SDL2$<$<STREQUAL:"${SDL2_LINKAGE}","static">:"-static">
+        )

src/AudioCaptureImpl_SDL.cpp

@@ -0,0 +1,52 @@
+#include "ProjectMSDLApplication.h"
+
+#include "AudioCapture.h"
+#include "ProjectMWrapper.h"
+#include "SDLRenderingWindow.h"
+
+#include <Poco/Environment.h>
+#include <Poco/File.h>
+
+ProjectMSDLApplication::ProjectMSDLApplication()
+{
+    // Note: order here is important, as subsystems are initialized in the same order.
+    addSubsystem(new SDLRenderingWindow);
+    addSubsystem(new ProjectMWrapper);
+    addSubsystem(new AudioCapture);
+}
+
+const char* ProjectMSDLApplication::name() const
+{
+    return "projectMSDL";
+}
+
+void ProjectMSDLApplication::initialize(Poco::Util::Application& self)
+{
+    loadConfiguration(PRIO_DEFAULT);
+
+    // Try to load user's custom configuration file on top.
+    Poco::Path userConfigurationFile = Poco::Path::configHome() + "projectM" + Poco::Path::separator() + "projectMSDL.properties";
+    if (Poco::File(userConfigurationFile).exists())
+    {
+        loadConfiguration(userConfigurationFile.toString(), -10);
+    }
+
+    Application::initialize(self);
+}
+
+void ProjectMSDLApplication::uninitialize()
+{
+    Application::uninitialize();
+}
+
+void ProjectMSDLApplication::defineOptions(Poco::Util::OptionSet& options)
+{
+
+}
+
+int ProjectMSDLApplication::main(const std::vector<std::string>& args)
+{
+    return EXIT_SUCCESS;
+}
+
+POCO_APP_MAIN(ProjectMSDLApplication)

src/AudioCaptureImpl_SDL.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <Poco/Util/Application.h>
+
+class ProjectMSDLApplication : public Poco::Util::Application
+{
+public:
+    ProjectMSDLApplication();
+
+    const char* name() const override;
+
+protected:
+    void initialize(Application& self) override;
+
+    void uninitialize() override;
+
+    void defineOptions(Poco::Util::OptionSet& options) override;
+
+    int main(const std::vector<std::string>& args) override;
+};
+
+

src/AudioCaptureImpl_WASAPI.cpp

@@ -0,0 +1,28 @@
+#include "ProjectMWrapper.h"
+
+const char* ProjectMWrapper::name() const
+{
+    return "ProjectM Wrapper";
+}
+
+void ProjectMWrapper::initialize(Poco::Util::Application& app)
+{
+    if (!_projectM)
+    {
+        projectm_create_settings(nullptr, PROJECTM_FLAG_NONE);
+    }
+}
+
+void ProjectMWrapper::uninitialize()
+{
+    if (_projectM)
+    {
+        projectm_destroy(_projectM);
+        _projectM = nullptr;
+    }
+}
+
+projectm* ProjectMWrapper::ProjectM() const
+{
+    return _projectM;
+}

src/AudioCaptureImpl_WASAPI.h

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <libprojectM/projectM.h>
+
+#include <Poco/Util/Subsystem.h>
+
+class ProjectMWrapper : public Poco::Util::Subsystem
+{
+public:
+    const char* name() const override;
+
+    /**
+     * Returns the projectM instance handle.
+     * @return The projectM instance handle used to call API functions.
+     */
+    projectm* ProjectM() const;
+
+protected:
+    void initialize(Poco::Util::Application& app) override;
+
+    void uninitialize() override;
+
+    projectm* _projectM{ nullptr };
+};
+
+