d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-26 21:18:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #509 from trilene/master

Browse source 
Bump mtxclient
This commit is contained in:
DeepBlueV7.X 2021-03-06 03:27:22 +00:00 committed by GitHub
commit 22071f4ff7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -359,7 +359,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare( FetchContent_Declare(
MatrixClient MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git 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_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")

2
io.github.NhekoReborn.Nheko.json
View file

@ -220,7 +220,7 @@
"name": "mtxclient", "name": "mtxclient",
"sources": [ "sources": [
{ {
"commit": "004d4203ceb441239aafb17e1340cd063139d029", "commit": "53f8883a15649adb798b1f5e73671c84f68e3274",
"type": "git", "type": "git",
"url": "https://github.com/Nheko-Reborn/mtxclient.git" "url": "https://github.com/Nheko-Reborn/mtxclient.git"
} }

14
src/CallManager.cpp
View file

@ -64,8 +64,8 @@ CallManager::CallManager(QObject *parent)
this, this,
[this](const std::string &sdp, const std::vector<CallCandidates::Candidate> &candidates) { [this](const std::string &sdp, const std::vector<CallCandidates::Candidate> &candidates) {
nhlog::ui()->debug("WebRTC: call id: {} - sending offer", callid_); nhlog::ui()->debug("WebRTC: call id: {} - sending offer", callid_);
emit newMessage(roomid_, CallInvite{callid_, sdp, 0, timeoutms_}); emit newMessage(roomid_, CallInvite{callid_, sdp, "0", timeoutms_});
emit newMessage(roomid_, CallCandidates{callid_, candidates, 0}); emit newMessage(roomid_, CallCandidates{callid_, candidates, "0"});
std::string callid(callid_); std::string callid(callid_);
QTimer::singleShot(timeoutms_, this, [this, callid]() { QTimer::singleShot(timeoutms_, this, [this, callid]() {
if (session_.state() == webrtc::State::OFFERSENT && callid == callid_) { if (session_.state() == webrtc::State::OFFERSENT && callid == callid_) {
@ -82,8 +82,8 @@ CallManager::CallManager(QObject *parent)
this, this,
[this](const std::string &sdp, const std::vector<CallCandidates::Candidate> &candidates) { [this](const std::string &sdp, const std::vector<CallCandidates::Candidate> &candidates) {
nhlog::ui()->debug("WebRTC: call id: {} - sending answer", callid_); nhlog::ui()->debug("WebRTC: call id: {} - sending answer", callid_);
emit newMessage(roomid_, CallAnswer{callid_, sdp, 0}); emit newMessage(roomid_, CallAnswer{callid_, sdp, "0"});
emit newMessage(roomid_, CallCandidates{callid_, candidates, 0}); emit newMessage(roomid_, CallCandidates{callid_, candidates, "0"});
}); });
connect(&session_, connect(&session_,
@ -91,7 +91,7 @@ CallManager::CallManager(QObject *parent)
this, this,
[this](const CallCandidates::Candidate &candidate) { [this](const CallCandidates::Candidate &candidate) {
nhlog::ui()->debug("WebRTC: call id: {} - sending ice candidate", callid_); 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); connect(&turnServerTimer_, &QTimer::timeout, this, &CallManager::retrieveTurnServer);
@ -238,7 +238,7 @@ CallManager::hangUp(CallHangUp::Reason reason)
if (!callid_.empty()) { if (!callid_.empty()) {
nhlog::ui()->debug( nhlog::ui()->debug(
"WebRTC: call id: {} - hanging up ({})", callid_, callHangUpReasonString(reason)); "WebRTC: call id: {} - hanging up ({})", callid_, callHangUpReasonString(reason));
emit newMessage(roomid_, CallHangUp{callid_, 0, reason}); emit newMessage(roomid_, CallHangUp{callid_, "0", reason});
endCall(); endCall();
} }
} }
@ -291,7 +291,7 @@ CallManager::handleEvent(const RoomEvent<CallInvite> &callInviteEvent)
if (isOnCall() || roomInfo.member_count != 2) { if (isOnCall() || roomInfo.member_count != 2) {
emit newMessage(QString::fromStdString(callInviteEvent.room_id), emit newMessage(QString::fromStdString(callInviteEvent.room_id),
CallHangUp{callInviteEvent.content.call_id, CallHangUp{callInviteEvent.content.call_id,
0, "0",
CallHangUp::Reason::InviteTimeOut}); CallHangUp::Reason::InviteTimeOut});
return; return;
} }