Compare commits

...

6 Commits

9 changed files with 523 additions and 387 deletions

View File

@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
include:
- qt_ver: '6.8.1'
- qt_ver: '6.9.0'
vs: '2022'
aqt_arch: 'win64_msvc2022_64'
msvc_arch: 'x64'
@ -35,22 +35,26 @@ jobs:
:: ------ dep ------
set CMAKE_PREFIX_PATH=%PWD%/dependencies_bin
mkdir dependencies_src
:: ===== ECM =====
echo ::group::===== ECM =====
git clone -q https://invent.kde.org/frameworks/extra-cmake-modules.git dependencies_src/extra-cmake-modules
cmake .\dependencies_src\extra-cmake-modules -Bbuild_dependencies/extra-cmake-modules -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DBUILD_TESTING=OFF || goto :error
cmake --build build_dependencies/extra-cmake-modules --config Release --target=install || goto :error
:: ===== Gperf (required by KCodecs) =====
echo ::endgroup::
echo ::group::===== Gperf (required by KCodecs) =====
choco install gperf
:: ===== KCodecs =====
echo ::endgroup::
echo ::group::===== KCodecs =====
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
:: ===== taglib =====
echo ::endgroup::
echo ::group::===== 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
cmake --build build_dependencies/taglib --config Release --target=install -j || goto :error
echo ::endgroup::
:: ------ app ------
cmake -Bbuild . -DUSE_QTEXTCODEC=ON -DCMAKE_INSTALL_PREFIX="%PWD%\build\" || goto :error
cmake -Bbuild . -DUSE_QTEXTCODEC=ON -DCMAKE_INSTALL_PREFIX='%PWD%\build\' || goto :error
cmake --build build --config Release -j || goto :error
cmake --build build --config Release --target=install || goto :error
:: ------ pkg ------

View File

@ -18,6 +18,7 @@ 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(FFmpeg COMPONENTS avutil avformat)
find_package(TagLib 2.0.0)
find_package(KF6Codecs 6.1.0)
@ -96,6 +97,11 @@ if (TARGET KF6::Codecs)
target_link_libraries (${EXE_NAME} PRIVATE KF6::Codecs)
endif ()
if (FFmpeg_FOUND)
target_compile_definitions(${EXE_NAME} PRIVATE HAVE_FFMPEG=1)
target_link_libraries (${EXE_NAME} PRIVATE FFmpeg::avutil FFmpeg::avformat)
endif ()
target_link_libraries(${EXE_NAME} PRIVATE Qt::Widgets Qt::Multimedia Qt::Network kissfft::kissfft)
if (USE_QTEXTCODEC)

View File

@ -114,12 +114,12 @@ void MainWindow::setAudioPropertyInfoForDisplay(int sampleRate, int bitrate, int
}
};
if (sampleRate >= 0) {
if (sampleRate > 0) {
uiStrs << QString("%1 Hz").arg(sampleRate);
tooltipStrs << tr("Sample Rate: %1 Hz").arg(sampleRate);
}
if (bitrate >= 0) {
if (bitrate > 0) {
uiStrs << QString("%1 Kbps").arg(bitrate);
tooltipStrs << tr("Bitrate: %1 Kbps").arg(bitrate);
}
@ -271,20 +271,21 @@ void MainWindow::loadFile()
m_playlistManager->loadPlaylist(urlList);
const QUrl & firstUrl = urlList.first();
const QString firstFilePath = firstUrl.toLocalFile();
m_mediaPlayer->setSource(firstUrl);
m_lrcbar->loadLyrics(firstFilePath);
QList<std::pair<qint64, QString>> chapters(PlaybackProgressIndicator::tryLoadSidecarChapterFile(firstFilePath));
loadFile(firstUrl);
}
void MainWindow::loadFile(const QUrl &url)
{
const QString filePath = url.toLocalFile();
m_mediaPlayer->setSource(url);
m_lrcbar->loadLyrics(filePath);
QList<std::pair<qint64, QString>> chapters(PlaybackProgressIndicator::tryLoadChapters(filePath));
ui->playbackProgressIndicator->setChapters(chapters);
}
void MainWindow::loadByModelIndex(const QModelIndex & index)
{
m_mediaPlayer->setSource(m_playlistManager->urlByIndex(index));
QString filePath(m_playlistManager->localFileByIndex(index));
m_lrcbar->loadLyrics(filePath);
QList<std::pair<qint64, QString>> chapters(PlaybackProgressIndicator::tryLoadSidecarChapterFile(filePath));
ui->playbackProgressIndicator->setChapters(chapters);
loadFile(m_playlistManager->urlByIndex(index));
}
void MainWindow::play()
@ -440,6 +441,8 @@ void MainWindow::initConnections()
if (!fileRef.isNull() && fileRef.audioProperties()) {
TagLib::AudioProperties *prop = fileRef.audioProperties();
setAudioPropertyInfoForDisplay(prop->sampleRate(), prop->bitrate(), prop->channels(), suffix);
} else {
qDebug() << "No Audio Properties from TagLib";
}
if (!fileRef.isNull() && fileRef.tag()) {
@ -447,6 +450,10 @@ void MainWindow::initConnections()
setAudioMetadataForDisplay(QString::fromStdString(tag->title().to8Bit(true)),
QString::fromStdString(tag->artist().to8Bit(true)),
QString::fromStdString(tag->album().to8Bit(true)));
m_urlMissingTagLibMetadata.clear();
} else {
qDebug() << "No Audio Metadata from TagLib";
m_urlMissingTagLibMetadata = fileUrl;
}
#endif // NO_TAGLIB
}
@ -458,12 +465,17 @@ void MainWindow::initConnections()
// see `02 Yoiyami Hanabi.mp3`'s Title. So we don't use Qt's one if tablib is available.
qDebug() << metadata.stringValue(QMediaMetaData::Title) << metadata.stringValue(QMediaMetaData::Author);
#ifdef NO_TAGLIB
bool needMetadataFromQt = true;
#else
bool needMetadataFromQt = m_urlMissingTagLibMetadata == m_mediaPlayer->source();
#endif // NO_TAGLIB
if (needMetadataFromQt) {
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));
#endif // NO_TAGLIB
}
QVariant coverArt(metadata.value(QMediaMetaData::ThumbnailImage));
if (!coverArt.isNull()) {
ui->coverLabel->setPixmap(QPixmap::fromImage(coverArt.value<QImage>()));
@ -678,7 +690,7 @@ void MainWindow::on_actionHelp_triggered()
"\n"
"[Source Code](https://github.com/BLumia/pineapple-music)\n"
"\n"
"Copyright &copy; 2024 [BLumia](https://github.com/BLumia/)"
"Copyright &copy; 2025 [BLumia](https://github.com/BLumia/)"
);
infoBox.setTextFormat(Qt::MarkdownText);
infoBox.exec();

View File

@ -7,6 +7,7 @@
#include <QMainWindow>
#include <QVariant>
#include <QUrl>
QT_BEGIN_NAMESPACE
namespace Ui { class MainWindow; }
@ -55,6 +56,7 @@ protected:
void dropEvent(QDropEvent *e) override;
void loadFile();
void loadFile(const QUrl &url);
void loadByModelIndex(const QModelIndex &index);
void play();
@ -89,6 +91,7 @@ private:
bool m_playbackSliderPressed = false;
QLinearGradient m_bgLinearGradient;
QPixmap m_skin;
QUrl m_urlMissingTagLibMetadata;
enum PlaybackMode m_playbackMode = CurrentItemInLoop;
Ui::MainWindow *ui;

View File

@ -11,6 +11,15 @@
#include <QPainterPath>
#include <QRegularExpression>
#ifdef HAVE_FFMPEG
extern "C" {
#include <libavformat/avformat.h>
#include <libavutil/avutil.h>
#include <libavutil/dict.h>
#include <libavutil/time.h> // Contains AV_TIME_BASE and AV_TIME_BASE_Q
} // extern "C"
#endif // HAVE_FFMPEG
PlaybackProgressIndicator::PlaybackProgressIndicator(QWidget *parent) :
QWidget(parent)
{
@ -30,6 +39,7 @@ void PlaybackProgressIndicator::setDuration(qint64 dur)
void PlaybackProgressIndicator::setChapters(QList<std::pair<qint64, QString> > chapters)
{
qDebug() << chapters;
m_chapterModel.clear();
for (const std::pair<qint64, QString> & chapter : chapters) {
QStandardItem * chapterItem = new QStandardItem(chapter.second);
@ -39,6 +49,15 @@ void PlaybackProgressIndicator::setChapters(QList<std::pair<qint64, QString> > c
update();
}
QList<std::pair<qint64, QString> > PlaybackProgressIndicator::tryLoadChapters(const QString &filePath)
{
auto chapters = tryLoadSidecarChapterFile(filePath);
if (chapters.size() == 0) {
chapters = tryLoadChaptersFromMetadata(filePath);
}
return chapters;
}
QList<std::pair<qint64, QString> > PlaybackProgressIndicator::tryLoadSidecarChapterFile(const QString &filePath)
{
if (filePath.endsWith(".chp", Qt::CaseInsensitive)) {
@ -63,6 +82,98 @@ QList<std::pair<qint64, QString> > PlaybackProgressIndicator::tryLoadSidecarChap
return {};
}
#ifdef HAVE_FFMPEG
// Helper function to convert FFmpeg time (in time_base units) to milliseconds
qint64 convertTimestampToMilliseconds(int64_t timestamp, AVRational time_base) {
// Convert to seconds first, then to milliseconds and cast to qint64
return static_cast<qint64>((double)timestamp * av_q2d(time_base) * 1000.0);
}
// Helper function to print FFmpeg errors
void printFFmpegError(int errnum) {
char errbuf[AV_ERROR_MAX_STRING_SIZE];
av_strerror(errnum, errbuf, sizeof(errbuf));
qCritical() << "FFmpeg error:" << errbuf;
}
#endif // HAVE_FFMPEG
QList<std::pair<qint64, QString> > PlaybackProgressIndicator::tryLoadChaptersFromMetadata(const QString &filePath)
{
#ifdef HAVE_FFMPEG
if (!QFile::exists(filePath)) {
qCritical() << "Error: File not found" << filePath;
return {};
}
AVFormatContext* format_ctx = nullptr; // FFmpeg format context
int ret = 0; // Return value for FFmpeg functions
qInfo() << "Attempting to open file:" << filePath;
// Open the input file and read the header.
// The last two arguments (AVInputFormat*, AVDictionary**) are optional.
// Passing nullptr for them means FFmpeg will try to guess the format
// and no options will be passed to the demuxer.
ret = avformat_open_input(&format_ctx, filePath.toUtf8().constData(), nullptr, nullptr);
if (ret < 0) {
qCritical() << "Could not open input file:" << filePath;
printFFmpegError(ret);
return {};
}
qInfo() << "File opened successfully.";
// Read stream information from the file.
// This populates format_ctx->streams and other metadata, including chapters.
ret = avformat_find_stream_info(format_ctx, nullptr);
if (ret < 0) {
qCritical() << "Could not find stream information for file:" << filePath;
printFFmpegError(ret);
avformat_close_input(&format_ctx); // Close the context before returning
return {};
}
qInfo() << "Stream information found.";
QList<std::pair<qint64, QString>> chapterList;
// Check if there are any chapters
if (format_ctx->nb_chapters == 0) {
qInfo() << "No chapters found in file:" << filePath;
} else {
qInfo() << "Found" << format_ctx->nb_chapters << "chapters.";
// Iterate through each chapter
for (unsigned int i = 0; i < format_ctx->nb_chapters; ++i) {
AVChapter* chapter = format_ctx->chapters[i];
// Chapter timestamps are typically in AV_TIME_BASE units by default
// unless the chapter itself has a specific time_base.
// For simplicity and common cases, we use AV_TIME_BASE_Q.
qint64 start_ms = convertTimestampToMilliseconds(chapter->start, chapter->time_base);
// Get the chapter title from its metadata.
// av_dict_get(dictionary, key, prev, flags)
// prev is used for iterating through multiple entries with the same key,
// we want the first one so we pass nullptr. flags=0 for case-insensitive.
AVDictionaryEntry* title_tag = av_dict_get(chapter->metadata, "title", nullptr, 0);
QString chapter_title = (title_tag && title_tag->value) ? QString::fromUtf8(title_tag->value) : "Untitled Chapter";
chapterList.append(std::make_pair(start_ms, chapter_title));
}
}
// Close the input file.
// This also frees the format_ctx and associated data.
avformat_close_input(&format_ctx);
qInfo() << "File closed.";
return chapterList;
#else
qInfo() << "FFmpeg not found during build.";
return {};
#endif // HAVE_FFMPEG
}
QList<std::pair<qint64, QString> > PlaybackProgressIndicator::parseCHPChapterFile(const QString &filePath)
{
QList<std::pair<qint64, QString>> chapters;

View File

@ -28,7 +28,9 @@ public:
void setDuration(qint64 dur);
void setChapters(QList<std::pair<qint64, QString>> chapters);
static QList<std::pair<qint64, QString>> tryLoadChapters(const QString & filePath);
static QList<std::pair<qint64, QString>> tryLoadSidecarChapterFile(const QString & filePath);
static QList<std::pair<qint64, QString>> tryLoadChaptersFromMetadata(const QString & filePath);
static QList<std::pair<qint64, QString>> parseCHPChapterFile(const QString & filePath);
static QList<std::pair<qint64, QString>> parsePBFChapterFile(const QString & filePath);

View File

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net>
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
@ -16,9 +16,7 @@ PlaylistModel::PlaylistModel(QObject *parent)
}
PlaylistModel::~PlaylistModel()
{
}
= default;
void PlaylistModel::setPlaylist(const QList<QUrl> &urls)
{
@ -29,7 +27,7 @@ void PlaylistModel::setPlaylist(const QList<QUrl> &urls)
QModelIndex PlaylistModel::loadPlaylist(const QList<QUrl> & urls)
{
if (urls.isEmpty()) return QModelIndex();
if (urls.isEmpty()) return {};
if (urls.count() == 1) {
return loadPlaylist(urls.constFirst());
} else {
@ -128,7 +126,7 @@ int PlaylistModel::rowCount(const QModelIndex &parent) const
QVariant PlaylistModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid()) return QVariant();
if (!index.isValid()) return {};
switch (role) {
case Qt::DisplayRole:
@ -137,7 +135,7 @@ QVariant PlaylistModel::data(const QModelIndex &index, int role) const
return m_playlist.at(index.row());
}
return QVariant();
return {};
}
PlaylistManager::PlaylistManager(QObject *parent)
@ -196,7 +194,7 @@ int PlaylistManager::totalCount() const
QModelIndex PlaylistManager::previousIndex() const
{
int count = totalCount();
if (count == 0) return QModelIndex();
if (count == 0) return {};
return m_model.index(m_currentIndex - 1 < 0 ? count - 1 : m_currentIndex - 1);
}
@ -204,7 +202,7 @@ QModelIndex PlaylistManager::previousIndex() const
QModelIndex PlaylistManager::nextIndex() const
{
int count = totalCount();
if (count == 0) return QModelIndex();
if (count == 0) return {};
return m_model.index(m_currentIndex + 1 == count ? 0 : m_currentIndex + 1);
}

View File

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net>
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
@ -18,7 +18,7 @@ public:
Q_PROPERTY(QStringList autoLoadFilterSuffixes MEMBER m_autoLoadSuffixes NOTIFY autoLoadFilterSuffixesChanged)
explicit PlaylistModel(QObject *parent = nullptr);
~PlaylistModel();
~PlaylistModel() override;
void setPlaylist(const QList<QUrl> & urls);
QModelIndex loadPlaylist(const QList<QUrl> & urls);

View File

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net>
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
@ -12,7 +12,7 @@ class SeekableSlider : public QSlider
Q_OBJECT
public:
explicit SeekableSlider(QWidget *parent = nullptr);
~SeekableSlider() = default;
~SeekableSlider() override = default;
signals: