Eject Undo: address cleanup notes

mixxxdj · Feb 14, 2022 · 515ac0b · 515ac0b
1 parent 231102f
commit 515ac0b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/mixer/baseplayer.h b/src/mixer/baseplayer.h
@@ -3,7 +3,7 @@
 #include <QObject>
 #include <QString>
 
-#include "playermanager.h"
+#include "mixer/playermanager.h"
 
 class BasePlayer : public QObject {
     Q_OBJECT

diff --git a/src/mixer/basetrackplayer.cpp b/src/mixer/basetrackplayer.cpp
@@ -310,7 +310,7 @@ void BaseTrackPlayerImpl::slotEjectTrack(double v) {
     }
     if (!m_pLoadedTrack) {
         TrackPointer lastEjected = m_pPlayerManager->getLastEjectedTrack();
-        if (lastEjected && lastEjected->getId().isValid()) {
+        if (lastEjected) {
             slotLoadTrack(lastEjected, false);
         }
         return;

diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp
@@ -600,7 +600,7 @@ Sampler* PlayerManager::getSampler(unsigned int sampler) const {
 
 TrackPointer PlayerManager::getLastEjectedTrack() const {
     if (m_pLibrary) {
-        return m_pLibrary->trackCollectionManager()->getTrackById(m_pLastEjectedTrackId);
+        return m_pLibrary->trackCollectionManager()->getTrackById(m_lastEjectedTrackId);
     }
     return nullptr;
 }
@@ -748,7 +748,7 @@ void PlayerManager::slotSaveEjectedTrack(TrackPointer track) {
     VERIFY_OR_DEBUG_ASSERT(track) {
         return;
     }
-    m_pLastEjectedTrackId = track->getId();
+    m_lastEjectedTrackId = track->getId();
 }
 
 void PlayerManager::onTrackAnalysisProgress(TrackId trackId, AnalyzerProgress analyzerProgress) {

diff --git a/src/mixer/playermanager.h b/src/mixer/playermanager.h
@@ -286,7 +286,7 @@ class PlayerManager : public QObject, public PlayerManagerInterface {
 
     TrackAnalysisScheduler::Pointer m_pTrackAnalysisScheduler;
 
-    TrackId m_pLastEjectedTrackId;
+    TrackId m_lastEjectedTrackId;
 
     QList<Deck*> m_decks;
     QList<Sampler*> m_samplers;