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

AlbumCoverLoader: Change ID to quint64

Browse Source
This commit is contained in:
Jonas Kvinge
2021-11-09 20:48:43 +01:00
parent d5dac9c6cc
commit a68d856074
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/covermanager/albumcoverloader.cpp
View File

@@ -549,7 +549,7 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, c
QMutexLocker l(&mutex_save_image_async_); QMutexLocker l(&mutex_save_image_async_);
quint64 id = ++save_image_async_id_; quint64 id = ++save_image_async_id_;
QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QString, song_filename), Q_ARG(QString, cover_filename)); QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QString, song_filename), Q_ARG(QString, cover_filename));
return id; return id;
} }
@@ -558,7 +558,7 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, c
QMutexLocker l(&mutex_save_image_async_); QMutexLocker l(&mutex_save_image_async_);
quint64 id = ++save_image_async_id_; quint64 id = ++save_image_async_id_;
QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QString, song_filename), Q_ARG(QImage, image)); QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QString, song_filename), Q_ARG(QImage, image));
return id; return id;
} }
@@ -567,7 +567,7 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QString &song_filename, c
QMutexLocker l(&mutex_save_image_async_); QMutexLocker l(&mutex_save_image_async_);
quint64 id = ++save_image_async_id_; quint64 id = ++save_image_async_id_;
QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QString, song_filename), Q_ARG(QByteArray, image_data)); QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QString, song_filename), Q_ARG(QByteArray, image_data));
return id; return id;
} }
@@ -576,7 +576,7 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList<QUrl> &urls, const
QMutexLocker l(&mutex_save_image_async_); QMutexLocker l(&mutex_save_image_async_);
quint64 id = ++save_image_async_id_; quint64 id = ++save_image_async_id_;
QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QList<QUrl>, urls), Q_ARG(QString, cover_filename)); QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QList<QUrl>, urls), Q_ARG(QString, cover_filename));
return id; return id;
} }
@@ -585,7 +585,7 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList<QUrl> &urls, const
QMutexLocker l(&mutex_save_image_async_); QMutexLocker l(&mutex_save_image_async_);
quint64 id = ++save_image_async_id_; quint64 id = ++save_image_async_id_;
QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QList<QUrl>, urls), Q_ARG(QImage, image)); QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QList<QUrl>, urls), Q_ARG(QImage, image));
return id; return id;
} }
@@ -594,12 +594,12 @@ quint64 AlbumCoverLoader::SaveEmbeddedCoverAsync(const QList<QUrl> &urls, const
QMutexLocker l(&mutex_save_image_async_); QMutexLocker l(&mutex_save_image_async_);
quint64 id = ++save_image_async_id_; quint64 id = ++save_image_async_id_;
QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(qint64, id), Q_ARG(QList<QUrl>, urls), Q_ARG(QByteArray, image_data)); QMetaObject::invokeMethod(this, "SaveEmbeddedCover", Qt::QueuedConnection, Q_ARG(quint64, id), Q_ARG(QList<QUrl>, urls), Q_ARG(QByteArray, image_data));
return id; return id;
} }
void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QByteArray &image_data) { void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QByteArray &image_data) {
TagReaderReply *reply = TagReaderClient::Instance()->SaveEmbeddedArt(song_filename, image_data); TagReaderReply *reply = TagReaderClient::Instance()->SaveEmbeddedArt(song_filename, image_data);
tagreader_save_embedded_art_requests_.insert(id, reply); tagreader_save_embedded_art_requests_.insert(id, reply);
@@ -608,7 +608,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_fi
} }
void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QImage &image) { void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QImage &image) {
QByteArray image_data; QByteArray image_data;
@@ -624,7 +624,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_fi
} }
void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QString &cover_filename) { void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QString &cover_filename) {
QFile file(cover_filename); QFile file(cover_filename);
@@ -646,7 +646,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QString &song_fi
} }
void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList<QUrl> &urls, const QImage &image) { void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QList<QUrl> &urls, const QImage &image) {
if (image.isNull()) { if (image.isNull()) {
for (const QUrl &url : urls) { for (const QUrl &url : urls) {
@@ -671,7 +671,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList<QUrl> &url
} }
void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList<QUrl> &urls, const QString &cover_filename) { void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QList<QUrl> &urls, const QString &cover_filename) {
QFile file(cover_filename); QFile file(cover_filename);
@@ -692,7 +692,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList<QUrl> &url
} }
void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList<QUrl> &urls, const QByteArray &image_data) { void AlbumCoverLoader::SaveEmbeddedCover(const quint64 id, const QList<QUrl> &urls, const QByteArray &image_data) {
for (const QUrl &url : urls) { for (const QUrl &url : urls) {
SaveEmbeddedCover(id, url.toLocalFile(), image_data); SaveEmbeddedCover(id, url.toLocalFile(), image_data);
@@ -700,7 +700,7 @@ void AlbumCoverLoader::SaveEmbeddedCover(const qint64 id, const QList<QUrl> &url
} }
void AlbumCoverLoader::SaveEmbeddedArtFinished(const qint64 id, TagReaderReply *reply, const bool cleared) { void AlbumCoverLoader::SaveEmbeddedArtFinished(const quint64 id, TagReaderReply *reply, const bool cleared) {
if (tagreader_save_embedded_art_requests_.contains(id)) { if (tagreader_save_embedded_art_requests_.contains(id)) {
tagreader_save_embedded_art_requests_.remove(id, reply); tagreader_save_embedded_art_requests_.remove(id, reply);

16
src/covermanager/albumcoverloader.h
View File

@@ -98,14 +98,14 @@ class AlbumCoverLoader : public QObject {
void ProcessTasks(); void ProcessTasks();
void RemoteFetchFinished(QNetworkReply *reply, const QUrl &cover_url); void RemoteFetchFinished(QNetworkReply *reply, const QUrl &cover_url);
void SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QString &cover_filename); void SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QString &cover_filename);
void SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QImage &image); void SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QImage &image);
void SaveEmbeddedCover(const qint64 id, const QString &song_filename, const QByteArray &image_data); void SaveEmbeddedCover(const quint64 id, const QString &song_filename, const QByteArray &image_data);
void SaveEmbeddedCover(const qint64 id, const QList<QUrl> &urls, const QImage &image); void SaveEmbeddedCover(const quint64 id, const QList<QUrl> &urls, const QImage &image);
void SaveEmbeddedCover(const qint64 id, const QList<QUrl> &urls, const QString &cover_filename); void SaveEmbeddedCover(const quint64 id, const QList<QUrl> &urls, const QString &cover_filename);
void SaveEmbeddedCover(const qint64 id, const QList<QUrl> &urls, const QByteArray &image_data); void SaveEmbeddedCover(const quint64 id, const QList<QUrl> &urls, const QByteArray &image_data);
void SaveEmbeddedArtFinished(const qint64 id, TagReaderReply *reply, const bool cleared); void SaveEmbeddedArtFinished(const quint64 id, TagReaderReply *reply, const bool cleared);
protected: protected:
@@ -167,7 +167,7 @@ class AlbumCoverLoader : public QObject {
QThread *original_thread_; QThread *original_thread_;
QMultiMap<qint64, TagReaderReply*> tagreader_save_embedded_art_requests_; QMultiMap<quint64, TagReaderReply*> tagreader_save_embedded_art_requests_;
}; };