Merge pull request #15 from Zacharias-Brohn/libcava/cava_integration

cava reintroduced : uses libcava or cava for nix : nixos might need fixing…

Plugins/ZShell/CMakeLists.txt

@@ -3,10 +3,10 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(Qalculate IMPORTED_TARGET libqalculate REQUIRED)
 pkg_check_modules(Pipewire IMPORTED_TARGET libpipewire-0.3 REQUIRED)
 pkg_check_modules(Aubio IMPORTED_TARGET aubio REQUIRED)
-# pkg_check_modules(Cava IMPORTED_TARGET libcava QUIET)
-# if(NOT Cava_FOUND)
-#     pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED)
-# endif()
+pkg_check_modules(Cava IMPORTED_TARGET libcava QUIET)
+if(NOT Cava_FOUND)
+    pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED)
+endif()
 
 set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml")
 qt_standard_project_setup(REQUIRES 6.9)

Plugins/ZShell/Services/CMakeLists.txt

@@ -6,9 +6,9 @@ qml_module(ZShell-services
         beattracker.hpp beattracker.cpp
         audiocollector.hpp audiocollector.cpp
         audioprovider.hpp audioprovider.cpp
-        # cavaprovider.hpp cavaprovider.cpp
+        cavaprovider.hpp cavaprovider.cpp
     LIBRARIES
         PkgConfig::Pipewire
         PkgConfig::Aubio
-        # PkgConfig::Cava
+        PkgConfig::Cava
 )

nix/default.nix

@@ -1,4 +1,6 @@
 {
+  fftw,
+  libcava,
   rev,
   lib,
   stdenv,
@@ -74,6 +76,8 @@
       libqalculate
       pipewire
       aubio
+      libcava
+      fftw
     ];
 
     dontWrapQtApps = true;