summary refs log tree commit diff
path: root/src/ChatPage.cpp
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2020-10-30 03:21:14 +0100
committerGitHub <noreply@github.com>2020-10-30 03:21:14 +0100
commitb64e6e9cd59c97f3e4f88c08d6c13f2574921d80 (patch)
tree5e2ee4ecaf8523bc006e47bad7f277b0e21eee0f /src/ChatPage.cpp
parentFix clipboard image pasting crash on macos (diff)
parentUnused variable (diff)
downloadnheko-b64e6e9cd59c97f3e4f88c08d6c13f2574921d80.tar.xz
Merge pull request #311 from trilene/webrtc-video
Support video calls
Diffstat (limited to 'src/ChatPage.cpp')
-rw-r--r--src/ChatPage.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp

index b587d521..78987fb9 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp
@@ -72,7 +72,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent) , isConnected_(true) , userSettings_{userSettings} , notificationsManager(this) - , callManager_(new CallManager(userSettings, this)) + , callManager_(new CallManager(this)) { setObjectName("chatPage"); @@ -442,7 +442,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent) } else { if (auto roomInfo = cache::singleRoomInfo(current_room_.toStdString()); roomInfo.member_count != 2) { - showNotification("Voice calls are limited to 1:1 rooms."); + showNotification("Calls are limited to 1:1 rooms."); } else { std::vector<RoomMember> members( cache::getMembers(current_room_.toStdString())); @@ -457,7 +457,10 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent) userSettings_, MainWindow::instance()); connect(dialog, &dialogs::PlaceCall::voice, this, [this]() { - callManager_->sendInvite(current_room_); + callManager_->sendInvite(current_room_, false); + }); + connect(dialog, &dialogs::PlaceCall::video, this, [this]() { + callManager_->sendInvite(current_room_, true); }); utils::centerWidget(dialog, MainWindow::instance()); dialog->show();