From 28b99be3183a853703691eaee22b92ac4da437be Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Mon, 18 Nov 2019 14:54:08 -0500
Subject: [PATCH] conference: manage hold and hang up
Change-Id: I4b7638a46566449914d39e9496bd5583f9d98f7f
---
src/CurrentCallVC.mm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index 6d81af68..e3f3b72c 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -162,6 +162,7 @@ CVPixelBufferRef pixelBufferPreview;
confUid_ = convIt->confId;
[self.chatVC setConversationUid:convUid model:account->conversationModel.get()];
[self connectSignals];
+ callModel->setCurrentCall([self getcallID]);
}
-(void) connectSignals {
@@ -330,6 +331,7 @@ CVPixelBufferRef pixelBufferPreview;
[muteAudioButton setHidden:!confUid_.empty()];
[muteVideoButton setHidden:!confUid_.empty()];
[recordOnOffButton setHidden:!confUid_.empty()];
+ [holdOnOffButton setHidden:!confUid_.empty()];
[timeSpentLabel setStringValue:@(callModel->getFormattedCallDuration(callUid_).c_str())];
if (refreshDurationTimer == nil)
@@ -802,7 +804,7 @@ CVPixelBufferRef pixelBufferPreview;
return;
auto* callModel = accountInfo_->callModel.get();
- callModel->hangUp([self getcallID]);
+ callModel->hangUp(callUid_);
}
- (IBAction)accept:(id)sender {
@@ -915,7 +917,7 @@ CVPixelBufferRef pixelBufferPreview;
- (IBAction)hidePreview:(id)sender {
CGRect previewFrame = previewView.frame;
- CGRect newPreviewFrame;//, bcHidePreviewFrame;
+ CGRect newPreviewFrame;
if (previewFrame.size.width > HIDE_PREVIEW_BUTTON_SIZE) {
self.movableBaseForView.movable = false;
newPreviewFrame = self.getVideoPreviewCollapsedSize;
--
GitLab