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

Version 2.5.7: Fix build on macOS and Linux.

This commit is contained in:
John Preston 2021-01-28 16:58:42 +04:00
parent d2662ba1fd
commit 0aea9bc46f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/calls/calls_group_members.cpp
View File

@ -47,7 +47,7 @@ constexpr auto kUserpicMinScale = 0.8;
constexpr auto kMaxLevel = 1.;
constexpr auto kWideScale = 5;
constexpr auto kSpeakerThreshold = {
const auto kSpeakerThreshold = std::vector<float>{
Group::kDefaultVolume * 0.1f / Group::kMaxVolume,
Group::kDefaultVolume * 0.9f / Group::kMaxVolume };
@ -1420,7 +1420,7 @@ void MembersController::addMuteActionsToContextMenu(
const auto isMuted = (muteState == Row::State::Muted)
|| (muteState == Row::State::MutedByMe);
auto mutesFromVolume = rpl::never<bool>();
auto mutesFromVolume = rpl::never<bool>() | rpl::type_erased();
if (!isMuted) {
const auto call = _call.get();
@ -1429,7 +1429,7 @@ void MembersController::addMuteActionsToContextMenu(
) | rpl::filter([=](const Group::ParticipantState &data) {
return data.user == user;
})
: rpl::never<Group::ParticipantState>();
: rpl::never<Group::ParticipantState>() | rpl::type_erased();
auto volumeItem = base::make_unique_q<MenuVolumeItem>(
menu,

2
Telegram/SourceFiles/calls/calls_volume_item.cpp
View File

@ -20,7 +20,7 @@ namespace {
constexpr auto kMaxVolumePercent = 200;
constexpr auto kSpeakerThreshold = {
const auto kSpeakerThreshold = std::vector<float>{
10.0f / kMaxVolumePercent,
50.0f / kMaxVolumePercent,
150.0f / kMaxVolumePercent };