RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Optimized updating of position in SMC.

This commit is contained in:
23rd 2021-06-07 08:40:50 +03:00
parent 8356bac6d7
commit c6fde48936
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Telegram/SourceFiles/window/system_media_controls_manager.cpp
View File

@ -65,28 +65,10 @@ SystemMediaControlsManager::SystemMediaControlsManager(
_controls->setPlaybackStatus(status);
}, _lifetime);
if (_controls->seekingSupported()) {
mediaPlayer->updatedNotifier(
) | trackFilter | rpl::map([=](const TrackState &state) {
return state.position;
}) | rpl::distinct_until_changed(
) | rpl::start_with_next([=](int position) {
_controls->setPosition(position);
}, _lifetime);
mediaPlayer->updatedNotifier(
) | trackFilter | rpl::map([=](const TrackState &state) {
return state.length;
}) | rpl::distinct_until_changed(
) | rpl::start_with_next([=](int length) {
_controls->setDuration(length);
}, _lifetime);
}
rpl::merge(
mediaPlayer->stops(type) | rpl::map_to(false),
mediaPlayer->startsPlay(type) | rpl::map_to(true)
) | rpl::start_with_next([=](bool audio) {
) | rpl::distinct_until_changed() | rpl::start_with_next([=](bool audio) {
_controls->setEnabled(audio);
if (audio) {
_controls->setIsNextEnabled(mediaPlayer->nextAvailable(type));
@ -142,6 +124,22 @@ SystemMediaControlsManager::SystemMediaControlsManager(
_controls->setArtist(performer);
_controls->setTitle(title);
if (_controls->seekingSupported()) {
const auto state = mediaPlayer->getState(audioType);
_controls->setDuration(state.length);
// macOS NowPlaying and Linux MPRIS update the track position
// according to the rate property
// while the playback status is "playing",
// so we should change the track position only when
// the track is changed
// or when the position is changed by the user.
_controls->setPosition(state.position);
}
// Setting a thumbnail can take a long time,
// so we need to update the display before that.
_controls->updateDisplay();
if (document && document->isSongWithCover()) {
const auto view = document->createMediaView();
view->thumbnailWanted(current.contextId());
@ -185,10 +183,27 @@ SystemMediaControlsManager::SystemMediaControlsManager(
}, _lifetime);
if (_controls->seekingSupported()) {
mediaPlayer->seekingChanges(
type
) | rpl::filter([](Media::Player::Instance::Seeking seeking) {
return (seeking == Media::Player::Instance::Seeking::Finish);
}) | rpl::map([=] {
return mediaPlayer->getState(type).position;
}) | rpl::distinct_until_changed(
) | rpl::start_with_next([=](int position) {
_controls->setPosition(position);
_controls->updateDisplay();
}, _lifetime);
_controls->seekRequests(
) | rpl::start_with_next([=](float64 progress) {
mediaPlayer->finishSeeking(type, progress);
}, _lifetime);
_controls->updatePositionRequests(
) | rpl::start_with_next([=] {
_controls->setPosition(mediaPlayer->getState(type).position);
}, _lifetime);
}
Core::App().passcodeLockValue(