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

'base::optional_variant<' -> 'std::variant<v::null_t,'

Browse Source
This commit is contained in:
John Preston
2020-08-31 13:04:17 +04:00
parent 734d834a20
commit f0e1d2fd02
38 changed files with 189 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/storage/localimageloader.cpp
View File

@@ -717,7 +717,7 @@ void FileLoadTask::process() {
_information = readMediaInformation(Core::MimeTypeForFile(info).name());
}
filemime = _information->filemime;
if (auto image = base::get_if<FileMediaInformation::Image>(
if (auto image = std::get_if<FileMediaInformation::Image>(
&_information->media)) {
fullimage = base::take(image->data);
if (!Core::IsMimeSticker(filemime)) {
@@ -732,7 +732,7 @@ void FileLoadTask::process() {
filemime = "audio/ogg";
} else {
if (_information) {
if (auto image = base::get_if<FileMediaInformation::Image>(
if (auto image = std::get_if<FileMediaInformation::Image>(
&_information->media)) {
fullimage = base::take(image->data);
}
@@ -757,7 +757,7 @@ void FileLoadTask::process() {
}
} else {
if (_information) {
if (auto image = base::get_if<FileMediaInformation::Image>(
if (auto image = std::get_if<FileMediaInformation::Image>(
&_information->media)) {
fullimage = base::take(image->data);
}
@@ -807,13 +807,13 @@ void FileLoadTask::process() {
_information = readMediaInformation(filemime);
filemime = _information->filemime;
}
if (auto song = base::get_if<FileMediaInformation::Song>(
if (auto song = std::get_if<FileMediaInformation::Song>(
&_information->media)) {
isSong = true;
auto flags = MTPDdocumentAttributeAudio::Flag::f_title | MTPDdocumentAttributeAudio::Flag::f_performer;
attributes.push_back(MTP_documentAttributeAudio(MTP_flags(flags), MTP_int(song->duration), MTP_string(song->title), MTP_string(song->performer), MTPstring()));
thumbnail = PrepareFileThumbnail(std::move(song->cover));
} else if (auto video = base::get_if<FileMediaInformation::Video>(
} else if (auto video = std::get_if<FileMediaInformation::Video>(
&_information->media)) {
isVideo = true;
auto coverWidth = video->thumbnail.width();