From 3846adfecca02d77eb71e2795892b24816ec798b Mon Sep 17 00:00:00 2001 From: trilene Date: Fri, 5 Mar 2021 20:08:41 -0500 Subject: [PATCH 1/2] Bump mtxclient --- CMakeLists.txt | 2 +- src/CallManager.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2650dbfc..b4f63953 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -359,7 +359,7 @@ if(USE_BUNDLED_MTXCLIENT) FetchContent_Declare( MatrixClient GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git - GIT_TAG 004d4203ceb441239aafb17e1340cd063139d029 + GIT_TAG 53f8883a15649adb798b1f5e73671c84f68e3274 ) set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") diff --git a/src/CallManager.cpp b/src/CallManager.cpp index 45d41ace..6d41f1c6 100644 --- a/src/CallManager.cpp +++ b/src/CallManager.cpp @@ -64,8 +64,8 @@ CallManager::CallManager(QObject *parent) this, [this](const std::string &sdp, const std::vector &candidates) { nhlog::ui()->debug("WebRTC: call id: {} - sending offer", callid_); - emit newMessage(roomid_, CallInvite{callid_, sdp, 0, timeoutms_}); - emit newMessage(roomid_, CallCandidates{callid_, candidates, 0}); + emit newMessage(roomid_, CallInvite{callid_, sdp, "0", timeoutms_}); + emit newMessage(roomid_, CallCandidates{callid_, candidates, "0"}); std::string callid(callid_); QTimer::singleShot(timeoutms_, this, [this, callid]() { if (session_.state() == webrtc::State::OFFERSENT && callid == callid_) { @@ -82,8 +82,8 @@ CallManager::CallManager(QObject *parent) this, [this](const std::string &sdp, const std::vector &candidates) { nhlog::ui()->debug("WebRTC: call id: {} - sending answer", callid_); - emit newMessage(roomid_, CallAnswer{callid_, sdp, 0}); - emit newMessage(roomid_, CallCandidates{callid_, candidates, 0}); + emit newMessage(roomid_, CallAnswer{callid_, sdp, "0"}); + emit newMessage(roomid_, CallCandidates{callid_, candidates, "0"}); }); connect(&session_, @@ -91,7 +91,7 @@ CallManager::CallManager(QObject *parent) this, [this](const CallCandidates::Candidate &candidate) { nhlog::ui()->debug("WebRTC: call id: {} - sending ice candidate", callid_); - emit newMessage(roomid_, CallCandidates{callid_, {candidate}, 0}); + emit newMessage(roomid_, CallCandidates{callid_, {candidate}, "0"}); }); connect(&turnServerTimer_, &QTimer::timeout, this, &CallManager::retrieveTurnServer); @@ -238,7 +238,7 @@ CallManager::hangUp(CallHangUp::Reason reason) if (!callid_.empty()) { nhlog::ui()->debug( "WebRTC: call id: {} - hanging up ({})", callid_, callHangUpReasonString(reason)); - emit newMessage(roomid_, CallHangUp{callid_, 0, reason}); + emit newMessage(roomid_, CallHangUp{callid_, "0", reason}); endCall(); } } @@ -291,7 +291,7 @@ CallManager::handleEvent(const RoomEvent &callInviteEvent) if (isOnCall() || roomInfo.member_count != 2) { emit newMessage(QString::fromStdString(callInviteEvent.room_id), CallHangUp{callInviteEvent.content.call_id, - 0, + "0", CallHangUp::Reason::InviteTimeOut}); return; } From 52b38abd08e7c746f6303878de29e5f04c5c36e4 Mon Sep 17 00:00:00 2001 From: trilene Date: Fri, 5 Mar 2021 21:24:00 -0500 Subject: [PATCH 2/2] Bump mtxclient --- io.github.NhekoReborn.Nheko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.github.NhekoReborn.Nheko.json b/io.github.NhekoReborn.Nheko.json index aa200f1d..1794f92f 100644 --- a/io.github.NhekoReborn.Nheko.json +++ b/io.github.NhekoReborn.Nheko.json @@ -220,7 +220,7 @@ "name": "mtxclient", "sources": [ { - "commit": "004d4203ceb441239aafb17e1340cd063139d029", + "commit": "53f8883a15649adb798b1f5e73671c84f68e3274", "type": "git", "url": "https://github.com/Nheko-Reborn/mtxclient.git" }