void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-15 21:57:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build on macOS and Linux.

Browse source
This commit is contained in:
John Preston 2021-03-12 17:58:58 +04:00
parent 0e72dc3974
commit d624e2ef65
10 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Telegram/SourceFiles/calls/calls_call.cpp
View file

@ -32,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <tgcalls/Instance.h>
#include <tgcalls/VideoCaptureInterface.h>
#include <tgcalls/StaticThreads.h>
namespace tgcalls {
class InstanceImpl;

1
Telegram/SourceFiles/calls/calls_choose_join_as.cpp
View file

@ -209,7 +209,6 @@ void ChooseJoinAsProcess::start(
strong->closeBox();
}
};
using Flag = MTPchannels_GetAdminedPublicChannels::Flag;
_request->id = session->api().request(MTPphone_GetGroupCallJoinAs(
_request->peer->input
)).done([=](const MTPphone_JoinAsPeers &result) {

3
Telegram/SourceFiles/calls/calls_group_call.cpp
View file

@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "webrtc/webrtc_create_adm.h"
#include <tgcalls/group/GroupInstanceCustomImpl.h>
#include <tgcalls/StaticThreads.h>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
@ -710,7 +711,6 @@ void GroupCall::handleUpdate(const MTPGroupCall &call) {
data.vstream_dc_id().value_or_empty());
if (const auto params = data.vparams()) {
params->match([&](const MTPDdataJSON &data) {
using ConnectionMode = tgcalls::GroupConnectionMode;
auto error = QJsonParseError{ 0, QJsonParseError::NoError };
const auto document = QJsonDocument::fromJson(
data.vdata().v,
@ -952,6 +952,7 @@ void GroupCall::ensureControllerCreated() {
const auto weak = base::make_weak(this);
const auto myLevel = std::make_shared<tgcalls::GroupLevelValue>();
tgcalls::GroupInstanceDescriptor descriptor = {
.threads = tgcalls::StaticThreads::getThreads(),
.config = tgcalls::GroupConfig{
},
.networkStateUpdated = [=](tgcalls::GroupNetworkState networkState) {

5
Telegram/SourceFiles/calls/calls_instance.cpp
View file

@ -31,9 +31,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "mainwidget.h"
#include "mtproto/mtproto_config.h"
#include "boxes/rate_call_box.h"
#include "tgcalls/VideoCaptureInterface.h"
#include "app.h"
#include <tgcalls/VideoCaptureInterface.h>
#include <tgcalls/StaticThreads.h>
namespace Calls {
namespace {
@ -585,6 +587,7 @@ std::shared_ptr<tgcalls::VideoCaptureInterface> Instance::getVideoCapture() {
}
auto result = std::shared_ptr<tgcalls::VideoCaptureInterface>(
tgcalls::VideoCaptureInterface::Create(
tgcalls::StaticThreads::getThreads(),
Core::App().settings().callVideoInputDeviceId().toStdString()));
_videoCapture = result;
return result;

2
Telegram/SourceFiles/export/export_api_wrap.cpp
View file

@ -301,7 +301,7 @@ auto ApiWrap::RequestBuilder<Request>::fail(
auto &silence_warning = _builder.fail([
common = base::take(_commonFailHandler),
specific = std::move(handler)
](const MTP::Error &error) mutable {
](const MTP::Error &error) {
if (!specific(error)) {
common(error);
}

1
Telegram/SourceFiles/ui/controls/call_mute_button.h
View file

@ -124,7 +124,6 @@ private:
rpl::variable<CallMuteButtonState> _state;
float _level = 0.;
float64 _crossLineProgress = 0.;
QRect _muteIconRect;
HandleMouseState _handleMouseState = HandleMouseState::Enabled;

2
Telegram/ThirdParty/tgcalls vendored

@ -1 +1 @@
Subproject commit d19c74b1474e4aab01d797373f1d62e4da5f87a5
Subproject commit 001d9c36b029094b18049198b830acc9969bae3c

2
Telegram/build/docker/centos_env/run.sh
View file

@ -18,4 +18,4 @@ if [ "$Command" == "" ]; then
Command="scl enable devtoolset-8 -- bash"
fi
docker run -it --rm --cpus=8 --memory=10g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $Command
docker run -it --rm --cpus=8 --memory=22g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $Command

2
Telegram/lib_lottie

@ -1 +1 @@
Subproject commit 9739a0d5674df45443197224e1e2da95e3072dd5
Subproject commit d1b9d1dc9fa3c8f6ef0c93dfb8406f242fdc4950

0
Telegram/lib_ui_patch.patch
View file