Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix: Connect/disconnect BaseTrackCache in TrackCollection #2513

Merged
merged 2 commits into from
Feb 23, 2020
Merged

Hotfix: Connect/disconnect BaseTrackCache in TrackCollection #2513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5dec6a
Connect/disconnect track source in TrackCollection
uklotzde Feb 23, 2020
e669364
Replace QSharedPointer::get() with data()
uklotzde Feb 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions src/library/basetrackcache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,37 +49,6 @@ BaseTrackCache::BaseTrackCache(TrackCollection* pTrackCollection,
}
}

void BaseTrackCache::connectTrackDAO(TrackDAO* pTrackDAO) {
connect(pTrackDAO,
&TrackDAO::trackDirty,
this,
&BaseTrackCache::slotTrackDirty);
connect(pTrackDAO,
&TrackDAO::trackClean,
this,
&BaseTrackCache::slotTrackClean);
connect(pTrackDAO,
&TrackDAO::trackChanged,
this,
&BaseTrackCache::slotTrackChanged);
connect(pTrackDAO,
&TrackDAO::tracksAdded,
this,
&BaseTrackCache::slotTracksAdded);
connect(pTrackDAO,
&TrackDAO::tracksRemoved,
this,
&BaseTrackCache::slotTracksRemoved);
connect(pTrackDAO,
&TrackDAO::dbTrackAdded,
this,
&BaseTrackCache::slotDbTrackAdded);
}

void BaseTrackCache::disconnectTrackDAO(TrackDAO* pTrackDAO) {
disconnect(pTrackDAO);
}

BaseTrackCache::~BaseTrackCache() {
// Required to allow forward declarations of (managed pointer) members
// in header file
Expand Down
4 changes: 0 additions & 4 deletions src/library/basetrackcache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,6 @@ class BaseTrackCache : public QObject {
void slotDbTrackAdded(TrackPointer pTrack);

private:
friend class TrackCollection;
void connectTrackDAO(TrackDAO* pTrackDAO);
void disconnectTrackDAO(TrackDAO* pTrackDAO);

const TrackPointer& getRecentTrack(TrackId trackId) const;
void replaceRecentTrack(TrackPointer pTrack) const;
void replaceRecentTrack(TrackId trackId, TrackPointer pTrack) const;
Expand Down
28 changes: 26 additions & 2 deletions src/library/trackcollection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,39 @@ void TrackCollection::connectTrackSource(QSharedPointer<BaseTrackCache> pTrackSo
return;
}
m_pTrackSource = pTrackSource;
m_pTrackSource->connectTrackDAO(&m_trackDao);
connect(&m_trackDao,
&TrackDAO::trackDirty,
m_pTrackSource.data(),
&BaseTrackCache::slotTrackDirty);
connect(&m_trackDao,
&TrackDAO::trackClean,
m_pTrackSource.data(),
&BaseTrackCache::slotTrackClean);
connect(&m_trackDao,
&TrackDAO::trackChanged,
m_pTrackSource.data(),
&BaseTrackCache::slotTrackChanged);
connect(&m_trackDao,
&TrackDAO::tracksAdded,
m_pTrackSource.data(),
&BaseTrackCache::slotTracksAdded);
connect(&m_trackDao,
&TrackDAO::tracksRemoved,
m_pTrackSource.data(),
&BaseTrackCache::slotTracksRemoved);
connect(&m_trackDao,
&TrackDAO::dbTrackAdded,
m_pTrackSource.data(),
&BaseTrackCache::slotDbTrackAdded);
}

QWeakPointer<BaseTrackCache> TrackCollection::disconnectTrackSource() {
DEBUG_ASSERT(QApplication::instance()->thread() == QThread::currentThread());

auto pWeakPtr = m_pTrackSource.toWeakRef();
if (m_pTrackSource) {
m_pTrackSource->disconnectTrackDAO(&m_trackDao);
kLogger.info() << "Disconnecting track source";
m_trackDao.disconnect(m_pTrackSource.data());
m_pTrackSource.reset();
}
return pWeakPtr;
Expand Down