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

Jump to bottom

Add PlayerProxy missing current track when created after loading #12559

Merged
merged 1 commit into from
Jan 14, 2024
Merged

Add PlayerProxy missing current track when created after loading #12559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/qml/qmlplayerproxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ QmlPlayerProxy::QmlPlayerProxy(BaseTrackPlayer* pTrackPlayer, QObject* parent)
this,
&QmlPlayerProxy::trackUnloaded);
connect(this, &QmlPlayerProxy::trackChanged, this, &QmlPlayerProxy::slotTrackChanged);
if (m_pTrackPlayer && m_pTrackPlayer->getLoadedTrack()) {
slotTrackLoaded(pTrackPlayer->getLoadedTrack());
}
}

void QmlPlayerProxy::loadTrackFromLocation(const QString& trackLocation, bool play) {
Expand Down Expand Up @@ -115,13 +118,23 @@ void QmlPlayerProxy::slotTrackLoaded(TrackPointer pTrack) {
}

void QmlPlayerProxy::slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack) {
Q_UNUSED(pNewTrack);
Q_UNUSED(pOldTrack);
VERIFY_OR_DEBUG_ASSERT(pOldTrack == m_pCurrentTrack) {
qWarning() << "QML Player proxy was expected to contain "
<< pOldTrack.get() << "as active track but got"
<< m_pCurrentTrack.get();
}

if (pNewTrack.get() == m_pCurrentTrack.get()) {
emit trackLoading();
return;
}

const TrackPointer pTrack = m_pCurrentTrack;
if (pTrack != nullptr) {
disconnect(pTrack.get(), nullptr, this, nullptr);
}
m_pCurrentTrack.reset();
m_pCurrentTrack = pNewTrack;
emit trackChanged();
emit trackLoading();
}
Expand Down
3 changes: 2 additions & 1 deletion src/qml/qmlwaveformoverview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ void QmlWaveformOverview::setPlayer(QmlPlayerProxy* pPlayer) {

m_pPlayer = pPlayer;

if (pPlayer != nullptr) {
if (m_pPlayer != nullptr) {
setCurrentTrack(m_pPlayer->internalTrackPlayer()->getLoadedTrack());
connect(m_pPlayer->internalTrackPlayer(),
&BaseTrackPlayer::newTrackLoaded,
this,
Expand Down