Compare commits

..

14 Commits

Author SHA1 Message Date
236798a957 feat: load chapter data from metadata too 2025-06-24 00:27:35 +08:00
15ffe5a85e chore: add fallback when taglib don't have related metadata 2025-06-23 00:57:45 +08:00
c672a597b3 fix(CI): FTBFS caused by pwsh syntax 2025-04-05 00:07:52 +08:00
8ada0d2138 chore(CI): bump msvc windows CI Qt version to 6.9.0 2025-04-03 00:09:11 +08:00
f55563d483 chore(CI): bump msvc windows CI Qt version to 6.8.2 2025-02-12 20:49:11 +08:00
b6a64a2495 chore: tidy code and hello 2025 :) 2025-02-09 13:12:37 +08:00
f17b722600 feat: sidecar .chp and .pbf support 2025-01-23 22:45:46 +08:00
9bbfefaea1 refactor(UI): prepare for chapter support on seekbar 2025-01-18 00:08:19 +08:00
cdadaa874e feat(macOS): initial macOS bundle support 2025-01-06 13:21:46 +08:00
c789d04a6c chore(CI): bump appveyor Qt version to 6.8 2025-01-05 23:26:14 +08:00
e2dd7c9307 chore: bump CI Qt version 2024-12-02 21:13:09 +08:00
af8e61c124 UI: add drop shadow to mainwindow labels 2024-11-16 20:38:48 +08:00
5d609cdace fix: FTBFS from Arch Linux 2024-10-27 18:03:36 +08:00
b2eb29ab5d lyricsmanager: parse time string by ourselves
QTime::fromString() can lead a crash when build with icu-enabled
Qt 6.8.0, see QTBUG-130597. Anyway let's workaround this issue
by simply implement it by ourselves.
2024-10-26 19:38:04 +08:00
18 changed files with 999 additions and 538 deletions

View File

@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
include:
- qt_ver: '6.8.0'
- 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 ------

3
.gitignore vendored
View File

@ -6,3 +6,6 @@
# User config file
CMakeLists.txt.user*
# Why, macOS, why?
.DS_Store

View File

@ -1,138 +1,162 @@
cmake_minimum_required(VERSION 3.12)
project(pineapple-music LANGUAGES CXX)
include (GNUInstallDirs)
cmake_minimum_required(VERSION 3.12)
project(pineapple-music LANGUAGES CXX VERSION 0.3.0)
include (GNUInstallDirs)
include (FeatureSummary)
include (FetchContent)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
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)
include (FetchContent)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
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)
FetchContent_Declare(
kissfft
GIT_REPOSITORY https://github.com/mborgerding/kissfft.git
GIT_TAG f5f2a3b2f2cd02bf80639adb12cbeed125bdf420
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)
if (USE_QTEXTCODEC)
find_package(Qt6 6.6 COMPONENTS Core5Compat REQUIRED)
endif()
set (PMUSIC_CPP_FILES
main.cpp
mainwindow.cpp
seekableslider.cpp
playlistmanager.cpp
singleapplicationmanager.cpp
lrcbar.cpp
set(KISSFFT_TOOLS OFF CACHE BOOL "dep(kissfft): build tools")
FetchContent_MakeAvailable(kissfft)
if (USE_QTEXTCODEC)
find_package(Qt6 6.6 COMPONENTS Core5Compat REQUIRED)
endif()
set (PMUSIC_CPP_FILES
main.cpp
mainwindow.cpp
seekableslider.cpp
playlistmanager.cpp
singleapplicationmanager.cpp
lrcbar.cpp
lyricsmanager.cpp
fftspectrum.cpp
)
set (PMUSIC_HEADER_FILES
mainwindow.h
seekableslider.h
playlistmanager.h
singleapplicationmanager.h
lrcbar.h
fftspectrum.cpp
playbackprogressindicator.cpp
)
set (PMUSIC_HEADER_FILES
mainwindow.h
seekableslider.h
playlistmanager.h
singleapplicationmanager.h
lrcbar.h
lyricsmanager.h
fftspectrum.h
)
set (PMUSIC_UI_FILES
mainwindow.ui
)
set (EXE_NAME pmusic)
# Translation
file (GLOB PMUSIC_TS_FILES languages/*.ts)
set (PMUSIC_CPP_FILES_FOR_I18N ${PMUSIC_CPP_FILES} ${PMUSIC_UI_FILES})
add_executable(${EXE_NAME} WIN32
${PMUSIC_HEADER_FILES}
${PMUSIC_CPP_FILES}
${PMUSIC_UI_FILES}
resources.qrc
)
qt_add_translations(${EXE_NAME}
TS_FILES
${PMUSIC_TS_FILES}
)
if (WIN32)
target_sources(${EXE_NAME} PRIVATE assets/pineapple-music.rc)
endif ()
if (NOT TagLib_FOUND)
target_compile_definitions(${EXE_NAME} PRIVATE NO_TAGLIB=1)
else ()
target_link_libraries(${EXE_NAME} PRIVATE TagLib::tag)
endif ()
if (TARGET KF6::Codecs)
target_compile_definitions(${EXE_NAME} PRIVATE HAVE_KCODECS=1)
target_link_libraries (${EXE_NAME} PRIVATE KF6::Codecs)
endif ()
target_link_libraries(${EXE_NAME} PRIVATE Qt::Widgets Qt::Multimedia Qt::Network kissfft::kissfft)
if (USE_QTEXTCODEC)
target_compile_definitions(${EXE_NAME} PRIVATE USE_QTEXTCODEC=1)
target_link_libraries(${EXE_NAME} PRIVATE Qt6::Core5Compat)
endif()
# Install settings
if (WIN32)
# FIXME: try to avoid install to a "bin" subfolder under windows...
# when fixed, don't forget to update the CI config file...
elseif (UNIX)
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX /usr)
endif ()
# install icon
install(
FILES icons/app-icon.svg
DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps"
RENAME net.blumia.pineapple-music.svg
)
# install shortcut
install(
FILES dist/net.blumia.pineapple-music.desktop
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
)
endif()
set (INSTALL_TARGETS_DEFAULT_ARGS
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Devel
)
install (
TARGETS ${EXE_NAME}
${INSTALL_TARGETS_DEFAULT_ARGS}
)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
fftspectrum.h
playbackprogressindicator.h
)
set (PMUSIC_UI_FILES
mainwindow.ui
)
set (EXE_NAME pmusic)
# Translation
file (GLOB PMUSIC_TS_FILES languages/*.ts)
set (PMUSIC_CPP_FILES_FOR_I18N ${PMUSIC_CPP_FILES} ${PMUSIC_UI_FILES})
add_executable(${EXE_NAME}
${PMUSIC_HEADER_FILES}
${PMUSIC_CPP_FILES}
${PMUSIC_UI_FILES}
resources.qrc
)
qt_add_translations(${EXE_NAME}
TS_FILES
${PMUSIC_TS_FILES}
)
if (WIN32)
target_sources(${EXE_NAME} PRIVATE assets/pineapple-music.rc)
endif ()
if (NOT TagLib_FOUND)
target_compile_definitions(${EXE_NAME} PRIVATE NO_TAGLIB=1)
else ()
target_link_libraries(${EXE_NAME} PRIVATE TagLib::tag)
endif ()
if (TARGET KF6::Codecs)
target_compile_definitions(${EXE_NAME} PRIVATE HAVE_KCODECS=1)
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)
target_compile_definitions(${EXE_NAME} PRIVATE USE_QTEXTCODEC=1)
target_link_libraries(${EXE_NAME} PRIVATE Qt6::Core5Compat)
endif()
# Install settings
if (WIN32)
set_target_properties(${EXE_NAME} PROPERTIES
WIN32_EXECUTABLE TRUE
)
elseif (APPLE)
set_source_files_properties(assets/icons/app-icon.icns PROPERTIES
MACOSX_PACKAGE_LOCATION "Resources"
)
target_sources(${EXE_NAME} PUBLIC assets/icons/app-icon.icns)
# See https://cmake.org/cmake/help/v3.15/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.html
set_target_properties(${EXE_NAME} PROPERTIES
MACOSX_BUNDLE TRUE
MACOSX_BUNDLE_BUNDLE_NAME "Pineapple Music"
MACOSX_BUNDLE_GUI_IDENTIFIER net.blumia.pineapple-music
MACOSX_BUNDLE_ICON_FILE app-icon.icns # contains the .icns file name, *without* the path.
MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
)
elseif (UNIX)
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX /usr)
endif ()
# install icon
install(
FILES icons/app-icon.svg
DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps"
RENAME net.blumia.pineapple-music.svg
)
# install shortcut
install(
FILES dist/net.blumia.pineapple-music.desktop
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
)
endif()
set (INSTALL_TARGETS_DEFAULT_ARGS
BUNDLE DESTINATION .
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Devel
)
install (
TARGETS ${EXE_NAME}
${INSTALL_TARGETS_DEFAULT_ARGS}
)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

View File

@ -7,9 +7,12 @@ Since **I** just need a simple player which *just works* right now, so I did man
We have the following features:
- [Sidecar](https://en.wikipedia.org/wiki/Sidecar_file) lyrics file (`.lrc`) support with an optional desktop lyrics bar widget
- Sidecar chapter file support
- [YouTube-style chapter](https://support.google.com/youtube/answer/9884579) saved to a plain text file with `.chp` suffix
- PotPlayer `.pbf` file, `[Bookmark]`s as chapters
- 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:
These features are not available, some of them are TBD and others are not planned:
- 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)

View File

@ -5,8 +5,8 @@ environment:
PACKAGE_INSTALL_ROOT: C:\projects\pir
matrix:
- build_name: mingw1120_64_qt6_7
QTPATH: C:\Qt\6.7\mingw_64
MINGW64: C:\Qt\Tools\mingw1120_64
QTPATH: C:\Qt\6.8\mingw_64
MINGW64: C:\Qt\Tools\mingw1310_64
install:
- mkdir %CMAKE_INSTALL_ROOT%

BIN
assets/icons/app-icon.icns Normal file

Binary file not shown.

View File

@ -26,6 +26,7 @@ FFTSpectrum::FFTSpectrum(QWidget* parent)
});
connect(m_audioBufferOutput, &QAudioBufferOutput::audioBufferReceived, this, [=](const QAudioBuffer& buffer) {
if (!isVisible()) return;
const QAudioFormat& fmt = buffer.format();
const QAudioFormat::SampleFormat sampleFormat = fmt.sampleFormat();
QAudioFormat::ChannelConfig channelConfig = fmt.channelConfig();
@ -112,10 +113,11 @@ void FFTSpectrum::paintEvent(QPaintEvent* e)
if (!m_freq.empty()) {
int width = this->width();
int height = this->height();
int barWidth = std::max(1ULL, width / m_freq.size());
int barWidth = std::max(1, (int)(width / m_freq.size()));
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));
QColor color(70, 130, 180, std::min(255, (int)(140 * m_freq[i]) + 90));
painter.fillRect(i * barWidth, height - barHeight, barWidth, barHeight, color);
}
}
}

View File

@ -112,8 +112,7 @@ bool LyricsManager::loadLyrics(QString filepath)
QRegularExpressionMatch match = lrcRegex.match(line);
while (match.hasMatch()) {
tagSectionPassed = true;
QTime timestamp(QTime::fromString(match.captured(1), "m:s.zz"));
timestamps.append(timestamp.msecsSinceStartOfDay());
timestamps.append(parseTimeToMilliseconds(match.captured(1)));
currentLrc = match.captured(2);
match = lrcRegex.match(currentLrc);
}
@ -177,6 +176,23 @@ double LyricsManager::maskPercent(int curTimeMs)
return (double)(curTimeMs - currentLyricsTime()) / (m_nextLyricsTime - m_currentLyricsTime);
}
int LyricsManager::parseTimeToMilliseconds(const QString &timeString)
{
QRegularExpression timeRegex(R"((\d{2,3}):(\d{2})\.(\d{2,3}))");
QRegularExpressionMatch match = timeRegex.match(timeString);
if (match.hasMatch()) {
int minutes = match.captured(1).toInt();
int seconds = match.captured(2).toInt();
int milliseconds = match.captured(3).toInt();
return minutes * 60000 + seconds * 1000 + milliseconds;
} else {
qCWarning(lcLyricsParser) << "Invalid time format:" << timeString;
return -1;
}
}
void LyricsManager::reset()
{
m_currentLyricsTime = 0;

View File

@ -25,6 +25,8 @@ public:
QString lyrics(int lineOffset = 0) const;
double maskPercent(int curTimeMs);
static int parseTimeToMilliseconds(const QString& timeString);
protected:

View File

@ -21,7 +21,6 @@ int main(int argc, char *argv[])
if (translator.load(QLocale(), QLatin1String("pineapple-music"), QLatin1String("_"), QLatin1String(":/i18n"))) {
a.installTranslator(&translator);
}
a.installTranslator(&translator);
// parse commandline arguments
QCommandLineParser parser;

View File

@ -33,6 +33,7 @@
#include <QMessageBox>
#include <QStringBuilder>
#include <QSettings>
#include <QGraphicsDropShadowEffect>
constexpr QSize miniSize(490, 160);
constexpr QSize fullSize(490, 420);
@ -61,6 +62,11 @@ MainWindow::MainWindow(QWidget *parent)
ui->actionOpen->setShortcut(QKeySequence::Open);
addAction(ui->actionOpen);
ui->titleLabel->setGraphicsEffect(createLabelShadowEffect());
ui->propLabel->setGraphicsEffect(createLabelShadowEffect());
ui->nowTimeLabel->setGraphicsEffect(createLabelShadowEffect());
ui->totalTimeLabel->setGraphicsEffect(createLabelShadowEffect());
setWindowFlags(Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::WindowMinimizeButtonHint);
setAttribute(Qt::WA_TranslucentBackground, true);
@ -108,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);
}
@ -236,6 +242,12 @@ void MainWindow::dropEvent(QDropEvent *e)
return;
}
if (fileName.endsWith(".chp") || fileName.endsWith(".pbf")) {
QList<std::pair<qint64, QString>> chapters(PlaybackProgressIndicator::tryLoadSidecarChapterFile(fileName));
ui->playbackProgressIndicator->setChapters(chapters);
return;
}
const QModelIndex & modelIndex = m_playlistManager->loadPlaylist(urls);
if (modelIndex.isValid()) {
loadByModelIndex(modelIndex);
@ -258,14 +270,22 @@ void MainWindow::loadFile()
}
m_playlistManager->loadPlaylist(urlList);
m_mediaPlayer->setSource(urlList.first());
m_lrcbar->loadLyrics(urlList.first().toLocalFile());
const QUrl & firstUrl = urlList.first();
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));
m_lrcbar->loadLyrics(m_playlistManager->localFileByIndex(index));
loadFile(m_playlistManager->urlByIndex(index));
}
void MainWindow::play()
@ -353,14 +373,6 @@ void MainWindow::on_stopBtn_clicked()
m_mediaPlayer->stop();
}
void MainWindow::on_playbackSlider_valueChanged(int value)
{
qint64 currPos = m_mediaPlayer->duration() == 0 ? value : m_mediaPlayer->position() * ui->playbackSlider->maximum() / m_mediaPlayer->duration();
if (qAbs(currPos - value) > 2) {
m_mediaPlayer->setPosition(ui->playbackSlider->value() * 1.0 / ui->playbackSlider->maximum() * m_mediaPlayer->duration());
}
}
void MainWindow::on_prevBtn_clicked()
{
QModelIndex index(m_playlistManager->previousIndex());
@ -408,6 +420,10 @@ void MainWindow::initConnections()
m_audioOutput->setDevice(m_mediaDevices->defaultAudioOutput());
});
connect(ui->playbackProgressIndicator, &PlaybackProgressIndicator::seekingRequested, this, [=](qint64 pos){
m_mediaPlayer->setPosition(pos);
});
connect(m_mediaPlayer, &QMediaPlayer::sourceChanged, this, [=](){
QUrl fileUrl(m_mediaPlayer->source());
@ -425,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()) {
@ -432,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
}
@ -443,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
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));
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));
}
QVariant coverArt(metadata.value(QMediaMetaData::ThumbnailImage));
if (!coverArt.isNull()) {
ui->coverLabel->setPixmap(QPixmap::fromImage(coverArt.value<QImage>()));
@ -464,7 +491,7 @@ void MainWindow::initConnections()
connect(m_mediaPlayer, &QMediaPlayer::positionChanged, this, [=](qint64 pos) {
ui->nowTimeLabel->setText(ms2str(pos));
if (m_mediaPlayer->duration() != 0) {
ui->playbackSlider->setSliderPosition(ui->playbackSlider->maximum() * pos / m_mediaPlayer->duration());
ui->playbackProgressIndicator->setPosition(pos);
}
m_lrcbar->playbackPositionChanged(pos, m_mediaPlayer->duration());
});
@ -478,6 +505,7 @@ void MainWindow::initConnections()
});
connect(m_mediaPlayer, &QMediaPlayer::durationChanged, this, [=](qint64 dua) {
ui->playbackProgressIndicator->setDuration(dua);
ui->totalTimeLabel->setText(ms2str(dua));
});
@ -662,9 +690,18 @@ 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();
}
QGraphicsDropShadowEffect *MainWindow::createLabelShadowEffect()
{
QGraphicsDropShadowEffect * effect = new QGraphicsDropShadowEffect(this);
effect->setBlurRadius(3);
effect->setColor(QColor(0, 0, 0, 180));
effect->setOffset(1, 1);
return effect;
}

View File

@ -7,6 +7,7 @@
#include <QMainWindow>
#include <QVariant>
#include <QUrl>
QT_BEGIN_NAMESPACE
namespace Ui { class MainWindow; }
@ -15,6 +16,7 @@ class QMediaDevices;
class QMediaPlayer;
class QAudioOutput;
class QPropertyAnimation;
class QGraphicsDropShadowEffect;
QT_END_NAMESPACE
class FFTSpectrum;
@ -54,6 +56,7 @@ protected:
void dropEvent(QDropEvent *e) override;
void loadFile();
void loadFile(const QUrl &url);
void loadByModelIndex(const QModelIndex &index);
void play();
@ -67,7 +70,6 @@ private slots:
void on_playBtn_clicked();
void on_volumeSlider_valueChanged(int value);
void on_stopBtn_clicked();
void on_playbackSlider_valueChanged(int value);
void on_prevBtn_clicked();
void on_nextBtn_clicked();
void on_volumeBtn_clicked();
@ -83,10 +85,13 @@ signals:
void playbackModeChanged(enum PlaybackMode mode);
private:
QGraphicsDropShadowEffect * createLabelShadowEffect();
bool m_clickedOnWindow = false;
bool m_playbackSliderPressed = false;
QLinearGradient m_bgLinearGradient;
QPixmap m_skin;
QUrl m_urlMissingTagLibMetadata;
enum PlaybackMode m_playbackMode = CurrentItemInLoop;
Ui::MainWindow *ui;

View File

@ -371,14 +371,7 @@ QListView {
</layout>
</item>
<item>
<widget class="SeekableSlider" name="playbackSlider">
<property name="maximum">
<number>1000</number>
</property>
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
<widget class="PlaybackProgressIndicator" name="playbackProgressIndicator" native="true"/>
</item>
<item>
<layout class="QHBoxLayout" name="playbackControlLayout">
@ -694,6 +687,12 @@ QListView {
<extends>QSlider</extends>
<header>seekableslider.h</header>
</customwidget>
<customwidget>
<class>PlaybackProgressIndicator</class>
<extends>QWidget</extends>
<header>playbackprogressindicator.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="resources.qrc"/>

View File

@ -0,0 +1,311 @@
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
#include "playbackprogressindicator.h"
#include <QDir>
#include <QFile>
#include <QFileInfo>
#include <QPainter>
#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)
{
}
void PlaybackProgressIndicator::setPosition(qint64 pos)
{
m_position = pos;
emit positionChanged(m_position);
}
void PlaybackProgressIndicator::setDuration(qint64 dur)
{
m_duration = dur;
emit durationChanged(m_duration);
}
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);
chapterItem->setData(chapter.first, StartTimeMsRole);
m_chapterModel.appendRow(chapterItem);
}
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)) {
return parseCHPChapterFile(filePath);
} else if (filePath.endsWith(".pbf", Qt::CaseInsensitive)) {
return parsePBFChapterFile(filePath);
}
QFileInfo fileInfo(filePath);
fileInfo.setFile(fileInfo.dir().filePath(fileInfo.completeBaseName() + ".chp"));
if (fileInfo.exists()) {
return parseCHPChapterFile(fileInfo.absoluteFilePath());
}
fileInfo.setFile(fileInfo.dir().filePath(fileInfo.completeBaseName() + ".pbf"));
if (fileInfo.exists()) {
return parsePBFChapterFile(fileInfo.absoluteFilePath());
}
fileInfo.setFile(filePath + ".chp");
if (fileInfo.exists()) {
return parseCHPChapterFile(fileInfo.absoluteFilePath());
}
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;
QFile file(filePath);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
return chapters;
}
QTextStream in(&file);
QRegularExpression timeRegex(R"((\d{1,2}):(\d{2})(?::(\d{2}))?(?:\.(\d{1,3}))?)");
while (!in.atEnd()) {
QString line = in.readLine().trimmed();
QRegularExpressionMatch match = timeRegex.match(line);
if (match.hasMatch()) {
int hours = match.capturedView(3).isEmpty() ? 0 : match.capturedView(1).toInt();
int minutes = match.capturedView(3).isEmpty() ? match.capturedView(1).toInt() : match.capturedView(2).toInt();
int seconds = match.capturedView(3).isEmpty() ? match.capturedView(2).toInt() : match.capturedView(3).toInt();
int milliseconds = 0;
QStringView millisecondsStr(match.capturedView(4));
if (!millisecondsStr.isEmpty()) {
milliseconds = millisecondsStr.toInt() * pow(10, 3 - millisecondsStr.length());
}
qint64 totalMilliseconds = (hours * 3600 + minutes * 60 + seconds) * 1000 + milliseconds;
QString chapterTitle = line.mid(match.capturedLength()).trimmed();
chapters.append(std::make_pair(totalMilliseconds, chapterTitle));
}
}
file.close();
return chapters;
}
QList<std::pair<qint64, QString> > PlaybackProgressIndicator::parsePBFChapterFile(const QString &filePath)
{
QList<std::pair<qint64, QString>> chapters;
QFile file(filePath);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
return chapters;
}
QTextStream in(&file);
QRegularExpression chapterRegex(R"(^\d+=(\d+)\*([^*]*)\*.*$)");
while (!in.atEnd()) {
QString line = in.readLine().trimmed();
QRegularExpressionMatch match = chapterRegex.match(line);
if (match.hasMatch()) {
qint64 timestamp = match.captured(1).toLongLong();
QString title = match.captured(2).trimmed();
chapters.append(std::make_pair(timestamp, title));
}
}
file.close();
return chapters;
}
void PlaybackProgressIndicator::paintEvent(QPaintEvent *event)
{
constexpr int progressBarHeight = 6;
constexpr QColor activeColor = QColor(85, 170, 0);
const QPointF topLeft(0, height() / 2.0 - progressBarHeight / 2.0);
const QSizeF barSize(width(), progressBarHeight);
const float currentProgress = m_duration <= 0 ? 0 : (m_seekingPosition >= 0 ? m_seekingPosition : m_position) / (float)m_duration;
const QSizeF progressSize(width() * currentProgress, progressBarHeight);
QPainterPath theProgress;
theProgress.addRoundedRect(QRectF(topLeft, progressSize), progressBarHeight / 2, progressBarHeight / 2);
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
painter.save();
// the bar itself
painter.setPen(Qt::gray);
painter.drawRoundedRect(QRectF(topLeft, barSize), progressBarHeight / 2, progressBarHeight / 2);
painter.fillPath(theProgress, activeColor);
// progress
painter.setPen(activeColor);
painter.drawPath(theProgress);
// chapter markers
if (m_duration > 0) {
painter.setPen(Qt::lightGray);
for (int i = 0; i < m_chapterModel.rowCount(); i++) {
qint64 chapterStartTime = m_chapterModel.item(i)->data(StartTimeMsRole).toInt();
if (chapterStartTime == 0) continue;
if (chapterStartTime > m_duration) break;
float chapterPercent = chapterStartTime / (float)m_duration;
float chapterPosX = width() * chapterPercent;
painter.drawLine(topLeft + QPoint(chapterPosX, 0),
topLeft + QPoint(chapterPosX, progressBarHeight));
}
}
painter.restore();
}
void PlaybackProgressIndicator::mousePressEvent(QMouseEvent *event)
{
if (m_duration > 0) {
event->accept();
} else {
return QWidget::mousePressEvent(event);
}
}
void PlaybackProgressIndicator::mouseMoveEvent(QMouseEvent *event)
{
if (m_duration > 0) {
m_seekingPosition = event->position().x() * m_duration / width();
if (m_seekOnMove) {
emit seekingRequested(m_seekingPosition);
}
update();
}
return QWidget::mouseMoveEvent(event);
}
void PlaybackProgressIndicator::mouseReleaseEvent(QMouseEvent *event)
{
if (m_duration > 0) {
int seekingPosition = event->position().x() * m_duration / width();
m_seekingPosition = -1;
emit seekingRequested(seekingPosition);
}
update();
return QWidget::mouseReleaseEvent(event);
}

View File

@ -0,0 +1,58 @@
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
#pragma once
#include <QWidget>
#include <QMouseEvent>
#include <QStandardItemModel>
class PlaybackProgressIndicator : public QWidget
{
Q_OBJECT
Q_PROPERTY(bool seekOnMove MEMBER m_seekOnMove NOTIFY seekOnMoveChanged)
Q_PROPERTY(qint64 position MEMBER m_position NOTIFY positionChanged)
Q_PROPERTY(qint64 duration MEMBER m_duration NOTIFY durationChanged)
public:
enum Roles {
ChapterTitleRole = Qt::DisplayRole,
StartTimeMsRole = Qt::UserRole + 1,
};
explicit PlaybackProgressIndicator(QWidget *parent = nullptr);
~PlaybackProgressIndicator() = default;
void setPosition(qint64 pos);
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);
signals:
void seekOnMoveChanged(bool sow);
void positionChanged(qint64 newPosition);
void durationChanged(qint64 newDuration);
void seekingRequested(qint64 position);
public slots:
protected:
void paintEvent(QPaintEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
void mouseMoveEvent(QMouseEvent *event) override;
void mouseReleaseEvent(QMouseEvent *event) override;
private:
bool m_seekOnMove = true;
qint64 m_position = -1;
qint64 m_seekingPosition = -1;
qint64 m_duration = -1;
QStandardItemModel m_chapterModel;
};

View File

@ -1,255 +1,253 @@
// SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
#include "playlistmanager.h"
#include <QCollator>
#include <QDir>
#include <QFileInfo>
#include <QUrl>
PlaylistModel::PlaylistModel(QObject *parent)
: QAbstractListModel(parent)
{
}
PlaylistModel::~PlaylistModel()
{
}
void PlaylistModel::setPlaylist(const QList<QUrl> &urls)
{
beginResetModel();
m_playlist = urls;
endResetModel();
}
QModelIndex PlaylistModel::loadPlaylist(const QList<QUrl> & urls)
{
if (urls.isEmpty()) return QModelIndex();
if (urls.count() == 1) {
return loadPlaylist(urls.constFirst());
} else {
setPlaylist(urls);
return index(0);
}
}
QModelIndex PlaylistModel::loadPlaylist(const QUrl &url)
{
QFileInfo info(url.toLocalFile());
QDir dir(info.path());
QString && currentFileName = info.fileName();
if (dir.path() == m_currentDir) {
int idx = indexOf(url);
return idx == -1 ? appendToPlaylist(url) : index(idx);
}
QStringList entryList = dir.entryList(
m_autoLoadSuffixes,
QDir::Files | QDir::NoSymLinks, QDir::NoSort);
QCollator collator;
collator.setNumericMode(true);
std::sort(entryList.begin(), entryList.end(), collator);
QList<QUrl> playlist;
int idx = -1;
for (int i = 0; i < entryList.count(); i++) {
const QString & fileName = entryList.at(i);
const QString & oneEntry = dir.absoluteFilePath(fileName);
const QUrl & url = QUrl::fromLocalFile(oneEntry);
playlist.append(url);
if (fileName == currentFileName) {
idx = i;
}
}
if (idx == -1) {
idx = playlist.count();
playlist.append(url);
}
m_currentDir = dir.path();
setPlaylist(playlist);
return index(idx);
}
QModelIndex PlaylistModel::appendToPlaylist(const QUrl &url)
{
const int lastIndex = rowCount();
beginInsertRows(QModelIndex(), lastIndex, lastIndex);
m_playlist.append(url);
endInsertRows();
return index(lastIndex);
}
bool PlaylistModel::removeAt(int index)
{
if (index < 0 || index >= rowCount()) return false;
beginRemoveRows(QModelIndex(), index, index);
m_playlist.removeAt(index);
endRemoveRows();
return true;
}
int PlaylistModel::indexOf(const QUrl &url) const
{
return m_playlist.indexOf(url);
}
QUrl PlaylistModel::urlByIndex(int index) const
{
return m_playlist.value(index);
}
QStringList PlaylistModel::autoLoadFilterSuffixes() const
{
return m_autoLoadSuffixes;
}
QHash<int, QByteArray> PlaylistModel::roleNames() const
{
QHash<int, QByteArray> result = QAbstractListModel::roleNames();
result.insert(UrlRole, "url");
return result;
}
int PlaylistModel::rowCount(const QModelIndex &parent) const
{
return m_playlist.count();
}
QVariant PlaylistModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid()) return QVariant();
switch (role) {
case Qt::DisplayRole:
return m_playlist.at(index.row()).fileName();
case UrlRole:
return m_playlist.at(index.row());
}
return QVariant();
}
PlaylistManager::PlaylistManager(QObject *parent)
: QObject(parent)
{
connect(&m_model, &PlaylistModel::rowsRemoved, this,
[this](const QModelIndex &, int, int) {
if (m_model.rowCount() <= m_currentIndex) {
setProperty("currentIndex", m_currentIndex - 1);
}
});
auto onRowCountChanged = [this](){
emit totalCountChanged(m_model.rowCount());
};
connect(&m_model, &PlaylistModel::rowsInserted, this, onRowCountChanged);
connect(&m_model, &PlaylistModel::rowsRemoved, this, onRowCountChanged);
connect(&m_model, &PlaylistModel::modelReset, this, onRowCountChanged);
}
PlaylistManager::~PlaylistManager()
{
}
PlaylistModel *PlaylistManager::model()
{
return &m_model;
}
void PlaylistManager::setPlaylist(const QList<QUrl> &urls)
{
m_model.setPlaylist(urls);
}
QModelIndex PlaylistManager::loadPlaylist(const QList<QUrl> &urls)
{
QModelIndex idx = m_model.loadPlaylist(urls);
setProperty("currentIndex", idx.row());
return idx;
}
QModelIndex PlaylistManager::loadPlaylist(const QUrl &url)
{
QModelIndex idx = m_model.loadPlaylist(url);
setProperty("currentIndex", idx.row());
return idx;
}
int PlaylistManager::totalCount() const
{
return m_model.rowCount();
}
QModelIndex PlaylistManager::previousIndex() const
{
int count = totalCount();
if (count == 0) return QModelIndex();
return m_model.index(m_currentIndex - 1 < 0 ? count - 1 : m_currentIndex - 1);
}
QModelIndex PlaylistManager::nextIndex() const
{
int count = totalCount();
if (count == 0) return QModelIndex();
return m_model.index(m_currentIndex + 1 == count ? 0 : m_currentIndex + 1);
}
QModelIndex PlaylistManager::curIndex() const
{
return m_model.index(m_currentIndex);
}
void PlaylistManager::setCurrentIndex(const QModelIndex &index)
{
if (index.isValid() && index.row() >= 0 && index.row() < totalCount()) {
setProperty("currentIndex", index.row());
}
}
QUrl PlaylistManager::urlByIndex(const QModelIndex &index)
{
return m_model.urlByIndex(index.row());
}
QString PlaylistManager::localFileByIndex(const QModelIndex &index)
{
return urlByIndex(index).toLocalFile();
}
bool PlaylistManager::removeAt(const QModelIndex &index)
{
return m_model.removeAt(index.row());
}
void PlaylistManager::setAutoLoadFilterSuffixes(const QStringList &nameFilters)
{
m_model.setProperty("autoLoadFilterSuffixes", nameFilters);
}
QList<QUrl> PlaylistManager::convertToUrlList(const QStringList &files)
{
QList<QUrl> urlList;
for (const QString & str : std::as_const(files)) {
QUrl url = QUrl::fromLocalFile(str);
if (url.isValid()) {
urlList.append(url);
}
}
return urlList;
}
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
#include "playlistmanager.h"
#include <QCollator>
#include <QDir>
#include <QFileInfo>
#include <QUrl>
PlaylistModel::PlaylistModel(QObject *parent)
: QAbstractListModel(parent)
{
}
PlaylistModel::~PlaylistModel()
= default;
void PlaylistModel::setPlaylist(const QList<QUrl> &urls)
{
beginResetModel();
m_playlist = urls;
endResetModel();
}
QModelIndex PlaylistModel::loadPlaylist(const QList<QUrl> & urls)
{
if (urls.isEmpty()) return {};
if (urls.count() == 1) {
return loadPlaylist(urls.constFirst());
} else {
setPlaylist(urls);
return index(0);
}
}
QModelIndex PlaylistModel::loadPlaylist(const QUrl &url)
{
QFileInfo info(url.toLocalFile());
QDir dir(info.path());
QString && currentFileName = info.fileName();
if (dir.path() == m_currentDir) {
int idx = indexOf(url);
return idx == -1 ? appendToPlaylist(url) : index(idx);
}
QStringList entryList = dir.entryList(
m_autoLoadSuffixes,
QDir::Files | QDir::NoSymLinks, QDir::NoSort);
QCollator collator;
collator.setNumericMode(true);
std::sort(entryList.begin(), entryList.end(), collator);
QList<QUrl> playlist;
int idx = -1;
for (int i = 0; i < entryList.count(); i++) {
const QString & fileName = entryList.at(i);
const QString & oneEntry = dir.absoluteFilePath(fileName);
const QUrl & url = QUrl::fromLocalFile(oneEntry);
playlist.append(url);
if (fileName == currentFileName) {
idx = i;
}
}
if (idx == -1) {
idx = playlist.count();
playlist.append(url);
}
m_currentDir = dir.path();
setPlaylist(playlist);
return index(idx);
}
QModelIndex PlaylistModel::appendToPlaylist(const QUrl &url)
{
const int lastIndex = rowCount();
beginInsertRows(QModelIndex(), lastIndex, lastIndex);
m_playlist.append(url);
endInsertRows();
return index(lastIndex);
}
bool PlaylistModel::removeAt(int index)
{
if (index < 0 || index >= rowCount()) return false;
beginRemoveRows(QModelIndex(), index, index);
m_playlist.removeAt(index);
endRemoveRows();
return true;
}
int PlaylistModel::indexOf(const QUrl &url) const
{
return m_playlist.indexOf(url);
}
QUrl PlaylistModel::urlByIndex(int index) const
{
return m_playlist.value(index);
}
QStringList PlaylistModel::autoLoadFilterSuffixes() const
{
return m_autoLoadSuffixes;
}
QHash<int, QByteArray> PlaylistModel::roleNames() const
{
QHash<int, QByteArray> result = QAbstractListModel::roleNames();
result.insert(UrlRole, "url");
return result;
}
int PlaylistModel::rowCount(const QModelIndex &parent) const
{
return m_playlist.count();
}
QVariant PlaylistModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid()) return {};
switch (role) {
case Qt::DisplayRole:
return m_playlist.at(index.row()).fileName();
case UrlRole:
return m_playlist.at(index.row());
}
return {};
}
PlaylistManager::PlaylistManager(QObject *parent)
: QObject(parent)
{
connect(&m_model, &PlaylistModel::rowsRemoved, this,
[this](const QModelIndex &, int, int) {
if (m_model.rowCount() <= m_currentIndex) {
setProperty("currentIndex", m_currentIndex - 1);
}
});
auto onRowCountChanged = [this](){
emit totalCountChanged(m_model.rowCount());
};
connect(&m_model, &PlaylistModel::rowsInserted, this, onRowCountChanged);
connect(&m_model, &PlaylistModel::rowsRemoved, this, onRowCountChanged);
connect(&m_model, &PlaylistModel::modelReset, this, onRowCountChanged);
}
PlaylistManager::~PlaylistManager()
{
}
PlaylistModel *PlaylistManager::model()
{
return &m_model;
}
void PlaylistManager::setPlaylist(const QList<QUrl> &urls)
{
m_model.setPlaylist(urls);
}
QModelIndex PlaylistManager::loadPlaylist(const QList<QUrl> &urls)
{
QModelIndex idx = m_model.loadPlaylist(urls);
setProperty("currentIndex", idx.row());
return idx;
}
QModelIndex PlaylistManager::loadPlaylist(const QUrl &url)
{
QModelIndex idx = m_model.loadPlaylist(url);
setProperty("currentIndex", idx.row());
return idx;
}
int PlaylistManager::totalCount() const
{
return m_model.rowCount();
}
QModelIndex PlaylistManager::previousIndex() const
{
int count = totalCount();
if (count == 0) return {};
return m_model.index(m_currentIndex - 1 < 0 ? count - 1 : m_currentIndex - 1);
}
QModelIndex PlaylistManager::nextIndex() const
{
int count = totalCount();
if (count == 0) return {};
return m_model.index(m_currentIndex + 1 == count ? 0 : m_currentIndex + 1);
}
QModelIndex PlaylistManager::curIndex() const
{
return m_model.index(m_currentIndex);
}
void PlaylistManager::setCurrentIndex(const QModelIndex &index)
{
if (index.isValid() && index.row() >= 0 && index.row() < totalCount()) {
setProperty("currentIndex", index.row());
}
}
QUrl PlaylistManager::urlByIndex(const QModelIndex &index)
{
return m_model.urlByIndex(index.row());
}
QString PlaylistManager::localFileByIndex(const QModelIndex &index)
{
return urlByIndex(index).toLocalFile();
}
bool PlaylistManager::removeAt(const QModelIndex &index)
{
return m_model.removeAt(index.row());
}
void PlaylistManager::setAutoLoadFilterSuffixes(const QStringList &nameFilters)
{
m_model.setProperty("autoLoadFilterSuffixes", nameFilters);
}
QList<QUrl> PlaylistManager::convertToUrlList(const QStringList &files)
{
QList<QUrl> urlList;
for (const QString & str : std::as_const(files)) {
QUrl url = QUrl::fromLocalFile(str);
if (url.isValid()) {
urlList.append(url);
}
}
return urlList;
}

View File

@ -1,85 +1,85 @@
// SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
#pragma once
#include <QUrl>
#include <QAbstractListModel>
class PlaylistModel : public QAbstractListModel
{
Q_OBJECT
public:
enum PlaylistRole {
UrlRole = Qt::UserRole
};
Q_ENUM(PlaylistRole)
Q_PROPERTY(QStringList autoLoadFilterSuffixes MEMBER m_autoLoadSuffixes NOTIFY autoLoadFilterSuffixesChanged)
explicit PlaylistModel(QObject *parent = nullptr);
~PlaylistModel();
void setPlaylist(const QList<QUrl> & urls);
QModelIndex loadPlaylist(const QList<QUrl> & urls);
QModelIndex loadPlaylist(const QUrl & url);
QModelIndex appendToPlaylist(const QUrl & url);
bool removeAt(int index);
int indexOf(const QUrl & url) const;
QUrl urlByIndex(int index) const;
QStringList autoLoadFilterSuffixes() const;
QHash<int, QByteArray> roleNames() const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
signals:
void autoLoadFilterSuffixesChanged(QStringList suffixes);
private:
// model data
QList<QUrl> m_playlist;
// properties
QStringList m_autoLoadSuffixes = {};
// internal
QString m_currentDir;
};
class PlaylistManager : public QObject
{
Q_OBJECT
public:
Q_PROPERTY(int currentIndex MEMBER m_currentIndex NOTIFY currentIndexChanged)
Q_PROPERTY(QStringList autoLoadFilterSuffixes WRITE setAutoLoadFilterSuffixes)
Q_PROPERTY(PlaylistModel * model READ model CONSTANT)
explicit PlaylistManager(QObject *parent = nullptr);
~PlaylistManager();
PlaylistModel * model();
void setPlaylist(const QList<QUrl> & url);
Q_INVOKABLE QModelIndex loadPlaylist(const QList<QUrl> & urls);
Q_INVOKABLE QModelIndex loadPlaylist(const QUrl & url);
int totalCount() const;
QModelIndex previousIndex() const;
QModelIndex nextIndex() const;
QModelIndex curIndex() const;
void setCurrentIndex(const QModelIndex & index);
QUrl urlByIndex(const QModelIndex & index);
QString localFileByIndex(const QModelIndex & index);
bool removeAt(const QModelIndex & index);
void setAutoLoadFilterSuffixes(const QStringList &nameFilters);
static QList<QUrl> convertToUrlList(const QStringList & files);
signals:
void currentIndexChanged(int index);
void totalCountChanged(int count);
private:
int m_currentIndex = -1;
PlaylistModel m_model;
};
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
#pragma once
#include <QUrl>
#include <QAbstractListModel>
class PlaylistModel : public QAbstractListModel
{
Q_OBJECT
public:
enum PlaylistRole {
UrlRole = Qt::UserRole
};
Q_ENUM(PlaylistRole)
Q_PROPERTY(QStringList autoLoadFilterSuffixes MEMBER m_autoLoadSuffixes NOTIFY autoLoadFilterSuffixesChanged)
explicit PlaylistModel(QObject *parent = nullptr);
~PlaylistModel() override;
void setPlaylist(const QList<QUrl> & urls);
QModelIndex loadPlaylist(const QList<QUrl> & urls);
QModelIndex loadPlaylist(const QUrl & url);
QModelIndex appendToPlaylist(const QUrl & url);
bool removeAt(int index);
int indexOf(const QUrl & url) const;
QUrl urlByIndex(int index) const;
QStringList autoLoadFilterSuffixes() const;
QHash<int, QByteArray> roleNames() const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
signals:
void autoLoadFilterSuffixesChanged(QStringList suffixes);
private:
// model data
QList<QUrl> m_playlist;
// properties
QStringList m_autoLoadSuffixes = {};
// internal
QString m_currentDir;
};
class PlaylistManager : public QObject
{
Q_OBJECT
public:
Q_PROPERTY(int currentIndex MEMBER m_currentIndex NOTIFY currentIndexChanged)
Q_PROPERTY(QStringList autoLoadFilterSuffixes WRITE setAutoLoadFilterSuffixes)
Q_PROPERTY(PlaylistModel * model READ model CONSTANT)
explicit PlaylistManager(QObject *parent = nullptr);
~PlaylistManager();
PlaylistModel * model();
void setPlaylist(const QList<QUrl> & url);
Q_INVOKABLE QModelIndex loadPlaylist(const QList<QUrl> & urls);
Q_INVOKABLE QModelIndex loadPlaylist(const QUrl & url);
int totalCount() const;
QModelIndex previousIndex() const;
QModelIndex nextIndex() const;
QModelIndex curIndex() const;
void setCurrentIndex(const QModelIndex & index);
QUrl urlByIndex(const QModelIndex & index);
QString localFileByIndex(const QModelIndex & index);
bool removeAt(const QModelIndex & index);
void setAutoLoadFilterSuffixes(const QStringList &nameFilters);
static QList<QUrl> convertToUrlList(const QStringList & files);
signals:
void currentIndexChanged(int index);
void totalCountChanged(int count);
private:
int m_currentIndex = -1;
PlaylistModel m_model;
};

View File

@ -1,24 +1,24 @@
// SPDX-FileCopyrightText: 2024 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
#pragma once
#include <QSlider>
#include <QMouseEvent>
class SeekableSlider : public QSlider
{
Q_OBJECT
public:
explicit SeekableSlider(QWidget *parent = nullptr);
~SeekableSlider() = default;
signals:
public slots:
protected:
void mouseReleaseEvent(QMouseEvent *event) override;
};
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
//
// SPDX-License-Identifier: MIT
#pragma once
#include <QSlider>
#include <QMouseEvent>
class SeekableSlider : public QSlider
{
Q_OBJECT
public:
explicit SeekableSlider(QWidget *parent = nullptr);
~SeekableSlider() override = default;
signals:
public slots:
protected:
void mouseReleaseEvent(QMouseEvent *event) override;
};