mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Fix streaming seek, display progress.

Browse Source
This commit is contained in:
John Preston
2019-02-22 15:58:26 +04:00
parent 93c548c013
commit 44c562d8ba
13 changed files with 248 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
View File

@@ -153,7 +153,7 @@ void Player::fileReady(Stream &&video, Stream &&audio) {
_waitingForData = false;
const auto weak = base::make_weak(&_sessionGuard);
const auto ready = [=](const Information & data) {
const auto ready = [=](const Information &data) {
crl::on_main(weak, [=, data = data]() mutable {
streamReady(std::move(data));
});
@@ -371,7 +371,12 @@ void Player::start() {
) | rpl::start_with_next_done([=](crl::time position) {
audioPlayedTill(position);
}, [=] {
// audio finished
if (_stage == Stage::Started) {
_audioFinished = true;
if (!_video || _videoFinished) {
_updates.fire({ Finished() });
}
}
}, _lifetime);
}
if (_video) {
@@ -380,22 +385,29 @@ void Player::start() {
_nextFrameTime = when;
checkNextFrame();
}, [=] {
// video finished
if (_stage == Stage::Started) {
_videoFinished = true;
if (!_audio || _audioFinished) {
_updates.fire({ Finished() });
}
}
}, _lifetime);
}
}
void Player::stop() {
_file->stop();
_audio = nullptr;
_video = nullptr;
_paused = false;
_information = Information();
invalidate_weak_ptrs(&_sessionGuard);
if (_stage != Stage::Failed) {
_stage = Stage::Uninitialized;
}
_updates = rpl::event_stream<Update, Error>();
_audio = nullptr;
_video = nullptr;
invalidate_weak_ptrs(&_sessionGuard);
_paused = false;
_audioFinished = false;
_videoFinished = false;
_readTillEnd = false;
_information = Information();
}
bool Player::failed() const {