Compare commits
2 Commits
8ada0d2138
...
15ffe5a85e
Author | SHA1 | Date | |
---|---|---|---|
15ffe5a85e | |||
c672a597b3 |
14
.github/workflows/windows.yml
vendored
14
.github/workflows/windows.yml
vendored
@ -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 ------
|
||||
|
@ -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);
|
||||
}
|
||||
@ -440,6 +440,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 +449,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 +464,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>()));
|
||||
|
@ -7,6 +7,7 @@
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QVariant>
|
||||
#include <QUrl>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
namespace Ui { class MainWindow; }
|
||||
@ -89,6 +90,7 @@ private:
|
||||
bool m_playbackSliderPressed = false;
|
||||
QLinearGradient m_bgLinearGradient;
|
||||
QPixmap m_skin;
|
||||
QUrl m_urlMissingTagLibMetadata;
|
||||
enum PlaybackMode m_playbackMode = CurrentItemInLoop;
|
||||
|
||||
Ui::MainWindow *ui;
|
||||
|
Loading…
x
Reference in New Issue
Block a user