summaryrefslogtreecommitdiffstats
path: root/src/library/basetrackcache.cpp
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2018-02-04 13:42:35 +0100
committerUwe Klotz <uklotz@mixxx.org>2018-02-04 13:44:50 +0100
commit9ff719efae8171ee85f2ab464eeba95da4731472 (patch)
tree1328489918df91e29ee5439ef55c51c4ddbbfff9 /src/library/basetrackcache.cpp
parenteec068228bdf3bf9e9729aaa5a4e7c746cb21010 (diff)
Inline member function
Diffstat (limited to 'src/library/basetrackcache.cpp')
-rw-r--r--src/library/basetrackcache.cpp23
1 files changed, 9 insertions, 14 deletions
diff --git a/src/library/basetrackcache.cpp b/src/library/basetrackcache.cpp
index b3bd35a6a1..ac42f72481 100644
--- a/src/library/basetrackcache.cpp
+++ b/src/library/basetrackcache.cpp
@@ -148,24 +148,19 @@ const TrackPointer& BaseTrackCache::getRecentTrack(TrackId trackId) const {
// pointer to avoid accessing and locking the global track
// cache excessively.
if (m_recentTrackId != trackId) {
- refreshRecentTrack(std::move(trackId));
+ if (trackId.isValid()) {
+ TrackPointer trackPtr =
+ GlobalTrackCache::instance().lookupById(trackId);
+ replaceRecentTrack(
+ std::move(trackId),
+ std::move(trackPtr));
+ } else {
+ resetRecentTrack();
+ }
}
return m_recentTrackPtr;
}
-void BaseTrackCache::refreshRecentTrack(TrackId trackId) const {
- DEBUG_ASSERT(m_bIsCaching);
- if (trackId.isValid()) {
- auto trackPtr =
- GlobalTrackCache::instance().lookupById(trackId).getTrack();
- replaceRecentTrack(
- std::move(trackId),
- std::move(trackPtr));
- } else {
- resetRecentTrack();
- }
-}
-
void BaseTrackCache::replaceRecentTrack(TrackPointer pTrack) const {
DEBUG_ASSERT(m_bIsCaching);
DEBUG_ASSERT(pTrack);