Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't pad images in the OSD

Browse Source
This commit is contained in:
David Sansome 2010-05-16 22:41:01 +00:00
parent 33e61f9eb8
commit 9694977b34
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/albumcoverloader.cpp
View File

@ -29,6 +29,7 @@ AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
: QObject(parent), : QObject(parent),
stop_requested_(false), stop_requested_(false),
height_(120), height_(120),
padding_(true),
next_id_(0), next_id_(0),
network_(NULL) network_(NULL)
{ {
@ -151,16 +152,19 @@ QImage AlbumCoverLoader::ScaleAndPad(const QImage &image) const {
QImage copy = image.scaled(QSize(height_, height_), QImage copy = image.scaled(QSize(height_, height_),
Qt::KeepAspectRatio, Qt::SmoothTransformation); Qt::KeepAspectRatio, Qt::SmoothTransformation);
// Pad the image to height_ x height_ if (!padding_)
QImage bigger_image(height_, height_, QImage::Format_ARGB32); return copy;
bigger_image.fill(0);
QPainter p(&bigger_image); // Pad the image to height_ x height_
QImage padded_image(height_, height_, QImage::Format_ARGB32);
padded_image.fill(0);
QPainter p(&padded_image);
p.drawImage((height_ - copy.width()) / 2, (height_ - copy.height()) / 2, p.drawImage((height_ - copy.width()) / 2, (height_ - copy.height()) / 2,
copy); copy);
p.end(); p.end();
return bigger_image; return padded_image;
} }
QPixmap AlbumCoverLoader::TryLoadPixmap(const QString &automatic, const QString &manual) { QPixmap AlbumCoverLoader::TryLoadPixmap(const QString &automatic, const QString &manual) {

2
src/core/albumcoverloader.h
View File

@ -40,6 +40,7 @@ class AlbumCoverLoader : public QObject {
static QString ImageCacheDir(); static QString ImageCacheDir();
void SetDesiredHeight(int height) { height_ = height; } void SetDesiredHeight(int height) { height_ = height; }
void SetPadOutputImage(bool padding) { padding_ = padding; }
quint64 LoadImageAsync(const QString& art_automatic, const QString& art_manual); quint64 LoadImageAsync(const QString& art_automatic, const QString& art_manual);
void Clear(); void Clear();
@ -85,6 +86,7 @@ class AlbumCoverLoader : public QObject {
bool stop_requested_; bool stop_requested_;
int height_; int height_;
bool padding_;
QMutex mutex_; QMutex mutex_;
QQueue<Task> tasks_; QQueue<Task> tasks_;

1
src/widgets/osd.cpp
View File

@ -50,6 +50,7 @@ OSD::~OSD() {
void OSD::CoverLoaderInitialised() { void OSD::CoverLoaderInitialised() {
cover_loader_->Worker()->SetNetwork(network_); cover_loader_->Worker()->SetNetwork(network_);
cover_loader_->Worker()->SetPadOutputImage(false);
connect(cover_loader_->Worker().get(), SIGNAL(ImageLoaded(quint64,QImage)), connect(cover_loader_->Worker().get(), SIGNAL(ImageLoaded(quint64,QImage)),
SLOT(AlbumArtLoaded(quint64,QImage))); SLOT(AlbumArtLoaded(quint64,QImage)));
} }