From 90c54b1f2a564e4f2a8c60bd5ad6549a0432067a Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 26 Dec 2019 17:14:35 +0300 Subject: [PATCH] Highlight timestamps in song captions. --- .../SourceFiles/core/local_url_handlers.cpp | 5 +++- .../SourceFiles/data/data_auto_download.cpp | 25 +++++++++++++------ .../view/media/history_view_document.cpp | 21 +++++++++++++--- .../view/media/history_view_document.h | 8 ++++++ .../media/player/media_player_instance.cpp | 10 +++++++- .../media/player/media_player_instance.h | 2 +- .../media/streaming/media_streaming_file.cpp | 4 +++ .../view/media_view_playback_progress.cpp | 7 +++++- 8 files changed, 66 insertions(+), 16 deletions(-) diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp index 732297b4a..fdb9a0198 100644 --- a/Telegram/SourceFiles/core/local_url_handlers.cpp +++ b/Telegram/SourceFiles/core/local_url_handlers.cpp @@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "data/data_document.h" #include "data/data_cloud_themes.h" #include "data/data_channel.h" +#include "media/player/media_player_instance.h" #include "mainwindow.h" #include "mainwidget.h" #include "main/main_session.h" @@ -385,10 +386,12 @@ bool OpenMediaTimestamp( session->settings().setMediaLastPlaybackPosition( documentId, time * crl::time(1000)); - if (!document->isNull()) { + if (document->isVideoFile()) { Core::App().showDocument( document, session->data().message(itemId)); + } else if (document->isSong()) { + Media::Player::instance()->play({ document, itemId }); } return true; } diff --git a/Telegram/SourceFiles/data/data_auto_download.cpp b/Telegram/SourceFiles/data/data_auto_download.cpp index 9ba73ecbc..98ab58775 100644 --- a/Telegram/SourceFiles/data/data_auto_download.cpp +++ b/Telegram/SourceFiles/data/data_auto_download.cpp @@ -259,15 +259,24 @@ Full Full::FullDisabled() { bool Should( const Full &data, - not_null peer, + Source source, not_null document) { if (document->sticker()) { return true; + } else if (document->isVoiceMessage() + || document->isVideoMessage() + || document->isSong() + || document->isVideoFile()) { + return false; } - return data.shouldDownload( - SourceFromPeer(peer), - Type::File, - document->size); + return data.shouldDownload(source, Type::File, document->size); +} + +bool Should( + const Full &data, + not_null peer, + not_null document) { + return Should(data, SourceFromPeer(peer), document); } bool Should( @@ -277,9 +286,9 @@ bool Should( return true; } const auto size = document->size; - return data.shouldDownload(Source::User, Type::File, size) - || data.shouldDownload(Source::Group, Type::File, size) - || data.shouldDownload(Source::Channel, Type::File, size); + return Should(data, Source::User, document) + || Should(data, Source::Group, document) + || Should(data, Source::Channel, document); } bool Should( diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp index 331bfe0c9..122cf42eb 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp @@ -38,10 +38,10 @@ Document::Document( : File(parent, parent->data()) , _data(document) { const auto item = parent->data(); - auto caption = createCaption(item); + auto caption = createCaption(); createComponents(!caption.isEmpty()); - if (auto named = Get()) { + if (const auto named = Get()) { fillNamedFromData(named); } @@ -49,7 +49,7 @@ Document::Document( setStatusSize(FileStatusSizeReady); - if (auto captioned = Get()) { + if (const auto captioned = Get()) { captioned->_caption = std::move(caption); } } @@ -830,7 +830,7 @@ void Document::refreshParentId(not_null realParent) { void Document::parentTextUpdated() { auto caption = (_parent->media() == this) - ? createCaption(_parent->data()) + ? createCaption() : Ui::Text::String(); if (!caption.isEmpty()) { AddComponents(HistoryDocumentCaptioned::Bit()); @@ -849,4 +849,17 @@ TextWithEntities Document::getCaption() const { return TextWithEntities(); } +Ui::Text::String Document::createCaption() { + const auto timestampLinksDuration = _data->isSong() + ? _data->getDuration() + : 0; + const auto timestampLinkBase = timestampLinksDuration + ? DocumentTimestampLinkBase(_data, _realParent->fullId()) + : QString(); + return File::createCaption( + _parent->data(), + timestampLinksDuration, + timestampLinkBase); +} + } // namespace HistoryView diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.h b/Telegram/SourceFiles/history/view/media/history_view_document.h index f9aeb5433..2783d9544 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_document.h +++ b/Telegram/SourceFiles/history/view/media/history_view_document.h @@ -12,6 +12,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL struct HistoryDocumentNamed; +namespace Ui { +namespace Text { +class String; +} // namespace Text +} // namespace Ui + namespace HistoryView { class Document @@ -69,6 +75,8 @@ private: int realDuration = 0; }; + [[nodiscard]] Ui::Text::String createCaption(); + QSize countOptimalSize() override; QSize countCurrentSize(int newWidth) override; diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp index 0ca7a99ac..8b69789ba 100644 --- a/Telegram/SourceFiles/media/player/media_player_instance.cpp +++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp @@ -422,7 +422,15 @@ Streaming::PlaybackOptions Instance::streamingOptions( ? kVoicePlaybackSpeedMultiplier : 1.; result.audioId = audioId; - result.position = position; + if (position >= 0) { + result.position = position; + } else if (document) { + auto &settings = document->session().settings(); + result.position = settings.mediaLastPlaybackPosition(document->id); + settings.setMediaLastPlaybackPosition(document->id, 0); + } else { + result.position = 0; + } return result; } diff --git a/Telegram/SourceFiles/media/player/media_player_instance.h b/Telegram/SourceFiles/media/player/media_player_instance.h index 8b975d348..1a06a816e 100644 --- a/Telegram/SourceFiles/media/player/media_player_instance.h +++ b/Telegram/SourceFiles/media/player/media_player_instance.h @@ -196,7 +196,7 @@ private: std::shared_ptr shared); Streaming::PlaybackOptions streamingOptions( const AudioMsgId &audioId, - crl::time position = 0); + crl::time position = -1); // Observed notifications. void handleSongUpdate(const AudioMsgId &audioId); diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp index e230ed7cb..7f23f6095 100644 --- a/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp +++ b/Telegram/SourceFiles/media/streaming/media_streaming_file.cpp @@ -146,6 +146,10 @@ Stream File::Context::initStream( result.codec = FFmpeg::MakeCodecPointer(info); if (!result.codec) { + if (info->codecpar->codec_id == AV_CODEC_ID_MJPEG) { + // mp3 files contain such "video stream", just ignore it. + return Stream(); + } return result; } diff --git a/Telegram/SourceFiles/media/view/media_view_playback_progress.cpp b/Telegram/SourceFiles/media/view/media_view_playback_progress.cpp index e09507427..d19f38f1d 100644 --- a/Telegram/SourceFiles/media/view/media_view_playback_progress.cpp +++ b/Telegram/SourceFiles/media/view/media_view_playback_progress.cpp @@ -66,7 +66,12 @@ void PlaybackProgress::updateState( const auto animatedPosition = position + (state.frequency * kPlaybackAnimationDurationMs / 1000); const auto animatedProgress = length ? qMax(float64(animatedPosition) / length, 0.) : 0.; if (length != _length || position != _position || wasInLoadingState) { - if (auto animated = (length && _length && animatedProgress > value())) { + const auto animated = length + && _length + && (animatedProgress > value()) + && (position > _position) + && (position < _position + state.frequency); + if (animated) { setValue(animatedProgress, animated); } else { setValue(progress, animated);