procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fixed auto-seeking by system for non-fully loaded audio files in SMC.

Browse source
This commit is contained in:
23rd 2021-06-08 07:14:36 +03:00
parent 2f0fd398d5
commit 4f8bab6a5f
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Telegram/SourceFiles/window/system_media_controls_manager.cpp
View file

@ -19,6 +19,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "main/main_session.h"
#include "media/audio/media_audio.h"
#include "media/player/media_player_instance.h"
#include "media/streaming/media_streaming_instance.h"
#include "media/streaming/media_streaming_player.h"
#include "ui/text/format_song_document_name.h"
#include "window/window_controller.h"
@ -54,6 +56,12 @@ SystemMediaControlsManager::SystemMediaControlsManager(
mediaPlayer->updatedNotifier(
) | trackFilter | rpl::map([=](const TrackState &state) {
using namespace Media::Player;
if (_streamed) {
const auto &player = _streamed->player();
if (player.buffering() || !player.playing()) {
return PlaybackStatus::Paused;
}
}
if (IsStoppedOrStopping(state.state)) {
return PlaybackStatus::Stopped;
} else if (IsPausedOrPausing(state.state)) {
@ -80,6 +88,7 @@ SystemMediaControlsManager::SystemMediaControlsManager(
_controls->updateDisplay();
} else {
_cachedMediaView.clear();
_streamed = nullptr;
_controls->clearMetadata();
}
_lifetimeDownload.destroy();
@ -134,6 +143,11 @@ SystemMediaControlsManager::SystemMediaControlsManager(
// the track is changed
// or when the position is changed by the user.
_controls->setPosition(state.position);
_streamed = std::make_unique<Media::Streaming::Instance>(
document,
current.contextId(),
nullptr);
}
// Setting a thumbnail can take a long time,

5
Telegram/SourceFiles/window/system_media_controls_manager.h
View file

@ -19,6 +19,10 @@ namespace Window {
class Controller;
} // namespace Window
namespace Media::Streaming {
class Instance;
} // namespace Media::Streaming
namespace Window {
class SystemMediaControlsManager {
@ -32,6 +36,7 @@ private:
const std::unique_ptr<base::Platform::SystemMediaControls> _controls;
std::vector<std::shared_ptr<Data::DocumentMedia>> _cachedMediaView;
std::unique_ptr<Media::Streaming::Instance> _streamed;
AudioMsgId _lastAudioMsgId;
rpl::lifetime _lifetimeDownload;