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

Refactoring

Browse Source
This commit is contained in:
Jonas Kvinge
2024-10-22 18:12:33 +02:00
parent dfcf715291
commit 8da2b9cd94
623 changed files with 9071 additions and 5126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/moodbar/moodbaritemdelegate.cpp
View File

@@ -36,7 +36,6 @@
#include <QPainter>
#include <QRect>
#include "core/application.h"
#include "core/settings.h"
#include "playlist/playlist.h"
#include "playlist/playlistview.h"
@@ -47,18 +46,20 @@
#include "moodbarpipeline.h"
#include "moodbarrenderer.h"
#include "settings/moodbarsettingspage.h"
#include "constants/moodbarsettings.h"
MoodbarItemDelegate::Data::Data() : state_(State::None) {}
MoodbarItemDelegate::MoodbarItemDelegate(Application *app, PlaylistView *view, QObject *parent)
MoodbarItemDelegate::MoodbarItemDelegate(const SharedPtr<MoodbarLoader> moodbar_loader, PlaylistView *playlist_view, QObject *parent)
: QItemDelegate(parent),
app_(app),
view_(view),
moodbar_loader_(moodbar_loader),
playlist_view_(playlist_view),
enabled_(false),
style_(MoodbarRenderer::MoodbarStyle::Normal) {
style_(MoodbarSettings::Style::Normal) {
QObject::connect(&*moodbar_loader, &MoodbarLoader::SettingsReloaded, this, &MoodbarItemDelegate::ReloadSettings);
QObject::connect(&*moodbar_loader, &MoodbarLoader::StyleChanged, this, &MoodbarItemDelegate::ReloadSettings);
QObject::connect(app_, &Application::SettingsChanged, this, &MoodbarItemDelegate::ReloadSettings);
ReloadSettings();
}
@@ -66,9 +67,9 @@ MoodbarItemDelegate::MoodbarItemDelegate(Application *app, PlaylistView *view, Q
void MoodbarItemDelegate::ReloadSettings() {
Settings s;
s.beginGroup(MoodbarSettingsPage::kSettingsGroup);
enabled_ = s.value("enabled", false).toBool();
const MoodbarRenderer::MoodbarStyle new_style = static_cast<MoodbarRenderer::MoodbarStyle>(s.value("style", static_cast<int>(MoodbarRenderer::MoodbarStyle::Normal)).toInt());
s.beginGroup(MoodbarSettings::kSettingsGroup);
enabled_ = s.value(MoodbarSettings::kEnabled, false).toBool();
const MoodbarSettings::Style new_style = static_cast<MoodbarSettings::Style>(s.value(MoodbarSettings::kStyle, static_cast<int>(MoodbarSettings::Style::Normal)).toInt());
s.endGroup();
if (!enabled_) {
@@ -151,7 +152,7 @@ void MoodbarItemDelegate::StartLoadingData(const QUrl &url, const bool has_cue,
// Load a mood file for this song and generate some colors from it
QByteArray bytes;
MoodbarPipeline *pipeline = nullptr;
switch (app_->moodbar_loader()->Load(url, has_cue, &bytes, &pipeline)) {
switch (moodbar_loader_->Load(url, has_cue, &bytes, &pipeline)) {
case MoodbarLoader::Result::CannotLoad:
data->state_ = Data::State::CannotLoad;
break;
@@ -278,7 +279,7 @@ void MoodbarItemDelegate::ImageLoaded(const QUrl &url, const QImage &image) {
data->pixmap_ = QPixmap::fromImage(image);
data->state_ = Data::State::Loaded;
Playlist *playlist = view_->playlist();
Playlist *playlist = playlist_view_->playlist();
const PlaylistFilter *filter = playlist->filter();
// Update all the indices with the new pixmap.