dguglielmi/sunny-overlay
1
0
Fork 0
mirror of https://github.com/dguglielmi/sunny-overlay.git synced 2025-12-06 11:42:40 +01:00
Code Issues Releases Wiki Activity

media-sound/mixxx: update pre-2.1.1 patches #5

Browse Source
This commit is contained in:
David GUGLIELMI
2018-05-17 13:44:40 +02:00
parent 38450d3ce3
commit f4e0c2134a
4 changed files with 392 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
media-sound/mixxx/files/mixxx-2.1.0-dlgtrackinfo-mismatching-signal-slot-connection.patch Normal file
View File

@@ -0,0 +1,57 @@
From 41840857fefb4f359e3fe5e16b9899ffceffd86b Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Wed, 16 May 2018 12:45:56 +0200
Subject: [PATCH] Fix mismatching signal/slot connection arg type
---
src/library/dlgtrackinfo.cpp | 18 +++++++++++-------
src/library/dlgtrackinfo.h | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index b619bfd59b..c0db2d815f 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -237,18 +237,22 @@ void DlgTrackInfo::slotCoverFound(const QObject* pRequestor,
}
void DlgTrackInfo::slotReloadCoverArt() {
- if (m_pLoadedTrack) {
- CoverInfo coverInfo =
- CoverArtUtils::guessCoverInfo(*m_pLoadedTrack);
- slotCoverInfoSelected(coverInfo);
+ VERIFY_OR_DEBUG_ASSERT(m_pLoadedTrack) {
+ return;
}
+ CoverInfo coverInfo =
+ CoverArtUtils::guessCoverInfo(*m_pLoadedTrack);
+ slotCoverInfoSelected(coverInfo);
}
-void DlgTrackInfo::slotCoverInfoSelected(const CoverInfo& coverInfo) {
+void DlgTrackInfo::slotCoverInfoSelected(const CoverInfoRelative& coverInfo) {
qDebug() << "DlgTrackInfo::slotCoverInfoSelected" << coverInfo;
- m_loadedCoverInfo = coverInfo;
+ VERIFY_OR_DEBUG_ASSERT(m_pLoadedTrack) {
+ return;
+ }
+ m_loadedCoverInfo = CoverInfo(coverInfo, m_pLoadedTrack->getLocation());
CoverArtCache* pCache = CoverArtCache::instance();
- if (pCache != NULL) {
+ if (pCache) {
pCache->requestCover(m_loadedCoverInfo, this, 0, false, true);
}
}
diff --git a/src/library/dlgtrackinfo.h b/src/library/dlgtrackinfo.h
index ab6717f6d5..0ca2a44a29 100644
--- a/src/library/dlgtrackinfo.h
+++ b/src/library/dlgtrackinfo.h
@@ -63,7 +63,7 @@ class DlgTrackInfo : public QDialog, public Ui::DlgTrackInfo {
void slotCoverFound(const QObject* pRequestor,
const CoverInfoRelative& info, QPixmap pixmap, bool fromCache);
- void slotCoverInfoSelected(const CoverInfo& coverInfo);
+ void slotCoverInfoSelected(const CoverInfoRelative& coverInfo);
void slotReloadCoverArt();
private: