From b03cad91622383ab3fd068927c56091efbbb1901 Mon Sep 17 00:00:00 2001 From: Vitaly Lipatov Date: Sun, 10 Apr 2022 18:57:16 +0300 Subject: [PATCH] remove legacy tgvoip --- tdesktop/Telegram/CMakeLists.txt | 3 --- tdesktop/Telegram/cmake/lib_tgcalls.cmake | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tdesktop/Telegram/CMakeLists.txt b/tdesktop/Telegram/CMakeLists.txt index c9d14d104..ce71bae06 100644 --- a/tdesktop/Telegram/CMakeLists.txt +++ b/tdesktop/Telegram/CMakeLists.txt @@ -31,7 +31,6 @@ get_filename_component(res_loc Resources REALPATH) include(cmake/telegram_options.cmake) include(cmake/lib_ffmpeg.cmake) include(cmake/lib_stripe.cmake) -include(cmake/lib_tgvoip.cmake) include(cmake/lib_tgcalls.cmake) include(cmake/td_export.cmake) include(cmake/td_mtproto.cmake) @@ -55,9 +54,7 @@ target_prepare_qrc(Telegram) target_link_libraries(Telegram PRIVATE - tdesktop::lib_tgcalls_legacy tdesktop::lib_tgcalls - tdesktop::lib_tgvoip # Order in this list defines the order of include paths in command line. # We need to place desktop-app::external_minizip this early to have its diff --git a/tdesktop/Telegram/cmake/lib_tgcalls.cmake b/tdesktop/Telegram/cmake/lib_tgcalls.cmake index e367fa624..a7fe23b05 100644 --- a/tdesktop/Telegram/cmake/lib_tgcalls.cmake +++ b/tdesktop/Telegram/cmake/lib_tgcalls.cmake @@ -243,6 +243,7 @@ PRIVATE ${tgcalls_loc} ) +if (DESKTOP_APP_TGCALLS_LEGACY) add_library(lib_tgcalls_legacy STATIC) init_target(lib_tgcalls_legacy) @@ -265,3 +266,4 @@ PRIVATE tdesktop::lib_tgvoip desktop-app::external_openssl ) +endif() -- 2.33.0 diff --git a/tdesktop/Telegram/SourceFiles/calls/calls_call.cpp b/tdesktop/Telegram/SourceFiles/calls/calls_call.cpp index 72f621ed0..dcb62b7de 100644 --- a/tdesktop/Telegram/SourceFiles/calls/calls_call.cpp +++ b/tdesktop/Telegram/SourceFiles/calls/calls_call.cpp @@ -38,8 +38,6 @@ namespace tgcalls { class InstanceImpl; class InstanceV2Impl; class InstanceV2_4_0_0Impl; -class InstanceImplLegacy; -void SetLegacyGlobalServerConfig(const std::string &serverConfig); } // namespace tgcalls namespace Calls { @@ -54,7 +52,6 @@ const auto kDefaultVersion = "2.4.4"_q; const auto Register = tgcalls::Register(); const auto RegisterV2 = tgcalls::Register(); const auto RegisterV240 = tgcalls::Register(); -const auto RegisterLegacy = tgcalls::Register(); void AppendEndpoint( std::vector &list, diff --git a/tdesktop/Telegram/SourceFiles/calls/calls_call.cpp b/tdesktop/Telegram/SourceFiles/calls/calls_call.cpp index dd075f82d..d1ce68410 100644 --- a/tdesktop/Telegram/SourceFiles/calls/calls_call.cpp +++ b/tdesktop/Telegram/SourceFiles/calls/calls_call.cpp @@ -1268,7 +1268,7 @@ Call::~Call() { } void UpdateConfig(const std::string &data) { - tgcalls::SetLegacyGlobalServerConfig(data); + // tgcalls::SetLegacyGlobalServerConfig(data); } } // namespace Calls