From b692242012c9bbf2a84528f28e041c3fd0825592 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 30 Jul 2020 14:32:37 +0400 Subject: [PATCH] Allow reference tgcalls implementation. --- Telegram/SourceFiles/calls/calls_call.cpp | 6 ++++-- Telegram/ThirdParty/tgcalls | 2 +- Telegram/cmake/lib_tgcalls.cmake | 3 +++ Telegram/lib_webrtc | 2 +- cmake | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp index b6843ccfba..b6686644e9 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp @@ -34,6 +34,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace tgcalls { class InstanceImpl; class InstanceImplLegacy; +class InstanceImplReference; void SetLegacyGlobalServerConfig(const std::string &serverConfig); } // namespace tgcalls @@ -48,6 +49,7 @@ const auto kDefaultVersion = "2.4.4"_q; const auto RegisterTag = tgcalls::Register(); const auto RegisterTagLegacy = tgcalls::Register(); +const auto RegisterTagReference = tgcalls::Register(); void AppendEndpoint( std::vector &list, @@ -56,7 +58,7 @@ void AppendEndpoint( if (data.vpeer_tag().v.length() != 16) { return; } - auto endpoint = tgcalls::Endpoint{ + tgcalls::Endpoint endpoint = { .endpointId = (int64_t)data.vid().v, .host = tgcalls::EndpointHost{ .ipv4 = data.vip().v.toStdString(), @@ -654,7 +656,7 @@ void Call::createAndStartController(const MTPDphoneCall &call) { memcpy(encryptionKeyValue->data(), _authKey.data(), 256); const auto weak = base::make_weak(this); - auto descriptor = tgcalls::Descriptor{ + tgcalls::Descriptor descriptor = { .config = tgcalls::Config{ .initializationTimeout = serverConfig.callConnectTimeoutMs / 1000., .receiveTimeout = serverConfig.callPacketTimeoutMs / 1000., diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index cad0db2f0d..a0e5c98cfd 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit cad0db2f0d96cf137820fd787e7def6b16ee55c7 +Subproject commit a0e5c98cfd8c53d3a8dc7fd1ff47552f0f5ea1cd diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake index d3fc8aad28..b0b3e0d124 100644 --- a/Telegram/cmake/lib_tgcalls.cmake +++ b/Telegram/cmake/lib_tgcalls.cmake @@ -79,6 +79,9 @@ PRIVATE # Linux # POSIX + + reference/InstanceImplReference.cpp + reference/InstanceImplReference.h ) target_compile_definitions(lib_tgcalls diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc index 817d74d734..29026bab21 160000 --- a/Telegram/lib_webrtc +++ b/Telegram/lib_webrtc @@ -1 +1 @@ -Subproject commit 817d74d734385fa4eb814c7f3ff0b4284b872b91 +Subproject commit 29026bab2166c746b51c088de4a218f9b7a5921e diff --git a/cmake b/cmake index d7c7e92ebc..83150a4691 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit d7c7e92ebc68bb9b6c5187dc8476d9f62b00058c +Subproject commit 83150a4691abed94cd349296baeb470ca973b0eb