dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moodbar: Disable moodbar loader for CUE songs

Browse Source
This commit is contained in:
Jonas Kvinge
2022-01-05 18:58:02 +01:00
parent 7d55eb4b44
commit fdedfd54c7
8 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/moodbar/moodbarcontroller.cpp
View File

@@ -59,7 +59,7 @@ void MoodbarController::CurrentSongChanged(const Song &song) {
QByteArray data;
MoodbarPipeline *pipeline = nullptr;
const MoodbarLoader::Result result = app_->moodbar_loader()->Load(song.url(), &data, &pipeline);
const MoodbarLoader::Result result = app_->moodbar_loader()->Load(song.url(), song.has_cue(), &data, &pipeline);
switch (result) {
case MoodbarLoader::CannotLoad:

9
src/moodbar/moodbaritemdelegate.cpp
View File

@@ -102,6 +102,7 @@ QPixmap MoodbarItemDelegate::PixmapForIndex(const QModelIndex &idx, const QSize
// Pixmaps are keyed off URL.
const QUrl url = idx.sibling(idx.row(), Playlist::Column_Filename).data().toUrl();
const bool has_cue = idx.sibling(idx.row(), Playlist::Column_HasCUE).data().toBool();
Data *data = nullptr;
if (data_.contains(url)) {
@@ -135,20 +136,20 @@ QPixmap MoodbarItemDelegate::PixmapForIndex(const QModelIndex &idx, const QSize
}
// We have to start loading the data from scratch.
StartLoadingData(url, data);
StartLoadingData(url, has_cue, data);
return QPixmap();
}
void MoodbarItemDelegate::StartLoadingData(const QUrl &url, Data *data) {
void MoodbarItemDelegate::StartLoadingData(const QUrl &url, const bool has_cue, Data *data) {
data->state_ = Data::State_LoadingData;
// Load a mood file for this song and generate some colors from it
QByteArray bytes;
MoodbarPipeline *pipeline = nullptr;
switch (app_->moodbar_loader()->Load(url, &bytes, &pipeline)) {
switch (app_->moodbar_loader()->Load(url, has_cue, &bytes, &pipeline)) {
case MoodbarLoader::CannotLoad:
data->state_ = Data::State_CannotLoad;
break;
@@ -183,7 +184,7 @@ void MoodbarItemDelegate::ReloadAllColors() {
Data *data = data_[url];
if (data->state_ == Data::State_Loaded) {
StartLoadingData(url, data);
StartLoadingData(url, false, data);
}
}

2
src/moodbar/moodbaritemdelegate.h
View File

@@ -77,7 +77,7 @@ class MoodbarItemDelegate : public QItemDelegate {
private:
QPixmap PixmapForIndex(const QModelIndex &idx, const QSize size);
void StartLoadingData(const QUrl &url, Data *data);
void StartLoadingData(const QUrl &url, const bool has_cue, Data *data);
void StartLoadingColors(const QUrl &url, const QByteArray &bytes, Data *data);
void StartLoadingImage(const QUrl &url, Data *data);

4
src/moodbar/moodbarloader.cpp
View File

@@ -93,9 +93,9 @@ QStringList MoodbarLoader::MoodFilenames(const QString &song_filename) {
}
MoodbarLoader::Result MoodbarLoader::Load(const QUrl &url, QByteArray *data, MoodbarPipeline **async_pipeline) {
MoodbarLoader::Result MoodbarLoader::Load(const QUrl &url, const bool has_cue, QByteArray *data, MoodbarPipeline **async_pipeline) {
if (url.scheme() != "file") {
if (!url.isLocalFile() || has_cue) {
return CannotLoad;
}

2
src/moodbar/moodbarloader.h
View File

@@ -52,7 +52,7 @@ class MoodbarLoader : public QObject {
WillLoadAsync
};
Result Load(const QUrl &url, QByteArray *data, MoodbarPipeline **async_pipeline);
Result Load(const QUrl &url, const bool has_cue, QByteArray *data, MoodbarPipeline **async_pipeline);
private slots:
void ReloadSettings();