yyc12345

2024-10-19 18:51:04 +08:00
7 changed files with 49 additions and 92 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,7 +1,7 @@
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -45,6 +45,9 @@ jobs:
        git clone -q https://invent.kde.org/frameworks/kcodecs.git dependencies_src/kcodecs
        cmake .\dependencies_src\kcodecs -Bbuild_dependencies/kcodecs -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DBUILD_TESTING=OFF || goto :error
        cmake --build build_dependencies/kcodecs --config Release --target=install || goto :error
+        :: ===== pkg-config =====
+        choco install pkgconfiglite
+        set PKG_CONFIG_PATH=%PWD%/dependencies_bin/lib/pkgconfig
        :: ===== taglib =====
        git clone --recurse-submodules -q https://github.com/taglib/taglib.git dependencies_src/taglib
        cmake .\dependencies_src\taglib -Bbuild_dependencies/taglib -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="dependencies_bin" || goto :error
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3,8 +3,7 @@ cmake_minimum_required(VERSION 3.12)
 project(pineapple-music LANGUAGES CXX)

 include (GNUInstallDirs)
-include (FeatureSummary)
-include(FetchContent)
+include (FeatureSummary)

 set(CMAKE_INCLUDE_CURRENT_DIR ON)

@ -18,24 +17,23 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 option(USE_QTEXTCODEC "Use QTextCodec instead of QStringConverter, in case Qt is not built with ICU" OFF)

 find_package(Qt6 6.6 COMPONENTS Widgets Multimedia Network LinguistTools REQUIRED)
-find_package(TagLib 2.0.0)
-find_package(KF6Codecs 6.1.0)
+find_package(KF6Codecs 6.1.0)
+find_package(PkgConfig)

-FetchContent_Declare(
-    kissfft
-    GIT_REPOSITORY https://github.com/mborgerding/kissfft.git
-    GIT_TAG f5f2a3b2f2cd02bf80639adb12cbeed125bdf420
-)
-set(KISSFFT_PKGCONFIG OFF CACHE BOOL "dep(kissfft): pkgconfig support")
-set(KISSFFT_STATIC ON CACHE BOOL "dep(kissfft): static linking")
-set(KISSFFT_TEST OFF CACHE BOOL "dep(kissfft): enable testing")
-set(KISSFFT_TOOLS OFF CACHE BOOL "dep(kissfft): build tools")
-FetchContent_MakeAvailable(kissfft)
+option(KISSFFT_PKGCONFIG OFF)
+option(KISSFFT_STATIC ON)
+option(KISSFFT_TEST OFF)
+option(KISSFFT_TOOLS OFF)
+add_subdirectory(kissfft EXCLUDE_FROM_ALL)

 if (USE_QTEXTCODEC)
    find_package(Qt6 6.6 COMPONENTS Core5Compat REQUIRED)
 endif()

+if (PKG_CONFIG_FOUND)
+pkg_check_modules(TagLib taglib IMPORTED_TARGET)
+endif ()
+
 set (PMUSIC_CPP_FILES
    main.cpp
    mainwindow.cpp
@ -86,7 +84,7 @@ endif ()
 if (NOT TagLib_FOUND)
    target_compile_definitions(${EXE_NAME} PRIVATE NO_TAGLIB=1)
 else ()
-    target_link_libraries(${EXE_NAME} PRIVATE TagLib::tag)
+    target_link_libraries(${EXE_NAME} PRIVATE PkgConfig::TagLib)
 endif ()

 if (TARGET KF6::Codecs)
--- a/README.md
+++ b/README.md
@ -2,23 +2,12 @@

 Since **I** just need a simple player which *just works* right now, so I did many things in a dirty way. Don't feel so weird if you saw something I did in this project is using a bad approach.

-### Features
-
-We have the following features:
-
- [Sidecar](https://en.wikipedia.org/wiki/Sidecar_file) lyrics file (`.lrc`) support with an optional desktop lyrics bar widget
- Auto-load all audio files in the same folder of the file that you attempted to play, into a playlist
-
-But these features are not available, some of them are TBD and others are not planned:
+### Feature Notice

 - File format support will be limited by the [FFmpeg version that Qt 6 uses](https://doc.qt.io/qt-6/qtmultimedia-attribution-ffmpeg.html).
  - ...which if you use Qt's official binary, only contains the LGPLv2.1+ part. (already good enough, tho)
 - No music library management support and there won't be one!
  - It'll auto-load music files in the same folder of the file that you attempted to play, so organize your music files on a folder-basis.
- Limited system integration:
-  - No [SMTC](https://learn.microsoft.com/en-us/uwp/api/windows.media.systemmediatransportcontrols) support under Windows for now
-  - No [MPRIS](https://www.freedesktop.org/wiki/Specifications/mpris-spec/) support under Linux desktop for now
-  - No "playback progress on taskbar icon" and "taskbar thumbnail buttons" support whatever on Windows or Linux desktop for now
 - Limited lyrics (`.lrc`) loading support:
  - Currently no `.tlrc` (for translated lyrics) or `.rlrc` (for romanized lyrics) support.
  - Multi-line lyrics and duplicated timestamps are not supported
@ -31,7 +20,7 @@ Current state, we need:
 - `cmake` as the build system.
 - `qt6` with `qt6-multimedia` since we use it for playback.
 - `taglib` to get the audio file properties.
- - `kissfft` for FFT support (will be downloaded at configure-time by `cmake`).
+ - `pkg-config` to find the installed taglib.

 Then we can build it with any proper c++ compiler like g++ or msvc.

--- a/appveyor.yml
+++ b/appveyor.yml
@ -3,6 +3,7 @@ image:
 environment:
  CMAKE_INSTALL_ROOT: C:\projects\cmake
  PACKAGE_INSTALL_ROOT: C:\projects\pir
+  PKG_CONFIG_PATH: C:\projects\pir\lib\pkgconfig
  matrix:
    - build_name: mingw1120_64_qt6_7
      QTPATH: C:\Qt\6.7\mingw_64
@ -22,6 +23,7 @@ build_script:
  - mkdir 3rdparty
  - choco install ninja
  - choco install gperf
+  - choco install pkgconfiglite
  - cd 3rdparty
 # install ECM
  - git clone -q https://invent.kde.org/frameworks/extra-cmake-modules.git
--- a/fftspectrum.cpp
+++ b/fftspectrum.cpp
@ -5,20 +5,15 @@
 #include "fftspectrum.h"

 #include <QAudioBuffer>
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
 #include <QAudioBufferOutput>
-#endif // QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
 #include <QPainter>

 #include <kissfft.hh>

 FFTSpectrum::FFTSpectrum(QWidget* parent)
    : QWidget(parent)
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
    , m_audioBufferOutput(new QAudioBufferOutput(this))
-#endif // #if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
    connect(this, &FFTSpectrum::mediaPlayerChanged, this, [=]() {
        if (m_mediaPlayer) {
            m_mediaPlayer->setAudioBufferOutput(m_audioBufferOutput);
@ -26,59 +21,25 @@ FFTSpectrum::FFTSpectrum(QWidget* parent)
    });

    connect(m_audioBufferOutput, &QAudioBufferOutput::audioBufferReceived, this, [=](const QAudioBuffer& buffer) {
-        const QAudioFormat& fmt = buffer.format();
+        const QAudioFormat&& fmt = buffer.format();
        const QAudioFormat::SampleFormat sampleFormat = fmt.sampleFormat();
-        QAudioFormat::ChannelConfig channelConfig = fmt.channelConfig();
-        const QFlags supportedChannelConfig({ QAudioFormat::ChannelConfigMono, QAudioFormat::ChannelConfigStereo });
+        int channelCount = fmt.channelCount();
        const int frameCount = buffer.frameCount();
        kissfft<float> fft(frameCount, false);
        std::vector<kissfft<float>::cpx_t> samples(frameCount);
        std::vector<kissfft<float>::cpx_t> mass(frameCount);
-        if (sampleFormat == QAudioFormat::Int16 && supportedChannelConfig.testFlag(channelConfig)) {
-            if (channelConfig == QAudioFormat::ChannelConfigMono) {
-                const QAudioBuffer::S16M* data = buffer.constData<QAudioBuffer::S16M>();
-                for (int i = 0; i < frameCount; ++i) {
-                    samples[i].real(data[i].value(QAudioFormat::FrontCenter) / float(32768));
-                    samples[i].imag(0);
-                }
-            } else {
-                const QAudioBuffer::S16S* data = buffer.constData<QAudioBuffer::S16S>();
-                for (int i = 0; i < frameCount; ++i) {
-                    samples[i].real(data[i].value(QAudioFormat::FrontLeft) / float(32768));
-                    samples[i].imag(0);
-                }
+        if (sampleFormat == QAudioFormat::Int16 && channelCount == 1) {
+            const QAudioBuffer::S16M* data = buffer.constData<QAudioBuffer::S16M>();
+            for (int i = 0; i < frameCount; ++i) {
+                samples[i].real(data[i].value(QAudioFormat::FrontCenter) / float(32768));
+                samples[i].imag(0);
            }
-        } else if (sampleFormat == QAudioFormat::Int32 && supportedChannelConfig.testFlag(channelConfig)) {
-            if (channelConfig == QAudioFormat::ChannelConfigMono) {
-                const QAudioBuffer::S32M* data = buffer.constData<QAudioBuffer::S32M>();
-                for (int i = 0; i < frameCount; ++i) {
-                    samples[i].real(data[i].value(QAudioFormat::FrontCenter) / float(2147483647));
-                    samples[i].imag(0);
-                }
-            } else {
-                const QAudioBuffer::S32S* data = buffer.constData<QAudioBuffer::S32S>();
-                for (int i = 0; i < frameCount; ++i) {
-                    samples[i].real(data[i].value(QAudioFormat::FrontLeft) / float(2147483647));
-                    samples[i].imag(0);
-                }
+        } else if (sampleFormat == QAudioFormat::Float && channelCount == 2) {
+            const QAudioBuffer::F32S* data = buffer.constData<QAudioBuffer::F32S>();
+            for (int i = 0; i < frameCount; ++i) {
+                samples[i].real(data[i].value(QAudioFormat::FrontLeft));
+                samples[i].imag(0);
            }
-        } else if (sampleFormat == QAudioFormat::Float && supportedChannelConfig.testFlag(channelConfig)) {
-            if (channelConfig == QAudioFormat::ChannelConfigMono) {
-                const QAudioBuffer::F32M* data = buffer.constData<QAudioBuffer::F32M>();
-                for (int i = 0; i < frameCount; ++i) {
-                    samples[i].real(data[i].value(QAudioFormat::FrontCenter));
-                    samples[i].imag(0);
-                }
-            } else {
-                const QAudioBuffer::F32S* data = buffer.constData<QAudioBuffer::F32S>();
-                for (int i = 0; i < frameCount; ++i) {
-                    samples[i].real(data[i].value(QAudioFormat::FrontLeft));
-                    samples[i].imag(0);
-                }
-            }
-        } else {
-            qWarning() << "Unsupported format or channel config:" << sampleFormat << channelConfig;
-            return;
        }
        fft.transform(samples.data(), mass.data());
        m_freq.resize(frameCount);
@ -88,10 +49,11 @@ FFTSpectrum::FFTSpectrum(QWidget* parent)
        for (auto& val : m_freq) {
            val = log10(val + 1);
        }
-        qDebug() << m_freq.size() << "updated" << sampleFormat << channelConfig;
+        qDebug() << m_freq.size() << "updated";
        update();
+        qDebug() << sampleFormat << channelCount;
    });
-#endif // QT_VERSION >= QT_VERSION_CHECK(6, 8, 0)
+
    resize(490, 420);
 }

@ -109,14 +71,17 @@ void FFTSpectrum::setMediaPlayer(QMediaPlayer* player)
 void FFTSpectrum::paintEvent(QPaintEvent* e)
 {
    QPainter painter(this);
+    painter.fillRect(rect(), Qt::black);

    if (!m_freq.empty()) {
        int width = this->width();
        int height = this->height();
        int barWidth = std::max(1ULL, width / m_freq.size());
+        qDebug() << m_freq.size() << barWidth << m_freq << "freq";
+
        for (int i = 0; i < m_freq.size(); i++) {
-            int barHeight = static_cast<int>(sqrt(m_freq[i]) * height * 0.5);
-            painter.fillRect(i * barWidth, height - barHeight, barWidth, barHeight, QColor(70, 130, 180, (int)(140 * m_freq[i]) + 90));
+            int barHeight = static_cast<int>(m_freq[i] * height);
+            painter.fillRect(i * barWidth, height - barHeight, barWidth, barHeight, Qt::green);
        }
    }
 }
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@ -18,6 +18,7 @@
 #include <QMediaPlayer>
 #include <QMediaMetaData>
 #include <QAudioOutput>
+#include <QAudioBuffer>
 #include <QPropertyAnimation>
 #include <QFileDialog>
 #include <QTime>
@ -441,8 +442,7 @@ void MainWindow::initConnections()
        setAudioMetadataForDisplay(metadata.stringValue(QMediaMetaData::Title),
                                   metadata.stringValue(QMediaMetaData::Author),
                                   metadata.stringValue(QMediaMetaData::AlbumTitle));
-        setAudioPropertyInfoForDisplay(-1, metadata.value(QMediaMetaData::AudioBitRate).toInt() / 1000,
-                                       -1, metadata.stringValue(QMediaMetaData::FileFormat));
+        setAudioPropertyInfoForDisplay(-1, metadata.value(QMediaMetaData::AudioBitRate).toInt() / 1000, -1, metadata.stringValue(QMediaMetaData::FileFormat));
 #endif // NO_TAGLIB
        QVariant coverArt(metadata.value(QMediaMetaData::ThumbnailImage));
        if (!coverArt.isNull()) {