diff options
author | Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> | 2023-06-04 22:04:00 +0200 |
---|---|---|
committer | Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> | 2023-06-04 22:04:00 +0200 |
commit | 585519d0ef1b76c1d5973c95c80b3ff31f1b5c72 (patch) | |
tree | 783691e67fa98cbcb7f94a59a5ca2ed04113252e /src/widget/wspinnybase.cpp | |
parent | 4a3a8dc39ef3c81d74eec4cd03916d3381ec4c0b (diff) | |
parent | ca1ba2f74356fb9b5907333fe3692185cfe78201 (diff) |
Merge remote-tracking branch 'upstream/2.4'
Diffstat (limited to 'src/widget/wspinnybase.cpp')
-rw-r--r-- | src/widget/wspinnybase.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/widget/wspinnybase.cpp b/src/widget/wspinnybase.cpp index 38a417a330..4a274f907c 100644 --- a/src/widget/wspinnybase.cpp +++ b/src/widget/wspinnybase.cpp @@ -22,12 +22,12 @@ // The SampleBuffers format enables antialiasing. WSpinnyBase::WSpinnyBase( - QWidget* parent, + QWidget* pParent, const QString& group, UserSettingsPointer pConfig, VinylControlManager* pVCMan, BaseTrackPlayer* pPlayer) - : WGLWidget(parent), + : WGLWidget(pParent), WBaseWidget(this), m_group(group), m_pConfig(pConfig), @@ -246,8 +246,8 @@ void WSpinnyBase::setLoadedCover(const QPixmap& pixmap) { } void WSpinnyBase::slotLoadTrack(TrackPointer pTrack) { - if (m_loadedTrack) { - disconnect(m_loadedTrack.get(), + if (m_pLoadedTrack) { + disconnect(m_pLoadedTrack.get(), &Track::coverArtUpdated, this, &WSpinnyBase::slotTrackCoverArtUpdated); @@ -256,9 +256,9 @@ void WSpinnyBase::slotLoadTrack(TrackPointer pTrack) { setLoadedCover(QPixmap()); - m_loadedTrack = pTrack; - if (m_loadedTrack) { - connect(m_loadedTrack.get(), + m_pLoadedTrack = pTrack; + if (m_pLoadedTrack) { + connect(m_pLoadedTrack.get(), &Track::coverArtUpdated, this, &WSpinnyBase::slotTrackCoverArtUpdated); @@ -269,13 +269,13 @@ void WSpinnyBase::slotLoadTrack(TrackPointer pTrack) { void WSpinnyBase::slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack) { Q_UNUSED(pNewTrack); - if (m_loadedTrack && pOldTrack == m_loadedTrack) { - disconnect(m_loadedTrack.get(), + if (m_pLoadedTrack && pOldTrack == m_pLoadedTrack) { + disconnect(m_pLoadedTrack.get(), &Track::coverArtUpdated, this, &WSpinnyBase::slotTrackCoverArtUpdated); } - m_loadedTrack.reset(); + m_pLoadedTrack.reset(); m_lastRequestedCover = CoverInfo(); setLoadedCover(QPixmap()); @@ -283,8 +283,8 @@ void WSpinnyBase::slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrac } void WSpinnyBase::slotTrackCoverArtUpdated() { - if (m_loadedTrack) { - CoverArtCache::requestTrackCover(this, m_loadedTrack); + if (m_pLoadedTrack) { + CoverArtCache::requestTrackCover(this, m_pLoadedTrack); } } @@ -297,25 +297,25 @@ void WSpinnyBase::slotCoverFound( Q_UNUSED(requestedCacheKey); Q_UNUSED(coverInfoUpdated); // CoverArtCache has taken care, updating the Track. if (pRequestor == this && - m_loadedTrack && - m_loadedTrack->getLocation() == coverInfo.trackLocation) { + m_pLoadedTrack && + m_pLoadedTrack->getLocation() == coverInfo.trackLocation) { setLoadedCover(pixmap); coverChanged(); } } void WSpinnyBase::slotCoverInfoSelected(const CoverInfoRelative& coverInfo) { - if (m_loadedTrack != nullptr) { + if (m_pLoadedTrack != nullptr) { // Will trigger slotTrackCoverArtUpdated(). - m_loadedTrack->setCoverInfo(coverInfo); + m_pLoadedTrack->setCoverInfo(coverInfo); } } void WSpinnyBase::slotReloadCoverArt() { - if (!m_loadedTrack) { + if (!m_pLoadedTrack) { return; } - const auto future = guessTrackCoverInfoConcurrently(m_loadedTrack); + const auto future = guessTrackCoverInfoConcurrently(m_pLoadedTrack); // Don't wait for the result and keep running in the background Q_UNUSED(future) } @@ -562,7 +562,7 @@ void WSpinnyBase::mouseMoveEvent(QMouseEvent* e) { } void WSpinnyBase::mousePressEvent(QMouseEvent* e) { - if (m_loadedTrack == nullptr) { + if (m_pLoadedTrack == nullptr) { return; } @@ -613,7 +613,7 @@ void WSpinnyBase::mousePressEvent(QMouseEvent* e) { } } else { if (!m_loadedCover.isNull()) { - m_pDlgCoverArt->init(m_loadedTrack); + m_pDlgCoverArt->init(m_pLoadedTrack); } else if (!m_pDlgCoverArt->isVisible() && m_bShowCover) { #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) m_pCoverMenu->popup(e->globalPosition().toPoint()); |