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

Fix albums of music files.

This commit is contained in:
John Preston 2020-11-05 13:53:25 +03:00
parent 2b39da483b
commit d09ece4203
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Telegram/SourceFiles/history/view/media/history_view_document.cpp
View File

@ -129,18 +129,18 @@ void Document::createComponents(bool caption) {
if (const auto thumbed = Get<HistoryDocumentThumbed>()) { if (const auto thumbed = Get<HistoryDocumentThumbed>()) {
thumbed->_linksavel = std::make_shared<DocumentSaveClickHandler>( thumbed->_linksavel = std::make_shared<DocumentSaveClickHandler>(
_data, _data,
_parent->data()->fullId()); _realParent->fullId());
thumbed->_linkopenwithl = std::make_shared<DocumentOpenWithClickHandler>( thumbed->_linkopenwithl = std::make_shared<DocumentOpenWithClickHandler>(
_data, _data,
_parent->data()->fullId()); _realParent->fullId());
thumbed->_linkcancell = std::make_shared<DocumentCancelClickHandler>( thumbed->_linkcancell = std::make_shared<DocumentCancelClickHandler>(
_data, _data,
_parent->data()->fullId()); _realParent->fullId());
} }
if (const auto voice = Get<HistoryDocumentVoice>()) { if (const auto voice = Get<HistoryDocumentVoice>()) {
voice->_seekl = std::make_shared<VoiceSeekClickHandler>( voice->_seekl = std::make_shared<VoiceSeekClickHandler>(
_data, _data,
_parent->data()->fullId()); _realParent->fullId());
} }
} }
@ -261,7 +261,7 @@ void Document::draw(
const auto cornerDownload = downloadInCorner(); const auto cornerDownload = downloadInCorner();
if (!_dataMedia->canBePlayed()) { if (!_dataMedia->canBePlayed()) {
_dataMedia->automaticLoad(_realParent->fullId(), _parent->data()); _dataMedia->automaticLoad(_realParent->fullId(), _realParent);
} }
bool loaded = dataLoaded(), displayLoading = _data->displayLoading(); bool loaded = dataLoaded(), displayLoading = _data->displayLoading();
bool selected = (selection == FullSelection); bool selected = (selection == FullSelection);
@ -453,7 +453,7 @@ void Document::draw(
auto activew = qRound(availw * progress); auto activew = qRound(availw * progress);
if (!outbg if (!outbg
&& !voice->_playback && !voice->_playback
&& _parent->data()->hasUnreadMediaFlag()) { && _realParent->hasUnreadMediaFlag()) {
activew = availw; activew = availw;
} }
auto bar_count = qMin(availw / (st::msgWaveformBar + st::msgWaveformSkip), wf_size); auto bar_count = qMin(availw / (st::msgWaveformBar + st::msgWaveformSkip), wf_size);
@ -507,7 +507,7 @@ void Document::draw(
p.setPen(status); p.setPen(status);
p.drawTextLeft(nameleft, statustop, width, statusText); p.drawTextLeft(nameleft, statustop, width, statusText);
if (_parent->data()->hasUnreadMediaFlag()) { if (_realParent->hasUnreadMediaFlag()) {
auto w = st::normalFont->width(statusText); auto w = st::normalFont->width(statusText);
if (w + st::mediaUnreadSkip + st::mediaUnreadSize <= statuswidth) { if (w + st::mediaUnreadSkip + st::mediaUnreadSize <= statuswidth) {
p.setPen(Qt::NoPen); p.setPen(Qt::NoPen);
@ -549,7 +549,7 @@ bool Document::downloadInCorner() const {
return _data->isAudioFile() return _data->isAudioFile()
&& _data->canBeStreamed() && _data->canBeStreamed()
&& !_data->inappPlaybackFailed() && !_data->inappPlaybackFailed()
&& IsServerMsgId(_parent->data()->id); && IsServerMsgId(_realParent->id);
} }
void Document::drawCornerDownload(Painter &p, bool selected, LayoutMode mode) const { void Document::drawCornerDownload(Painter &p, bool selected, LayoutMode mode) const {
@ -687,7 +687,7 @@ TextState Document::textState(
auto waveformbottom = st.padding.top() - topMinus + st::msgWaveformMax + st::msgWaveformMin; auto waveformbottom = st.padding.top() - topMinus + st::msgWaveformMax + st::msgWaveformMin;
if (QRect(nameleft, nametop, namewidth, waveformbottom - nametop).contains(point)) { if (QRect(nameleft, nametop, namewidth, waveformbottom - nametop).contains(point)) {
const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Voice); const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Voice);
if (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId()) if (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId())
&& !::Media::Player::IsStoppedOrStopping(state.state)) { && !::Media::Player::IsStoppedOrStopping(state.state)) {
if (!voice->seeking()) { if (!voice->seeking()) {
voice->setSeekingStart((point.x() - nameleft) / float64(namewidth)); voice->setSeekingStart((point.x() - nameleft) / float64(namewidth));
@ -814,7 +814,7 @@ bool Document::updateStatusText() const {
if (_data->isVoiceMessage()) { if (_data->isVoiceMessage()) {
const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Voice); const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Voice);
if (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId()) if (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId())
&& !::Media::Player::IsStoppedOrStopping(state.state)) { && !::Media::Player::IsStoppedOrStopping(state.state)) {
if (auto voice = Get<HistoryDocumentVoice>()) { if (auto voice = Get<HistoryDocumentVoice>()) {
bool was = (voice->_playback != nullptr); bool was = (voice->_playback != nullptr);
@ -840,19 +840,19 @@ bool Document::updateStatusText() const {
voice->checkPlaybackFinished(); voice->checkPlaybackFinished();
} }
} }
if (!showPause && (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId()))) { if (!showPause && (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId()))) {
showPause = ::Media::Player::instance()->isSeeking(AudioMsgId::Type::Voice); showPause = ::Media::Player::instance()->isSeeking(AudioMsgId::Type::Voice);
} }
} else if (_data->isAudioFile()) { } else if (_data->isAudioFile()) {
const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Song); const auto state = ::Media::Player::instance()->getState(AudioMsgId::Type::Song);
if (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId()) if (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId())
&& !::Media::Player::IsStoppedOrStopping(state.state)) { && !::Media::Player::IsStoppedOrStopping(state.state)) {
statusSize = -1 - (state.position / state.frequency); statusSize = -1 - (state.position / state.frequency);
realDuration = (state.length / state.frequency); realDuration = (state.length / state.frequency);
showPause = ::Media::Player::ShowPauseIcon(state.state); showPause = ::Media::Player::ShowPauseIcon(state.state);
} else { } else {
} }
if (!showPause && (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId()))) { if (!showPause && (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId()))) {
showPause = ::Media::Player::instance()->isSeeking(AudioMsgId::Type::Song); showPause = ::Media::Player::instance()->isSeeking(AudioMsgId::Type::Song);
} }
} }
@ -962,7 +962,7 @@ void Document::clickHandlerPressedChanged(const ClickHandlerPtr &p, bool pressed
} else if (!pressed && voice->seeking()) { } else if (!pressed && voice->seeking()) {
const auto type = AudioMsgId::Type::Voice; const auto type = AudioMsgId::Type::Voice;
const auto state = ::Media::Player::instance()->getState(type); const auto state = ::Media::Player::instance()->getState(type);
if (state.id == AudioMsgId(_data, _parent->data()->fullId(), state.id.externalPlayId()) && state.length) { if (state.id == AudioMsgId(_data, _realParent->fullId(), state.id.externalPlayId()) && state.length) {
const auto currentProgress = voice->seekingCurrent(); const auto currentProgress = voice->seekingCurrent();
::Media::Player::instance()->finishSeeking( ::Media::Player::instance()->finishSeeking(
AudioMsgId::Type::Voice, AudioMsgId::Type::Voice,