From 2dfa713566e0a14c2fb1aeb446b3fe858b1c7a91 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 19 Jan 2018 17:24:11 +0100 Subject: [PATCH 01/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 2cd079c96..94e457427 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2cd079c96f66cf535ea6af8daf70d0212055258c +Subproject commit 94e457427ee726ea4970f68a48dfe23c75795d88 From 9d995147079580c53979153512d50763adedcd03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Turnel?= Date: Wed, 24 Jan 2018 18:20:30 +0100 Subject: [PATCH 02/60] Update bctoolbox --- submodules/bctoolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 8a1d19db3..d867082bb 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 8a1d19db312444b0288db7dd62119c982d8beb1e +Subproject commit d867082bb0ebe240c4e2d4e8bdb309b1a9eace75 From 49bd4259677f06389e65c2bb36ae19f15471c1b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Turnel?= Date: Thu, 25 Jan 2018 11:25:43 +0100 Subject: [PATCH 03/60] Update linhpone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 94e457427..1e350eda3 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 94e457427ee726ea4970f68a48dfe23c75795d88 +Subproject commit 1e350eda339d3758121be4901015607c9ee360ef From 2a60488b62cbef6ed47eb80bbcadf157c655af26 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 26 Jan 2018 10:11:34 +0100 Subject: [PATCH 04/60] chore(submodules): update bctoolbox, belle-sip, cmake-builder, linphone and mediastreamer2 --- submodules/bctoolbox | 2 +- submodules/belle-sip | 2 +- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index d867082bb..d2132483e 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit d867082bb0ebe240c4e2d4e8bdb309b1a9eace75 +Subproject commit d2132483e1fbe08d6cea60250e5ba8803eee1252 diff --git a/submodules/belle-sip b/submodules/belle-sip index e930ed9e1..1b0029dd1 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit e930ed9e169cb2d54411b0c8f87ee1e6a153bced +Subproject commit 1b0029dd12247b33a13c67f25a81e782197efd24 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index e5be87c43..f1d409b39 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit e5be87c436c27608e41237cb71814ff9149c4033 +Subproject commit f1d409b39e0ea10018db012d34a4ce914bd7cbc0 diff --git a/submodules/linphone b/submodules/linphone index 1e350eda3..9072624ac 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1e350eda339d3758121be4901015607c9ee360ef +Subproject commit 9072624acb0b8ff6816b7cc6f207c3c4efc4c8cc diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 3555dbbdd..ad7571fa4 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 3555dbbdd2119d083166ca65ef7360b0c894268d +Subproject commit ad7571fa436623986e88d5e6cd329cf7e5bcc48e From ae1f436280d01c63aa38601c3c148fa763196e4a Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 26 Jan 2018 11:13:00 +0100 Subject: [PATCH 05/60] Fix submodule [--force] --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 1b0029dd1..68f164801 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 1b0029dd12247b33a13c67f25a81e782197efd24 +Subproject commit 68f1648017dde65edc8cd8054016fa3486a2955b From 1544c8dcc73087508f8871aaa8c86795cbc53998 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Fri, 26 Jan 2018 12:12:41 +0100 Subject: [PATCH 06/60] Make it build. [--force] --- submodules/externals/srtp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/srtp b/submodules/externals/srtp index d79ae9512..4a5ea6a64 160000 --- a/submodules/externals/srtp +++ b/submodules/externals/srtp @@ -1 +1 @@ -Subproject commit d79ae95126baa3cec83097469e97525a1d9e2d50 +Subproject commit 4a5ea6a64043038f4a4ac0f18d54db02a08d9b92 From d65d31c12f5c4e973924ef64dac5d418c56d3611 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 29 Jan 2018 15:45:25 +0100 Subject: [PATCH 07/60] update linphone & belle-sip --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 68f164801..bfcb762ab 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 68f1648017dde65edc8cd8054016fa3486a2955b +Subproject commit bfcb762ab5548d91ccca67dabd4e6707a8fcfbb1 diff --git a/submodules/linphone b/submodules/linphone index 9072624ac..d410c7e6c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9072624acb0b8ff6816b7cc6f207c3c4efc4c8cc +Subproject commit d410c7e6c7e92e3a5bdbe328ebe9b13c60670575 From 338fb5191c6db2d463a5d150e48935ada2fe65c8 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 29 Jan 2018 18:10:26 +0100 Subject: [PATCH 08/60] Update submodules. --- submodules/bctoolbox | 2 +- submodules/belr | 2 +- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- submodules/ortp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index d2132483e..01ec217fb 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit d2132483e1fbe08d6cea60250e5ba8803eee1252 +Subproject commit 01ec217fbf84c7488afbe36913d4fde5d783b10a diff --git a/submodules/belr b/submodules/belr index 6dc5d2f9d..565666f6c 160000 --- a/submodules/belr +++ b/submodules/belr @@ -1 +1 @@ -Subproject commit 6dc5d2f9d37ba094cf397135c16b47375261be83 +Subproject commit 565666f6c59eaa9b6cecffe0ae7e2d2e391c0647 diff --git a/submodules/linphone b/submodules/linphone index d410c7e6c..03853c8b1 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d410c7e6c7e92e3a5bdbe328ebe9b13c60670575 +Subproject commit 03853c8b14aa8baa7f12dd8dba2eefc95416d482 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index ad7571fa4..2f6d8916f 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit ad7571fa436623986e88d5e6cd329cf7e5bcc48e +Subproject commit 2f6d8916f6fbf81aa25e9b274330aca10da500c5 diff --git a/submodules/ortp b/submodules/ortp index 8fff73b5b..6028a16e6 160000 --- a/submodules/ortp +++ b/submodules/ortp @@ -1 +1 @@ -Subproject commit 8fff73b5b56f1cbf6fcca10068cc0f401d024420 +Subproject commit 6028a16e6889f5906fcdd745b174cc512b7c9915 From da200fbd993e930c60844e6a3d1ac958dc713150 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 1 Feb 2018 13:24:38 +0100 Subject: [PATCH 09/60] update belle-sip --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index bfcb762ab..4c6b700d5 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit bfcb762ab5548d91ccca67dabd4e6707a8fcfbb1 +Subproject commit 4c6b700d585089ef63ea9c9ae206d135720dd9f9 From 84011c00c58b02404d9d068c8762a7f622ceb457 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 1 Feb 2018 17:46:37 +0100 Subject: [PATCH 10/60] Update belle-sip and linphone submodules. --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 4c6b700d5..984ed66bc 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 4c6b700d585089ef63ea9c9ae206d135720dd9f9 +Subproject commit 984ed66bce4af6df64de70a151a82ad5c9eb3c66 diff --git a/submodules/linphone b/submodules/linphone index 03853c8b1..7b5061ace 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 03853c8b14aa8baa7f12dd8dba2eefc95416d482 +Subproject commit 7b5061ace70564cfab117abb9f0dae85e3211e03 From c63b75ca8de64313a69456144d703c481f38dce0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 2 Feb 2018 09:09:02 +0100 Subject: [PATCH 11/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7b5061ace..e62d8fffd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7b5061ace70564cfab117abb9f0dae85e3211e03 +Subproject commit e62d8fffd7e7bcc5deda0186aa394d4adf429072 From 6423030e0b89d604d60afbab1f353f9e56753307 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 2 Feb 2018 11:04:59 +0100 Subject: [PATCH 12/60] chore(submodules): update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index e62d8fffd..b07da774a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e62d8fffd7e7bcc5deda0186aa394d4adf429072 +Subproject commit b07da774ab2dfcae63957ecb20518545cb172cc1 From 6221508e0221a75ef0634f4befd1ff8686194306 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 2 Feb 2018 11:48:44 +0100 Subject: [PATCH 13/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index b07da774a..7ec3f703f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b07da774ab2dfcae63957ecb20518545cb172cc1 +Subproject commit 7ec3f703f5b46646b637148f837098b308f01810 From ff3407d9cd641272ca6f5c78d9d417be951cb41d Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 2 Feb 2018 15:13:20 +0100 Subject: [PATCH 14/60] update belle-sip --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 984ed66bc..10b5b5f35 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 984ed66bce4af6df64de70a151a82ad5c9eb3c66 +Subproject commit 10b5b5f354ecceb7f82d4ff103b1da758330175d From a4b9bdb6f015471c1b071bb08cf5cacfae956955 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Fri, 2 Feb 2018 15:46:56 +0100 Subject: [PATCH 15/60] fix(SipAddressesModel): do not fetch all chat messages to construct history, ONLY THE LAST... --- src/components/sip-addresses/SipAddressesModel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/sip-addresses/SipAddressesModel.cpp b/src/components/sip-addresses/SipAddressesModel.cpp index de61b703f..64a46c33d 100644 --- a/src/components/sip-addresses/SipAddressesModel.cpp +++ b/src/components/sip-addresses/SipAddressesModel.cpp @@ -469,7 +469,7 @@ void SipAddressesModel::initSipAddresses () { // Get sip addresses from chatrooms. for (const auto &chatRoom : core->getChatRooms()) { - list > history = chatRoom->getHistory(0); + list > history = chatRoom->getHistory(1); if (history.size() == 0) continue; From 99f80a597c553bfa3fcac5aec598935691fcd66c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 5 Feb 2018 09:30:36 +0100 Subject: [PATCH 16/60] update belle-sip --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 10b5b5f35..3da1dd118 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 10b5b5f354ecceb7f82d4ff103b1da758330175d +Subproject commit 3da1dd118e466c27ffade5af16528dfca145031b From 2daa0ef5450c9f63e5420071f03542efeb3a2bf2 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 5 Feb 2018 17:08:19 +0100 Subject: [PATCH 17/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7ec3f703f..702e257ca 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7ec3f703f5b46646b637148f837098b308f01810 +Subproject commit 702e257caecd6e5915c69c054bafe701aeabd3fc From 82289b2d1e7d13733b61197fceb604698d42651a Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 5 Feb 2018 17:08:28 +0100 Subject: [PATCH 18/60] Create and start linphone core separately. --- src/components/core/CoreManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/core/CoreManager.cpp b/src/components/core/CoreManager.cpp index 7379f3cf2..156e630d3 100644 --- a/src/components/core/CoreManager.cpp +++ b/src/components/core/CoreManager.cpp @@ -215,7 +215,8 @@ void CoreManager::createLinphoneCore (const QString &configPath) { setResourcesPaths(); - mCore = linphone::Factory::get()->createCore(mHandlers, Paths::getConfigFilePath(configPath), Paths::getFactoryConfigFilePath()); + mCore = linphone::Factory::get()->createCore(Paths::getConfigFilePath(configPath), Paths::getFactoryConfigFilePath(), nullptr); + mCore->addListener(mHandlers); mCore->setVideoDisplayFilter("MSOGL"); mCore->usePreviewWindow(true); @@ -230,6 +231,8 @@ void CoreManager::createLinphoneCore (const QString &configPath) { config->setInt("video", "display", 1); } + mCore->start(); + setDatabasesPaths(); setOtherPaths(); } From 762e3ab8986c3d1706c0f624b7a55608c1c6ae0a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 6 Feb 2018 10:13:01 +0100 Subject: [PATCH 19/60] Updated linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 702e257ca..1ca73da1c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 702e257caecd6e5915c69c054bafe701aeabd3fc +Subproject commit 1ca73da1cf180f39204df9179d44e5a0baf620ec From 61ce19b9fb339cdc9a8ec81df2a61eab3f0df6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Mon, 5 Feb 2018 16:52:49 +0100 Subject: [PATCH 20/60] Adjusts Linphone Qt's code to fit the new API of Liblinphone --- src/app/logger/Logger.cpp | 2 +- src/components/assistant/AssistantModel.cpp | 74 ++++---- src/components/assistant/AssistantModel.hpp | 2 +- src/components/call/CallModel.cpp | 164 +++++++++--------- src/components/call/CallModel.hpp | 12 +- src/components/calls/CallsListModel.cpp | 14 +- src/components/calls/CallsListModel.hpp | 2 +- src/components/chat/ChatModel.cpp | 44 ++--- src/components/chat/ChatModel.hpp | 24 +-- src/components/contacts/ContactsListModel.cpp | 2 +- src/components/core/CoreHandlers.cpp | 54 +++--- src/components/core/CoreHandlers.hpp | 10 +- src/components/core/CoreManager.cpp | 8 +- src/components/core/CoreManager.hpp | 2 +- src/components/presence/Presence.hpp | 8 +- .../settings/AccountSettingsModel.cpp | 16 +- src/components/settings/SettingsModel.cpp | 6 +- src/components/settings/SettingsModel.hpp | 14 +- .../sip-addresses/SipAddressesModel.cpp | 28 +-- .../sip-addresses/SipAddressesModel.hpp | 2 +- src/utils/LinphoneUtils.cpp | 8 +- submodules/linphone | 2 +- 22 files changed, 249 insertions(+), 249 deletions(-) diff --git a/src/app/logger/Logger.cpp b/src/app/logger/Logger.cpp index db392cc1a..e82156465 100644 --- a/src/app/logger/Logger.cpp +++ b/src/app/logger/Logger.cpp @@ -20,7 +20,7 @@ * Author: Ronan Abhamon */ -#include +#include #include #include #include diff --git a/src/components/assistant/AssistantModel.cpp b/src/components/assistant/AssistantModel.cpp index 1364f782c..5caf97daf 100644 --- a/src/components/assistant/AssistantModel.cpp +++ b/src/components/assistant/AssistantModel.cpp @@ -48,15 +48,15 @@ private: void onCreateAccount ( const shared_ptr &, - linphone::AccountCreatorStatus status, + linphone::AccountCreator::Status status, const string & ) override { - if (status == linphone::AccountCreatorStatusAccountCreated) + if (status == linphone::AccountCreator::Status::AccountCreated) emit mAssistant->createStatusChanged(QString("")); else { - if (status == linphone::AccountCreatorStatusRequestFailed) + if (status == linphone::AccountCreator::Status::RequestFailed) emit mAssistant->createStatusChanged(tr("requestFailed")); - else if (status == linphone::AccountCreatorStatusServerError) + else if (status == linphone::AccountCreator::Status::ServerError) emit mAssistant->createStatusChanged(tr("cannotSendSms")); else emit mAssistant->createStatusChanged(tr("accountAlreadyExists")); @@ -65,14 +65,14 @@ private: void onIsAccountExist ( const shared_ptr &creator, - linphone::AccountCreatorStatus status, + linphone::AccountCreator::Status status, const string & ) override { - if (status == linphone::AccountCreatorStatusAccountExist || status == linphone::AccountCreatorStatusAccountExistWithAlias) { + if (status == linphone::AccountCreator::Status::AccountExist || status == linphone::AccountCreator::Status::AccountExistWithAlias) { createProxyConfig(creator); emit mAssistant->loginStatusChanged(QString("")); } else { - if (status == linphone::AccountCreatorStatusRequestFailed) + if (status == linphone::AccountCreator::Status::RequestFailed) emit mAssistant->loginStatusChanged(tr("requestFailed")); else emit mAssistant->loginStatusChanged(tr("loginWithUsernameFailed")); @@ -81,19 +81,19 @@ private: void onActivateAccount ( const shared_ptr &creator, - linphone::AccountCreatorStatus status, + linphone::AccountCreator::Status status, const string & ) override { if ( - status == linphone::AccountCreatorStatusAccountActivated || - status == linphone::AccountCreatorStatusAccountAlreadyActivated + status == linphone::AccountCreator::Status::AccountActivated || + status == linphone::AccountCreator::Status::AccountAlreadyActivated ) { if (creator->getEmail().empty()) createProxyConfig(creator); emit mAssistant->activateStatusChanged(QString("")); } else { - if (status == linphone::AccountCreatorStatusRequestFailed) + if (status == linphone::AccountCreator::Status::RequestFailed) emit mAssistant->activateStatusChanged(tr("requestFailed")); else emit mAssistant->activateStatusChanged(tr("smsActivationFailed")); @@ -102,14 +102,14 @@ private: void onIsAccountActivated ( const shared_ptr &creator, - linphone::AccountCreatorStatus status, + linphone::AccountCreator::Status status, const string & ) override { - if (status == linphone::AccountCreatorStatusAccountActivated) { + if (status == linphone::AccountCreator::Status::AccountActivated) { createProxyConfig(creator); emit mAssistant->activateStatusChanged(QString("")); } else { - if (status == linphone::AccountCreatorStatusRequestFailed) + if (status == linphone::AccountCreator::Status::RequestFailed) emit mAssistant->activateStatusChanged(tr("requestFailed")); else emit mAssistant->activateStatusChanged(tr("emailActivationFailed")); @@ -118,15 +118,15 @@ private: void onRecoverAccount ( const shared_ptr &, - linphone::AccountCreatorStatus status, + linphone::AccountCreator::Status status, const string & ) override { - if (status == linphone::AccountCreatorStatusRequestOk) { + if (status == linphone::AccountCreator::Status::RequestOk) { emit mAssistant->recoverStatusChanged(QString("")); } else { - if (status == linphone::AccountCreatorStatusRequestFailed) + if (status == linphone::AccountCreator::Status::RequestFailed) emit mAssistant->recoverStatusChanged(tr("requestFailed")); - else if (status == linphone::AccountCreatorStatusServerError) + else if (status == linphone::AccountCreator::Status::ServerError) emit mAssistant->recoverStatusChanged(tr("cannotSendSms")); else emit mAssistant->recoverStatusChanged(tr("loginWithPhoneNumberFailed")); @@ -243,12 +243,12 @@ void AssistantModel::setEmail (const QString &email) { QString error; switch (mAccountCreator->setEmail(::Utils::appStringToCoreString(email))) { - case linphone::AccountCreatorEmailStatusOk: + case linphone::AccountCreator::EmailStatus::Ok: break; - case linphone::AccountCreatorEmailStatusMalformed: + case linphone::AccountCreator::EmailStatus::Malformed: error = tr("emailStatusMalformed"); break; - case linphone::AccountCreatorEmailStatusInvalidCharacters: + case linphone::AccountCreator::EmailStatus::InvalidCharacters: error = tr("emailStatusMalformedInvalidCharacters"); break; } @@ -267,19 +267,19 @@ void AssistantModel::setPassword (const QString &password) { QString error; switch (mAccountCreator->setPassword(::Utils::appStringToCoreString(password))) { - case linphone::AccountCreatorPasswordStatusOk: + case linphone::AccountCreator::PasswordStatus::Ok: break; - case linphone::AccountCreatorPasswordStatusTooShort: + case linphone::AccountCreator::PasswordStatus::TooShort: error = tr("passwordStatusTooShort").arg(config->getInt("assistant", "password_min_length", 1)); break; - case linphone::AccountCreatorPasswordStatusTooLong: + case linphone::AccountCreator::PasswordStatus::TooLong: error = tr("passwordStatusTooLong").arg(config->getInt("assistant", "password_max_length", -1)); break; - case linphone::AccountCreatorPasswordStatusInvalidCharacters: + case linphone::AccountCreator::PasswordStatus::InvalidCharacters: error = tr("passwordStatusInvalidCharacters") .arg(::Utils::coreStringToAppString(config->getString("assistant", "password_regex", ""))); break; - case linphone::AccountCreatorPasswordStatusMissingCharacters: + case linphone::AccountCreator::PasswordStatus::MissingCharacters: error = tr("passwordStatusMissingCharacters") .arg(::Utils::coreStringToAppString(config->getString("assistant", "missing_characters", ""))); break; @@ -310,18 +310,18 @@ void AssistantModel::setPhoneNumber (const QString &phoneNumber) { QString error; switch (mAccountCreator->setPhoneNumber(::Utils::appStringToCoreString(phoneNumber), ::Utils::appStringToCoreString(mCountryCode))) { - case linphone::AccountCreatorPhoneNumberStatusOk: + case int(linphone::AccountCreator::PhoneNumberStatus::Ok): break; - case linphone::AccountCreatorPhoneNumberStatusInvalid: + case int(linphone::AccountCreator::PhoneNumberStatus::Invalid): error = tr("phoneNumberStatusInvalid"); break; - case linphone::AccountCreatorPhoneNumberStatusTooShort: + case int(linphone::AccountCreator::PhoneNumberStatus::TooShort): error = tr("phoneNumberStatusTooShort"); break; - case linphone::AccountCreatorPhoneNumberStatusTooLong: + case int(linphone::AccountCreator::PhoneNumberStatus::TooLong): error = tr("phoneNumberStatusTooLong"); break; - case linphone::AccountCreatorPhoneNumberStatusInvalidCountryCode: + case int(linphone::AccountCreator::PhoneNumberStatus::InvalidCountryCode): error = tr("phoneNumberStatusInvalidCountryCode"); break; default: @@ -393,24 +393,24 @@ void AssistantModel::setConfigFilename (const QString &configFilename) { // ----------------------------------------------------------------------------- -QString AssistantModel::mapAccountCreatorUsernameStatusToString (linphone::AccountCreatorUsernameStatus status) const { +QString AssistantModel::mapAccountCreatorUsernameStatusToString (linphone::AccountCreator::UsernameStatus status) const { shared_ptr config = CoreManager::getInstance()->getCore()->getConfig(); QString error; switch (status) { - case linphone::AccountCreatorUsernameStatusOk: + case linphone::AccountCreator::UsernameStatus::Ok: break; - case linphone::AccountCreatorUsernameStatusTooShort: + case linphone::AccountCreator::UsernameStatus::TooShort: error = tr("usernameStatusTooShort").arg(config->getInt("assistant", "username_min_length", 1)); break; - case linphone::AccountCreatorUsernameStatusTooLong: + case linphone::AccountCreator::UsernameStatus::TooLong: error = tr("usernameStatusTooLong").arg(config->getInt("assistant", "username_max_length", -1)); break; - case linphone::AccountCreatorUsernameStatusInvalidCharacters: + case linphone::AccountCreator::UsernameStatus::InvalidCharacters: error = tr("usernameStatusInvalidCharacters") .arg(::Utils::coreStringToAppString(config->getString("assistant", "username_regex", ""))); break; - case linphone::AccountCreatorUsernameStatusInvalid: + case linphone::AccountCreator::UsernameStatus::Invalid: error = tr("usernameStatusInvalid"); break; } diff --git a/src/components/assistant/AssistantModel.hpp b/src/components/assistant/AssistantModel.hpp index b8d01e096..3fe8d5f78 100644 --- a/src/components/assistant/AssistantModel.hpp +++ b/src/components/assistant/AssistantModel.hpp @@ -94,7 +94,7 @@ private: QString getConfigFilename () const; void setConfigFilename (const QString &configFilename); - QString mapAccountCreatorUsernameStatusToString (linphone::AccountCreatorUsernameStatus status) const; + QString mapAccountCreatorUsernameStatusToString (linphone::AccountCreator::UsernameStatus status) const; QString mCountryCode; QString mConfigFilename; diff --git a/src/components/call/CallModel.cpp b/src/components/call/CallModel.cpp index 7c13d0086..222fa348c 100644 --- a/src/components/call/CallModel.cpp +++ b/src/components/call/CallModel.cpp @@ -88,14 +88,14 @@ void CallModel::setRecordFile (shared_ptr &callParams) { void CallModel::updateStats (const shared_ptr &callStats) { switch (callStats->getType()) { - case linphone::StreamTypeText: - case linphone::StreamTypeUnknown: + case linphone::StreamType::Text: + case linphone::StreamType::Unknown: break; - case linphone::StreamTypeAudio: + case linphone::StreamType::Audio: updateStats(callStats, mAudioStats); break; - case linphone::StreamTypeVideo: + case linphone::StreamType::Video: updateStats(callStats, mVideoStats); break; } @@ -243,42 +243,42 @@ void CallModel::stopRecording () { // ----------------------------------------------------------------------------- -void CallModel::handleCallStateChanged (const shared_ptr &call, linphone::CallState state) { +void CallModel::handleCallStateChanged (const shared_ptr &call, linphone::Call::State state) { if (call != mCall) return; updateIsInConference(); switch (state) { - case linphone::CallStateError: - case linphone::CallStateEnd: + case linphone::Call::State::Error: + case linphone::Call::State::End: setCallErrorFromReason(call->getReason()); stopAutoAnswerTimer(); mPausedByRemote = false; break; - case linphone::CallStateConnected: - case linphone::CallStateReferred: - case linphone::CallStateReleased: - case linphone::CallStateStreamsRunning: + case linphone::Call::State::Connected: + case linphone::Call::State::Referred: + case linphone::Call::State::Released: + case linphone::Call::State::StreamsRunning: mPausedByRemote = false; break; - case linphone::CallStatePausedByRemote: + case linphone::Call::State::PausedByRemote: mNotifyCameraFirstFrameReceived = true; mPausedByRemote = true; break; - case linphone::CallStatePausing: + case linphone::Call::State::Pausing: mNotifyCameraFirstFrameReceived = true; mPausedByUser = true; break; - case linphone::CallStateResuming: + case linphone::Call::State::Resuming: mPausedByUser = false; break; - case linphone::CallStateUpdatedByRemote: + case linphone::Call::State::UpdatedByRemote: if (!mCall->getCurrentParams()->videoEnabled() && mCall->getRemoteParams()->videoEnabled()) { mCall->deferUpdate(); emit videoRequested(); @@ -286,17 +286,17 @@ void CallModel::handleCallStateChanged (const shared_ptr &call, break; - case linphone::CallStateIdle: - case linphone::CallStateIncomingReceived: - case linphone::CallStateOutgoingInit: - case linphone::CallStateOutgoingProgress: - case linphone::CallStateOutgoingRinging: - case linphone::CallStateOutgoingEarlyMedia: - case linphone::CallStatePaused: - case linphone::CallStateIncomingEarlyMedia: - case linphone::CallStateUpdating: - case linphone::CallStateEarlyUpdatedByRemote: - case linphone::CallStateEarlyUpdating: + case linphone::Call::State::Idle: + case linphone::Call::State::IncomingReceived: + case linphone::Call::State::OutgoingInit: + case linphone::Call::State::OutgoingProgress: + case linphone::Call::State::OutgoingRinging: + case linphone::Call::State::OutgoingEarlyMedia: + case linphone::Call::State::Paused: + case linphone::Call::State::IncomingEarlyMedia: + case linphone::Call::State::Updating: + case linphone::Call::State::EarlyUpdatedByRemote: + case linphone::Call::State::EarlyUpdating: break; } @@ -327,39 +327,39 @@ void CallModel::stopAutoAnswerTimer () const { CallModel::CallStatus CallModel::getStatus () const { switch (mCall->getState()) { - case linphone::CallStateConnected: - case linphone::CallStateStreamsRunning: + case linphone::Call::State::Connected: + case linphone::Call::State::StreamsRunning: return CallStatusConnected; - case linphone::CallStateEnd: - case linphone::CallStateError: - case linphone::CallStateReferred: - case linphone::CallStateReleased: + case linphone::Call::State::End: + case linphone::Call::State::Error: + case linphone::Call::State::Referred: + case linphone::Call::State::Released: return CallStatusEnded; - case linphone::CallStatePaused: - case linphone::CallStatePausedByRemote: - case linphone::CallStatePausing: - case linphone::CallStateResuming: + case linphone::Call::State::Paused: + case linphone::Call::State::PausedByRemote: + case linphone::Call::State::Pausing: + case linphone::Call::State::Resuming: return CallStatusPaused; - case linphone::CallStateUpdating: - case linphone::CallStateUpdatedByRemote: + case linphone::Call::State::Updating: + case linphone::Call::State::UpdatedByRemote: return mPausedByRemote ? CallStatusPaused : CallStatusConnected; - case linphone::CallStateEarlyUpdatedByRemote: - case linphone::CallStateEarlyUpdating: - case linphone::CallStateIdle: - case linphone::CallStateIncomingEarlyMedia: - case linphone::CallStateIncomingReceived: - case linphone::CallStateOutgoingEarlyMedia: - case linphone::CallStateOutgoingInit: - case linphone::CallStateOutgoingProgress: - case linphone::CallStateOutgoingRinging: + case linphone::Call::State::EarlyUpdatedByRemote: + case linphone::Call::State::EarlyUpdating: + case linphone::Call::State::Idle: + case linphone::Call::State::IncomingEarlyMedia: + case linphone::Call::State::IncomingReceived: + case linphone::Call::State::OutgoingEarlyMedia: + case linphone::Call::State::OutgoingInit: + case linphone::Call::State::OutgoingProgress: + case linphone::Call::State::OutgoingRinging: break; } - return mCall->getDir() == linphone::CallDirIncoming ? CallStatusIncoming : CallStatusOutgoing; + return mCall->getDir() == linphone::Call::Dir::Incoming ? CallStatusIncoming : CallStatusOutgoing; } // ----------------------------------------------------------------------------- @@ -385,16 +385,16 @@ QString CallModel::getCallError () const { void CallModel::setCallErrorFromReason (linphone::Reason reason) { switch (reason) { - case linphone::ReasonDeclined: + case linphone::Reason::Declined: mCallError = tr("callErrorDeclined"); break; - case linphone::ReasonNotFound: + case linphone::Reason::NotFound: mCallError = tr("callErrorNotFound"); break; - case linphone::ReasonBusy: + case linphone::Reason::Busy: mCallError = tr("callErrorBusy"); break; - case linphone::ReasonNotAcceptable: + case linphone::Reason::NotAcceptable: mCallError = tr("callErrorNotAcceptable"); break; default: @@ -462,10 +462,10 @@ bool CallModel::getPausedByUser () const { void CallModel::setPausedByUser (bool status) { switch (mCall->getState()) { - case linphone::CallStateConnected: - case linphone::CallStateStreamsRunning: - case linphone::CallStatePaused: - case linphone::CallStatePausedByRemote: + case linphone::Call::State::Connected: + case linphone::Call::State::StreamsRunning: + case linphone::Call::State::Paused: + case linphone::Call::State::PausedByRemote: break; default: return; } @@ -496,8 +496,8 @@ void CallModel::setVideoEnabled (bool status) { } switch (mCall->getState()) { - case linphone::CallStateConnected: - case linphone::CallStateStreamsRunning: + case linphone::Call::State::Connected: + case linphone::Call::State::StreamsRunning: break; default: return; } @@ -515,10 +515,10 @@ void CallModel::setVideoEnabled (bool status) { bool CallModel::getUpdating () const { switch (mCall->getState()) { - case linphone::CallStateConnected: - case linphone::CallStateStreamsRunning: - case linphone::CallStatePaused: - case linphone::CallStatePausedByRemote: + case linphone::Call::State::Connected: + case linphone::Call::State::StreamsRunning: + case linphone::Call::State::Paused: + case linphone::Call::State::PausedByRemote: return false; default: @@ -556,33 +556,33 @@ bool CallModel::isSecured () const { shared_ptr params = mCall->getCurrentParams(); linphone::MediaEncryption encryption = params->getMediaEncryption(); return ( - encryption == linphone::MediaEncryptionZRTP && mCall->getAuthenticationTokenVerified() - ) || encryption == linphone::MediaEncryptionSRTP || encryption == linphone::MediaEncryptionDTLS; + encryption == linphone::MediaEncryption::ZRTP && mCall->getAuthenticationTokenVerified() + ) || encryption == linphone::MediaEncryption::SRTP || encryption == linphone::MediaEncryption::DTLS; } // ----------------------------------------------------------------------------- QString CallModel::getLocalSas () const { QString token = ::Utils::coreStringToAppString(mCall->getAuthenticationToken()); - return mCall->getDir() == linphone::CallDirIncoming ? token.left(2).toUpper() : token.right(2).toUpper(); + return mCall->getDir() == linphone::Call::Dir::Incoming ? token.left(2).toUpper() : token.right(2).toUpper(); } QString CallModel::getRemoteSas () const { QString token = ::Utils::coreStringToAppString(mCall->getAuthenticationToken()); - return mCall->getDir() != linphone::CallDirIncoming ? token.left(2).toUpper() : token.right(2).toUpper(); + return mCall->getDir() != linphone::Call::Dir::Incoming ? token.left(2).toUpper() : token.right(2).toUpper(); } // ----------------------------------------------------------------------------- QString CallModel::getSecuredString () const { switch (mCall->getCurrentParams()->getMediaEncryption()) { - case linphone::MediaEncryptionSRTP: + case linphone::MediaEncryption::SRTP: return QStringLiteral("SRTP"); - case linphone::MediaEncryptionZRTP: + case linphone::MediaEncryption::ZRTP: return QStringLiteral("ZRTP"); - case linphone::MediaEncryptionDTLS: + case linphone::MediaEncryption::DTLS: return QStringLiteral("DTLS"); - case linphone::MediaEncryptionNone: + case linphone::MediaEncryption::None: break; } @@ -613,10 +613,10 @@ void CallModel::updateStats (const shared_ptr &callSt shared_ptr payloadType; switch (callStats->getType()) { - case linphone::StreamTypeAudio: + case linphone::StreamType::Audio: payloadType = params->getUsedAudioPayloadType(); break; - case linphone::StreamTypeVideo: + case linphone::StreamType::Video: payloadType = params->getUsedVideoPayloadType(); break; default: @@ -625,10 +625,10 @@ void CallModel::updateStats (const shared_ptr &callSt QString family; switch (callStats->getIpFamilyOfRemote()) { - case linphone::AddressFamilyInet: + case linphone::AddressFamily::Inet: family = QStringLiteral("IPv4"); break; - case linphone::AddressFamilyInet6: + case linphone::AddressFamily::Inet6: family = QStringLiteral("IPv6"); break; default: @@ -649,10 +649,10 @@ void CallModel::updateStats (const shared_ptr &callSt statsList << ::createStat(tr("callStatsReceiverLossRate"), QStringLiteral("%1 %").arg(callStats->getReceiverLossRate())); switch (callStats->getType()) { - case linphone::StreamTypeAudio: + case linphone::StreamType::Audio: statsList << ::createStat(tr("callStatsJitterBuffer"), QStringLiteral("%1 ms").arg(callStats->getJitterBufferSizeMs())); break; - case linphone::StreamTypeVideo: { + case linphone::StreamType::Video: { const QString sentVideoDefinitionName = ::Utils::coreStringToAppString(params->getSentVideoDefinition()->getName()); const QString sentVideoDefinition = QStringLiteral("%1x%2") .arg(params->getSentVideoDefinition()->getWidth()) @@ -684,17 +684,17 @@ void CallModel::updateStats (const shared_ptr &callSt QString CallModel::iceStateToString (linphone::IceState state) const { switch (state) { - case linphone::IceStateNotActivated: + case linphone::IceState::NotActivated: return tr("iceStateNotActivated"); - case linphone::IceStateFailed: + case linphone::IceState::Failed: return tr("iceStateFailed"); - case linphone::IceStateInProgress: + case linphone::IceState::InProgress: return tr("iceStateInProgress"); - case linphone::IceStateReflexiveConnection: + case linphone::IceState::ReflexiveConnection: return tr("iceStateReflexiveConnection"); - case linphone::IceStateHostConnection: + case linphone::IceState::HostConnection: return tr("iceStateHostConnection"); - case linphone::IceStateRelayConnection: + case linphone::IceState::RelayConnection: return tr("iceStateRelayConnection"); } diff --git a/src/components/call/CallModel.hpp b/src/components/call/CallModel.hpp index e98b5b574..2a4b22b88 100644 --- a/src/components/call/CallModel.hpp +++ b/src/components/call/CallModel.hpp @@ -78,10 +78,10 @@ public: Q_ENUM(CallStatus); enum CallEncryption { - CallEncryptionNone = linphone::MediaEncryptionNone, - CallEncryptionDtls = linphone::MediaEncryptionDTLS, - CallEncryptionSrtp = linphone::MediaEncryptionSRTP, - CallEncryptionZrtp = linphone::MediaEncryptionZRTP + CallEncryptionNone = int(linphone::MediaEncryption::None), + CallEncryptionDtls = int(linphone::MediaEncryption::DTLS), + CallEncryptionSrtp = int(linphone::MediaEncryption::SRTP), + CallEncryptionZrtp = int(linphone::MediaEncryption::ZRTP) }; Q_ENUM(CallEncryption); @@ -139,14 +139,14 @@ signals: void cameraFirstFrameReceived (unsigned int width, unsigned int height); private: - void handleCallStateChanged (const std::shared_ptr &call, linphone::CallState state); + void handleCallStateChanged (const std::shared_ptr &call, linphone::Call::State state); void stopAutoAnswerTimer () const; CallStatus getStatus () const; bool isOutgoing () const { - return mCall->getDir() == linphone::CallDirOutgoing; + return mCall->getDir() == linphone::Call::Dir::Outgoing; } void updateIsInConference (); diff --git a/src/components/calls/CallsListModel.cpp b/src/components/calls/CallsListModel.cpp index 69b1509b2..56455cda8 100644 --- a/src/components/calls/CallsListModel.cpp +++ b/src/components/calls/CallsListModel.cpp @@ -172,23 +172,23 @@ static void joinConference (const shared_ptr &call) { addModel->update(); } -void CallsListModel::handleCallStateChanged (const shared_ptr &call, linphone::CallState state) { +void CallsListModel::handleCallStateChanged (const shared_ptr &call, linphone::Call::State state) { switch (state) { - case linphone::CallStateIncomingReceived: + case linphone::Call::State::IncomingReceived: addCall(call); ::joinConference(call); break; - case linphone::CallStateOutgoingInit: + case linphone::Call::State::OutgoingInit: addCall(call); break; - case linphone::CallStateEnd: - case linphone::CallStateError: + case linphone::Call::State::End: + case linphone::Call::State::Error: removeCall(call); break; - case linphone::CallStateStreamsRunning: { + case linphone::Call::State::StreamsRunning: { int index = ::findCallIndex(mList, call); emit callRunning(index, &call->getData("call-model")); } break; @@ -221,7 +221,7 @@ bool CallsListModel::removeRows (int row, int count, const QModelIndex &parent) // ----------------------------------------------------------------------------- void CallsListModel::addCall (const shared_ptr &call) { - if (call->getDir() == linphone::CallDirOutgoing) + if (call->getDir() == linphone::Call::Dir::Outgoing) App::smartShowWindow(App::getInstance()->getCallsWindow()); CallModel *callModel = new CallModel(call); diff --git a/src/components/calls/CallsListModel.hpp b/src/components/calls/CallsListModel.hpp index c64614624..172381a1d 100644 --- a/src/components/calls/CallsListModel.hpp +++ b/src/components/calls/CallsListModel.hpp @@ -60,7 +60,7 @@ private: bool removeRow (int row, const QModelIndex &parent = QModelIndex()); bool removeRows (int row, int count, const QModelIndex &parent = QModelIndex()) override; - void handleCallStateChanged (const std::shared_ptr &call, linphone::CallState state); + void handleCallStateChanged (const std::shared_ptr &call, linphone::Call::State state); void addCall (const std::shared_ptr &call); void removeCall (const std::shared_ptr &call); diff --git a/src/components/chat/ChatModel.cpp b/src/components/chat/ChatModel.cpp index 8e387d561..3c589ffaf 100644 --- a/src/components/chat/ChatModel.cpp +++ b/src/components/chat/ChatModel.cpp @@ -180,7 +180,7 @@ private: signalDataChanged(it); } - void onMsgStateChanged (const shared_ptr &message, linphone::ChatMessageState state) override { + void onMsgStateChanged (const shared_ptr &message, linphone::ChatMessage::State state) override { if (!mChatModel) return; @@ -189,7 +189,7 @@ private: return; // File message downloaded. - if (state == linphone::ChatMessageStateFileTransferDone && !message->isOutgoing()) { + if (state == linphone::ChatMessage::State::FileTransferDone && !message->isOutgoing()) { ::createThumbnail(message); ::fillThumbnailProperty((*it).first, message); @@ -201,7 +201,7 @@ private: App::getInstance()->getNotifier()->notifyReceivedFileMessage(message); } - (*it).first["status"] = state; + (*it).first["status"] = int(state); signalDataChanged(it); } @@ -305,8 +305,8 @@ void ChatModel::setSipAddress (const QString &sipAddress) { // Old workaround. // It can exist messages with a not delivered status. It's a linphone core bug. - if (message->getState() == linphone::ChatMessageStateInProgress) - map["status"] = linphone::ChatMessageStateNotDelivered; + if (message->getState() == linphone::ChatMessage::State::InProgress) + map["status"] = int(linphone::ChatMessage::State::NotDelivered); mEntries << qMakePair(map, static_pointer_cast(message)); } @@ -435,7 +435,7 @@ void ChatModel::downloadFile (int id) { shared_ptr message = static_pointer_cast(entry.second); - switch (message->getState()) { + switch (int(message->getState())) { case MessageStatusDelivered: case MessageStatusDeliveredToUser: case MessageStatusDisplayed: @@ -529,8 +529,8 @@ void ChatModel::fillMessageEntry (QVariantMap &dest, const shared_ptrgetTime() * 1000); dest["content"] = ::Utils::coreStringToAppString(message->getText()); - dest["isOutgoing"] = message->isOutgoing() || message->getState() == linphone::ChatMessageStateIdle; - dest["status"] = message->getState(); + dest["isOutgoing"] = message->isOutgoing() || message->getState() == linphone::ChatMessage::State::Idle; + dest["status"] = int(message->getState()); shared_ptr content = message->getFileTransferInformation(); if (content) { @@ -547,8 +547,8 @@ void ChatModel::fillCallStartEntry (QVariantMap &dest, const shared_ptrgetDir() == linphone::CallDirOutgoing; - dest["status"] = callLog->getStatus(); + dest["isOutgoing"] = callLog->getDir() == linphone::Call::Dir::Outgoing; + dest["status"] = int(callLog->getStatus()); dest["isStart"] = true; } @@ -557,8 +557,8 @@ void ChatModel::fillCallEndEntry (QVariantMap &dest, const shared_ptrgetDir() == linphone::CallDirOutgoing; - dest["status"] = callLog->getStatus(); + dest["isOutgoing"] = callLog->getDir() == linphone::Call::Dir::Outgoing; + dest["status"] = int(callLog->getStatus()); dest["isStart"] = false; } @@ -576,7 +576,7 @@ void ChatModel::removeEntry (ChatEntryData &pair) { } case ChatModel::CallEntry: { - if (pair.first["status"].toInt() == linphone::CallStatusSuccess) { + if (pair.first["status"].toInt() == int(linphone::Call::Status::Success)) { // WARNING: Unable to remove symmetric call here. (start/end) // We are between `beginRemoveRows` and `endRemoveRows`. // A solution is to schedule a `removeEntry` call in the Qt main loop. @@ -601,16 +601,16 @@ void ChatModel::removeEntry (ChatEntryData &pair) { } void ChatModel::insertCall (const shared_ptr &callLog) { - linphone::CallStatus status = callLog->getStatus(); + linphone::Call::Status status = callLog->getStatus(); switch (status) { - case linphone::CallStatusAborted: - case linphone::CallStatusEarlyAborted: + case linphone::Call::Status::Aborted: + case linphone::Call::Status::EarlyAborted: return; // Ignore aborted calls. - case linphone::CallStatusSuccess: - case linphone::CallStatusMissed: - case linphone::CallStatusDeclined: + case linphone::Call::Status::Success: + case linphone::Call::Status::Missed: + case linphone::Call::Status::Declined: break; } @@ -637,7 +637,7 @@ void ChatModel::insertCall (const shared_ptr &callLog) { auto it = insertEntry(qMakePair(start, static_pointer_cast(callLog))); // Add end call. (if necessary) - if (status == linphone::CallStatusSuccess) { + if (status == linphone::Call::Status::Success) { QVariantMap end; fillCallEndEntry(end, callLog); insertEntry(qMakePair(end, static_pointer_cast(callLog)), &it); @@ -658,9 +658,9 @@ void ChatModel::insertMessageAtEnd (const shared_ptr &mes // ----------------------------------------------------------------------------- -void ChatModel::handleCallStateChanged (const shared_ptr &call, linphone::CallState state) { +void ChatModel::handleCallStateChanged (const shared_ptr &call, linphone::Call::State state) { if ( - (state == linphone::CallStateEnd || state == linphone::CallStateError) && + (state == linphone::Call::State::End || state == linphone::Call::State::Error) && mChatRoom == CoreManager::getInstance()->getCore()->getChatRoom(call->getRemoteAddress()) ) insertCall(call->getCallLog()); diff --git a/src/components/chat/ChatModel.hpp b/src/components/chat/ChatModel.hpp index d09c2b2c6..e14c21654 100644 --- a/src/components/chat/ChatModel.hpp +++ b/src/components/chat/ChatModel.hpp @@ -52,22 +52,22 @@ public: Q_ENUM(EntryType); enum CallStatus { - CallStatusDeclined = linphone::CallStatusDeclined, - CallStatusMissed = linphone::CallStatusMissed, - CallStatusSuccess = linphone::CallStatusSuccess + CallStatusDeclined = int(linphone::Call::Status::Declined), + CallStatusMissed = int(linphone::Call::Status::Missed), + CallStatusSuccess = int(linphone::Call::Status::Success) }; Q_ENUM(CallStatus); enum MessageStatus { - MessageStatusDelivered = linphone::ChatMessageStateDelivered, - MessageStatusDeliveredToUser = linphone::ChatMessageStateDeliveredToUser, - MessageStatusDisplayed = linphone::ChatMessageStateDisplayed, - MessageStatusFileTransferDone = linphone::ChatMessageStateFileTransferDone, - MessageStatusFileTransferError = linphone::ChatMessageStateFileTransferError, - MessageStatusIdle = linphone::ChatMessageStateIdle, - MessageStatusInProgress = linphone::ChatMessageStateInProgress, - MessageStatusNotDelivered = linphone::ChatMessageStateNotDelivered + MessageStatusDelivered = int(linphone::ChatMessage::State::Delivered), + MessageStatusDeliveredToUser = int(linphone::ChatMessage::State::DeliveredToUser), + MessageStatusDisplayed = int(linphone::ChatMessage::State::Displayed), + MessageStatusFileTransferDone = int(linphone::ChatMessage::State::FileTransferDone), + MessageStatusFileTransferError = int(linphone::ChatMessage::State::FileTransferError), + MessageStatusIdle = int(linphone::ChatMessage::State::Idle), + MessageStatusInProgress = int(linphone::ChatMessage::State::InProgress), + MessageStatusNotDelivered = int(linphone::ChatMessage::State::NotDelivered) }; Q_ENUM(MessageStatus); @@ -134,7 +134,7 @@ private: void insertCall (const std::shared_ptr &callLog); void insertMessageAtEnd (const std::shared_ptr &message); - void handleCallStateChanged (const std::shared_ptr &call, linphone::CallState state); + void handleCallStateChanged (const std::shared_ptr &call, linphone::Call::State state); void handleIsComposingChanged (const std::shared_ptr &chatRoom); void handleMessageReceived (const std::shared_ptr &message); diff --git a/src/components/contacts/ContactsListModel.cpp b/src/components/contacts/ContactsListModel.cpp index 5fca467b3..99fbb1d8c 100644 --- a/src/components/contacts/ContactsListModel.cpp +++ b/src/components/contacts/ContactsListModel.cpp @@ -140,7 +140,7 @@ ContactModel *ContactsListModel::addContact (VcardModel *vcardModel) { if ( mLinphoneFriends->addFriend(contact->mLinphoneFriend) != - linphone::FriendListStatus::FriendListStatusOK + linphone::FriendList::Status::OK ) { qWarning() << QStringLiteral("Unable to add contact from vcard:") << vcardModel; delete contact; diff --git a/src/components/core/CoreHandlers.cpp b/src/components/core/CoreHandlers.cpp index bd7bcb013..157193a56 100644 --- a/src/components/core/CoreHandlers.cpp +++ b/src/components/core/CoreHandlers.cpp @@ -88,12 +88,12 @@ void CoreHandlers::onAuthenticationRequested ( void CoreHandlers::onCallStateChanged ( const shared_ptr &, const shared_ptr &call, - linphone::CallState state, + linphone::Call::State state, const string & ) { emit callStateChanged(call, state); - if (call->getState() == linphone::CallStateIncomingReceived) + if (call->getState() == linphone::Call::State::IncomingReceived) App::getInstance()->getNotifier()->notifyReceivedCall(call); } @@ -110,7 +110,7 @@ void CoreHandlers::onGlobalStateChanged ( linphone::GlobalState gstate, const string & ) { - if (gstate == linphone::GlobalStateOn) { + if (gstate == linphone::GlobalState::On) { mCoreStartedLock->lock(); Q_ASSERT(mCoreStarted == false); @@ -130,7 +130,7 @@ void CoreHandlers::onIsComposingReceived ( void CoreHandlers::onLogCollectionUploadStateChanged ( const shared_ptr &, - linphone::CoreLogCollectionUploadState state, + linphone::Core::LogCollectionUploadState state, const string &info ) { emit logsUploadStateChanged(state, info); @@ -190,46 +190,46 @@ void CoreHandlers::onRegistrationStateChanged ( void CoreHandlers::onTransferStateChanged ( const shared_ptr &, const shared_ptr &call, - linphone::CallState state + linphone::Call::State state ) { switch (state) { - case linphone::CallStateEarlyUpdatedByRemote: - case linphone::CallStateEarlyUpdating: - case linphone::CallStateIdle: - case linphone::CallStateIncomingEarlyMedia: - case linphone::CallStateIncomingReceived: - case linphone::CallStateOutgoingEarlyMedia: - case linphone::CallStateOutgoingRinging: - case linphone::CallStatePaused: - case linphone::CallStatePausedByRemote: - case linphone::CallStatePausing: - case linphone::CallStateReferred: - case linphone::CallStateReleased: - case linphone::CallStateResuming: - case linphone::CallStateStreamsRunning: - case linphone::CallStateUpdatedByRemote: - case linphone::CallStateUpdating: + case linphone::Call::State::EarlyUpdatedByRemote: + case linphone::Call::State::EarlyUpdating: + case linphone::Call::State::Idle: + case linphone::Call::State::IncomingEarlyMedia: + case linphone::Call::State::IncomingReceived: + case linphone::Call::State::OutgoingEarlyMedia: + case linphone::Call::State::OutgoingRinging: + case linphone::Call::State::Paused: + case linphone::Call::State::PausedByRemote: + case linphone::Call::State::Pausing: + case linphone::Call::State::Referred: + case linphone::Call::State::Released: + case linphone::Call::State::Resuming: + case linphone::Call::State::StreamsRunning: + case linphone::Call::State::UpdatedByRemote: + case linphone::Call::State::Updating: break; // Nothing. // 1. Init. - case linphone::CallStateOutgoingInit: + case linphone::Call::State::OutgoingInit: qInfo() << QStringLiteral("Call transfer init."); break; // 2. In progress. - case linphone::CallStateOutgoingProgress: + case linphone::Call::State::OutgoingProgress: qInfo() << QStringLiteral("Call transfer in progress."); break; // 3. Done. - case linphone::CallStateConnected: + case linphone::Call::State::Connected: qInfo() << QStringLiteral("Call transfer succeeded."); emit callTransferSucceeded(call); break; // 4. Error. - case linphone::CallStateEnd: - case linphone::CallStateError: + case linphone::Call::State::End: + case linphone::Call::State::Error: qWarning() << QStringLiteral("Call transfer failed."); emit callTransferFailed(call); break; @@ -242,7 +242,7 @@ void CoreHandlers::onVersionUpdateCheckResultReceived ( const string &version, const string &url ) { - if (result == linphone::VersionUpdateCheckResultNewVersionAvailable) + if (result == linphone::VersionUpdateCheckResult::NewVersionAvailable) App::getInstance()->getNotifier()->notifyNewVersionAvailable( ::Utils::coreStringToAppString(version), ::Utils::coreStringToAppString(url) diff --git a/src/components/core/CoreHandlers.hpp b/src/components/core/CoreHandlers.hpp index 46305f05f..87dd810f3 100644 --- a/src/components/core/CoreHandlers.hpp +++ b/src/components/core/CoreHandlers.hpp @@ -42,12 +42,12 @@ public: signals: void authenticationRequested (const std::shared_ptr &authInfo); - void callStateChanged (const std::shared_ptr &call, linphone::CallState state); + void callStateChanged (const std::shared_ptr &call, linphone::Call::State state); void callTransferFailed (const std::shared_ptr &call); void callTransferSucceeded (const std::shared_ptr &call); void coreStarted (); void isComposingChanged (const std::shared_ptr &chatRoom); - void logsUploadStateChanged (linphone::CoreLogCollectionUploadState state, const std::string &info); + void logsUploadStateChanged (linphone::Core::LogCollectionUploadState state, const std::string &info); void messageReceived (const std::shared_ptr &message); void presenceReceived (const QString &sipAddress, const std::shared_ptr &presenceModel); void registrationStateChanged (const std::shared_ptr &proxyConfig, linphone::RegistrationState state); @@ -69,7 +69,7 @@ private: void onCallStateChanged ( const std::shared_ptr &core, const std::shared_ptr &call, - linphone::CallState state, + linphone::Call::State state, const std::string &message ) override; @@ -92,7 +92,7 @@ private: void onLogCollectionUploadStateChanged ( const std::shared_ptr &core, - linphone::CoreLogCollectionUploadState state, + linphone::Core::LogCollectionUploadState state, const std::string &info ) override; @@ -130,7 +130,7 @@ private: void onTransferStateChanged ( const std::shared_ptr &core, const std::shared_ptr &call, - linphone::CallState state + linphone::Call::State state ) override; void onVersionUpdateCheckResultReceived ( diff --git a/src/components/core/CoreManager.cpp b/src/components/core/CoreManager.cpp index 156e630d3..a740db8c4 100644 --- a/src/components/core/CoreManager.cpp +++ b/src/components/core/CoreManager.cpp @@ -253,13 +253,13 @@ void CoreManager::iterate () { // ----------------------------------------------------------------------------- -void CoreManager::handleLogsUploadStateChanged (linphone::CoreLogCollectionUploadState state, const string &info) { +void CoreManager::handleLogsUploadStateChanged (linphone::Core::LogCollectionUploadState state, const string &info) { switch (state) { - case linphone::CoreLogCollectionUploadStateInProgress: + case linphone::Core::LogCollectionUploadState::InProgress: break; - case linphone::CoreLogCollectionUploadStateDelivered: - case linphone::CoreLogCollectionUploadStateNotDelivered: + case linphone::Core::LogCollectionUploadState::Delivered: + case linphone::Core::LogCollectionUploadState::NotDelivered: emit logsUploaded(::Utils::coreStringToAppString(info)); break; } diff --git a/src/components/core/CoreManager.hpp b/src/components/core/CoreManager.hpp index b8474b9b4..8ada943bf 100644 --- a/src/components/core/CoreManager.hpp +++ b/src/components/core/CoreManager.hpp @@ -148,7 +148,7 @@ private: void iterate (); - void handleLogsUploadStateChanged (linphone::CoreLogCollectionUploadState state, const std::string &info); + void handleLogsUploadStateChanged (linphone::Core::LogCollectionUploadState state, const std::string &info); static QString getDownloadUrl (); diff --git a/src/components/presence/Presence.hpp b/src/components/presence/Presence.hpp index 7ff3958d6..2ad1bc678 100644 --- a/src/components/presence/Presence.hpp +++ b/src/components/presence/Presence.hpp @@ -36,10 +36,10 @@ class Presence : public QObject { public: enum PresenceStatus { - Online = linphone::ConsolidatedPresenceOnline, - Busy = linphone::ConsolidatedPresenceBusy, - DoNotDisturb = linphone::ConsolidatedPresenceDoNotDisturb, - Offline = linphone::ConsolidatedPresenceOffline + Online = int(linphone::ConsolidatedPresence::Online), + Busy = int(linphone::ConsolidatedPresence::Busy), + DoNotDisturb = int(linphone::ConsolidatedPresence::DoNotDisturb), + Offline = int(linphone::ConsolidatedPresence::Offline) }; Q_ENUM(PresenceStatus); diff --git a/src/components/settings/AccountSettingsModel.cpp b/src/components/settings/AccountSettingsModel.cpp index 048aa3613..b30ce7f9c 100644 --- a/src/components/settings/AccountSettingsModel.cpp +++ b/src/components/settings/AccountSettingsModel.cpp @@ -32,15 +32,15 @@ using namespace std; static inline AccountSettingsModel::RegistrationState mapLinphoneRegistrationStateToUi (linphone::RegistrationState state) { switch (state) { - case linphone::RegistrationStateNone: - case linphone::RegistrationStateCleared: - case linphone::RegistrationStateFailed: + case linphone::RegistrationState::None: + case linphone::RegistrationState::Cleared: + case linphone::RegistrationState::Failed: return AccountSettingsModel::RegistrationStateNotRegistered; - case linphone::RegistrationStateProgress: + case linphone::RegistrationState::Progress: return AccountSettingsModel::RegistrationStateInProgress; - case linphone::RegistrationStateOk: + case linphone::RegistrationState::Ok: break; } @@ -105,7 +105,7 @@ QVariantMap AccountSettingsModel::getProxyConfigDescription (const shared_ptr
  • getAvpfRrInterval(); map["registerEnabled"] = proxyConfig->registerEnabled(); map["publishPresence"] = proxyConfig->publishEnabled(); - map["avpfEnabled"] = proxyConfig->getAvpfMode() == linphone::AVPFMode::AVPFModeEnabled; + map["avpfEnabled"] = proxyConfig->getAvpfMode() == linphone::AVPFMode::Enabled; map["registrationState"] = ::mapLinphoneRegistrationStateToUi(proxyConfig->getState()); return map; @@ -168,8 +168,8 @@ bool AccountSettingsModel::addOrUpdateProxyConfig ( proxyConfig->enableRegister(data["registerEnabled"].toBool()); proxyConfig->enablePublish(data["publishPresence"].toBool()); proxyConfig->setAvpfMode(data["avpfEnabled"].toBool() - ? linphone::AVPFMode::AVPFModeEnabled - : linphone::AVPFMode::AVPFModeDefault + ? linphone::AVPFMode::Enabled + : linphone::AVPFMode::Default ); return addOrUpdateProxyConfig(proxyConfig); diff --git a/src/components/settings/SettingsModel.cpp b/src/components/settings/SettingsModel.cpp index 848cd86ab..10fb7846b 100644 --- a/src/components/settings/SettingsModel.cpp +++ b/src/components/settings/SettingsModel.cpp @@ -306,13 +306,13 @@ QVariantList SettingsModel::getSupportedMediaEncryptions () const { shared_ptr core = CoreManager::getInstance()->getCore(); QVariantList list; - if (core->mediaEncryptionSupported(linphone::MediaEncryptionDTLS)) + if (core->mediaEncryptionSupported(linphone::MediaEncryption::DTLS)) list << ::buildEncryptionDescription(MediaEncryptionDtls, "DTLS"); - if (core->mediaEncryptionSupported(linphone::MediaEncryptionSRTP)) + if (core->mediaEncryptionSupported(linphone::MediaEncryption::SRTP)) list << ::buildEncryptionDescription(MediaEncryptionSrtp, "SRTP"); - if (core->mediaEncryptionSupported(linphone::MediaEncryptionZRTP)) + if (core->mediaEncryptionSupported(linphone::MediaEncryption::ZRTP)) list << ::buildEncryptionDescription(MediaEncryptionZrtp, "ZRTP"); return list; diff --git a/src/components/settings/SettingsModel.hpp b/src/components/settings/SettingsModel.hpp index 686da9a41..c8f288973 100644 --- a/src/components/settings/SettingsModel.hpp +++ b/src/components/settings/SettingsModel.hpp @@ -132,18 +132,18 @@ class SettingsModel : public QObject { public: enum MediaEncryption { - MediaEncryptionNone = linphone::MediaEncryptionNone, - MediaEncryptionDtls = linphone::MediaEncryptionDTLS, - MediaEncryptionSrtp = linphone::MediaEncryptionSRTP, - MediaEncryptionZrtp = linphone::MediaEncryptionZRTP + MediaEncryptionNone = int(linphone::MediaEncryption::None), + MediaEncryptionDtls = int(linphone::MediaEncryption::DTLS), + MediaEncryptionSrtp = int(linphone::MediaEncryption::SRTP), + MediaEncryptionZrtp = int(linphone::MediaEncryption::ZRTP) }; Q_ENUM(MediaEncryption); enum LimeState { - LimeStateDisabled = linphone::LimeStateDisabled, - LimeStateMandatory = linphone::LimeStateMandatory, - LimeStatePreferred = linphone::LimeStatePreferred + LimeStateDisabled = int(linphone::LimeState::Disabled), + LimeStateMandatory = int(linphone::LimeState::Mandatory), + LimeStatePreferred = int(linphone::LimeState::Preferred) }; Q_ENUM(LimeState); diff --git a/src/components/sip-addresses/SipAddressesModel.cpp b/src/components/sip-addresses/SipAddressesModel.cpp index 64a46c33d..a3921fdd0 100644 --- a/src/components/sip-addresses/SipAddressesModel.cpp +++ b/src/components/sip-addresses/SipAddressesModel.cpp @@ -136,13 +136,13 @@ QString SipAddressesModel::getTransportFromSipAddress (const QString &sipAddress return QString(""); switch (address->getTransport()) { - case linphone::TransportTypeUdp: + case linphone::TransportType::Udp: return QStringLiteral("UDP"); - case linphone::TransportTypeTcp: + case linphone::TransportType::Tcp: return QStringLiteral("TCP"); - case linphone::TransportTypeTls: + case linphone::TransportType::Tls: return QStringLiteral("TLS"); - case linphone::TransportTypeDtls: + case linphone::TransportType::Dtls: return QStringLiteral("DTLS"); } @@ -278,13 +278,13 @@ void SipAddressesModel::handleMessageReceived (const shared_ptr &call, - linphone::CallState state + linphone::Call::State state ) { // Ignore aborted calls. - if (call->getCallLog()->getStatus() == linphone::CallStatus::CallStatusAborted) + if (call->getCallLog()->getStatus() == linphone::Call::Status::Aborted) return; - if (state == linphone::CallStateEnd || state == linphone::CallStateError) + if (state == linphone::Call::State::End || state == linphone::Call::State::Error) addOrUpdateSipAddress( ::Utils::coreStringToAppString(call->getRemoteAddress()->asStringUriOnly()), call ); @@ -297,16 +297,16 @@ void SipAddressesModel::handlePresenceReceived ( Presence::PresenceStatus status; switch (presenceModel->getConsolidatedPresence()) { - case linphone::ConsolidatedPresenceOnline: + case linphone::ConsolidatedPresence::Online: status = Presence::PresenceStatus::Online; break; - case linphone::ConsolidatedPresenceBusy: + case linphone::ConsolidatedPresence::Busy: status = Presence::PresenceStatus::Busy; break; - case linphone::ConsolidatedPresenceDoNotDisturb: + case linphone::ConsolidatedPresence::DoNotDisturb: status = Presence::PresenceStatus::DoNotDisturb; break; - case linphone::ConsolidatedPresenceOffline: + case linphone::ConsolidatedPresence::Offline: status = Presence::PresenceStatus::Offline; break; } @@ -392,7 +392,7 @@ void SipAddressesModel::addOrUpdateSipAddress (QVariantMap &map, ContactModel *c void SipAddressesModel::addOrUpdateSipAddress (QVariantMap &map, const shared_ptr &call) { const shared_ptr callLog = call->getCallLog(); - map["timestamp"] = callLog->getStatus() == linphone::CallStatus::CallStatusSuccess + map["timestamp"] = callLog->getStatus() == linphone::Call::Status::Success ? QDateTime::fromMSecsSinceEpoch((callLog->getStartDate() + callLog->getDuration()) * 1000) : QDateTime::fromMSecsSinceEpoch(callLog->getStartDate() * 1000); } @@ -492,7 +492,7 @@ void SipAddressesModel::initSipAddresses () { if (addressDone.contains(sipAddress)) continue; // Already used. - if (callLog->getStatus() == linphone::CallStatusAborted) + if (callLog->getStatus() == linphone::Call::Status::Aborted) continue; // Ignore aborted calls. addressDone << sipAddress; @@ -501,7 +501,7 @@ void SipAddressesModel::initSipAddresses () { map["sipAddress"] = sipAddress; // The duration can be wrong if status is not success. - map["timestamp"] = callLog->getStatus() == linphone::CallStatus::CallStatusSuccess + map["timestamp"] = callLog->getStatus() == linphone::Call::Status::Success ? QDateTime::fromMSecsSinceEpoch((callLog->getStartDate() + callLog->getDuration()) * 1000) : QDateTime::fromMSecsSinceEpoch(callLog->getStartDate() * 1000); diff --git a/src/components/sip-addresses/SipAddressesModel.hpp b/src/components/sip-addresses/SipAddressesModel.hpp index a22cfeacf..0aaefd2b8 100644 --- a/src/components/sip-addresses/SipAddressesModel.hpp +++ b/src/components/sip-addresses/SipAddressesModel.hpp @@ -81,7 +81,7 @@ private: void handleSipAddressRemoved (ContactModel *contact, const QString &sipAddress); void handleMessageReceived (const std::shared_ptr &message); - void handleCallStateChanged (const std::shared_ptr &call, linphone::CallState state); + void handleCallStateChanged (const std::shared_ptr &call, linphone::Call::State state); void handlePresenceReceived (const QString &sipAddress, const std::shared_ptr &presenceModel); void handleAllEntriesRemoved (const QString &sipAddress); diff --git a/src/utils/LinphoneUtils.cpp b/src/utils/LinphoneUtils.cpp index d8ec7a433..3e0bd335d 100644 --- a/src/utils/LinphoneUtils.cpp +++ b/src/utils/LinphoneUtils.cpp @@ -26,11 +26,11 @@ linphone::TransportType LinphoneUtils::stringToTransportType (const QString &transport) { if (transport == "TCP") - return linphone::TransportType::TransportTypeTcp; + return linphone::TransportType::Tcp; if (transport == "UDP") - return linphone::TransportType::TransportTypeUdp; + return linphone::TransportType::Udp; if (transport == "TLS") - return linphone::TransportType::TransportTypeTls; + return linphone::TransportType::Tls; - return linphone::TransportType::TransportTypeDtls; + return linphone::TransportType::Dtls; } diff --git a/submodules/linphone b/submodules/linphone index 1ca73da1c..bff2f9a26 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1ca73da1cf180f39204df9179d44e5a0baf620ec +Subproject commit bff2f9a26f46607d7c24128ff045817ec1ce3a29 From 62a7488bcbf1de1c8950f95732238213c6c8a8a6 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Tue, 6 Feb 2018 17:16:23 +0100 Subject: [PATCH 21/60] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index bff2f9a26..7d621c5bd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bff2f9a26f46607d7c24128ff045817ec1ce3a29 +Subproject commit 7d621c5bd1e9e7f76ffeb90a0ad0f882b88efb92 From e9f6d88b1c60af2a52322ecf225d455a7fe9f4e8 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 6 Feb 2018 18:15:16 +0100 Subject: [PATCH 22/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7d621c5bd..9760d1e80 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7d621c5bd1e9e7f76ffeb90a0ad0f882b88efb92 +Subproject commit 9760d1e808a874e204853088348adac9cc26570e From a63f1dcfe05c67c8ad1de3cbac766f148802fa4c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 7 Feb 2018 17:18:20 +0100 Subject: [PATCH 23/60] update linphone sub --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 9760d1e80..655f5912a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9760d1e808a874e204853088348adac9cc26570e +Subproject commit 655f5912a5550fd04ed7d2317a555545f6a4fd97 From 1bbb815875f6643e46025452d943df65e5d410b7 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 8 Feb 2018 17:29:04 +0100 Subject: [PATCH 24/60] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 655f5912a..6cc3fb27d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 655f5912a5550fd04ed7d2317a555545f6a4fd97 +Subproject commit 6cc3fb27dba032b7519a195795c0eb26b8945345 From c44f4dd8843f7c43e02608cd639442c4cb8f1095 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 9 Feb 2018 14:26:33 +0100 Subject: [PATCH 25/60] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 6cc3fb27d..a19e50539 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 6cc3fb27dba032b7519a195795c0eb26b8945345 +Subproject commit a19e505394b60255890e9983c2f6a47109c87d0b From 1e6608ca951ec19e718f658542069a9a0e1e8d86 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 9 Feb 2018 16:50:33 +0100 Subject: [PATCH 26/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index a19e50539..ace638771 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a19e505394b60255890e9983c2f6a47109c87d0b +Subproject commit ace638771e22798fb1a74ccb546aec1e59a847b6 From 3b7ffa7d822fc01f4e44ec573ad271282ef8a439 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 12 Feb 2018 18:07:31 +0100 Subject: [PATCH 27/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index ace638771..8c9164a5e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ace638771e22798fb1a74ccb546aec1e59a847b6 +Subproject commit 8c9164a5eb0331756a4c8c802f887146e033d2b8 From 218b77780842a449e0eedf61a9470b17f34f7f6f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 13 Feb 2018 09:59:38 +0100 Subject: [PATCH 28/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 8c9164a5e..57687e1b9 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 8c9164a5eb0331756a4c8c802f887146e033d2b8 +Subproject commit 57687e1b99972dccd0d2d449e7213ff2da126597 From a84d44c27ac83a1c51ce5d9903c0418e92946fa3 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 13 Feb 2018 10:32:12 +0100 Subject: [PATCH 29/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 57687e1b9..2f39f845d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 57687e1b99972dccd0d2d449e7213ff2da126597 +Subproject commit 2f39f845d57d37b6c2b86ad323786fed8874158d From b08bda2e468bb87b339a38effe5bbf8254a8acd1 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 14 Feb 2018 18:11:27 +0100 Subject: [PATCH 30/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 2f39f845d..91bce6e69 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2f39f845d57d37b6c2b86ad323786fed8874158d +Subproject commit 91bce6e69561a03831d9ecfc77f647e2e67f6cb4 From f0d96dfbed41190ac03f4ca191f7a2c47a85e84f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 15 Feb 2018 10:45:58 +0100 Subject: [PATCH 31/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 91bce6e69..1cfd80573 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 91bce6e69561a03831d9ecfc77f647e2e67f6cb4 +Subproject commit 1cfd80573168ed46153cd3eba854c268159323e9 From 7176bd2ca070de723642c492e48baffbd78389c8 Mon Sep 17 00:00:00 2001 From: Wescoeur Date: Tue, 20 Feb 2018 00:37:25 +0100 Subject: [PATCH 32/60] chore(submodules): update bctoolbox, belle-sip, bzrtp, cmake-builder, linphone, mediastreamer2 and ortp --- submodules/bctoolbox | 2 +- submodules/belle-sip | 2 +- submodules/bzrtp | 2 +- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- submodules/ortp | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 01ec217fb..e34db6796 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 01ec217fbf84c7488afbe36913d4fde5d783b10a +Subproject commit e34db6796ade971615d4b572bda87d9f699ea497 diff --git a/submodules/belle-sip b/submodules/belle-sip index 3da1dd118..9dbf913f4 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 3da1dd118e466c27ffade5af16528dfca145031b +Subproject commit 9dbf913f44db7d7b7157e32272b0ec64f07037bb diff --git a/submodules/bzrtp b/submodules/bzrtp index 41b2163c8..0dc85788d 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit 41b2163c865fed835abc013ecaa25267fa2b1d63 +Subproject commit 0dc85788df6ef10e8dda6a69d1c8746e14d95c01 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index f1d409b39..e2fe49c93 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit f1d409b39e0ea10018db012d34a4ce914bd7cbc0 +Subproject commit e2fe49c934beb86505391bc39189e1d5cc8e2b8b diff --git a/submodules/linphone b/submodules/linphone index 1cfd80573..3ba718de5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1cfd80573168ed46153cd3eba854c268159323e9 +Subproject commit 3ba718de5f92fa2d3d5bb034e28229f92796a675 diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 2f6d8916f..e20c2ed9a 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 2f6d8916f6fbf81aa25e9b274330aca10da500c5 +Subproject commit e20c2ed9a7397e5d6cc9ed4cbf3539761ae35111 diff --git a/submodules/ortp b/submodules/ortp index 6028a16e6..f680edf45 160000 --- a/submodules/ortp +++ b/submodules/ortp @@ -1 +1 @@ -Subproject commit 6028a16e6889f5906fcdd745b174cc512b7c9915 +Subproject commit f680edf45368746987ece42dd0a1ca49c1b1b57e From 912b67616c6a7d4934e3671ffc929d843761b0ef Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Fri, 23 Feb 2018 10:46:07 +0100 Subject: [PATCH 33/60] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 3ba718de5..7bf0554a1 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3ba718de5f92fa2d3d5bb034e28229f92796a675 +Subproject commit 7bf0554a17a8fd7fdaec6df7d2b0a6c12bd76536 From 593055be5d71ea853ba68f1387eb24038d9cc47b Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Tue, 27 Feb 2018 10:49:05 +0100 Subject: [PATCH 34/60] fix(CoreManager): avoid in getChatModelFromSipAddress when migration chat room is used --- src/components/core/CoreManager.cpp | 17 ++++++++++------- src/components/core/CoreManager.hpp | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/components/core/CoreManager.cpp b/src/components/core/CoreManager.cpp index a740db8c4..9ec2caab2 100644 --- a/src/components/core/CoreManager.cpp +++ b/src/components/core/CoreManager.cpp @@ -94,15 +94,18 @@ shared_ptr CoreManager::getChatModelFromSipAddress (const QString &si // Create a new chat model. if (!mChatModels.contains(sipAddress)) { - Q_ASSERT(mCore->createAddress(::Utils::appStringToCoreString(sipAddress)) != nullptr); + Q_CHECK_PTR(mCore->createAddress(::Utils::appStringToCoreString(sipAddress))); - auto deleter = [this](ChatModel *chatModel) { - mChatModels.remove(chatModel->getSipAddress()); - delete chatModel; - }; + // Don't use chatModel->getSipAddress() in lambda. + // If it is a migration chat room the chat room sip address can be changed!!! + auto deleter = [this, sipAddress](ChatModel *chatModel) { + bool removed = mChatModels.remove(sipAddress); + Q_ASSERT(removed); + delete chatModel; + }; shared_ptr chatModel(new ChatModel(sipAddress), deleter); - mChatModels[chatModel->getSipAddress()] = chatModel; + mChatModels[sipAddress] = chatModel; emit chatModelCreated(chatModel); @@ -111,7 +114,7 @@ shared_ptr CoreManager::getChatModelFromSipAddress (const QString &si // Returns an existing chat model. shared_ptr chatModel = mChatModels[sipAddress].lock(); - Q_CHECK_PTR(chatModel.get()); + Q_CHECK_PTR(chatModel); return chatModel; } diff --git a/src/components/core/CoreManager.hpp b/src/components/core/CoreManager.hpp index 8ada943bf..d8f5f2e64 100644 --- a/src/components/core/CoreManager.hpp +++ b/src/components/core/CoreManager.hpp @@ -163,7 +163,7 @@ private: SettingsModel *mSettingsModel = nullptr; AccountSettingsModel *mAccountSettingsModel = nullptr; - QHash > mChatModels; + QHash> mChatModels; QTimer *mCbsTimer = nullptr; From ddb0b1a9f5de643a0fd3bdfc2c1088c00e8eee6f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 27 Feb 2018 17:26:04 +0100 Subject: [PATCH 35/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7bf0554a1..7d491f868 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7bf0554a17a8fd7fdaec6df7d2b0a6c12bd76536 +Subproject commit 7d491f8689f0b3a590dde24151f7696045fa95d5 From 6fac5a0e43a4d3642756490901208ba2694f57dd Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 28 Feb 2018 19:08:04 +0100 Subject: [PATCH 36/60] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7d491f868..d440dfd3f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7d491f8689f0b3a590dde24151f7696045fa95d5 +Subproject commit d440dfd3fdf2e2eee4c420725f03af668f5d1cfa From df55e620ebd521543b71bb4728e6599c63380e53 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Thu, 1 Mar 2018 11:52:22 +0100 Subject: [PATCH 37/60] chore(submodules): update belle-sip and linphone --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 9dbf913f4..7aeebbb83 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 9dbf913f44db7d7b7157e32272b0ec64f07037bb +Subproject commit 7aeebbb8387bb8de943caded23cd23bb78b6a58b diff --git a/submodules/linphone b/submodules/linphone index d440dfd3f..1ad9a0789 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d440dfd3fdf2e2eee4c420725f03af668f5d1cfa +Subproject commit 1ad9a0789fb6fd80177c043d012bd8acaf7eb01a From cbff8b8bd1e7e9ef3a03a00ea15f1f43ea849844 Mon Sep 17 00:00:00 2001 From: Erwan Croze Date: Fri, 2 Mar 2018 11:25:46 +0100 Subject: [PATCH 38/60] Update submodule linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 1ad9a0789..a23391a05 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1ad9a0789fb6fd80177c043d012bd8acaf7eb01a +Subproject commit a23391a0567f4612545c2bbe81e90ff9855186c1 From 98f67d87086f922e21c665f1c3c6058cbed787cf Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 2 Mar 2018 17:34:03 +0100 Subject: [PATCH 39/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index a23391a05..7c239c8ec 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a23391a0567f4612545c2bbe81e90ff9855186c1 +Subproject commit 7c239c8ec4aa1c0006a1204112e93e272c8ca5a5 From 93a098adcf51b1c56ab0af8676be376842489dd9 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 5 Mar 2018 13:32:36 +0100 Subject: [PATCH 40/60] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7c239c8ec..77fec544b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7c239c8ec4aa1c0006a1204112e93e272c8ca5a5 +Subproject commit 77fec544bdbfc11f44a12e1777525e5458dfd300 From d8b4ae8cd30c2ff7d4fc3148abd32293210e7e85 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 7 Mar 2018 16:49:21 +0100 Subject: [PATCH 41/60] chore(submodules): update linphone & belle-sip --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 7aeebbb83..2d4085354 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7aeebbb8387bb8de943caded23cd23bb78b6a58b +Subproject commit 2d4085354443598d59d43168e16e47e4d34e0ca3 diff --git a/submodules/linphone b/submodules/linphone index 77fec544b..cff45b8c1 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 77fec544bdbfc11f44a12e1777525e5458dfd300 +Subproject commit cff45b8c13d97ebad4bdde51c55815b9e3d4066e From 204af7f573f5c923f3b3b4a842543cd50fe87da4 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 7 Mar 2018 17:17:02 +0100 Subject: [PATCH 42/60] update linphone & belle-sip --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index cff45b8c1..18d0c4ad2 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit cff45b8c13d97ebad4bdde51c55815b9e3d4066e +Subproject commit 18d0c4ad209986afeba500e8013c11782b1bf32c From 4956de7b1d5cf77db379a9e4be653d68ee0683a2 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 7 Mar 2018 17:50:11 +0100 Subject: [PATCH 43/60] chore(submodules): update belr & linphone --- submodules/belr | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belr b/submodules/belr index 565666f6c..18abde9e4 160000 --- a/submodules/belr +++ b/submodules/belr @@ -1 +1 @@ -Subproject commit 565666f6c59eaa9b6cecffe0ae7e2d2e391c0647 +Subproject commit 18abde9e43e8f98e22c09afee3e089c4e7691173 diff --git a/submodules/linphone b/submodules/linphone index 18d0c4ad2..49e1af1f7 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 18d0c4ad209986afeba500e8013c11782b1bf32c +Subproject commit 49e1af1f758dbb7b33debd4faea8ce976c473f98 From b94193110a6a685cbbf8a95e1cf932eb1cf1740c Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 9 Mar 2018 10:30:05 +0100 Subject: [PATCH 44/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 49e1af1f7..b9eaf0a7e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 49e1af1f758dbb7b33debd4faea8ce976c473f98 +Subproject commit b9eaf0a7e9d35487dfb3bd83fde1fe106d8a8dba From 6852484c2f4f628e85f15008832a09f66017011b Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 13 Mar 2018 14:12:40 +0100 Subject: [PATCH 45/60] Update belle-sip and linphone submodules. --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 2d4085354..4a7fb340f 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 2d4085354443598d59d43168e16e47e4d34e0ca3 +Subproject commit 4a7fb340f4cb46984cf222c7a8527af03d508192 diff --git a/submodules/linphone b/submodules/linphone index b9eaf0a7e..ead7221c9 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b9eaf0a7e9d35487dfb3bd83fde1fe106d8a8dba +Subproject commit ead7221c9762a8bfdd3e0dfa9b7b0655284465d9 From d1b25b2d64d87e4a3bf5e6c01b033897a41be4f6 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 13 Mar 2018 15:17:25 +0100 Subject: [PATCH 46/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index ead7221c9..94ce0fa25 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ead7221c9762a8bfdd3e0dfa9b7b0655284465d9 +Subproject commit 94ce0fa252204a27bfc90ebb0c1cf60337f82208 From 65f378530dd9d930aca1f9b707b50f27dc64217a Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 13 Mar 2018 17:30:22 +0100 Subject: [PATCH 47/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 94ce0fa25..61c79b43e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 94ce0fa252204a27bfc90ebb0c1cf60337f82208 +Subproject commit 61c79b43e0fc46cf4429d3b699956d2b679d65a4 From 5d294e4ce24d62b45cfdf461fbcb950c11642e55 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 14 Mar 2018 08:22:10 +0100 Subject: [PATCH 48/60] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 61c79b43e..261b0f195 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 61c79b43e0fc46cf4429d3b699956d2b679d65a4 +Subproject commit 261b0f195adef14020c782a1abf2738cd6759959 From 49c42cfa5bae103af2402e4ef6be0e91bf4a9bd7 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 14 Mar 2018 10:32:11 +0100 Subject: [PATCH 49/60] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 261b0f195..e620b432b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 261b0f195adef14020c782a1abf2738cd6759959 +Subproject commit e620b432b20e6337b6a638b7a52234b793974ecf From 2fa85262ee3e66b58d3273d3127e25a4fde4d784 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 14 Mar 2018 18:17:29 +0100 Subject: [PATCH 50/60] Update cmake-builder submodule. --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index e2fe49c93..26600085a 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit e2fe49c934beb86505391bc39189e1d5cc8e2b8b +Subproject commit 26600085af0b150a77a390379070f6ee0a31cb23 From a4f44e3e28450eb3ee83bad3ca50d59e481f40b5 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 14 Mar 2018 18:17:40 +0100 Subject: [PATCH 51/60] Handle Clang sanitizer tools in linphoneqt builder. --- cmake_builder/linphoneqt.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake_builder/linphoneqt.cmake b/cmake_builder/linphoneqt.cmake index b8bceced4..b4c6e1521 100644 --- a/cmake_builder/linphoneqt.cmake +++ b/cmake_builder/linphoneqt.cmake @@ -24,6 +24,7 @@ lcb_external_source_paths("..") lcb_dependencies("linphone" "ms2plugins") lcb_groupable(YES) +lcb_sanitizable(YES) lcb_package_source(YES) lcb_cmake_options("-DENABLE_UPDATE_CHECK=${ENABLE_UPDATE_CHECK}") From f682466a7c27ce3b8f93208f10831c9c2e480a94 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 14 Mar 2018 18:19:28 +0100 Subject: [PATCH 52/60] Update belle-sip and linphone submodule. --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 4a7fb340f..b5dc97624 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 4a7fb340f4cb46984cf222c7a8527af03d508192 +Subproject commit b5dc976246121b3785b3fa918625c073dffe5242 diff --git a/submodules/linphone b/submodules/linphone index e620b432b..09025ed3c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e620b432b20e6337b6a638b7a52234b793974ecf +Subproject commit 09025ed3c894d2b3dd3f601dceccdbe32d1305e4 From c42a362ce99dba5898617938d552c6309a8bf0fd Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 15 Mar 2018 08:59:06 +0100 Subject: [PATCH 53/60] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 09025ed3c..7c27d3c9b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 09025ed3c894d2b3dd3f601dceccdbe32d1305e4 +Subproject commit 7c27d3c9bc2fa468e61683055eb7867d216d5b3a From ff5caef02c8ba1423230433e35bfe4c8f691eb94 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 15 Mar 2018 10:50:42 +0100 Subject: [PATCH 54/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7c27d3c9b..5c2669970 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7c27d3c9bc2fa468e61683055eb7867d216d5b3a +Subproject commit 5c2669970fc341e6c97cc3f6e2eb7ca766de2bd7 From ea72767c59e6f160977db54f275315b00213785a Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 16 Mar 2018 15:29:46 +0100 Subject: [PATCH 55/60] Updated linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 5c2669970..eb6713b68 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 5c2669970fc341e6c97cc3f6e2eb7ca766de2bd7 +Subproject commit eb6713b68d23ffc51e1d31511ceac4c0b0b82a91 From b3409c501465c3250919e11e30cf138c703d20b5 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 19 Mar 2018 14:31:55 +0100 Subject: [PATCH 56/60] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index eb6713b68..dc4f2a155 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit eb6713b68d23ffc51e1d31511ceac4c0b0b82a91 +Subproject commit dc4f2a155b37174912070d7e60135ada60659317 From f053a1b46ba6cf5b2096c932b97b9feb9a2fd2c4 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 19 Mar 2018 16:35:38 +0100 Subject: [PATCH 57/60] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index dc4f2a155..174f5f570 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit dc4f2a155b37174912070d7e60135ada60659317 +Subproject commit 174f5f570a9bfd43d3b946c3379f851ad736b1ea From adf13edfff9a726d85982500906e480445b91a3b Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 19 Mar 2018 17:10:41 +0100 Subject: [PATCH 58/60] update linphone and ms2 --- submodules/linphone | 2 +- submodules/mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/linphone b/submodules/linphone index 174f5f570..4eb83a7b8 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 174f5f570a9bfd43d3b946c3379f851ad736b1ea +Subproject commit 4eb83a7b82b6dc9d474ca2901c0b37f75cfe185a diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index e20c2ed9a..f49b3d5ea 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit e20c2ed9a7397e5d6cc9ed4cbf3539761ae35111 +Subproject commit f49b3d5ea3ab56b4b021a760a58f44015b3c5765 From d64b632f9a5f1cdc893b4c40fa5217556b75f510 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 19 Mar 2018 17:56:14 +0100 Subject: [PATCH 59/60] update ms2 --- submodules/mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index f49b3d5ea..682f3b4a2 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit f49b3d5ea3ab56b4b021a760a58f44015b3c5765 +Subproject commit 682f3b4a241cd6cdf552db3af100710075d8c973 From 14bd842ec398f0939b32d9970726995b8fb137c3 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 20 Mar 2018 15:03:14 +0100 Subject: [PATCH 60/60] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 4eb83a7b8..95abefb81 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 4eb83a7b82b6dc9d474ca2901c0b37f75cfe185a +Subproject commit 95abefb81a3a45f86971158ee8b75a79fd5f5593