fanhuadesenlinnn/tdesktop
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/telegramdesktop/tdesktop synced 2026-09-20 08:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed system media controls state after video story with stopped player.

Browse Source
This commit is contained in:
23rd
2026-09-17 21:07:24 +03:00
parent ae2279b7c8
commit 69368057b9
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Telegram/SourceFiles/media/system_media_controls_manager.cpp
View File

@@ -45,6 +45,19 @@ constexpr auto kSkipMs = crl::time(15 * 1000);
Unexpected("RepeatModeToLoopStatus in SystemMediaControlsManager");
}
[[nodiscard]] std::optional<AudioMsgId::Type> ActivePlayerType() {
using namespace Media::Player;
const auto player = instance();
using Type = AudioMsgId::Type;
for (const auto type : { Type::Voice, Type::Song }) {
if (player->current(type)
&& !IsStoppedOrStopping(player->getState(type).state)) {
return type;
}
}
return std::nullopt;
}
} // namespace
bool SystemMediaControlsManager::Supported() {
@@ -175,11 +188,8 @@ void SystemMediaControlsManager::syncPlayerStateToControls() {
= base::Platform::SystemMediaControls::PlaybackStatus;
using namespace Media::Player;
const auto mediaPlayer = Media::Player::instance();
const auto type = mediaPlayer->current(AudioMsgId::Type::Song)
? AudioMsgId::Type::Song
: AudioMsgId::Type::Voice;
const auto current = mediaPlayer->current(type);
if (!current) {
const auto type = ActivePlayerType();
if (!type) {
_cachedMediaView = nullptr;
_streamed = nullptr;
_controls->setEnabled(false);
@@ -189,16 +199,16 @@ void SystemMediaControlsManager::syncPlayerStateToControls() {
_controls->setEnabled(true);
_controls->setIsPlayPauseEnabled(true);
_controls->setIsStopEnabled(true);
_controls->setIsNextEnabled(mediaPlayer->nextAvailable(type));
_controls->setIsPreviousEnabled(mediaPlayer->previousAvailable(type));
const auto state = mediaPlayer->getState(type);
_controls->setIsNextEnabled(mediaPlayer->nextAvailable(*type));
_controls->setIsPreviousEnabled(mediaPlayer->previousAvailable(*type));
const auto state = mediaPlayer->getState(*type);
_controls->setPlaybackStatus(IsStoppedOrStopping(state.state)
? PlaybackStatus::Stopped
: IsPausedOrPausing(state.state)
? PlaybackStatus::Paused
: PlaybackStatus::Playing);
_lastAudioMsgId = AudioMsgId();
applyPlayerTrack(type);
applyPlayerTrack(*type);
_controls->updateDisplay();
}
@@ -288,12 +298,9 @@ SystemMediaControlsManager::SystemMediaControlsManager()
auto unlocked = Core::App().passcodeLockChanges(
) | rpl::filter([=](bool locked) {
return !locked && (mediaPlayer->current(AudioMsgId::Type::Song)
|| mediaPlayer->current(AudioMsgId::Type::Voice));
}) | rpl::map([=]() -> AudioMsgId::Type {
return mediaPlayer->current(AudioMsgId::Type::Song)
? AudioMsgId::Type::Song
: AudioMsgId::Type::Voice;
return !locked && ActivePlayerType().has_value();
}) | rpl::map([=] {
return *ActivePlayerType();
}) | rpl::before_next([=] {
if (_videoDelegate) {
return;